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

refactor, more robust flag propagation

Browse Source
This commit is contained in:
Jared Forsyth
2013-11-20 01:05:18 -07:00
parent 73e88630a5
commit dc8a62e0e9
5 changed files with 76 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
flag.go
View File

@@ -24,6 +24,14 @@ func flagSet(name string, flags []Flag) *flag.FlagSet {
return set
}
func eachName(longName string, fn func(string)) {
parts := strings.Split(longName, ",")
for _, name := range parts {
name = strings.Trim(name, " ")
fn(name)
}
}
type StringSlice []string
func (f *StringSlice) Set(value string) error {
@@ -46,14 +54,13 @@ type StringSliceFlag struct {
}
func (f StringSliceFlag) String() string {
return fmt.Sprintf("%s%v '%v'\t%v", prefixFor(f.Name), f.Name, "-"+f.Name+" option -"+f.Name+" option", f.Usage)
return fmt.Sprintf("%s '%v'\t%v", prefixFor(f.Name), f.Name, "-"+f.Name+" option -"+f.Name+" option", f.Usage)
}
func (f StringSliceFlag) Apply(set *flag.FlagSet) {
parts := strings.Split(f.Name, ", ")
for _, name := range parts {
eachName(f.Name, func(name string) {
set.Var(f.Value, name, f.Usage)
}
})
}
func (f StringSliceFlag) GetName() string {
@@ -88,14 +95,15 @@ type IntSliceFlag struct {
}
func (f IntSliceFlag) String() string {
return fmt.Sprintf("%s%v '%v'\t%v", prefixFor(f.Name), f.Name, "-"+f.Name+" option -"+f.Name+" option", f.Usage)
firstName := strings.Trim(strings.Split(f.Name, ",")[0], " ")
pref := prefixFor(firstName)
return fmt.Sprintf("%s '%v'\t%v", prefixedNames(f.Name), pref+firstName+" option "+pref+firstName+" option", f.Usage)
}
func (f IntSliceFlag) Apply(set *flag.FlagSet) {
parts := strings.Split(f.Name, ", ")
for _, name := range parts {
eachName(f.Name, func(name string) {
set.Var(f.Value, name, f.Usage)
}
})
}
func (f IntSliceFlag) GetName() string {
@@ -108,14 +116,13 @@ type BoolFlag struct {
}
func (f BoolFlag) String() string {
return fmt.Sprintf("%s%v\t%v", prefixFor(f.Name), f.Name, f.Usage)
return fmt.Sprintf("%s\t%v", prefixedNames(f.Name), f.Usage)
}
func (f BoolFlag) Apply(set *flag.FlagSet) {
parts := strings.Split(f.Name, ", ")
for _, name := range parts {
eachName(f.Name, func(name string) {
set.Bool(name, false, f.Usage)
}
})
}
func (f BoolFlag) GetName() string {
@@ -129,14 +136,13 @@ type StringFlag struct {
}
func (f StringFlag) String() string {
return fmt.Sprintf("%s%v '%v'\t%v", prefixFor(f.Name), f.Name, f.Value, f.Usage)
return fmt.Sprintf("%s '%v'\t%v", prefixedNames(f.Name), f.Value, f.Usage)
}
func (f StringFlag) Apply(set *flag.FlagSet) {
parts := strings.Split(f.Name, ", ")
for _, name := range parts {
eachName(f.Name, func(name string) {
set.String(name, f.Value, f.Usage)
}
})
}
func (f StringFlag) GetName() string {
@@ -150,14 +156,13 @@ type IntFlag struct {
}
func (f IntFlag) String() string {
return fmt.Sprintf("%s%v '%v'\t%v", prefixFor(f.Name), f.Name, f.Value, f.Usage)
return fmt.Sprintf("%s '%v'\t%v", prefixedNames(f.Name), f.Value, f.Usage)
}
func (f IntFlag) Apply(set *flag.FlagSet) {
parts := strings.Split(f.Name, ", ")
for _, name := range parts {
eachName(f.Name, func(name string) {
set.Int(name, f.Value, f.Usage)
}
})
}
func (f IntFlag) GetName() string {
@@ -169,12 +174,13 @@ type helpFlag struct {
}
func (f helpFlag) String() string {
return fmt.Sprintf("--help, -h\t%v", f.Usage)
return fmt.Sprintf("%s\t%v", prefixedNames("help, h"), f.Usage)
}
func (f helpFlag) Apply(set *flag.FlagSet) {
set.Bool("h", false, f.Usage)
set.Bool("help", false, f.Usage)
eachName("help, h", func(name string) {
set.Bool(name, false, f.Usage)
})
}
func (f helpFlag) GetName() string {
@@ -190,3 +196,15 @@ func prefixFor(name string) (prefix string) {
return
}
func prefixedNames(fullName string) (prefixed string) {
parts := strings.Split(fullName, ",")
for i, name := range parts {
name = strings.Trim(name, " ")
prefixed += prefixFor(name) + name
if i < len(parts) - 1 {
prefixed += ", "
}
}
return
}