Changeset 10 in code

Timestamp:

Mar 13, 2023, 11:17:03 AM (2 years ago)

Author:

koizumi.aoi

Message:

rep: hard-coding api endpoint, change variable names to be less confusing, etc

File:

• trunk/main.go (modified) (4 diffs)

trunk/main.go

@@ -1 @@
-// $TheSupernovaDuo: stcli,v 1.3.1 2023/02/11 07:54:25 akoizumi Exp 
+// $TheSupernovaDuo: stcli,v 1.4.0 2023/03/13 08:14:55 akoizumi Exp 
 // Command line client for SimplyTranslate, a privacy friendly frontend to other translation engines
 package main
@@ -11 +11 @@
         "net/url"
 )
+
 var (
         engine string
-        from string
         instance string
         input string
-        to string
+        source string
+        target string
 )
 type Translate struct {
@@ -22 +23 @@
 }
 func init() {
-        flag.StringVar(&engine, "e", "google", "Translation engine to use (default: google)")
-        flag.StringVar(&from, "f", "auto", "Set the language to translate from. This can be skipped as it will autodetect the language you're translating from")
-        flag.StringVar(&instance, "i", "https://simplytranslate.org/api/translate/", "Instance to use (default: https://simplytranslate.org/api/translate/)")
+        flag.StringVar(&engine, "e", "google", "Translation engine to use")
+        flag.StringVar(&source, "f", "auto", "Set the language to translate from. This can be skipped as it will autodetect the language you're translating from")
+        flag.StringVar(&instance, "i", "https://translate.bus-hit.me", "Instance to use)")
         flag.StringVar(&input, "I", "", "Enter the text to be translated")
-        flag.StringVar(&to, "t", "en", "Set the language to translate to (default: en)")
+        flag.StringVar(&target, "t", "en", "Set the language to translate to")
 }
 func main() {
         // Begin flag parsing
         flag.Parse()
-        // Check if any of those two variables is empty.
-        // It actually needs the two to have content.
+        // Check if there's any input, otherwise bail out.
         if len(input) == 0 {
                 log.Fatal("Missing input.")
@@ -39 +39 @@
         var translate Translate
         // Build the full URL to query
-        var encinput = url.PathEscape(input)
-        var queryURL = instance + "?engine=" + engine + "&from=" + from + "&to=" + to + "&text=" + encinput
+        var encInput = url.PathEscape(input)
+        var apiEndpoint = "/api/translate"
+        var queryURL = instance + apiEndpoint + "?engine=" + engine + "&from=" + source + "&to=" + target + "&text=" + encInput
         // Begin the request and process the response
         resp, err := http.Get(queryURL)