ryanc/lume
1
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

Refactor configuration file loading

Browse Source
This commit is contained in:
Ryan Cavicchioni 2021-01-11 20:48:21 -06:00
parent 63631be598
commit 715fb435e1
Signed by: ryanc
GPG Key ID: 877EEDAF9245103D
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/lume/main.go
View File

@ -11,14 +11,21 @@ import (
"github.com/BurntSushi/toml" "github.com/BurntSushi/toml"
) )
const lumercFile = ".lumerc" const lumercFile string = ".lumerc"
func main() { func main() {
var config lumecmd.Config 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 == "" { if config.AccessToken == "" {
@ -53,10 +60,10 @@ func main() {
os.Exit(exitCode) os.Exit(exitCode)
} }
func loadConfig() lumecmd.Config { func getConfigPath() string {
var config lumecmd.Config
var tryPath, configPath string var tryPath, configPath string
// ~/.lumerc
homeDir, err := os.UserHomeDir() homeDir, err := os.UserHomeDir()
if err == nil { if err == nil {
tryPath = path.Join(homeDir, lumercFile) tryPath = path.Join(homeDir, lumercFile)
@ -65,6 +72,7 @@ func loadConfig() lumecmd.Config {
} }
} }
// ./.lumerc
cwd, err := os.Getwd() cwd, err := os.Getwd()
if err == nil { if err == nil {
tryPath = path.Join(cwd, lumercFile) tryPath = path.Join(cwd, lumercFile)
@ -73,9 +81,5 @@ func loadConfig() lumecmd.Config {
} }
} }
if configPath != "" { return configPath
toml.DecodeFile(configPath, &config)
}
return config
} }