Changeset 26 in code for trunk/cmd/suwako/main.go

Timestamp:

Oct 26, 2023, 2:13:55 AM (20 months ago)

Author:

yakumo.izuru

Message:

女神がこんなに可愛いわけがない！

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

File:

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

trunk/cmd/suwako/main.go

@@ -12 +12 @@
 
         "github.com/integrii/flaggy"
-        "github.com/joho/godotenv"
+        "gopkg.in/ini.v1"
         "marisa.chaotic.ninja/suwako"
 )
 
-var (
+var conf struct {
         engine string
         instance string
+}
+
+var (
         input string
         source string = "auto"
@@ -34 +37 @@
 }
 
-func loadCfg() {
+func iniLoad(file string) error {
+        cfg, err := ini.Load(file)
+        if err != nil {
+                return err
+        }
+        conf.engine = cfg.Section("").Key("engine").String()
+        conf.instance = cfg.Section("").Key("instance").String()
+
+        return nil
+}
+
+func flagParse() {
         flaggy.SetName("suwako")
         flaggy.SetDescription("Command line client for SimplyTranslate")
@@ -43 +57 @@
         flaggy.AddPositionalValue(&input, "input", 1, true, "Text to translate")
 
-        home, err := os.UserHomeDir()
-        errCheck(err)
-        conf := home + "/.suwako/suwako.conf"
-        err = godotenv.Load(conf)
-        errCheck(err)
-
-        engine = os.Getenv("SUWAKO_ENGINE")
-        instance = os.Getenv("SUWAKO_INSTANCE")
-
         flaggy.Parse()
 }
 
 func main() {
-        // Load configuration and parse flags
-        loadCfg()
+        // Flag parsing
+        flagParse()
+
+        // Load configuration file
+        home, err := os.UserHomeDir()
+        errCheck(err)
+        cfgfile := home + "/.suwako/suwako.conf"
+        iniLoad(cfgfile)
 
         // Verify command-line inputs
@@ -71 +82 @@
 
         // Construct the final path to query
-        var queryURL = instance + "?engine=" + engine + "&from=" + source + "&to=" + target + "&text=" + encInput
+        var queryURL = conf.instance + "?engine=" + conf.engine + "&from=" + source + "&to=" + target + "&text=" + encInput
 
         // Shoot danmaku to path