Changeset 20 in code for trunk/engines

Timestamp:

Aug 31, 2023, 8:28:02 AM (22 months ago)

Author:

manerakai

Message:

Improved code

Location:

trunk/engines

Files:

• engine.go (modified) (2 diffs)
• google.go (modified) (6 diffs)
• iciba.go (modified) (4 diffs)
• libretranslate.go (modified) (1 diff)
• reverso.go (modified) (1 diff)

trunk/engines/engine.go

@@ -13 +13 @@
         Translate(text string, from, to string) (TranslationResult, error)
         DetectLanguage(text string) (string, error)
+        Tts(text, lang string) (string, error)
 }
 
@@ -18 +19 @@
 
 var Engines = map[string]Engine{
-        "google":   &GoogleTranslate{},
-        "icibia":   &ICIBA{},
-        "libre":    &LibreTranslate{},
+        "google": &GoogleTranslate{},
+        // "icibia":   &ICIBA{},
+        // "libre":    &LibreTranslate{},
         "reverseo": &Reverso{},
 }

trunk/engines/google.go

@@ -36 +36 @@
 
         response, err := http.Get(requestURL.String())
-
         if err != nil {
                 return nil, err
@@ -44 +43 @@
 
         doc, err := goquery.NewDocumentFromReader(response.Body)
-
         if err != nil {
                 return nil, err
         }
 
-        var langs Language
+        var langs Language = make(Language)
 
         doc.Find(".language-item").Each(func(_ int, s *goquery.Selection) {
@@ -55 +53 @@
 
                 href, exists := a.Attr("href")
-
-                // Shouldn't happen, but here goes.
                 if !exists {
                         return
@@ -62 +58 @@
 
                 langURL, err := url.Parse(href)
-
                 if err != nil {
                         return
@@ -68 +63 @@
 
                 langCode := langURL.Query()[langsType][0]
-
-                if langCode == "auto" {
-                        return
-                }
 
                 langs[langCode] = a.Text()
@@ -85 +76 @@
 func (e *GoogleTranslate) TargetLanguages() (Language, error) {
         return e.getLangs("target")
+}
+
+func (e *GoogleTranslate) Tts(text, lang string) (string, error) {
+        requestURL, _ := url.Parse("https://translate.google.com/translate_tts")
+
+        query := url.Values{}
+        query.Add("tl", lang)
+        query.Add("q", text)
+        query.Add("client", "tw-ob")
+        requestURL.RawQuery = query.Encode()
+
+        return requestURL.String(), nil
 }
 

trunk/engines/iciba.go

@@ -226 +226 @@
 
 func (_ *ICIBA) Translate(text string, from, to string) (TranslationResult, error) {
-        requestURL, err := url.Parse("https://ifanyi.iciba.com/index.php")
-
-        if err != nil {
-                // The URL is constant, so it should never fail.
-                panic(err)
-        }
+        requestURL, _ := url.Parse("https://ifanyi.iciba.com/index.php")
 
         query := url.Values{}
@@ -240 +235 @@
 
         sum := md5.Sum([]byte(("6key_web_fanyiifanyiweb8hc9s98e" + text)))
-
         query.Add("sign", hex.EncodeToString(sum[:])[:16])
 
@@ -251 +245 @@
 
         response, err := http.PostForm(requestURL.String(), formData)
-
         if err != nil {
                 return TranslationResult{}, err
@@ -287 +280 @@
         }, nil
 }
+
+func (_ *ICIBA) Tts(text, lang string) (string, error) { return "", nil }

trunk/engines/libretranslate.go

@@ -63 +63 @@
 
 func (e *LibreTranslate) TargetLanguages() (Language, error) { return e.getLangs() }
+
+func (e *LibreTranslate) Tts(text, lang string) (string, error) { return "", nil }
 
 type libreDetectResponse []struct {

trunk/engines/reverso.go

@@ -46 +46 @@
 
 func (_ *Reverso) TargetLanguages() (Language, error) { return reversoLangs, nil }
+
+func (_ *Reverso) Tts(text, lang string) (string, error) { return "", nil }
 
 type reversoAPIResponse struct {