X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FDictionary.java;h=cde3eb9ca04fd521f1575a2f1a5294fecb928401;hb=a82db103035d624c4f6d333a0143d54495d66ba2;hp=2cc05b4f573213659b17636fbb2d2a52a91cd003;hpb=507a6c6f058d33536972b7980dbb99034ec4d61f;p=Dictionary.git diff --git a/src/com/hughes/android/dictionary/engine/Dictionary.java b/src/com/hughes/android/dictionary/engine/Dictionary.java index 2cc05b4..cde3eb9 100644 --- a/src/com/hughes/android/dictionary/engine/Dictionary.java +++ b/src/com/hughes/android/dictionary/engine/Dictionary.java @@ -14,36 +14,42 @@ package com.hughes.android.dictionary.engine; -import com.hughes.android.dictionary.DictionaryInfo; -import com.hughes.util.CachingList; -import com.hughes.util.raf.RAFList; -import com.hughes.util.raf.RAFListSerializer; -import com.hughes.util.raf.RAFSerializable; - import java.io.DataInput; +import java.io.DataInputStream; import java.io.DataOutput; import java.io.File; import java.io.IOException; +import java.io.ObjectOutputStream; import java.io.PrintStream; import java.io.RandomAccessFile; +import java.nio.channels.Channels; +import java.nio.channels.FileChannel; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import com.hughes.android.dictionary.DictionaryInfo; +import com.hughes.util.CachingList; +import com.hughes.util.raf.RAFList; +import com.hughes.util.raf.RAFListSerializer; +import com.hughes.util.raf.RAFSerializable; + public class Dictionary implements RAFSerializable { - static final int CACHE_SIZE = 5000; + private static final int CACHE_SIZE = 5000; - static final int CURRENT_DICT_VERSION = 6; - static final String END_OF_DICTIONARY = "END OF DICTIONARY"; + private static final int CURRENT_DICT_VERSION = 7; + private static final String END_OF_DICTIONARY = "END OF DICTIONARY"; // persisted final int dictFileVersion; - final long creationMillis; + public final long creationMillis; public final String dictInfo; public final List pairEntries; public final List textEntries; public final List htmlEntries; + public final List htmlData; public final List sources; public final List indices; @@ -56,14 +62,16 @@ public class Dictionary implements RAFSerializable { this.dictFileVersion = CURRENT_DICT_VERSION; this.creationMillis = System.currentTimeMillis(); this.dictInfo = dictInfo; - pairEntries = new ArrayList(); - textEntries = new ArrayList(); - htmlEntries = new ArrayList(); - sources = new ArrayList(); - indices = new ArrayList(); + pairEntries = new ArrayList<>(); + textEntries = new ArrayList<>(); + htmlEntries = new ArrayList<>(); + htmlData = null; + sources = new ArrayList<>(); + indices = new ArrayList<>(); } - public Dictionary(final RandomAccessFile raf) throws IOException { + public Dictionary(final FileChannel ch) throws IOException { + DataInput raf = new DataInputStream(Channels.newInputStream(ch)); dictFileVersion = raf.readInt(); if (dictFileVersion < 0 || dictFileVersion > CURRENT_DICT_VERSION) { throw new IOException("Invalid dictionary version: " + dictFileVersion); @@ -74,30 +82,33 @@ public class Dictionary implements RAFSerializable { // Load the sources, then seek past them, because reading them later // disrupts the offset. try { - final RAFList rafSources = RAFList.create(raf, new EntrySource.Serializer( - this), raf.getFilePointer()); - sources = new ArrayList(rafSources); - raf.seek(rafSources.getEndOffset()); + final RAFList rafSources = RAFList.create(ch, new EntrySource.Serializer( + this), ch.position(), dictFileVersion, dictInfo + " sources: "); + sources = new ArrayList<>(rafSources); + ch.position(rafSources.getEndOffset()); pairEntries = CachingList.create( - RAFList.create(raf, new PairEntry.Serializer(this), raf.getFilePointer()), - CACHE_SIZE); + RAFList.create(ch, new PairEntry.Serializer(this), ch.position(), dictFileVersion, dictInfo + " pairs: "), + CACHE_SIZE, false); textEntries = CachingList.create( - RAFList.create(raf, new TextEntry.Serializer(this), raf.getFilePointer()), - CACHE_SIZE); + RAFList.create(ch, new TextEntry.Serializer(this), ch.position(), dictFileVersion, dictInfo + " text: "), + CACHE_SIZE, true); if (dictFileVersion >= 5) { htmlEntries = CachingList.create( - RAFList.create(raf, new HtmlEntry.Serializer(this), raf.getFilePointer()), - CACHE_SIZE); + RAFList.create(ch, new HtmlEntry.Serializer(this, ch), ch.position(), dictFileVersion, dictInfo + " html: "), + CACHE_SIZE, false); } else { htmlEntries = Collections.emptyList(); } - indices = CachingList.createFullyCached(RAFList.create(raf, indexSerializer, - raf.getFilePointer())); + if (dictFileVersion >= 7) { + htmlData = RAFList.create(ch, new HtmlEntry.DataDeserializer(), ch.position(), dictFileVersion, dictInfo + " html: "); + } else { + htmlData = null; + } + indices = CachingList.createFullyCached(RAFList.create(ch, new IndexSerializer(ch), + ch.position(), dictFileVersion, dictInfo + " index: ")); } catch (RuntimeException e) { - final IOException ioe = new IOException("RuntimeException loading dictionary"); - ioe.initCause(e); - throw ioe; + throw new IOException("RuntimeException loading dictionary", e); } final String end = raf.readUTF(); if (!end.equals(END_OF_DICTIONARY)) { @@ -108,35 +119,49 @@ public class Dictionary implements RAFSerializable { @Override public void write(DataOutput out) throws IOException { RandomAccessFile raf = (RandomAccessFile)out; + if (dictFileVersion < 7) throw new RuntimeException("write function cannot write formats older than v7!"); raf.writeInt(dictFileVersion); raf.writeLong(creationMillis); raf.writeUTF(dictInfo); + System.out.println("sources start: " + raf.getFilePointer()); RAFList.write(raf, sources, new EntrySource.Serializer(this)); - RAFList.write(raf, pairEntries, new PairEntry.Serializer(this)); + System.out.println("pair start: " + raf.getFilePointer()); + RAFList.write(raf, pairEntries, new PairEntry.Serializer(this), 64, true); + System.out.println("text start: " + raf.getFilePointer()); RAFList.write(raf, textEntries, new TextEntry.Serializer(this)); - RAFList.write(raf, htmlEntries, new HtmlEntry.Serializer(this)); - RAFList.write(raf, indices, indexSerializer); + System.out.println("html index start: " + raf.getFilePointer()); + RAFList.write(raf, htmlEntries, new HtmlEntry.Serializer(this, null), 64, true); + System.out.println("html data start: " + raf.getFilePointer()); + assert htmlData == null; + RAFList.write(raf, htmlEntries, new HtmlEntry.DataSerializer(), 128, true); + System.out.println("indices start: " + raf.getFilePointer()); + RAFList.write(raf, indices, new IndexSerializer(null)); + System.out.println("end: " + raf.getFilePointer()); raf.writeUTF(END_OF_DICTIONARY); } - private final RAFListSerializer indexSerializer = new RAFListSerializer() { + private final class IndexSerializer implements RAFListSerializer { + private final FileChannel ch; + + IndexSerializer(FileChannel ch) { + this.ch = ch; + } + @Override public Index read(DataInput raf, final int readIndex) throws IOException { - return new Index(Dictionary.this, raf); + return new Index(Dictionary.this, ch, raf); } @Override public void write(DataOutput raf, Index t) throws IOException { t.write(raf); } - }; + } final RAFListSerializer htmlEntryIndexSerializer = new RAFListSerializer() { @Override - public void write(DataOutput raf, HtmlEntry t) throws IOException { - if (t.index() == -1) - throw new IndexOutOfBoundsException(); - raf.writeInt(t.index()); + public void write(DataOutput raf, HtmlEntry t) { + assert false; } @Override @@ -172,14 +197,17 @@ public class Dictionary implements RAFSerializable { RandomAccessFile raf = null; try { raf = new RandomAccessFile(file, "r"); - final Dictionary dict = new Dictionary(raf); + final Dictionary dict = new Dictionary(raf.getChannel()); final DictionaryInfo dictionaryInfo = dict.getDictionaryInfo(); dictionaryInfo.uncompressedFilename = file.getName(); dictionaryInfo.uncompressedBytes = file.length(); raf.close(); return dictionaryInfo; } catch (IOException e) { - return null; + final DictionaryInfo dictionaryInfo = new DictionaryInfo(); + dictionaryInfo.uncompressedFilename = file.getName(); + dictionaryInfo.uncompressedBytes = file.length(); + return dictionaryInfo; } finally { if (raf != null) { try {