Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename package name to Yomitan. #3

Merged
merged 4 commits into from
Mar 22, 2023
Merged

Rename package name to Yomitan. #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5885233
Rename package name to Yomitan.
xythh Mar 19, 2023
33710d6
Import jmdict-go as jmdict.
xythh Mar 19, 2023
7676f26
Revert changes to build scripts.
xythh Mar 20, 2023
8637158
Added new go.sum.
xythh Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package yomichan
package yomitan

import (
"archive/zip"
Expand Down Expand Up @@ -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"
}
}

Expand Down
4 changes: 2 additions & 2 deletions daijirin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions daijisen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions epwing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion frequency.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package yomichan
package yomitan

import (
"bufio"
Expand Down
4 changes: 2 additions & 2 deletions gakken.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
)

Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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=
Expand Down
4 changes: 2 additions & 2 deletions jmdict.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package yomichan
package yomitan

import (
"errors"
Expand All @@ -7,7 +7,7 @@ import (
"strconv"
"strings"

"foosoft.net/projects/jmdict"
jmdict "github.com/themoeway/jmdict-go"
"golang.org/x/exp/slices"
)

Expand Down
2 changes: 1 addition & 1 deletion jmdict_constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package yomichan
package yomitan

type LangCode struct {
language string
Expand Down
4 changes: 2 additions & 2 deletions jmdict_forms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions jmdict_glossary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions jmdict_headword.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions jmdict_metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion jmdict_references.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package yomichan
package yomitan

import (
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion jmdict_tags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package yomichan
package yomitan

import (
"fmt"
Expand Down
4 changes: 2 additions & 2 deletions jmnedict.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion jmnedict_generic_terms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package yomichan
package yomitan

import (
"golang.org/x/exp/slices"
Expand Down
2 changes: 1 addition & 1 deletion jmnedict_text_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package yomichan
package yomitan

import (
"strings"
Expand Down
4 changes: 2 additions & 2 deletions kanjidic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions kotowaza.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions koujien.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions meikyou.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion rikai.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package yomichan
package yomitan

import (
"database/sql"
Expand Down
38 changes: 19 additions & 19 deletions scripts/build_dicts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

go get foosoft.net/projects/yomichan-import/yomichan
go get github.com/themoeway/yomitan-import/tree/master/yomitan
xythh marked this conversation as resolved.
Show resolved Hide resolved

mkdir -p src
mkdir -p dst
Expand All @@ -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
14 changes: 7 additions & 7 deletions scripts/build_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions shougakukan2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion structured_content.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package yomichan
package yomitan

type contentAttr struct {
lang string
Expand Down
4 changes: 2 additions & 2 deletions wadai.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Loading