X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FHtmlEntry.java;h=8dcf905175f5f5e01b983a7fd288f2a80a998ae1;hb=a6dcf86c19971cea1e7585a43bc65f12f189636c;hp=ca153a70126af7638ffcbed677a65402227e6eb8;hpb=9cb5a8e2d7acacc8e01e5133e50a225550eb0501;p=Dictionary.git diff --git a/src/com/hughes/android/dictionary/engine/HtmlEntry.java b/src/com/hughes/android/dictionary/engine/HtmlEntry.java index ca153a7..8dcf905 100644 --- a/src/com/hughes/android/dictionary/engine/HtmlEntry.java +++ b/src/com/hughes/android/dictionary/engine/HtmlEntry.java @@ -3,15 +3,16 @@ package com.hughes.android.dictionary.engine; import com.hughes.util.StringUtil; import com.hughes.util.raf.RAFListSerializer; +import com.hughes.util.raf.RAFListSerializerSkippable; import com.ibm.icu.text.Transliterator; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.io.PrintStream; -import java.io.RandomAccessFile; import java.io.UnsupportedEncodingException; import java.lang.ref.SoftReference; +import java.nio.channels.FileChannel; import java.util.List; import java.util.regex.Pattern; @@ -19,7 +20,8 @@ public class HtmlEntry extends AbstractEntry implements Comparable { // Title is not HTML escaped. public final String title; - public final LazyHtmlLoader lazyHtmlLoader; + private final LazyHtmlLoader lazyHtmlLoader; + @SuppressWarnings("WeakerAccess") public String html; public HtmlEntry(final EntrySource entrySource, String title) { @@ -28,28 +30,28 @@ public class HtmlEntry extends AbstractEntry implements Comparable { lazyHtmlLoader = null; } - public HtmlEntry(Dictionary dictionary, DataInput raf, final int index) + public HtmlEntry(Dictionary dictionary, FileChannel ch, DataInput raf, final int index) throws IOException { super(dictionary, raf, index); title = raf.readUTF(); - lazyHtmlLoader = new LazyHtmlLoader(raf, dictionary.htmlData, index); + lazyHtmlLoader = new LazyHtmlLoader(ch, raf, dictionary.htmlData, index); html = null; } - public void writeBase(DataOutput raf) throws IOException { + private void writeBase(DataOutput raf) throws IOException { super.write(raf); raf.writeUTF(title); } - public void writeData(DataOutput raf) throws IOException { + private void writeData(DataOutput raf) throws IOException { final byte[] bytes = getHtml().getBytes("UTF-8"); StringUtil.writeVarInt(raf, bytes.length); raf.write(bytes); } - public static byte[] readData(DataInput raf) throws IOException { + private static byte[] readData(DataInput raf) throws IOException { int len = StringUtil.readVarInt(raf); - final byte[] bytes = new byte[len]; + final byte[] bytes = new byte[Math.min(len, 20 * 1024 * 1024)]; raf.readFully(bytes); return bytes; } @@ -70,19 +72,35 @@ public class HtmlEntry extends AbstractEntry implements Comparable { return new Row(this.index, rowIndex, dictionaryIndex); } - static final class Serializer implements RAFListSerializer { + static final class Serializer implements RAFListSerializerSkippable { final Dictionary dictionary; + final FileChannel ch; - Serializer(Dictionary dictionary) { + Serializer(Dictionary dictionary, FileChannel ch) { this.dictionary = dictionary; + this.ch = ch; } @Override public HtmlEntry read(DataInput raf, final int index) throws IOException { - return new HtmlEntry(dictionary, raf, index); + return new HtmlEntry(dictionary, ch, raf, index); } + @Override + public void skip(DataInput raf, final int index) throws IOException { + if (dictionary.dictFileVersion >= 7) + { + StringUtil.readVarInt(raf); + } + else + { + raf.skipBytes(2); + } + int l = raf.readUnsignedShort(); + raf.skipBytes(l); + } + @Override public void write(DataOutput raf, HtmlEntry t) throws IOException { t.writeBase(raf); @@ -91,7 +109,7 @@ public class HtmlEntry extends AbstractEntry implements Comparable { static final class DataSerializer implements RAFListSerializer { @Override - public HtmlEntry read(DataInput raf, final int index) throws IOException { + public HtmlEntry read(DataInput raf, final int index) { assert false; return null; } @@ -109,17 +127,17 @@ public class HtmlEntry extends AbstractEntry implements Comparable { } @Override - public void write(DataOutput raf, byte[] t) throws IOException { + public void write(DataOutput raf, byte[] t) { assert false; } } - public String getRawText(final boolean compact) { + private String getRawText(final boolean compact) { return title + ":\n" + getHtml(); } @Override - public int compareTo(HtmlEntry another) { + public int compareTo(/*@NonNull*/ HtmlEntry another) { if (title.compareTo(another.title) != 0) { return title.compareTo(another.title); } @@ -135,8 +153,6 @@ public class HtmlEntry extends AbstractEntry implements Comparable { public static class Row extends RowBase { - boolean isExpanded = false; - Row(final DataInput raf, final int thisRowIndex, final Index index, int extra) throws IOException { super(raf, thisRowIndex, index, extra); @@ -197,6 +213,7 @@ public class HtmlEntry extends AbstractEntry implements Comparable { return result.toString(); } + @SuppressWarnings("WeakerAccess") public static String formatQuickdicUrl(final String indexShortName, final String text) { assert !indexShortName.contains(":"); assert text.length() > 0; @@ -209,8 +226,10 @@ public class HtmlEntry extends AbstractEntry implements Comparable { // -------------------------------------------------------------------- + @SuppressWarnings("WeakerAccess") public static final class LazyHtmlLoader { - final RandomAccessFile raf; + final DataInput raf; + final FileChannel ch; final long offset; final int numBytes; final int numZipBytes; @@ -218,26 +237,28 @@ public class HtmlEntry extends AbstractEntry implements Comparable { final int index; // Not sure this volatile is right, but oh well. - volatile SoftReference htmlRef = new SoftReference(null); + volatile SoftReference htmlRef = new SoftReference<>(null); - private LazyHtmlLoader(final DataInput inp, List data, int index) throws IOException { + private LazyHtmlLoader(FileChannel ch, final DataInput inp, List data, int index) throws IOException { this.data = data; this.index = index; if (data != null) { this.raf = null; + this.ch = null; this.offset = 0; this.numBytes = -1; this.numZipBytes = -1; return; } - raf = (RandomAccessFile)inp; - numBytes = raf.readInt(); - numZipBytes = raf.readInt(); - offset = raf.getFilePointer(); + raf = inp; + this.ch = ch; + numBytes = Math.min(raf.readInt(), 20 * 1024 * 1024); + numZipBytes = Math.min(raf.readInt(), 20 * 1024 * 1024); + offset = ch.position(); raf.skipBytes(numZipBytes); } - public String getHtml() { + String getHtml() { String html = htmlRef.get(); if (html != null) { return html; @@ -248,16 +269,16 @@ public class HtmlEntry extends AbstractEntry implements Comparable { } catch (UnsupportedEncodingException e) { throw new RuntimeException("Dictionary HTML data corrupted", e); } - htmlRef = new SoftReference(html); + htmlRef = new SoftReference<>(html); return html; } System.out.println("Loading Html: numBytes=" + numBytes + ", numZipBytes=" + numZipBytes); final byte[] zipBytes = new byte[numZipBytes]; - synchronized (raf) { + synchronized (ch) { try { - raf.seek(offset); - raf.read(zipBytes); + ch.position(offset); + raf.readFully(zipBytes); } catch (IOException e) { throw new RuntimeException("Failed to read HTML data from dictionary", e); } @@ -268,7 +289,7 @@ public class HtmlEntry extends AbstractEntry implements Comparable { } catch (IOException e) { throw new RuntimeException("Dictionary HTML data corrupted", e); } - htmlRef = new SoftReference(html); + htmlRef = new SoftReference<>(html); return html; } }