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

Simplify stripFlags function

Browse source
This commit is contained in:
Albert Nigmatzianov 2017-04-23 22:38:30 +02:00
parent aea94819d2
commit 9890b7b2e9
1 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
command.go
View file

@ -392,40 +392,48 @@ func shortHasNoOptDefVal(name string, fs *flag.FlagSet) bool {
} }
func stripFlags(args []string, c *Command) []string { func stripFlags(args []string, c *Command) []string {
if len(args) < 1 { if len(args) == 0 {
return args return args
} }
c.mergePersistentFlags() c.mergePersistentFlags()
commands := []string{} commands := []string{}
inQuote := false inQuote := false
inFlag := false
for _, y := range args { Loop:
for len(args) > 0 {
s := args[0]
if !inQuote { if !inQuote {
switch { switch {
case strings.HasPrefix(y, "\""): case strings.HasPrefix(s, "\"") || strings.Contains(s, "=\""):
inQuote = true inQuote = true
case strings.Contains(y, "=\""): case strings.HasPrefix(s, "--") && !strings.Contains(s, "=") && !hasNoOptDefVal(s[2:], c.Flags()):
inQuote = true // If '--flag arg' then
case strings.HasPrefix(y, "--") && !strings.Contains(y, "="): // delete two items from args.
// TODO: this isn't quite right, we should really check ahead for 'true' or 'false' fallthrough // Do the same as below.
inFlag = !hasNoOptDefVal(y[2:], c.Flags()) case strings.HasPrefix(s, "-") && !strings.Contains(s, "=") && len(s) == 2 && !shortHasNoOptDefVal(s[1:], c.Flags()):
case strings.HasPrefix(y, "-") && !strings.Contains(y, "=") && len(y) == 2 && !shortHasNoOptDefVal(y[1:], c.Flags()): // If '-f arg' then
inFlag = true // delete two items from args.
case inFlag:
inFlag = false // If there are only two elements in args or less,
case y == "": // break loop, ...
// strip empty commands, as the go tests expect this to be ok.... if len(args) <= 2 {
case !strings.HasPrefix(y, "-"): break Loop
commands = append(commands, y) } else {
inFlag = false // ... else delete first two items.
args = args[2:]
continue
}
case s != "" && !strings.HasPrefix(s, "-"):
commands = append(commands, s)
} }
} }
if strings.HasSuffix(y, "\"") && !strings.HasSuffix(y, "\\\"") { if strings.HasSuffix(s, "\"") && !strings.HasSuffix(s, "\\\"") {
inQuote = false inQuote = false
} }
args = args[1:]
} }
return commands return commands