diff --git a/dicts/dicts.go b/dicts/dicts.go index 043c911..2d6f950 100644 --- a/dicts/dicts.go +++ b/dicts/dicts.go @@ -95,10 +95,12 @@ func (DictGetter) GetDict(lang, filename string) ([]byte, error) { return GetDict(lang, filename) } +// XXX: Doesn't work func (DictGetter) IsOldFormat(magic []byte) bool { if len(magic) < 2 { return false } + println(magic[0], magic[1]) // LZW return (magic[0] == 0x1F && magic[1] == 0x9D) || (magic[0] == 0x1F && magic[1] == 0xA0) } diff --git a/repo/hashtron_phonemizer_repo.go b/repo/hashtron_phonemizer_repo.go index 9af1408..cee9117 100644 --- a/repo/hashtron_phonemizer_repo.go +++ b/repo/hashtron_phonemizer_repo.go @@ -333,17 +333,19 @@ func (r *HashtronPhonemizerRepository) LoadLanguage(isReverse bool, lang string) continue } - if !isReverse && (*r.getter).IsOldFormat(compressedData) { + if !isReverse /* doesnt work: && (*r.getter).IsOldFormat(compressedData)*/ { bytesReader := bytes.NewReader(compressedData) r.mut.Lock() - (*r.nets)[lang+reverse].ReadCompressedWeights(bytesReader) + err := (*r.nets)[lang+reverse].ReadCompressedWeights(bytesReader) r.mut.Unlock() + log.Error0(err) return } else if isReverse && (*r.getter).IsNewFormat(compressedData) { bytesReader := bytes.NewReader(compressedData) r.mut.Lock() - (*r.nets)[lang+reverse].ReadZlibWeights(bytesReader) + err := (*r.nets)[lang+reverse].ReadZlibWeights(bytesReader) r.mut.Unlock() + log.Error0(err) return } }