alex/yomichan-import
1
Fork 0
Code Releases Activity

WIP

Browse Source
This commit is contained in:
Alex Yatskov 2016-08-02 22:21:06 -07:00
parent e2d11e2cda
commit 9a436ce9a0
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
jmdict.go
View File

@ -33,7 +33,8 @@ import (
type dictJson struct { type dictJson struct {
Indices map[string]string `json:"i"` Indices map[string]string `json:"i"`
Items [][]string `json:"d"` Entities map[string]string `json:"e"`
Defs [][]string `json:"d"`
} }
type dictEntry struct { type dictEntry struct {
@ -52,33 +53,36 @@ func (d *dictEntry) addTags(tags []string) {
} }
func appendIndex(indices map[string]string, key string, value int) { func appendIndex(indices map[string]string, key string, value int) {
items, _ := indices[key] def, _ := indices[key]
if len(indices) > 0 { if len(def) > 0 {
items = " " def += " "
} }
items += strconv.Itoa(value) def += strconv.Itoa(value)
indices[key] = items indices[key] = def
} }
func buildDictJson(entries []dictEntry) dictJson { func buildDictJson(entries []dictEntry, entities map[string]string) dictJson {
dict := dictJson{Indices: make(map[string]string)} dict := dictJson{
Indices: make(map[string]string),
Entities: entities,
}
for index, entry := range entries { for i, e := range entries {
item := []string{entry.Expression, entry.Reading, strings.Join(entry.Tags, " ")} entry := []string{e.Expression, e.Reading, strings.Join(e.Tags, " ")}
item = append(item, entry.Glossary...) entry = append(entry, e.Glossary...)
dict.Items = append(dict.Items, item) dict.Defs = append(dict.Defs, entry)
appendIndex(dict.Indices, entry.Expression, index) appendIndex(dict.Indices, e.Expression, i)
if len(entry.Reading) > 0 { if len(e.Reading) > 0 {
appendIndex(dict.Indices, entry.Reading, index) appendIndex(dict.Indices, e.Reading, i)
} }
} }
return dict return dict
} }
func outputJson(entries []dictEntry, writer io.Writer) error { func outputJson(entries []dictEntry, entities map[string]string, writer io.Writer) error {
dict := buildDictJson(entries) dict := buildDictJson(entries, entities)
bytes, err := json.MarshalIndent(dict, "", " ") bytes, err := json.MarshalIndent(dict, "", " ")
// bytes, err := json.Marshal(dict) // bytes, err := json.Marshal(dict)
@ -205,7 +209,7 @@ func convertEdictEntry(edictEntry jmdict.EdictEntry) []dictEntry {
} }
func processEnamdict(reader io.Reader, writer io.Writer) error { func processEnamdict(reader io.Reader, writer io.Writer) error {
enamdictEntries, _, err := jmdict.LoadEnamdict(reader, false) enamdictEntries, entities, err := jmdict.LoadEnamdict(reader, false)
if err != nil { if err != nil {
return err return err
} }
@ -215,11 +219,11 @@ func processEnamdict(reader io.Reader, writer io.Writer) error {
entries = append(entries, convertEnamdictEntry(enamdictEntry)...) entries = append(entries, convertEnamdictEntry(enamdictEntry)...)
} }
return outputJson(entries, writer) return outputJson(entries, entities, writer)
} }
func processEdict(reader io.Reader, writer io.Writer) error { func processEdict(reader io.Reader, writer io.Writer) error {
edictEntries, _, err := jmdict.LoadEdict(reader, false) edictEntries, entities, err := jmdict.LoadEdict(reader, false)
if err != nil { if err != nil {
return err return err
} }
@ -229,5 +233,5 @@ func processEdict(reader io.Reader, writer io.Writer) error {
entries = append(entries, convertEdictEntry(edictEntry)...) entries = append(entries, convertEdictEntry(edictEntry)...)
} }
return outputJson(entries, writer) return outputJson(entries, entities, writer)
} }