fs: Add string alternatives for setting options over the rc
Before this change options were read and set in native format. This means for example nanoseconds for durations or an integer for enumerated types, which isn't very convenient for humans. This change enables these types to be set with a string with the syntax as used in the command line instead, so `"10s"` rather than `10000000000` or `"DEBUG"` rather than `8` for log level.
This commit is contained in:
parent
e32f08f37b
commit
ae3963e4b4
17 changed files with 516 additions and 20 deletions
|
@ -2,6 +2,7 @@ package fs
|
|||
|
||||
// SizeSuffix is parsed by flag with k/M/G suffixes
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"math"
|
||||
"sort"
|
||||
|
@ -143,3 +144,30 @@ func (l SizeSuffixList) Less(i, j int) bool { return l[i] < l[j] }
|
|||
func (l SizeSuffixList) Sort() {
|
||||
sort.Sort(l)
|
||||
}
|
||||
|
||||
// UnmarshalJSONFlag unmarshals a JSON input for a flag. If the input
|
||||
// is a string then it calls the Set method on the flag otherwise it
|
||||
// calls the setInt function with a parsed int64.
|
||||
func UnmarshalJSONFlag(in []byte, x interface{ Set(string) error }, setInt func(int64) error) error {
|
||||
// Try to parse as string first
|
||||
var s string
|
||||
err := json.Unmarshal(in, &s)
|
||||
if err == nil {
|
||||
return x.Set(s)
|
||||
}
|
||||
// If that fails parse as integer
|
||||
var i int64
|
||||
err = json.Unmarshal(in, &i)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return setInt(i)
|
||||
}
|
||||
|
||||
// UnmarshalJSON makes sure the value can be parsed as a string or integer in JSON
|
||||
func (x *SizeSuffix) UnmarshalJSON(in []byte) error {
|
||||
return UnmarshalJSONFlag(in, x, func(i int64) error {
|
||||
*x = SizeSuffix(i)
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue