Merge pull request #3 from xythh/master

Rename package name to Yomitan.
themoeway · Mar 22, 2023 · 73b35ff · 73b35ff
2 parents 65016b5 + 8637158
commit 73b35ff
Show file tree

Hide file tree

Showing 32 changed files with 125 additions and 125 deletions.
diff --git a/common.go b/common.go
@@ -1,4 +1,4 @@
-package yomichan
+package yomitan
 
 import (
 	"archive/zip"
@@ -158,10 +158,10 @@ func (index *dbIndex) setDefaults() {
 		index.Format = 3
 	}
 	if index.Author == "" {
-		index.Author = "yomichan-import"
+		index.Author = "yomitan-import"
 	}
 	if index.Url == "" {
-		index.Url = "https://github.com/FooSoft/yomichan-import"
+		index.Url = "https://github.com/themoeway/yomitan-import"
 	}
 }
 

diff --git a/daijirin.go b/daijirin.go
@@ -1,10 +1,10 @@
-package yomichan
+package yomitan
 
 import (
 	"regexp"
 	"strings"
 
-	zig "foosoft.net/projects/zero-epwing-go"
+	zig "github.com/themoeway/zero-epwing-go"
 )
 
 type daijirinExtractor struct {

diff --git a/daijisen.go b/daijisen.go
@@ -1,10 +1,10 @@
-package yomichan
+package yomitan
 
 import (
 	"regexp"
 	"strings"
 
-	zig "foosoft.net/projects/zero-epwing-go"
+	zig "github.com/themoeway/zero-epwing-go"
 )
 
 type daijisenExtractor struct {

diff --git a/epwing.go b/epwing.go
@@ -1,12 +1,12 @@
-package yomichan
+package yomitan
 
 import (
 	"fmt"
 	"regexp"
 	"strconv"
 	"strings"
 
-	zig "foosoft.net/projects/zero-epwing-go"
+	zig "github.com/themoeway/zero-epwing-go"
 )
 
 type epwingExtractor interface {

diff --git a/frequency.go b/frequency.go
@@ -1,4 +1,4 @@
-package yomichan
+package yomitan
 
 import (
 	"bufio"

diff --git a/gakken.go b/gakken.go
@@ -1,10 +1,10 @@
-package yomichan
+package yomitan
 
 import (
 	"regexp"
 	"strings"
 
-	zig "foosoft.net/projects/zero-epwing-go"
+	zig "github.com/themoeway/zero-epwing-go"
 )
 
 type gakkenExtractor struct {

diff --git a/go.mod b/go.mod
@@ -1,12 +1,12 @@
-module foosoft.net/projects/yomichan-import
+module github.com/themoeway/yomitan-import
 
 go 1.18
 
 require (
-	foosoft.net/projects/jmdict v0.0.0-20220704034116-2e3194aa18d5
-	foosoft.net/projects/zero-epwing-go v0.0.0-20220704035039-bc008453615d
 	github.com/andlabs/ui v0.0.0-20200610043537-70a69d6ae31e
 	github.com/mattn/go-sqlite3 v1.14.14
+	github.com/themoeway/jmdict-go v0.0.0-20230321060422-fa8f5d54f364
+	github.com/themoeway/zero-epwing-go v0.0.0-20230320143722-0af367763d6c
 	golang.org/x/exp v0.0.0-20221207211629-99ab8fa1c11f
 )
 

diff --git a/go.sum b/go.sum
@@ -1,11 +1,11 @@
-foosoft.net/projects/jmdict v0.0.0-20220704034116-2e3194aa18d5 h1:OSA3YcWT9bUg4ut4bTuUtrW1wMg9wJen1VUBbLKqyTQ=
-foosoft.net/projects/jmdict v0.0.0-20220704034116-2e3194aa18d5/go.mod h1:ZrjLCcE7ZrND28ZOSGYMd78tL+Dffiv2g+NjOMKgnew=
-foosoft.net/projects/zero-epwing-go v0.0.0-20220704035039-bc008453615d h1:GDyxif1+wM5gml2yTb9zy+9KE9NcTrtFxplpQCt/ksQ=
-foosoft.net/projects/zero-epwing-go v0.0.0-20220704035039-bc008453615d/go.mod h1:ux61lX0Tn9Pd3xz/48Obt2I/A5LPWoNtV2x6rZpWuPM=
 github.com/andlabs/ui v0.0.0-20200610043537-70a69d6ae31e h1:wSQCJiig/QkoUnpvelSPbLiZNWvh2yMqQTQvIQqSUkU=
 github.com/andlabs/ui v0.0.0-20200610043537-70a69d6ae31e/go.mod h1:5G2EjwzgZUPnnReoKvPWVneT8APYbyKkihDVAHUi0II=
 github.com/mattn/go-sqlite3 v1.14.14 h1:qZgc/Rwetq+MtyE18WhzjokPD93dNqLGNT3QJuLvBGw=
 github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/themoeway/jmdict-go v0.0.0-20230321060422-fa8f5d54f364 h1:JSSM5osTN5FCoj7uErWoMVY+IbDh+OG0aRJnKsxgngc=
+github.com/themoeway/jmdict-go v0.0.0-20230321060422-fa8f5d54f364/go.mod h1:M9O+lJXOwrOqpN4VUv8Qkn1gsZ/SZaSAiF7nj0m1NZk=
+github.com/themoeway/zero-epwing-go v0.0.0-20230320143722-0af367763d6c h1:32GHNc47Ff2l+zkixRhK2Q4GqosXI4D5w0PjDNMAo68=
+github.com/themoeway/zero-epwing-go v0.0.0-20230320143722-0af367763d6c/go.mod h1:O6+Fn5z4McOG0I8tS1X2HqYx9n0KPW1KQccYyoXzSR4=
 golang.org/x/exp v0.0.0-20221207211629-99ab8fa1c11f h1:90Jq/vvGVDsqj8QqCynjFw9MCerDguSMODLYII416Y8=
 golang.org/x/exp v0.0.0-20221207211629-99ab8fa1c11f/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=

diff --git a/jmdict.go b/jmdict.go
@@ -1,4 +1,4 @@
-package yomichan
+package yomitan
 
 import (
 	"errors"
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"foosoft.net/projects/jmdict"
+	jmdict "github.com/themoeway/jmdict-go"
 	"golang.org/x/exp/slices"
 )
 

diff --git a/jmdict_constants.go b/jmdict_constants.go
@@ -1,4 +1,4 @@
-package yomichan
+package yomitan
 
 type LangCode struct {
 	language string

diff --git a/jmdict_forms.go b/jmdict_forms.go
@@ -1,10 +1,10 @@
-package yomichan
+package yomitan
 
 import (
 	"os"
 	"strings"
 
-	"foosoft.net/projects/jmdict"
+	jmdict "github.com/themoeway/jmdict-go"
 	"golang.org/x/exp/slices"
 )
 

diff --git a/jmdict_glossary.go b/jmdict_glossary.go
@@ -1,10 +1,10 @@
-package yomichan
+package yomitan
 
 import (
 	"fmt"
 	"strconv"
 
-	"foosoft.net/projects/jmdict"
+	jmdict "github.com/themoeway/jmdict-go"
 )
 
 func glossaryContainsLanguage(glossary []jmdict.JmdictGlossary, language string) bool {

diff --git a/jmdict_headword.go b/jmdict_headword.go
@@ -1,12 +1,12 @@
-package yomichan
+package yomitan
 
 import (
 	"fmt"
 	"hash/fnv"
 	"regexp"
 	"strconv"
 
-	"foosoft.net/projects/jmdict"
+	jmdict "github.com/themoeway/jmdict-go"
 	"golang.org/x/exp/slices"
 )
 
@@ -235,7 +235,7 @@ func extractHeadwords(entry jmdict.JmdictEntry) []headword {
 	if allKanjiAreIrregular {
 		// Adding the reading-only terms before kanji+reading
 		// terms here for the sake of the Index property,
-		// which affects the yomichan term ranking.
+		// which affects the yomitan term ranking.
 		for _, reading := range entry.Readings {
 			h := newHeadword(nil, &reading)
 			h.Index = len(headwords)

diff --git a/jmdict_metadata.go b/jmdict_metadata.go
@@ -1,9 +1,9 @@
-package yomichan
+package yomitan
 
 import (
 	"strings"
 
-	"foosoft.net/projects/jmdict"
+	jmdict "github.com/themoeway/jmdict-go"
 	"golang.org/x/exp/slices"
 )
 

diff --git a/jmdict_references.go b/jmdict_references.go
@@ -1,4 +1,4 @@
-package yomichan
+package yomitan
 
 import (
 	"fmt"

diff --git a/jmdict_tags.go b/jmdict_tags.go
@@ -1,4 +1,4 @@
-package yomichan
+package yomitan
 
 import (
 	"fmt"

diff --git a/jmnedict.go b/jmnedict.go
@@ -1,10 +1,10 @@
-package yomichan
+package yomitan
 
 import (
 	"os"
 	"regexp"
 
-	"foosoft.net/projects/jmdict"
+	jmdict "github.com/themoeway/jmdict-go"
 )
 
 func jmnedictPublicationDate(dictionary jmdict.Jmnedict) string {

diff --git a/jmnedict_generic_terms.go b/jmnedict_generic_terms.go
@@ -1,4 +1,4 @@
-package yomichan
+package yomitan
 
 import (
 	"golang.org/x/exp/slices"

diff --git a/jmnedict_text_util.go b/jmnedict_text_util.go
@@ -1,4 +1,4 @@
-package yomichan
+package yomitan
 
 import (
 	"strings"

diff --git a/kanjidic.go b/kanjidic.go
@@ -1,10 +1,10 @@
-package yomichan
+package yomitan
 
 import (
 	"os"
 	"strconv"
 
-	"foosoft.net/projects/jmdict"
+	jmdict "github.com/themoeway/jmdict-go"
 )
 
 func kanjidicExtractKanji(entry jmdict.KanjidicCharacter, language string) *dbKanji {

diff --git a/kotowaza.go b/kotowaza.go
@@ -1,10 +1,10 @@
-package yomichan
+package yomitan
 
 import (
 	"regexp"
 	"strings"
 
-	zig "foosoft.net/projects/zero-epwing-go"
+	zig "github.com/themoeway/zero-epwing-go"
 )
 
 type kotowazaExtractor struct {

diff --git a/koujien.go b/koujien.go
@@ -1,10 +1,10 @@
-package yomichan
+package yomitan
 
 import (
 	"regexp"
 	"strings"
 
-	zig "foosoft.net/projects/zero-epwing-go"
+	zig "github.com/themoeway/zero-epwing-go"
 )
 
 type koujienExtractor struct {

diff --git a/meikyou.go b/meikyou.go
@@ -1,10 +1,10 @@
-package yomichan
+package yomitan
 
 import (
 	"regexp"
 	"strings"
 
-	zig "foosoft.net/projects/zero-epwing-go"
+	zig "github.com/themoeway/zero-epwing-go"
 )
 
 type meikyouExtractor struct {

diff --git a/rikai.go b/rikai.go
@@ -1,4 +1,4 @@
-package yomichan
+package yomitan
 
 import (
 	"database/sql"

diff --git a/scripts/build_dicts.sh b/scripts/build_dicts.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-go get foosoft.net/projects/yomichan-import/yomichan
+go get github.com/themoeway/yomitan-import/tree/master/yomitan
 
 mkdir -p src
 mkdir -p dst
@@ -17,27 +17,27 @@ function refresh_source () {
 }
 
 refresh_source "JMdict_e_examp"
-yomichan -language="english_extra" -title="JMdict" src/JMdict_e_examp dst/jmdict_english_extra_with_examples.zip
+yomitan -language="english_extra" -title="JMdict" src/JMdict_e_examp dst/jmdict_english_extra_with_examples.zip
 
 refresh_source "JMdict"
-yomichan -language="english_extra" -title="JMdict"         src/JMdict dst/jmdict_english_extra.zip
-yomichan -language="english"   -title="JMdict (English)"   src/JMdict dst/jmdict_english.zip
-yomichan -language="dutch"     -title="JMdict (Dutch)"     src/JMdict dst/jmdict_dutch.zip
-yomichan -language="french"    -title="JMdict (French)"    src/JMdict dst/jmdict_french.zip
-yomichan -language="german"    -title="JMdict (German)"    src/JMdict dst/jmdict_german.zip
-yomichan -language="hungarian" -title="JMdict (Hungarian)" src/JMdict dst/jmdict_hungarian.zip
-yomichan -language="russian"   -title="JMdict (Russian)"   src/JMdict dst/jmdict_russian.zip
-yomichan -language="slovenian" -title="JMdict (Slovenian)" src/JMdict dst/jmdict_slovenian.zip
-yomichan -language="spanish"   -title="JMdict (Spanish)"   src/JMdict dst/jmdict_spanish.zip
-yomichan -language="swedish"   -title="JMdict (Swedish)"   src/JMdict dst/jmdict_swedish.zip
-
-yomichan -format="forms"       -title="JMdict Forms"       src/JMdict dst/jmdict_forms.zip
+yomitan -language="english_extra" -title="JMdict"         src/JMdict dst/jmdict_english_extra.zip
+yomitan -language="english"   -title="JMdict (English)"   src/JMdict dst/jmdict_english.zip
+yomitan -language="dutch"     -title="JMdict (Dutch)"     src/JMdict dst/jmdict_dutch.zip
+yomitan -language="french"    -title="JMdict (French)"    src/JMdict dst/jmdict_french.zip
+yomitan -language="german"    -title="JMdict (German)"    src/JMdict dst/jmdict_german.zip
+yomitan -language="hungarian" -title="JMdict (Hungarian)" src/JMdict dst/jmdict_hungarian.zip
+yomitan -language="russian"   -title="JMdict (Russian)"   src/JMdict dst/jmdict_russian.zip
+yomitan -language="slovenian" -title="JMdict (Slovenian)" src/JMdict dst/jmdict_slovenian.zip
+yomitan -language="spanish"   -title="JMdict (Spanish)"   src/JMdict dst/jmdict_spanish.zip
+yomitan -language="swedish"   -title="JMdict (Swedish)"   src/JMdict dst/jmdict_swedish.zip
+
+yomitan -format="forms"       -title="JMdict Forms"       src/JMdict dst/jmdict_forms.zip
 
 refresh_source "JMnedict.xml"
-yomichan src/JMnedict.xml dst/jmnedict.zip
+yomitan src/JMnedict.xml dst/jmnedict.zip
 
 refresh_source "kanjidic2.xml"
-yomichan -language="english"    -title="KANJIDIC"              src/kanjidic2.xml dst/kanjidic_english.zip
-yomichan -language="french"     -title="KANJIDIC (French)"     src/kanjidic2.xml dst/kanjidic_french.zip
-yomichan -language="portuguese" -title="KANJIDIC (Portuguese)" src/kanjidic2.xml dst/kanjidic_portuguese.zip
-yomichan -language="spanish"    -title="KANJIDIC (Spanish)"    src/kanjidic2.xml dst/kanjidic_spanish.zip
+yomitan -language="english"    -title="KANJIDIC"              src/kanjidic2.xml dst/kanjidic_english.zip
+yomitan -language="french"     -title="KANJIDIC (French)"     src/kanjidic2.xml dst/kanjidic_french.zip
+yomitan -language="portuguese" -title="KANJIDIC (Portuguese)" src/kanjidic2.xml dst/kanjidic_portuguese.zip
+yomitan -language="spanish"    -title="KANJIDIC (Spanish)"    src/kanjidic2.xml dst/kanjidic_spanish.zip
diff --git a/scripts/build_linux.sh b/scripts/build_linux.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
 mkdir -p dst
-mkdir -p yomichan-import
+mkdir -p yomitan-import
 
-go build foosoft.net/projects/yomichan-import/yomichan
-go build foosoft.net/projects/yomichan-import/yomichan-gtk
+go build github.com/themoeway/yomitan-import/tree/master/yomichan
+go build github.com/themoeway/yomitan-import/tree/master/yomichan-gtk
 
-mv yomichan yomichan-import
-mv yomichan-gtk yomichan-import
+mv yomitan yomitan-import
+mv yomitan-gtk yomitan-import
 
-tar czvf dst/yomichan-import_linux.tar.gz yomichan-import
+tar czvf dst/yomitan-import_linux.tar.gz yomitan-import
 
-rm -rf yomichan-import
+rm -rf yomitan-import
diff --git a/shougakukan2.go b/shougakukan2.go
@@ -1,10 +1,10 @@
-package yomichan
+package yomitan
 
 import (
 	"regexp"
 	"strings"
 
-	zig "foosoft.net/projects/zero-epwing-go"
+	zig "github.com/themoeway/zero-epwing-go"
 )
 
 type shougakukan2Extractor struct {

diff --git a/structured_content.go b/structured_content.go
@@ -1,4 +1,4 @@
-package yomichan
+package yomitan
 
 type contentAttr struct {
 	lang               string

diff --git a/wadai.go b/wadai.go
@@ -1,10 +1,10 @@
-package yomichan
+package yomitan
 
 import (
 	"regexp"
 	"strings"
 
-	zig "foosoft.net/projects/zero-epwing-go"
+	zig "github.com/themoeway/zero-epwing-go"
 )
 
 type wadaiExtractor struct {