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

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

git-svn-id: file:///srv/svn/repo/suwako/trunk@26 0b558ee1-521d-8b46-a41b-40029c97c055

cmd/suwako/main.go

@@ -11,13 +11,16 @@ import (
 	"os"
 
 	"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"
 	target string
@@ -33,7 +36,18 @@ func errCheck(err error) {
 	}
 }
 
-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")
 	flaggy.SetVersion(suwako.FullVersion())
@@ -42,21 +56,18 @@ func loadCfg() {
 	flaggy.String(&target, "t", "to", "Target language")
 	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
 	if len(target) == 0 {
@@ -70,7 +81,7 @@ func main() {
 	var encInput = url.PathEscape(input)
 
 	// 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
 	resp, err := http.Get(queryURL)