Changeset 23 in code for trunk/engines/reverso.go

Timestamp:

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

Author:

manerakai

Message:

Improved code

File:

• trunk/engines/reverso.go (modified) (3 diffs)

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
 }