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

Add functions to load configuration

Browse Source
This commit is contained in:
Ryan Cavicchioni 2021-03-14 22:11:12 -05:00
parent e86ce1aeaf
commit 32bce4eaba
Signed by: ryanc
GPG Key ID: 877EEDAF9245103D
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cmd/config.go
View File

@ -5,6 +5,8 @@ import (
"fmt"
"os"
"path"
"github.com/BurntSushi/toml"
)
const lumercFile string = ".lumerc"
@ -50,6 +52,28 @@ func (c *Config) validateColors() (err error) {
return err
}
func LoadConfig(s string) (Config, error) {
var err error
var c Config
if _, err := toml.Decode(s, &c); err != nil {
err = fmt.Errorf("fatal: failed to parse; %w", err)
}
return c, err
}
func LoadConfigFile(configPath string) (Config, error) {
var err error
var c Config
if _, err := toml.DecodeFile(configPath, &c); err != nil {
err = fmt.Errorf("fatal: failed to parse %s; %w", configPath, err)
}
return c, err
}
func getConfigPath() string {
var tryPath, configPath string

4
cmd/main.go
View File

@ -8,7 +8,6 @@ import (
"strings"
"git.kill0.net/chill9/lifx-go"
"github.com/BurntSushi/toml"
)
var userAgent string
@ -46,8 +45,7 @@ func Main(args []string) (int, error) {
return ExitFailure, err
}
if _, err := toml.DecodeFile(configPath, &config); err != nil {
err = fmt.Errorf("fatal: failed to parse %s; %w", configPath, err)
if config, err = LoadConfigFile(configPath); err != nil {
return ExitFailure, err
}