Changeset 21 in code

Timestamp:

Oct 21, 2023, 8:12:04 PM (20 months ago)

Author:

yakumo.izuru

Message:

Load config with godotenv

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

Location:

trunk

Files:

• cmd/suwako/main.go (modified) (2 diffs)
• go.mod (modified) (1 diff)
• go.sum (modified) (1 diff)

trunk/cmd/suwako/main.go

@@ -10 +10 @@
         "net/http"
         "net/url"
+        "os"
+
+        "github.com/joho/godotenv"
         "marisa.chaotic.ninja/suwako"
-        "os"
 )
 
@@ -24 +26 @@
         Output string `json:"translated_text"`
 }
-func init() {
+func loadCfg() {
         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(&input, "i", "", "Enter the text to be translated")
-        flag.StringVar(&target, "t", "en", "Set the language to translate to")
+        flag.StringVar(&target, "t", "", "Set the language to translate to")
+
         flag.Usage = func() {
                 fmt.Printf("usage: suwako -f [lang] -i [text] -t [lang]\nversion: %v\n", suwako.FullVersion())
         }
+
+        home, err := os.UserHomeDir()
+        sanityCheck(err)
+        conf := home + "/.suwako/suwako.conf"
+        err = godotenv.Load(conf)
+        sanityCheck(err)
+
+        engine = os.Getenv("SUWAKO_ENGINE")
+        instance = os.Getenv("SUWAKO_INSTANCE")
+
+        flag.Parse()
+}
+func check() {
+        if len(input) == 0 || len(target) == 0 {
+                log.Fatal("Either there is no input or there is no target language")
+        }
 }
 func main() {
-        engine = os.Getenv("SUWAKO_ENGINE")
-        instance = os.Getenv("SUWAKO_INSTANCE")
+        loadCfg()
+        check()
         
-        flag.Parse()
-
-        if len(engine) == 0 || len(instance) == 0 {
-                log.Println("SUWAKO_ENGINE and/or SUWAKO_INSTANCE are unset")
-                log.Println("Defaulting to simplytranslate.org with engine 'google'")
-                engine = "google"
-                instance = "https://simplytranslate.org"
-        }
-        if len(input) == 0 {
-                log.Fatal("Missing input text.")
-        }
-        // Map a variable to the struct
         var translate Translate
-        // Build the full URL to query
         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)
         sanityCheck(err)
         defer resp.Body.Close()
-        // JSON decoding
         _ = json.NewDecoder(resp.Body).Decode(&translate)
         sanityCheck(err)

trunk/go.mod

@@ -2 +2 @@
 
 go 1.18
+
+require github.com/joho/godotenv v1.5.1

trunk/go.sum

@@ +1 @@
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=