Refactor configuration file loading

.gitignore

@@ -15,3 +15,4 @@
 # Dependency directories (remove the comment below to include it)
 # vendor/
 
+.lumerc

cmd/lume/init_windows.go

@@ -0,0 +1,19 @@
+// +build windows
+
+// https://stackoverflow.com/a/52579002
+
+package main
+
+import (
+	"os"
+
+	"golang.org/x/sys/windows"
+)
+
+func init() {
+	stdout := windows.Handle(os.Stdout.Fd())
+	var originalMode uint32
+
+	windows.GetConsoleMode(stdout, &originalMode)
+	windows.SetConsoleMode(stdout, originalMode|windows.ENABLE_VIRTUAL_TERMINAL_PROCESSING)
+}

cmd/lume/main.go

@@ -9,25 +9,23 @@ import (
 	lifx "git.kill0.net/chill9/lume"
 	lumecmd "git.kill0.net/chill9/lume/cmd"
 	"github.com/BurntSushi/toml"
-
-	"golang.org/x/sys/windows"
 )
 
-const lumercFile = ".lumerc"
+const lumercFile string = ".lumerc"
 
 func main() {
-	var originalMode uint32
-	stdout := windows.Handle(os.Stdout.Fd())
-
-	windows.GetConsoleMode(stdout, &originalMode)
-	windows.SetConsoleMode(stdout, originalMode|windows.ENABLE_VIRTUAL_TERMINAL_PROCESSING)
-	defer windows.SetConsoleMode(stdout, originalMode)
-
 	var config lumecmd.Config
-	config = loadConfig()
 
-	if config.AccessToken == "" {
+	configPath := getConfigPath()
-		config.AccessToken = os.Getenv("LIFX_ACCESS_TOKEN")
+	if _, err := toml.DecodeFile(configPath, &config); err != nil {
+		fmt.Printf("fatal: failed to parse %s\n", configPath)
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	envAccessToken := os.Getenv("LIFX_ACCESS_TOKEN")
+	if envAccessToken != "" {
+		config.AccessToken = envAccessToken
 	}
 
 	if config.AccessToken == "" {
@@ -54,7 +52,7 @@ func main() {
 	fs := cmd.Flags
 	fs.Parse(os.Args[2:])
 
-	cmdArgs.Flags = lumecmd.Flags{fs}
+	cmdArgs.Flags = lumecmd.Flags{FlagSet: fs}
 	exitCode, err := cmd.Func(cmdArgs)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "fatal: %s\n", err)
@@ -62,10 +60,10 @@ func main() {
 	os.Exit(exitCode)
 }
 
-func loadConfig() lumecmd.Config {
+func getConfigPath() string {
-	var config lumecmd.Config
 	var tryPath, configPath string
 
+	// ~/.lumerc
 	homeDir, err := os.UserHomeDir()
 	if err == nil {
 		tryPath = path.Join(homeDir, lumercFile)
@@ -74,6 +72,7 @@ func loadConfig() lumecmd.Config {
 		}
 	}
 
+	// ./.lumerc
 	cwd, err := os.Getwd()
 	if err == nil {
 		tryPath = path.Join(cwd, lumercFile)
@@ -82,9 +81,5 @@ func loadConfig() lumecmd.Config {
 		}
 	}
 
-	if configPath != "" {
+	return configPath
-		toml.DecodeFile(configPath, &config)
-	}
-
-	return config
 }