x/urfave-cli
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modify nesting flag apply

Browse Source
This commit is contained in:
Dokiy 2022-08-30 14:29:39 +08:00 committed by Dan Buch
parent 9a33ae888c
commit d520bfce53
Signed by: meatballhat
GPG Key ID: A12F782281063434
1 changed files with 141 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

263
altsrc/flag.go
View File

@ -64,19 +64,22 @@ func InitInputSourceWithContext(flags []cli.Flag, createInputSource func(cCtx *c
// ApplyInputSourceValue applies a generic value to the flagSet if required // ApplyInputSourceValue applies a generic value to the flagSet if required
func (f *GenericFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContext) error { func (f *GenericFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContext) error {
if f.set != nil && !cCtx.IsSet(f.Name) && !isEnvVarSet(f.EnvVars) { if f.set == nil || cCtx.IsSet(f.Name) || isEnvVarSet(f.EnvVars) {
for _, name := range f.GenericFlag.Names() { return nil
if isc.isSet(name) { }
value, err := isc.Generic(name) for _, name := range f.GenericFlag.Names() {
if err != nil { if !isc.isSet(name) {
return err continue
} }
if value != nil { value, err := isc.Generic(name)
for _, n := range f.Names() { if err != nil {
_ = f.set.Set(n, value.String()) return err
} }
} if value == nil {
} continue
}
for _, n := range f.Names() {
_ = f.set.Set(n, value.String())
} }
} }
@ -85,23 +88,27 @@ func (f *GenericFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceCo
// ApplyInputSourceValue applies a StringSlice value to the flagSet if required // ApplyInputSourceValue applies a StringSlice value to the flagSet if required
func (f *StringSliceFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContext) error { func (f *StringSliceFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContext) error {
if f.set != nil && !cCtx.IsSet(f.Name) && !isEnvVarSet(f.EnvVars){ if f.set == nil || cCtx.IsSet(f.Name) || isEnvVarSet(f.EnvVars) {
for _, name := range f.StringSliceFlag.Names() { return nil
if isc.isSet(name) { }
value, err := isc.StringSlice(name) for _, name := range f.StringSliceFlag.Names() {
if err != nil { if !isc.isSet(name) {
return err continue
} }
if value != nil { value, err := isc.StringSlice(name)
var sliceValue = *(cli.NewStringSlice(value...)) if err != nil {
for _, n := range f.Names() { return err
underlyingFlag := f.set.Lookup(n) }
if underlyingFlag != nil { if value == nil {
underlyingFlag.Value = &sliceValue continue
} }
} var sliceValue = *(cli.NewStringSlice(value...))
} for _, n := range f.Names() {
underlyingFlag := f.set.Lookup(n)
if underlyingFlag == nil {
continue
} }
underlyingFlag.Value = &sliceValue
} }
} }
return nil return nil
@ -109,23 +116,27 @@ func (f *StringSliceFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSour
// ApplyInputSourceValue applies a IntSlice value if required // ApplyInputSourceValue applies a IntSlice value if required
func (f *IntSliceFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContext) error { func (f *IntSliceFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContext) error {
if f.set != nil && !cCtx.IsSet(f.Name) && !isEnvVarSet(f.EnvVars) { if f.set == nil || cCtx.IsSet(f.Name) || isEnvVarSet(f.EnvVars) {
for _, name := range f.IntSliceFlag.Names() { return nil
if isc.isSet(name) { }
value, err := isc.IntSlice(name) for _, name := range f.IntSliceFlag.Names() {
if err != nil { if !isc.isSet(name) {
return err continue
} }
if value != nil { value, err := isc.IntSlice(name)
var sliceValue = *(cli.NewIntSlice(value...)) if err != nil {
for _, n := range f.Names() { return err
underlyingFlag := f.set.Lookup(n) }
if underlyingFlag != nil { if value == nil {
underlyingFlag.Value = &sliceValue continue
} }
} var sliceValue = *(cli.NewIntSlice(value...))
} for _, n := range f.Names() {
underlyingFlag := f.set.Lookup(n)
if underlyingFlag == nil {
continue
} }
underlyingFlag.Value = &sliceValue
} }
} }
return nil return nil
@ -133,19 +144,19 @@ func (f *IntSliceFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceC
// ApplyInputSourceValue applies a Bool value to the flagSet if required // ApplyInputSourceValue applies a Bool value to the flagSet if required
func (f *BoolFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContext) error { func (f *BoolFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContext) error {
if f.set != nil && !cCtx.IsSet(f.Name) && !isEnvVarSet(f.EnvVars) { if f.set == nil || cCtx.IsSet(f.Name) || isEnvVarSet(f.EnvVars) {
for _, name := range f.BoolFlag.Names() { return nil
if isc.isSet(name) { }
value, err := isc.Bool(name) for _, name := range f.BoolFlag.Names() {
if err != nil { if !isc.isSet(name) {
return err continue
} }
if value { value, err := isc.Bool(name)
for _, n := range f.Names() { if err != nil {
_ = f.set.Set(n, strconv.FormatBool(value)) return err
} }
} for _, n := range f.Names() {
} _ = f.set.Set(n, strconv.FormatBool(value))
} }
} }
return nil return nil
@ -153,17 +164,19 @@ func (f *BoolFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceConte
// ApplyInputSourceValue applies a String value to the flagSet if required // ApplyInputSourceValue applies a String value to the flagSet if required
func (f *StringFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContext) error { func (f *StringFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContext) error {
if f.set != nil && !(cCtx.IsSet(f.Name) || isEnvVarSet(f.EnvVars)) { if f.set == nil || cCtx.IsSet(f.Name) || isEnvVarSet(f.EnvVars) {
for _, name := range f.StringFlag.Names(){ return nil
if isc.isSet(name) { }
value, err := isc.String(name) for _, name := range f.StringFlag.Names() {
if err != nil { if !isc.isSet(name) {
return err continue
} }
for _, n := range f.Names() { value, err := isc.String(name)
_ = f.set.Set(n, value) if err != nil {
} return err
} }
for _, n := range f.Names() {
_ = f.set.Set(n, value)
} }
} }
return nil return nil
@ -171,29 +184,29 @@ func (f *StringFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceCon
// ApplyInputSourceValue applies a Path value to the flagSet if required // ApplyInputSourceValue applies a Path value to the flagSet if required
func (f *PathFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContext) error { func (f *PathFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContext) error {
if f.set != nil && !(cCtx.IsSet(f.Name) || isEnvVarSet(f.EnvVars)) { if f.set == nil || cCtx.IsSet(f.Name) || isEnvVarSet(f.EnvVars) {
for _, name := range f.PathFlag.Names() { return nil
if isc.isSet(name) { }
value, err := isc.String(name) for _, name := range f.PathFlag.Names() {
if !isc.isSet(name) {
continue
}
value, err := isc.String(name)
if err != nil {
return err
}
if value == "" {
continue
}
for _, n := range f.Names() {
if !filepath.IsAbs(value) && isc.Source() != "" {
basePathAbs, err := filepath.Abs(isc.Source())
if err != nil { if err != nil {
return err return err
} }
if value != "" { value = filepath.Join(filepath.Dir(basePathAbs), value)
for _, n := range f.Names() {
if !filepath.IsAbs(value) && isc.Source() != "" {
basePathAbs, err := filepath.Abs(isc.Source())
if err != nil {
return err
}
value = filepath.Join(filepath.Dir(basePathAbs), value)
}
_ = f.set.Set(n, value)
}
}
} }
_ = f.set.Set(n, value)
} }
} }
return nil return nil
@ -201,17 +214,19 @@ func (f *PathFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceConte
// ApplyInputSourceValue applies a int value to the flagSet if required // ApplyInputSourceValue applies a int value to the flagSet if required
func (f *IntFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContext) error { func (f *IntFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContext) error {
if f.set != nil && !(cCtx.IsSet(f.Name) || isEnvVarSet(f.EnvVars)) { if f.set == nil || cCtx.IsSet(f.Name) || isEnvVarSet(f.EnvVars) {
for _, name := range f.IntFlag.Names() { return nil
if isc.isSet(name) { }
value, err := isc.Int(name) for _, name := range f.IntFlag.Names() {
if err != nil { if !isc.isSet(name) {
return err continue
} }
for _, n := range f.Names() { value, err := isc.Int(name)
_ = f.set.Set(n, strconv.FormatInt(int64(value), 10)) if err != nil {
} return err
} }
for _, n := range f.Names() {
_ = f.set.Set(n, strconv.FormatInt(int64(value), 10))
} }
} }
return nil return nil
@ -219,17 +234,19 @@ func (f *IntFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContex
// ApplyInputSourceValue applies a Duration value to the flagSet if required // ApplyInputSourceValue applies a Duration value to the flagSet if required
func (f *DurationFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContext) error { func (f *DurationFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContext) error {
if f.set != nil && !(cCtx.IsSet(f.Name) || isEnvVarSet(f.EnvVars)) { if f.set == nil || cCtx.IsSet(f.Name) || isEnvVarSet(f.EnvVars) {
for _, name := range f.DurationFlag.Names() { return nil
if isc.isSet(name) { }
value, err := isc.Duration(name) for _, name := range f.DurationFlag.Names() {
if err != nil { if !isc.isSet(name) {
return err continue
} }
for _, n := range f.Names() { value, err := isc.Duration(name)
_ = f.set.Set(n, value.String()) if err != nil {
} return err
} }
for _, n := range f.Names() {
_ = f.set.Set(n, value.String())
} }
} }
return nil return nil
@ -237,18 +254,20 @@ func (f *DurationFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceC
// ApplyInputSourceValue applies a Float64 value to the flagSet if required // ApplyInputSourceValue applies a Float64 value to the flagSet if required
func (f *Float64Flag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContext) error { func (f *Float64Flag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContext) error {
if f.set != nil && !(cCtx.IsSet(f.Name) || isEnvVarSet(f.EnvVars)) { if f.set == nil || cCtx.IsSet(f.Name) || isEnvVarSet(f.EnvVars) {
for _, name := range f.Float64Flag.Names() { return nil
if isc.isSet(name) { }
value, err := isc.Float64(name) for _, name := range f.Float64Flag.Names() {
if err != nil { if !isc.isSet(name) {
return err continue
} }
floatStr := float64ToString(value) value, err := isc.Float64(name)
for _, n := range f.Names() { if err != nil {
_ = f.set.Set(n, floatStr) return err
} }
} floatStr := float64ToString(value)
for _, n := range f.Names() {
_ = f.set.Set(n, floatStr)
} }
} }
return nil return nil