r4/dischord
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve configuration error checking (fix panic)

Browse Source 
A panic would occur if a field in the config file (e.g. youtube-dl.youtube-dl-path) was not set
This commit is contained in:
r4
2022-09-23 15:46:18 +02:00
parent 7bdfcf9776
commit c8f9832f48
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/config.go
View File

@@ -97,14 +97,20 @@ func macosEnableExecutable(filename string) error {
// configuration file does not exist or is invalid.
func Load(filename string) (*Config, error) {
cfg := &Config{}
_, err := toml.DecodeFile(filename, cfg)
meta, err := toml.DecodeFile(filename, cfg)
if err != nil {
if pe, ok := err.(toml.ParseError); ok {
fmt.Println(pe.ErrorWithUsage())
}
return nil, err
}
if undec := meta.Undecoded(); len(undec) > 0 {
return nil, fmt.Errorf("%v: field '%v' could not be decoded", filename, undec[0])
}
if cfg.Token == defaultToken || cfg.Token == "" {
return nil, ErrTokenNotSet
}
if err := cfg.Extractors.CheckTypes(); err != nil {
if err := cfg.Extractors.CheckValidity(); err != nil {
return nil, err
}
if _, err := exec.LookPath(cfg.Extractors["youtube-dl"]["youtube-dl-path"].(string)); err != nil {