Fix pitch display and sense deserializing

Julien LepillerMon Jul 19 00:11:52+0200 2021

30e5973

Fix pitch display and sense deserializing

app/src/main/java/eu/lepiller/nani/dictionary/DictionaryFactory.java

269269
    }
270270
271271
    public static URL getListUrl() throws MalformedURLException {
272-
        return new URL("https://nani.lepiller.eu/dicos/list");
272+
        return new URL("https://nani.lepiller.eu/dicos2/list");
273273
    }
274274
275275
    public static File getListFile() {

app/src/main/java/eu/lepiller/nani/dictionary/ResultDictionary.java

6161
                String source_language = getString(file);
6262
                sense_sources.add(new Result.Source(source_content, source_wasei, source_language));
6363
            }
64-
            ArrayList<String> sense_infos = getStringList(file);
64+
            ArrayList<String> sense_infos = getHuffmanStringList(file, meaningHuffman);
6565
            ArrayList<String> sense_glosses = getHuffmanStringList(file, meaningHuffman);
6666
            String sense_language = getString(file);
6767
            senses.add(new Result.Sense(sense_references, sense_limits, sense_infos, sense_sources,

app/src/main/java/eu/lepiller/nani/dictionary/WadokuPitchDictionary.java

7272
            List<Result.Reading> readings = r.getReadings();
7373
7474
            for(String k: kanjis) {
75-
                Log.d(TAG, "Searching pitch for " + Arrays.toString(k.getBytes()));
7675
                for(Result.Reading read: readings) {
7776
                    List<String> readingKanjis = read.getKanjis();
78-
                    if(readingKanjis != null && !readingKanjis.contains(k)) {
77+
                    if(readingKanjis != null && readingKanjis.size() > 0 && !readingKanjis.contains(k)) {
7978
                        // this is not a reading for the current kanji, so continue to the next
8079
                        // reading
8180
                        continue;
8281
                    }
8382
                    List<String> innerReadings = read.getReadings();
8483
                    for(String reading: innerReadings) {
84+
                        Log.d(TAG, "Searching pitch for " + k + reading);
8585
                        String pitch = findPitch(k, reading, file);
8686
                        if(pitch != null) {
8787
                            Log.d(TAG, "Found " + pitch);