Changeset 23 in code for trunk/engines

Timestamp:

Sep 2, 2023, 12:15:30 PM (22 months ago)

Author:

manerakai

Message:

Improved code

Location:

trunk/engines

Files:

• engine.go (modified) (2 diffs)
• google.go (modified) (4 diffs)
• iciba.go (modified) (3 diffs)
• libretranslate.go (modified) (5 diffs)
• reverso.go (modified) (3 diffs)

trunk/engines/engine.go

@@ -9 +9 @@
 
 type Engine interface {
-        InternalName() string
         DisplayName() string
         SourceLanguages() (Language, error)
         TargetLanguages() (Language, error)
         Translate(text string, from, to string) (TranslationResult, error)
-        DetectLanguage(text string) (string, error)
         Tts(text, lang string) (string, error)
 }
@@ -22 +20 @@
 var Engines = map[string]Engine{
         "google": &GoogleTranslate{},
-        // "icibia":   &ICIBA{},
+        // "icibia": &ICIBA{},
         // "libre":    &LibreTranslate{},
         "reverseo": &Reverso{},

trunk/engines/google.go

@@ -16 +16 @@
 type GoogleTranslate struct{}
 
-func (_ *GoogleTranslate) InternalName() string { return "google" }
-
 func (_ *GoogleTranslate) DisplayName() string { return "Google" }
 
@@ -30 +28 @@
 
         default:
-                panic(fmt.Errorf("getLangs was passed an invalid language type: %s", langsType))
+                return nil, fmt.Errorf("Invalid language type: %s", langsType)
         }
 
@@ -94 +92 @@
         return requestURL.String(), nil
 }
-
-func (_ *GoogleTranslate) DetectLanguage(text string) (string, error) { return "", nil }
 
 func (_ *GoogleTranslate) Translate(text string, from, to string) (TranslationResult, error) {
@@ -276 +272 @@
                         }
                 }
+
+                if len(json_) > 0 && json_[0] != nil && len(json_[0].([]interface{})) > 2 && json_[0].([]interface{})[2] != nil {
+                        from = json_[0].([]interface{})[2].(string)
+                }
         }
 

trunk/engines/iciba.go

@@ -12 +12 @@
 // ICIBA is an engine that fetches data from https://www.iciba.com.
 type ICIBA struct{}
-
-func (_ *ICIBA) InternalName() string { return "iciba" }
 
 func (_ *ICIBA) DisplayName() string { return "iCIBA" }
@@ -216 +214 @@
 func (_ *ICIBA) TargetLanguages() (Language, error) { return icibaLanguages, nil }
 
-func (_ *ICIBA) DetectLanguage(text string) (string, error) { return "", nil }
-
-type icibaTranslateResponse struct {
-        Content struct {
-                From string `json:"from"`
-                Out  string `json:"out"`
-        } `json:"content"`
-}
-
 func (_ *ICIBA) Translate(text string, from, to string) (TranslationResult, error) {
         requestURL, _ := url.Parse("https://ifanyi.iciba.com/index.php")
@@ -255 +244 @@
         }
 
-        var responseJSON icibaTranslateResponse
+        var responseJSON struct {
+                Content struct {
+                        From string `json:"from"`
+                        Out  string `json:"out"`
+                } `json:"content"`
+        }
 
         if err := json.NewDecoder(response.Body).Decode(&responseJSON); err != nil {

trunk/engines/libretranslate.go

@@ -23 +23 @@
         APIKey string
 }
-
-func (_ *LibreTranslate) InternalName() string { return "libre" }
 
 func (_ *LibreTranslate) DisplayName() string { return "LibreTranslate" }
@@ -71 +69 @@
 }
 
-func (e *LibreTranslate) DetectLanguage(text string) (string, error) {
+func (e *LibreTranslate) detectLanguage(text string) (string, error) {
         formData := map[string]string{"q": text}
 
@@ -125 +123 @@
 }
 
-type libreTranslateResponse struct {
-        TranslatedText string `json:"translatedText"`
-}
-
 func (e *LibreTranslate) Translate(text string, from, to string) (TranslationResult, error) {
         formData := map[string]string{
@@ -158 +152 @@
         }
 
-        var responseJSON libreTranslateResponse
+        var responseJSON struct {
+                TranslatedText string `json:"translatedText"`
+        }
 
         if err := json.NewDecoder(response.Body).Decode(&responseJSON); err != nil {
@@ -164 +160 @@
         }
 
-        return TranslationResult{TranslatedText: responseJSON.TranslatedText}, nil
+        if r, err := e.detectLanguage(text); err == nil {
+                from = r
+        }
+
+        return TranslationResult{
+                TranslatedText: responseJSON.TranslatedText,
+                SourceLanguage: from,
+        }, nil
 }

trunk/engines/reverso.go

@@ -10 +10 @@
 // Reverso is an engine that fetches data from https://reverso.net.
 type Reverso struct{}
-
-func (_ *Reverso) InternalName() string { return "reverso" }
 
 func (_ *Reverso) DisplayName() string { return "Reverso" }
@@ -84 +82 @@
 
         request.Header.Set("Content-Type", "application/json")
-        // Returns 403 with empty or no user agent.
         request.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; rv:110.0) Gecko/20100101 Firefox/110.0")
 
@@ -110 +107 @@
 }
 
-func (e *Reverso) DetectLanguage(text string) (string, error) {
-        // Any language pair works here, does not affect result
-        r, err := e.callAPI(text, "ara", "chi")
-
-        if err != nil {
-                return "", err
+func (e *Reverso) Translate(text string, from, to string) (TranslationResult, error) {
+        if from == "auto" || from == "" {
+                from = "eng"
         }
 
+        var translation string
+
+        r, err := e.callAPI(text, from, to)
+        if err != nil {
+                return TranslationResult{}, err
+        }
+
+        translation = r.Translation[0]
         langCode := r.LanguageDetection.DetectedLanguage
 
         for code := range reversoLangs {
                 if code == langCode {
-                        return code, nil
+                        from = code
                 }
-        }
-
-        return "", fmt.Errorf("language code \"%s\" is not in Reverso's language list", langCode)
-}
-
-func (e *Reverso) Translate(text string, from, to string) (TranslationResult, error) {
-        if from == "auto" {
-                from_, err := e.DetectLanguage(text)
-
-                if err != nil {
-                        return TranslationResult{}, err
-                }
-
-                from = from_
-        }
-
-        var translation string
-
-        if from == to {
-                translation = text
-        } else {
-                r, err := e.callAPI(text, from, to)
-
-                if err != nil {
-                        return TranslationResult{}, err
-                }
-
-                translation = r.Translation[0]
         }
 
         return TranslationResult{
                 TranslatedText: translation,
+                SourceLanguage: from,
         }, nil
 }