MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reorder config loading to load config and *then* fill in missing defaults

Browse Source
This commit is contained in:
Daniel Barton 2024-04-13 23:28:07 +08:00
parent 1d5090957b
commit b279bf1f88
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config/config.go
View File

@ -332,12 +332,6 @@ type Configuration struct {
// This function does not modify the currently stored global configuration. // This function does not modify the currently stored global configuration.
func NewAtPath(path string) (*Configuration, error) { func NewAtPath(path string) (*Configuration, error) {
var c Configuration var c Configuration
// Configures the default values for many of the configuration options present
// in the structs. Values set in the configuration file take priority over the
// default values.
if err := defaults.Set(&c); err != nil {
return nil, err
}
// Track the location where we created this configuration. // Track the location where we created this configuration.
c.path = path c.path = path
return &c, nil return &c, nil
@ -513,6 +507,13 @@ func FromFile(path string) error {
return err return err
} }
// Configures the default values for many of the configuration options present
// in the structs. Values set in the configuration file will not be overridden by the
// default values.
if err := defaults.Set(c); err != nil {
return err
}
// Store this configuration in the global state. // Store this configuration in the global state.
Set(c) Set(c)
return nil return nil