glenux-archive/spf13--viper
1
0
Fork 0
mirror of https://github.com/spf13/viper synced 2025-05-11 06:37:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

extract parsing into single func

Browse source
This commit is contained in:
Trevor Foster 2020-03-28 00:14:46 -04:00
parent 326772ea29
commit 61c17d0781
1 changed files with 17 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
viper.go
View file

@ -1084,18 +1084,7 @@ func (v *Viper) find(lcaseKey string, flagDefault bool) interface{} {
res, _ := readAsCSV(s)
return cast.ToIntSlice(res)
case "stringToString":
s := strings.TrimPrefix(flag.ValueString(), "[")
s = strings.TrimSuffix(s, "]")
if s == "" {
return nil
}
elements := strings.Split(s, ",")
result := make(map[string]string, len(elements))
for _, element := range elements {
pair := strings.SplitN(element, "=", 2)
result[pair[0]] = pair[1]
}
return result
return parseStringToStringFlagValue(flag.ValueString())
default:
return flag.ValueString()
}
@ -1172,18 +1161,7 @@ func (v *Viper) find(lcaseKey string, flagDefault bool) interface{} {
res, _ := readAsCSV(s)
return cast.ToIntSlice(res)
case "stringToString":
s := strings.TrimPrefix(flag.ValueString(), "[")
s = strings.TrimSuffix(s, "]")
if s == "" {
return nil
}
elements := strings.Split(s, ",")
result := make(map[string]string, len(elements))
for _, element := range elements {
pair := strings.SplitN(element, "=", 2)
result[pair[0]] = pair[1]
}
return result
return parseStringToStringFlagValue(flag.ValueString())
default:
return flag.ValueString()
}
@ -1203,6 +1181,21 @@ func readAsCSV(val string) ([]string, error) {
return csvReader.Read()
}
func parseStringToStringFlagValue(val string) map[string]string {
s := strings.TrimPrefix(val, "[")
s = strings.TrimSuffix(s, "]")
if s == "" {
return nil
}
elements := strings.Split(s, ",")
result := make(map[string]string, len(elements))
for _, element := range elements {
pair := strings.SplitN(element, "=", 2)
result[pair[0]] = pair[1]
}
return result
}
// IsSet checks to see if the key has been set in any of the data locations.
// IsSet is case-insensitive for a key.
func IsSet(key string) bool { return v.IsSet(key) }