From c4d051d74faf74b82e5b646c4337566b1eac5ef2 Mon Sep 17 00:00:00 2001 From: fattalion Date: Wed, 21 Sep 2022 09:01:41 +0000 Subject: [PATCH] Make repo a monorepo Also fixed the module URLs. git-svn-id: file:///srv/svn/repo/mai/trunk@9 e410bdd4-646f-c54f-a7ce-fffcc4f439ae --- README.md | 8 +++----- engine.go => engines/engine.go | 2 +- go.mod => engines/go.mod | 2 +- go.sum => engines/go.sum | 0 google.go => engines/google.go | 2 +- iciba.go => engines/iciba.go | 2 +- language.go => engines/language.go | 2 +- libretranslate.go => engines/libretranslate.go | 2 +- web/go.mod | 7 +++++++ web/go.sum | 16 ++++++++++++++++ web/main.go | 12 ++++++++++++ 11 files changed, 44 insertions(+), 11 deletions(-) rename engine.go => engines/engine.go (92%) rename go.mod => engines/go.mod (68%) rename go.sum => engines/go.sum (100%) rename google.go => engines/google.go (98%) rename iciba.go => engines/iciba.go (99%) rename language.go => engines/language.go (58%) rename libretranslate.go => engines/libretranslate.go (99%) create mode 100644 web/go.mod create mode 100644 web/go.sum create mode 100644 web/main.go diff --git a/README.md b/README.md index 0641f42..cc857d3 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,10 @@ -## SimplyTranslate Engines +## SimplyTranslate -The core part of SimplyTranslate that actually gets the data from translation websites. - -Note that this is a work-in-progress rewrite of https://codeberg.org/SimpleWeb/SimplyTranslate-Engines in Go. Much work remains until this rewrite will replace the original Python repository. +This is a work-in-progress rewrite of https://codeberg.org/SimpleWeb/SimplyTranslate-Engines and https://codeberg.org/SimpleWeb/SimplyTranslate-Web in Go (yes, in one repo). Much work remains until this rewrite will replace the original Python repositories. ### License -SimplyTranslate Engines is free software: you can redistribute it and/or modify +SimplyTranslate is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/engine.go b/engines/engine.go similarity index 92% rename from engine.go rename to engines/engine.go index f4668c9..fcc1e06 100644 --- a/engine.go +++ b/engines/engine.go @@ -1,4 +1,4 @@ -package simplytranslate_engines +package engines type TranslationResult struct { SourceLanguage Language diff --git a/go.mod b/engines/go.mod similarity index 68% rename from go.mod rename to engines/go.mod index d194733..af47de5 100644 --- a/go.mod +++ b/engines/go.mod @@ -1,4 +1,4 @@ -module codeberg.org/Simple-Web/simplytranslate_engines_go +module codeberg.org/SimpleWeb/SimplyTranslate/engines go 1.16 diff --git a/go.sum b/engines/go.sum similarity index 100% rename from go.sum rename to engines/go.sum diff --git a/google.go b/engines/google.go similarity index 98% rename from google.go rename to engines/google.go index a8c1db0..682671e 100644 --- a/google.go +++ b/engines/google.go @@ -1,4 +1,4 @@ -package simplytranslate_engines +package engines import ( "fmt" diff --git a/iciba.go b/engines/iciba.go similarity index 99% rename from iciba.go rename to engines/iciba.go index e5a42a6..24d0478 100644 --- a/iciba.go +++ b/engines/iciba.go @@ -1,4 +1,4 @@ -package simplytranslate_engines +package engines import ( "crypto/md5" diff --git a/language.go b/engines/language.go similarity index 58% rename from language.go rename to engines/language.go index 48fa775..5dad0f6 100644 --- a/language.go +++ b/engines/language.go @@ -1,4 +1,4 @@ -package simplytranslate_engines +package engines type Language struct { Name, Code string diff --git a/libretranslate.go b/engines/libretranslate.go similarity index 99% rename from libretranslate.go rename to engines/libretranslate.go index 4d26fce..25656f2 100644 --- a/libretranslate.go +++ b/engines/libretranslate.go @@ -1,4 +1,4 @@ -package simplytranslate_engines +package engines import ( "bytes" diff --git a/web/go.mod b/web/go.mod new file mode 100644 index 0000000..3ea3a28 --- /dev/null +++ b/web/go.mod @@ -0,0 +1,7 @@ +module codeberg.org/SimpleWeb/SimplyTranslate/web + +go 1.16 + +require codeberg.org/SimpleWeb/SimplyTranslate/engines v0.0.0 + +replace codeberg.org/SimpleWeb/SimplyTranslate/engines v0.0.0 => ../engines diff --git a/web/go.sum b/web/go.sum new file mode 100644 index 0000000..1980c0a --- /dev/null +++ b/web/go.sum @@ -0,0 +1,16 @@ +github.com/PuerkitoBio/goquery v1.8.0 h1:PJTF7AmFCFKk1N6V6jmKfrNH9tV5pNE6lZMkG0gta/U= +github.com/PuerkitoBio/goquery v1.8.0/go.mod h1:ypIiRMtY7COPGk+I/YbZLbxsxn9g5ejnI2HSMtkjZvI= +github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c= +github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= +golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220805013720-a33c5aa5df48 h1:N9Vc/rorQUDes6B9CNdIxAn5jODGj2wzfrei2x4wNj4= +golang.org/x/net v0.0.0-20220805013720-a33c5aa5df48/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/web/main.go b/web/main.go new file mode 100644 index 0000000..e50c9c6 --- /dev/null +++ b/web/main.go @@ -0,0 +1,12 @@ +package main + +import ( + "codeberg.org/SimpleWeb/SimplyTranslate/engines" +) + +// TODO: port web frontend to Go. + +func main() { + engine := &engines.GoogleTranslateEngine{} + print(engine.DisplayName()) +}