blacklight/aerc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

config: move ui config parse in function

Browse source 
Avoid repetition. Also, commit de24d2d590 ("config: fix setting of
zero-value time.Duration config values") did not apply to contextual ui
config sections. Fix that.

Fixes: de24d2d590 ("config: fix setting of zero-value time.Duration config values")
Signed-off-by: Robin Jarry <robin@jarry.cc>
Acked-by: Tim Culverhouse <tim@timculverhouse.com>
This commit is contained in:
Robin Jarry 2022-09-04 22:04:40 +02:00
parent aae29324fd
commit 1aa4fb9bff
1 changed files with 39 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
config/config.go
View file

@ -499,31 +499,9 @@ func (config *AercConfig) LoadConfig(file *ini.File) error {
} }
if ui, err := file.GetSection("ui"); err == nil { if ui, err := file.GetSection("ui"); err == nil {
if err := ui.MapTo(&config.Ui); err != nil { if err := parseUiConfig(ui, &config.Ui); err != nil {
return err return err
} }
if err := validateBorderChars(ui, &config.Ui); err != nil {
return err
}
// Values with type=time.Duration must be explicitly set. If these
// values are given a default in the struct passed to ui.MapTo, which
// they are, a zero-value in the config won't overwrite the default.
for key, val := range ui.KeysHash() {
switch key {
case "dirlist-delay":
dur, err := time.ParseDuration(val)
if err != nil {
return err
}
config.Ui.DirListDelay = dur
case "completion-delay":
dur, err := time.ParseDuration(val)
if err != nil {
return err
}
config.Ui.CompletionDelay = dur
}
}
} }
for _, sectionName := range file.SectionStrings() { for _, sectionName := range file.SectionStrings() {
@ -536,10 +514,7 @@ func (config *AercConfig) LoadConfig(file *ini.File) error {
return err return err
} }
uiSubConfig := UIConfig{} uiSubConfig := UIConfig{}
if err := uiSection.MapTo(&uiSubConfig); err != nil { if err := parseUiConfig(uiSection, &uiSubConfig); err != nil {
return err
}
if err := validateBorderChars(uiSection, &uiSubConfig); err != nil {
return err return err
} }
contextualUi := UIConfigContext{ contextualUi := UIConfigContext{
@ -641,23 +616,44 @@ func (config *AercConfig) LoadConfig(file *ini.File) error {
return nil return nil
} }
func validateBorderChars(section *ini.Section, config *UIConfig) error { func parseUiConfig(section *ini.Section, config *UIConfig) error {
for key, val := range section.KeysHash() { if err := section.MapTo(config); err != nil {
switch key { return err
case "border-char-vertical": }
char := []rune(val)
if len(char) != 1 { if key, err := section.GetKey("border-char-vertical"); err == nil {
chars := []rune(key.String())
if len(chars) != 1 {
return fmt.Errorf("%v must be one and only one character", key) return fmt.Errorf("%v must be one and only one character", key)
} }
config.BorderCharVertical = char[0] config.BorderCharVertical = chars[0]
case "border-char-horizontal": }
char := []rune(val) if key, err := section.GetKey("border-char-horizontal"); err == nil {
if len(char) != 1 { chars := []rune(key.String())
if len(chars) != 1 {
return fmt.Errorf("%v must be one and only one character", key) return fmt.Errorf("%v must be one and only one character", key)
} }
config.BorderCharHorizontal = char[0] config.BorderCharHorizontal = chars[0]
} }
// Values with type=time.Duration must be explicitly set. If these
// values are given a default in the struct passed to ui.MapTo, which
// they are, a zero-value in the config won't overwrite the default.
if key, err := section.GetKey("dirlist-delay"); err == nil {
dur, err := key.Duration()
if err != nil {
return err
} }
config.DirListDelay = dur
}
if key, err := section.GetKey("completion-delay"); err == nil {
dur, err := key.Duration()
if err != nil {
return err
}
config.CompletionDelay = dur
}
return nil return nil
} }