refactor: usage using self UnquoteUsage

sandwich-go · Jan 13, 2022 · 4fdcbeb · 4fdcbeb
1 parent 81b55a1
commit 4fdcbeb
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 9 deletions.
diff --git a/tests/conf.go b/tests/conf.go
@@ -46,6 +46,7 @@ func ConfigOptionDeclareWithDefault() interface{} {
 			"test1": 100,
 			"test2": 200,
 		},
+		"Int8":            int8(1),
 		"TimeDurations":   []time.Duration([]time.Duration{time.Second, time.Second}), // @MethodComment(延迟队列)
 		"DefaultEmptyMap": map[string]int{},
 		"Int64Slice":      []int64{101, 202, 303},

diff --git a/tests/gen_config_optiongen.go b/tests/gen_config_optiongen.go
diff --git a/xflag/usage.go b/xflag/usage.go
@@ -43,18 +43,22 @@ func (f *FlagList) FlagGetAndDel(name string) *FlagInfo {
 	return nil
 }
 
+// UnquoteUsage linke flag.UnquoteUsage
+func UnquoteUsage(ff *flag.Flag) (name string, usage string) {
+	varname, usage := flag.UnquoteUsage(ff)
+	if t, ok := ff.Value.(interface{ TypeName() string }); ok {
+		varname = t.TypeName()
+	}
+	if t, ok := ff.Value.(interface{ IsBoolFlag() bool }); ok && t.IsBoolFlag() {
+		varname = "bool"
+	}
+	return varname, usage
+}
+
 // GetFlagInfo get FlagList from given FlagSet
 func GetFlagInfo(f *flag.FlagSet) (ret FlagList) {
 	f.VisitAll(func(ff *flag.Flag) {
-		varname, usage := flag.UnquoteUsage(ff)
-		if varname == "" || varname == "value" {
-			if t, ok := ff.Value.(interface{ TypeName() string }); ok {
-				varname = t.TypeName()
-			}
-			if t, ok := ff.Value.(interface{ IsBoolFlag() bool }); ok && t.IsBoolFlag() {
-				varname = "bool"
-			}
-		}
+		varname, usage := UnquoteUsage(ff)
 		v := &FlagInfo{
 			Name:     ff.Name,
 			Usage:    usage,