package com.hughes.android.dictionary.engine;
-import com.hughes.util.StringUtil;
-import com.hughes.util.raf.RAFListSerializer;
-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.charset.StandardCharsets;
import java.util.List;
import java.util.regex.Pattern;
+import com.hughes.util.DataInputBuffer;
+import com.hughes.util.StringUtil;
+import com.hughes.util.raf.RAFListSerializer;
+import com.hughes.util.raf.RAFListSerializerSkippable;
+import com.ibm.icu.text.Transliterator;
+
public class HtmlEntry extends AbstractEntry implements Comparable<HtmlEntry> {
// 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) {
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 {
- final byte[] bytes = getHtml().getBytes("UTF-8");
+ private void writeData(DataOutput raf) throws IOException {
+ final byte[] bytes = getHtml().getBytes(StandardCharsets.UTF_8);
StringUtil.writeVarInt(raf, bytes.length);
raf.write(bytes);
}
- public static byte[] readData(DataInput raf) throws IOException {
+ private static DataInputBuffer readData(DataInput raf) throws IOException {
int len = StringUtil.readVarInt(raf);
- final byte[] bytes = new byte[len];
- raf.readFully(bytes);
- return bytes;
+ return ((DataInputBuffer)raf).slice(len);
}
String getHtml() {
return new Row(this.index, rowIndex, dictionaryIndex);
}
- static final class Serializer implements RAFListSerializer<HtmlEntry> {
+ static final class Serializer implements RAFListSerializerSkippable<HtmlEntry> {
final Dictionary dictionary;
return new HtmlEntry(dictionary, 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);
static final class DataSerializer implements RAFListSerializer<HtmlEntry> {
@Override
- public HtmlEntry read(DataInput raf, final int index) throws IOException {
+ public HtmlEntry read(DataInput raf, final int index) {
assert false;
return null;
}
}
}
- static final class DataDeserializer implements RAFListSerializer<byte[]> {
+ static final class DataDeserializer implements RAFListSerializer<DataInputBuffer> {
@Override
- public byte[] read(DataInput raf, final int index) throws IOException {
- return HtmlEntry.readData(raf);
+ public DataInputBuffer read(DataInput raf, final int index) throws IOException {
+ return readData(raf);
}
@Override
- public void write(DataOutput raf, byte[] t) throws IOException {
+ public void write(DataOutput raf, DataInputBuffer 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);
}
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);
return result.toString();
}
+ @SuppressWarnings("WeakerAccess")
public static String formatQuickdicUrl(final String indexShortName, final String text) {
assert !indexShortName.contains(":");
assert text.length() > 0;
- return String.format("q://d?%s&%s", indexShortName, StringUtil.encodeForUrl(text));
+ StringBuilder s = new StringBuilder("q://d?");
+ s.append(indexShortName);
+ s.append("&");
+ s.append(StringUtil.encodeForUrl(text));
+ return s.toString();
}
public static boolean isQuickdicUrl(String url) {
// --------------------------------------------------------------------
+ @SuppressWarnings("WeakerAccess")
public static final class LazyHtmlLoader {
- final RandomAccessFile raf;
- final long offset;
+ final DataInputBuffer buf;
final int numBytes;
- final int numZipBytes;
- final List<byte[]> data;
+ final List<DataInputBuffer> data;
final int index;
// Not sure this volatile is right, but oh well.
- volatile SoftReference<String> htmlRef = new SoftReference<String>(null);
+ volatile SoftReference<String> htmlRef = new SoftReference<>(null);
- private LazyHtmlLoader(final DataInput inp, List<byte[]> data, int index) throws IOException {
+ private LazyHtmlLoader(final DataInput inp, List<DataInputBuffer> data, int index) throws IOException {
this.data = data;
this.index = index;
if (data != null) {
- this.raf = null;
- this.offset = 0;
+ buf = null;
this.numBytes = -1;
- this.numZipBytes = -1;
return;
}
- raf = (RandomAccessFile)inp;
- numBytes = raf.readInt();
- numZipBytes = raf.readInt();
- offset = raf.getFilePointer();
- raf.skipBytes(numZipBytes);
+ numBytes = Math.min(inp.readInt(), 20 * 1024 * 1024);
+ int numZipBytes = Math.min(inp.readInt(), 20 * 1024 * 1024);
+ DataInputBuffer b = (DataInputBuffer)inp;
+ buf = b.slice(numZipBytes);
}
- public String getHtml() {
+ String getHtml() {
String html = htmlRef.get();
if (html != null) {
return html;
}
if (data != null) {
- try {
- html = new String(data.get(index), "UTF-8");
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException("Dictionary HTML data corrupted", e);
- }
- htmlRef = new SoftReference<String>(html);
+ html = data.get(index).asString();
+ htmlRef = new SoftReference<>(html);
return html;
}
System.out.println("Loading Html: numBytes=" + numBytes + ", numZipBytes="
- + numZipBytes);
- final byte[] zipBytes = new byte[numZipBytes];
- synchronized (raf) {
- try {
- raf.seek(offset);
- raf.read(zipBytes);
- } catch (IOException e) {
- throw new RuntimeException("Failed to read HTML data from dictionary", e);
- }
- }
+ + buf.limit());
+ final byte[] zipBytes = new byte[buf.limit()];
+ buf.rewind();
+ buf.readFully(zipBytes);
try {
final byte[] bytes = StringUtil.unzipFully(zipBytes, numBytes);
- html = new String(bytes, "UTF-8");
+ html = new String(bytes, StandardCharsets.UTF_8);
} catch (IOException e) {
throw new RuntimeException("Dictionary HTML data corrupted", e);
}
- htmlRef = new SoftReference<String>(html);
+ htmlRef = new SoftReference<>(html);
return html;
}
}
projects / Dictionary.git / blobdiff