alex/yomichan-import
1
Fork 0
Code Releases Activity

Rename some jmdict functions

Browse Source
This commit is contained in:
stephenmk 2023-02-01 19:14:37 -06:00
parent 3b420f8b6c
commit 19d6d0bb43
No known key found for this signature in database
GPG Key ID: B6DA730DB06235F1
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.go
View File

@ -329,7 +329,7 @@ func detectFormat(path string) (string, error) {
func ExportDb(inputPath, outputPath, format, language, title string, stride int, pretty bool) error { func ExportDb(inputPath, outputPath, format, language, title string, stride int, pretty bool) error {
handlers := map[string]func(string, string, string, string, int, bool) error{ handlers := map[string]func(string, string, string, string, int, bool) error{
"edict": jmdExportDb, "edict": jmdictExportDb,
"forms": formsExportDb, "forms": formsExportDb,
"enamdict": jmnedictExportDb, "enamdict": jmnedictExportDb,
"epwing": epwingExportDb, "epwing": epwingExportDb,

18
jmdict.go
View File

@ -79,7 +79,7 @@ func jmdictPublicationDate(dictionary jmdict.Jmdict) string {
} }
} }
func createFormsTerm(headword headword, entry jmdict.JmdictEntry, meta jmdictMetadata) (dbTerm, bool) { func jmdictFormsTerm(headword headword, entry jmdict.JmdictEntry, meta jmdictMetadata) (dbTerm, bool) {
// Don't add "forms" terms to non-English dictionaries. // Don't add "forms" terms to non-English dictionaries.
// Information would be duplicated if users installed more // Information would be duplicated if users installed more
// than one version. // than one version.
@ -107,7 +107,7 @@ func createFormsTerm(headword headword, entry jmdict.JmdictEntry, meta jmdictMet
return term, true return term, true
} }
func createSearchTerm(headword headword, entry jmdict.JmdictEntry, meta jmdictMetadata) (dbTerm, bool) { func jmdictSearchTerm(headword headword, entry jmdict.JmdictEntry, meta jmdictMetadata) (dbTerm, bool) {
// Don't add "search" terms to non-English dictionaries. // Don't add "search" terms to non-English dictionaries.
// Information would be duplicated if users installed more // Information would be duplicated if users installed more
// than one version. // than one version.
@ -140,7 +140,7 @@ func createSearchTerm(headword headword, entry jmdict.JmdictEntry, meta jmdictMe
return term, true return term, true
} }
func createSenseTerm(sense jmdict.JmdictSense, senseNumber int, headword headword, entry jmdict.JmdictEntry, meta jmdictMetadata) (dbTerm, bool) { func jmdictSenseTerm(sense jmdict.JmdictSense, senseNumber int, headword headword, entry jmdict.JmdictEntry, meta jmdictMetadata) (dbTerm, bool) {
if sense.RestrictedReadings != nil && !slices.Contains(sense.RestrictedReadings, headword.Reading) { if sense.RestrictedReadings != nil && !slices.Contains(sense.RestrictedReadings, headword.Reading) {
return dbTerm{}, false return dbTerm{}, false
} }
@ -176,12 +176,12 @@ func createSenseTerm(sense jmdict.JmdictSense, senseNumber int, headword headwor
return term, true return term, true
} }
func extractTerms(headword headword, entry jmdict.JmdictEntry, meta jmdictMetadata) ([]dbTerm, bool) { func jmdictTerms(headword headword, entry jmdict.JmdictEntry, meta jmdictMetadata) ([]dbTerm, bool) {
if meta.seqToSenseCount[entry.Sequence] == 0 { if meta.seqToSenseCount[entry.Sequence] == 0 {
return nil, false return nil, false
} }
if headword.IsSearchOnly { if headword.IsSearchOnly {
if searchTerm, ok := createSearchTerm(headword, entry, meta); ok { if searchTerm, ok := jmdictSearchTerm(headword, entry, meta); ok {
return []dbTerm{searchTerm}, true return []dbTerm{searchTerm}, true
} else { } else {
return nil, false return nil, false
@ -194,20 +194,20 @@ func extractTerms(headword headword, entry jmdict.JmdictEntry, meta jmdictMetada
// Do not increment sense number // Do not increment sense number
continue continue
} }
if senseTerm, ok := createSenseTerm(sense, senseNumber, headword, entry, meta); ok { if senseTerm, ok := jmdictSenseTerm(sense, senseNumber, headword, entry, meta); ok {
terms = append(terms, senseTerm) terms = append(terms, senseTerm)
} }
senseNumber += 1 senseNumber += 1
} }
if formsTerm, ok := createFormsTerm(headword, entry, meta); ok { if formsTerm, ok := jmdictFormsTerm(headword, entry, meta); ok {
terms = append(terms, formsTerm) terms = append(terms, formsTerm)
} }
return terms, true return terms, true
} }
func jmdExportDb(inputPath string, outputPath string, languageName string, title string, stride int, pretty bool) error { func jmdictExportDb(inputPath string, outputPath string, languageName string, title string, stride int, pretty bool) error {
if _, ok := langNameToCode[languageName]; !ok { if _, ok := langNameToCode[languageName]; !ok {
return errors.New("Unrecognized language parameter: " + languageName) return errors.New("Unrecognized language parameter: " + languageName)
} }
@ -229,7 +229,7 @@ func jmdExportDb(inputPath string, outputPath string, languageName string, title
for _, entry := range dictionary.Entries { for _, entry := range dictionary.Entries {
headwords := extractHeadwords(entry) headwords := extractHeadwords(entry)
for _, headword := range headwords { for _, headword := range headwords {
if newTerms, ok := extractTerms(headword, entry, meta); ok { if newTerms, ok := jmdictTerms(headword, entry, meta); ok {
terms = append(terms, newTerms...) terms = append(terms, newTerms...)
} }
} }

2
jmdict_forms.go
View File

@ -207,7 +207,7 @@ func formsExportDb(inputPath, outputPath, languageName, title string, stride int
headwords := extractHeadwords(entry) headwords := extractHeadwords(entry)
for _, h := range headwords { for _, h := range headwords {
if h.IsSearchOnly { if h.IsSearchOnly {
if term, ok := createSearchTerm(h, entry, meta); ok { if term, ok := jmdictSearchTerm(h, entry, meta); ok {
terms = append(terms, term) terms = append(terms, term)
} }
continue continue