Changeset 30 in code

Timestamp:

Feb 10, 2024, 11:39:49 AM (16 months ago)

Author:

yakumo.izuru

Message:

Assume the instance is down if the translation output is blank

Signed-off-by: Izuru Yakumo <yakumo.izuru@…>

File:

• trunk/cmd/suwako/main.go (modified) (5 diffs)

trunk/cmd/suwako/main.go

@@ -1 @@
-// $TheSupernovaDuo: suwako,v 1.5.4 2024/01/14 21:21:50 yakumo_izuru Exp $
+// $TheSupernovaDuo: suwako,v 1.5.5 2024/01/20 21:07:30 yakumo_izuru Exp $
 // Command line client for SimplyTranslate, a privacy friendly frontend to other translation engines
 package main
@@ -43 +43 @@
                 return err
         }
-        conf.engine = cfg.Section("simplytranslate").Key("engine").String()
-        conf.instance = cfg.Section("simplytranslate").Key("instance").String()
+        conf.engine = cfg.Section("suwako").Key("engine").String()
+        conf.instance = cfg.Section("suwako").Key("instance").String()
 
         return nil
@@ -66 +66 @@
 
         // Load configuration file
-        home, err := os.UserHomeDir()
+        config, err := os.UserConfigDir()
         errCheck(err)
-        cfgfile := home + "/.suwako/suwako.conf"
+        cfgfile := config + "/suwako/suwako.ini"
         iniLoad(cfgfile)
 
@@ -83 +83 @@
 
         // Construct the final path to query
-        var queryURL = conf.instance + "?engine=" + conf.engine + "&from=" + source + "&to=" + target + "&text=" + encInput
+        var queryURL = conf.instance + "/api/translate/" + "?engine=" + conf.engine + "&from=" + source + "&to=" + target + "&text=" + encInput
 
         // Shoot danmaku to path
@@ -93 +93 @@
         _ = json.NewDecoder(resp.Body).Decode(&translate)
         errCheck(err)
-        fmt.Printf("%v\n",translate.Output)
+        if len(translate.Output) == 0 {
+                log.Fatal("There was no output, maybe the server was down?")
+        } else {
+                fmt.Printf("%v\n", translate.Output)
+        }
 }