glenux-archive/spf13--cobra
1
0
Fork 0
mirror of https://github.com/spf13/cobra synced 2024-11-25 07:07:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge flags & check bool regular flag

Browse source
This commit is contained in:
Gary Miller 2018-01-16 16:30:46 +11:00
parent 92aeee7d6c
commit 1972d4ec3b
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
command.go
View file

@ -436,10 +436,13 @@ func (c *Command) VersionTemplate() string {
` `
} }
func hasNoOptDefVal(name string, fs *flag.FlagSet) bool { func hasDefault(name string, c *Command) bool {
flag := fs.Lookup(name) flag := c.Flags().Lookup(name)
if flag == nil { if flag == nil {
return false return true
}
if flag.Value.Type() == "bool" {
return true
} }
return flag.NoOptDefVal != "" return flag.NoOptDefVal != ""
} }
@ -468,16 +471,13 @@ func stripFlags(args []string, c *Command) []string {
return args return args
} }
c.mergePersistentFlags() c.mergePersistentFlags()
commands := []string{} commands := []string{}
flags := c.Flags()
Loop: Loop:
for len(args) > 0 { for len(args) > 0 {
s := args[0] s := args[0]
args = args[1:] args = args[1:]
switch { switch {
case strings.HasPrefix(s, "--") && !strings.Contains(s, "=") && !hasNoOptDefVal(s[2:], flags): case strings.HasPrefix(s, "--") && !strings.Contains(s, "=") && !hasDefault(s[2:], c):
// If '--flag arg' then // If '--flag arg' then
// delete arg from args. // delete arg from args.
fallthrough // (do the same as below) fallthrough // (do the same as below)
@ -580,6 +580,7 @@ func (c *Command) findNext(next string) *Command {
// Traverse the command tree to find the command, and parse args for // Traverse the command tree to find the command, and parse args for
// each parent. // each parent.
func (c *Command) Traverse(args []string) (*Command, []string, error) { func (c *Command) Traverse(args []string) (*Command, []string, error) {
c.mergePersistentFlags()
flags := []string{} flags := []string{}
inFlag := false inFlag := false
@ -588,7 +589,7 @@ func (c *Command) Traverse(args []string) (*Command, []string, error) {
// A long flag with a space separated value // A long flag with a space separated value
case strings.HasPrefix(arg, "--") && !strings.Contains(arg, "="): case strings.HasPrefix(arg, "--") && !strings.Contains(arg, "="):
// TODO: this isn't quite right, we should really check ahead for 'true' or 'false' // TODO: this isn't quite right, we should really check ahead for 'true' or 'false'
inFlag = !hasNoOptDefVal(arg[2:], c.Flags()) inFlag = !hasDefault(arg[2:], c)
flags = append(flags, arg) flags = append(flags, arg)
continue continue
// A short flag with a space separated value // A short flag with a space separated value