diff --git a/.github/workflows/autoapprove.yml b/.github/workflows/autoapprove.yml index ebe28c9..5bf5d9f 100644 --- a/.github/workflows/autoapprove.yml +++ b/.github/workflows/autoapprove.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: approve - uses: hmarr/auto-approve-action@v2 + uses: hmarr/auto-approve-action@v3 if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]' id: approve with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d8002e9..9603352 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,13 +10,13 @@ jobs: runs-on: ubuntu-latest steps: - name: setup - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: - go-version: 1.16 + go-version: 1.17 - name: checkout uses: actions/checkout@v3 - name: cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} @@ -34,7 +34,7 @@ jobs: - name: checkout uses: actions/checkout@v3 - name: lint - uses: golangci/golangci-lint-action@v3.1.0 + uses: golangci/golangci-lint-action@v3.4.0 continue-on-error: true with: # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version. diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9b4d428..2f6c6de 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -45,12 +45,12 @@ jobs: - name: checkout uses: actions/checkout@v3 - name: setup - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: - go-version: 1.16 + go-version: 1.17 # Initializes the CodeQL tools for scanning. - name: init - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -61,7 +61,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: autobuild - uses: github/codeql-action/autobuild@v1 + uses: github/codeql-action/autobuild@v2 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -75,4 +75,4 @@ jobs: # make release - name: analyze - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml index 3681028..f41c1c0 100644 --- a/.github/workflows/dependabot-automerge.yml +++ b/.github/workflows/dependabot-automerge.yml @@ -15,7 +15,7 @@ jobs: steps: - name: metadata id: metadata - uses: dependabot/fetch-metadata@v1.3.0 + uses: dependabot/fetch-metadata@v1.3.6 with: github-token: "${{ secrets.TOKEN }}" - name: merge diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index ff10c46..f313ebe 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,13 +10,13 @@ jobs: runs-on: ubuntu-latest steps: - name: setup - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: - go-version: 1.16 + go-version: 1.17 - name: checkout uses: actions/checkout@v3 - name: cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} @@ -34,7 +34,7 @@ jobs: - name: checkout uses: actions/checkout@v3 - name: lint - uses: golangci/golangci-lint-action@v3.1.0 + uses: golangci/golangci-lint-action@v3.4.0 continue-on-error: true with: # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version. diff --git a/flag.go b/flag.go index 93da9aa..b89a278 100644 --- a/flag.go +++ b/flag.go @@ -5,7 +5,9 @@ import ( "errors" "flag" "fmt" + "os" "reflect" + "strings" "time" "go.unistack.org/micro/v3/config" @@ -27,7 +29,10 @@ var ( */ type flagConfig struct { + fset *flag.FlagSet opts config.Options + name string + env string } func (c *flagConfig) Options() config.Options { @@ -39,9 +44,23 @@ func (c *flagConfig) Init(opts ...config.Option) error { o(&c.opts) } + if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail { + return err + } + + c.configure() + fields, err := rutil.StructFields(c.opts.Struct) if err != nil { - return err + if !c.opts.AllowFail { + return err + } + + if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail { + return err + } + + return nil } for _, sf := range fields { @@ -49,11 +68,26 @@ func (c *flagConfig) Init(opts ...config.Option) error { if !ok { continue } - fn, fv, fd := getFlagOpts(tf) + + fn, fd, fv := getFlagOpts(tf) + if tf, ok = sf.Field.Tag.Lookup(c.env); ok { + fd += fmt.Sprintf(" (env %s)", tf) + } rcheck := true - switch sf.Value.Interface().(type) { + if !sf.Value.IsValid() { + continue + } + vi := sf.Value.Interface() + if vi == nil { + continue + } + if f := flag.Lookup(fn); f != nil { + return nil + } + + switch vi.(type) { case time.Duration: err = c.flagDuration(sf.Value, fn, fv, fd) rcheck = false @@ -63,10 +97,13 @@ func (c *flagConfig) Init(opts ...config.Option) error { } if err != nil { - c.opts.Logger.Errorf(c.opts.Context, "flag init error: %v", err) if !c.opts.AllowFail { return err } + if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail { + return err + } + return nil } @@ -99,26 +136,52 @@ func (c *flagConfig) Init(opts ...config.Option) error { err = c.flagMap(sf.Value, fn, fv, fd) } if err != nil { - c.opts.Logger.Errorf(c.opts.Context, "flag init error: %v", err) if !c.opts.AllowFail { return err } + + if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail { + return err + } + return nil } } + if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail { + return err + } + return nil } func (c *flagConfig) Load(ctx context.Context, opts ...config.LoadOption) error { options := config.NewLoadOptions(opts...) _ = options + + if err := config.DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail { + return err + } + + if err := config.DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail { + return err + } + // TODO: allow merge, append and so flag.Parse() + return nil } func (c *flagConfig) Save(ctx context.Context, opts ...config.SaveOption) error { + if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail { + return err + } + + if err := config.DefaultAfterSave(ctx, c); err != nil && !c.opts.AllowFail { + return err + } + return nil } @@ -134,10 +197,125 @@ func (c *flagConfig) Watch(ctx context.Context, opts ...config.WatchOption) (con return nil, fmt.Errorf("not implemented") } +func (c *flagConfig) usage() { + mapDelim := DefaultMapDelim + sliceDelim := DefaultSliceDelim + + if c.opts.Context != nil { + if d, ok := c.opts.Context.Value(mapDelimKey{}).(string); ok { + mapDelim = d + } + if d, ok := c.opts.Context.Value(sliceDelimKey{}).(string); ok { + sliceDelim = d + } + } + + if c.name == "" { + fmt.Fprintf(c.fset.Output(), "Usage:\n") + } else { + fmt.Fprintf(c.fset.Output(), "Usage of %s:\n", c.name) + } + + c.fset.VisitAll(func(f *flag.Flag) { + var b strings.Builder + fmt.Fprintf(&b, " -%s", f.Name) // Two spaces before -; see next two comments. + _, usage := flag.UnquoteUsage(f) + name := "value" + v := reflect.TypeOf(f.Value).String() + b.WriteString(" ") + switch v { + case "*flag.boolFlag": + name = "bool" + case "*flag.durationValue": + name = "duration" + case "*flag.float64Value": + name = "float" + case "*flag.intValue", "*flag.int64Value": + name = "int" + case "*flag.stringValue": + name = "string" + case "*flag.uintValue", "*flag.uint64Value": + name = "uint" + case "*flag.mapValue": + // nv := f.Value.(*mapValue) + name = fmt.Sprintf("string key=val with %q as separator", mapDelim) + case "*flag.sliceValue": + // nv := f.Value.(*sliceValue) + name = fmt.Sprintf("string with %q as separator", sliceDelim) + } + b.WriteString(name) + + // Boolean flags of one ASCII letter are so common we + // treat them specially, putting their usage on the same line. + if b.Len() <= 4 { // space, space, '-', 'x'. + b.WriteString("\t") + } else { + // Four spaces before the tab triggers good alignment + // for both 4- and 8-space tab stops. + b.WriteString("\n \t") + } + b.WriteString(strings.ReplaceAll(usage, "\n", "\n \t")) + + if f.Value.String() == f.DefValue { + fmt.Fprintf(&b, " (default %q)", f.DefValue) + } else { + fmt.Fprintf(&b, " (default %q current %q)", f.DefValue, f.Value) + } + + fmt.Fprint(c.fset.Output(), b.String(), "\n") + }) +} + +func (c *flagConfig) configure() { + flagSet := flag.CommandLine + flagSetName := os.Args[0] + flagSetErrorHandling := flag.ExitOnError + flagEnv := "env" + var flagUsage func() + var isSet bool + + if c.opts.Context != nil { + if v, ok := c.opts.Context.Value(flagSetNameKey{}).(string); ok { + isSet = true + flagSetName = v + } + if v, ok := c.opts.Context.Value(flagSetErrorHandlingKey{}).(flag.ErrorHandling); ok { + isSet = true + flagSetErrorHandling = v + } + if v, ok := c.opts.Context.Value(flagSetKey{}).(*flag.FlagSet); ok { + flagSet = v + } + if v, ok := c.opts.Context.Value(flagSetUsageKey{}).(func()); ok { + flagUsage = v + } + if v, ok := c.opts.Context.Value(flagEnvKey{}).(string); ok { + flagEnv = v + } + } + c.fset = flagSet + + if isSet { + c.fset.Init(flagSetName, flagSetErrorHandling) + } + if flagUsage != nil { + c.fset.Usage = flagUsage + } else { + c.fset.Usage = c.usage + } + c.env = flagEnv + + c.name = flagSetName +} + func NewConfig(opts ...config.Option) config.Config { options := config.NewOptions(opts...) if len(options.StructTag) == 0 { options.StructTag = DefaultStructTag } - return &flagConfig{opts: options} + + c := &flagConfig{opts: options} + c.configure() + + return c } diff --git a/flag_test.go b/flag_test.go index 23769f9..bc12bcb 100644 --- a/flag_test.go +++ b/flag_test.go @@ -2,6 +2,7 @@ package flag import ( "context" + "flag" "os" "testing" "time" @@ -17,19 +18,35 @@ func TestLoad(t *testing.T) { os.Args = append(os.Args, "-addr", "33,44") os.Args = append(os.Args, "-time", time.RFC822) os.Args = append(os.Args, "-metadata", "key=20") + os.Args = append(os.Args, "-components", "all=info,api=debug") + os.Args = append(os.Args, "-addr", "33,44") + os.Args = append(os.Args, "-badflag", "test") + type NestedConfig struct { + Value string `flag:"name=nested_value"` + } type Config struct { - Broker string `flag:"name=broker,desc='description with, comma',default='127.0.0.1:9092'"` - Verbose bool `flag:"name=verbose,desc='verbose output',default='false'"` - Addr []string `flag:"name=addr,desc='addrs',default='127.0.0.1:9092'"` - Wait time.Duration `flag:"name=wait,desc='wait time',default='2s'"` - Time time.Time `flag:"name=time,desc='some time',default='02 Jan 06 15:04 MST'"` - Metadata map[string]int `flag:"name=metadata,desc='some meta',default=''"` + Time time.Time `flag:"name=time,desc='some time',default='02 Jan 06 15:04 MST'"` + Components map[string]string `flag:"name=components,desc='components logging'"` + Metadata map[string]int `flag:"name=metadata,desc='some meta',default=''"` + Nested *NestedConfig + Broker string `flag:"name=broker,desc='description with, comma',default='127.0.0.1:9092'"` + WithoutDesc string `flag:"name=without_desc,default='without_default'"` + WithoutAll string `flag:"name=without_all"` + WithoutDefault string `flag:"name=without_default,desc='with'"` + Addr []string `flag:"name=addr,desc='addrs',default='127.0.0.1:9092'"` + Wait time.Duration `flag:"name=wait,desc='wait time',default='2s'"` + Verbose bool `flag:"name=verbose,desc='verbose output',default='false'"` } ctx := context.Background() - cfg := &Config{} + cfg := &Config{Nested: &NestedConfig{}} - c := NewConfig(config.Struct(cfg), TimeFormat(time.RFC822)) + c := NewConfig(config.Struct(cfg), TimeFormat(time.RFC822), FlagErrorHandling(flag.ContinueOnError)) + if err := c.Init(); err != nil { + t.Fatalf("init failed: %v", err) + } + + // double init test if err := c.Init(); err != nil { t.Fatalf("init failed: %v", err) } @@ -44,4 +61,8 @@ func TestLoad(t *testing.T) { if tf := cfg.Time.Format(time.RFC822); tf != "02 Jan 06 15:04 MST" { t.Fatalf("parse time error: %s != %s", tf, "02 Jan 06 15:04 MST") } + + if len(cfg.Components) != 2 { + t.Fatalf("cant parse map components %#+v", cfg) + } } diff --git a/go.mod b/go.mod index a871fa9..19bf822 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,7 @@ module go.unistack.org/micro-config-flag/v3 -go 1.16 +go 1.18 -require go.unistack.org/micro/v3 v3.8.21 +require go.unistack.org/micro/v3 v3.10.16 + +require github.com/imdario/mergo v0.3.13 // indirect diff --git a/go.sum b/go.sum index ab83980..8ff5437 100644 --- a/go.sum +++ b/go.sum @@ -1,153 +1,10 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= -github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/gnostic v0.6.6/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= -github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= +github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= -github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= -github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.unistack.org/micro-proto/v3 v3.2.1 h1:z7+V97LcAwMbBiYStmf8b6fFk2UPJTzni+rxNqk4NrI= -go.unistack.org/micro-proto/v3 v3.2.1/go.mod h1:ZltVWNECD5yK+40+OCONzGw4OtmSdTpVi8/KFgo9dqM= -go.unistack.org/micro/v3 v3.8.21 h1:8vYxtIlPnCBZ888BrQSP6+b0CFQcn5FiaqDpI5XqorQ= -go.unistack.org/micro/v3 v3.8.21/go.mod h1:aBOCQ6SkAwKMRI7Q1CIsQA2S88ibyJfweJZlT1M2qpE= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +go.unistack.org/micro/v3 v3.10.16 h1:2er/SKKYbV60M+UuJM4eYCF0MZYAIq/yNUrAbTfgq8Q= +go.unistack.org/micro/v3 v3.10.16/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/options.go b/options.go index ae904dc..3830aed 100644 --- a/options.go +++ b/options.go @@ -1,6 +1,8 @@ package flag import ( + "flag" + "go.unistack.org/micro/v3/config" ) @@ -24,3 +26,39 @@ type timeFormatKey struct{} func TimeFormat(s string) config.Option { return config.SetOption(timeFormatKey{}, s) } + +type flagSetKey struct{} + +// FlagSet set flag set name +func FlagSet(f *flag.FlagSet) config.Option { + return config.SetOption(flagSetKey{}, f) +} + +type flagSetNameKey struct{} + +// FlagSetName set flag set name +func FlagSetName(n string) config.Option { + return config.SetOption(flagSetNameKey{}, n) +} + +type flagSetErrorHandlingKey struct{} + +// FlagErrorHandling set flag set error handling +func FlagErrorHandling(eh flag.ErrorHandling) config.Option { + return config.SetOption(flagSetErrorHandlingKey{}, eh) +} + +type flagSetUsageKey struct{} + +// FlagUsage set flag set usage func +func FlagUsage(fn func()) config.Option { + return config.SetOption(flagSetUsageKey{}, fn) +} + + +type flagEnvKey struct{} + +// FlagEnv set flag set usage func +func FlagEnv(n string) config.Option { + return config.SetOption(flagEnvKey{}, n) +} diff --git a/util.go b/util.go index 221b53c..8f9c704 100644 --- a/util.go +++ b/util.go @@ -2,12 +2,139 @@ package flag import ( "flag" + "fmt" "reflect" "strconv" "strings" "time" ) +type mapValue struct { + delim string + def string + v reflect.Value +} + +func (v *mapValue) String() string { + if v.v.Kind() != reflect.Invalid { + var kv []string + it := v.v.MapRange() + for it.Next() { + k := it.Key().Interface() + v := it.Value().Interface() + kv = append(kv, fmt.Sprintf("%v=%v", k, v)) + } + return strings.Join(kv, ",") + } + return v.def +} + +func (v *mapValue) Get() interface{} { + return v.v.Interface() +} + +func (v *mapValue) Set(s string) error { + ps := strings.Split(s, v.delim) + if len(ps) == 0 { + return nil + } + v.v.Set(reflect.MakeMapWithSize(v.v.Type(), len(ps))) + kt := v.v.Type().Key().Kind() + vt := v.v.Type().Elem().Kind() + + for i := 0; i < len(ps); i++ { + fs := strings.Split(ps[i], "=") + switch len(fs) { + case 0: + return nil + case 1: + if len(fs[0]) == 0 { + return nil + } + return ErrInvalidValue + case 2: + break + default: + return ErrInvalidValue + } + key, err := convertType(reflect.ValueOf(fs[0]), kt) + if err != nil { + return err + } + val, err := convertType(reflect.ValueOf(fs[1]), vt) + if err != nil { + return err + } + v.v.SetMapIndex(key.Convert(v.v.Type().Key()), val.Convert(v.v.Type().Elem())) + } + return nil +} + +type sliceValue struct { + delim string + def string + v reflect.Value +} + +func (v *sliceValue) String() string { + if v.v.Kind() != reflect.Invalid { + var kv []string + for idx := 0; idx < v.v.Len(); idx++ { + kv = append(kv, fmt.Sprintf("%v", v.v.Index(idx).Interface())) + } + return strings.Join(kv, ",") + } + return v.def +} + +func (v *sliceValue) Get() interface{} { + return v.v.Interface() +} + +func (v *sliceValue) Set(s string) error { + p := strings.Split(s, v.delim) + v.v.Set(reflect.MakeSlice(v.v.Type(), len(p), len(p))) + switch v.v.Type().Elem().Kind() { + case reflect.Int, reflect.Int64: + for idx := range p { + i, err := strconv.ParseInt(p[idx], 10, 64) + if err != nil { + return err + } + v.v.Index(idx).SetInt(i) + } + case reflect.Uint, reflect.Uint64: + for idx := range p { + i, err := strconv.ParseUint(p[idx], 10, 64) + if err != nil { + return err + } + v.v.Index(idx).SetUint(i) + } + case reflect.Float64: + for idx := range p { + i, err := strconv.ParseFloat(p[idx], 64) + if err != nil { + return err + } + v.v.Index(idx).SetFloat(i) + } + case reflect.Bool: + for idx := range p { + i, err := strconv.ParseBool(p[idx]) + if err != nil { + return err + } + v.v.Index(idx).SetBool(i) + } + case reflect.String: + for idx := range p { + v.v.Index(idx).SetString(p[idx]) + } + } + return nil +} + func convertType(v reflect.Value, t reflect.Kind) (reflect.Value, error) { switch v.Kind() { case reflect.String: @@ -51,50 +178,12 @@ func (c *flagConfig) flagSlice(v reflect.Value, fn, fv, fd string) error { } } - flag.Func(fn, fd, func(s string) error { - p := strings.Split(s, delim) - v.Set(reflect.MakeSlice(v.Type(), len(p), len(p))) - switch v.Type().Elem().Kind() { - case reflect.Int, reflect.Int64: - for idx := range p { - i, err := strconv.ParseInt(p[idx], 10, 64) - if err != nil { - return err - } - v.Index(idx).SetInt(i) - } - case reflect.Uint, reflect.Uint64: - for idx := range p { - i, err := strconv.ParseUint(p[idx], 10, 64) - if err != nil { - return err - } - v.Index(idx).SetUint(i) - } - case reflect.Float64: - for idx := range p { - i, err := strconv.ParseFloat(p[idx], 64) - if err != nil { - return err - } - v.Index(idx).SetFloat(i) - } - case reflect.Bool: - for idx := range p { - i, err := strconv.ParseBool(p[idx]) - if err != nil { - return err - } - v.Index(idx).SetBool(i) - } - case reflect.String: - for idx := range p { - v.Index(idx).SetString(p[idx]) - } - } - return nil - }) - + v.Set(reflect.MakeSlice(v.Type(), 0, 0)) + mp := &sliceValue{v: v, def: fv, delim: delim} + if err := mp.Set(fv); err != nil { + return err + } + flag.Var(mp, fn, fd) return nil } @@ -105,43 +194,12 @@ func (c *flagConfig) flagMap(v reflect.Value, fn, fv, fd string) error { delim = d } } - flag.Func(fn, fd, func(s string) error { - ps := strings.Split(s, delim) - if len(ps) == 0 { - return nil - } - v.Set(reflect.MakeMapWithSize(v.Type(), len(ps))) - kt := v.Type().Key().Kind() - vt := v.Type().Elem().Kind() - - for i := 0; i < len(ps); i++ { - fs := strings.Split(ps[i], "=") - switch len(fs) { - case 0: - return nil - case 1: - if len(fs[0]) == 0 { - return nil - } - return ErrInvalidValue - case 2: - break - default: - return ErrInvalidValue - } - key, err := convertType(reflect.ValueOf(fs[0]), kt) - if err != nil { - return err - } - val, err := convertType(reflect.ValueOf(fs[1]), vt) - if err != nil { - return err - } - v.SetMapIndex(key.Convert(v.Type().Key()), val.Convert(v.Type().Elem())) - } - return nil - }) - + v.Set(reflect.MakeMapWithSize(v.Type(), 0)) + mp := &mapValue{v: v, def: fv, delim: delim} + if err := mp.Set(fv); err != nil { + return err + } + flag.Var(mp, fn, fd) return nil } @@ -172,7 +230,7 @@ func (c *flagConfig) flagDuration(v reflect.Value, fn, fv, fd string) error { if !ok { return ErrInvalidValue } - i, err := time.ParseDuration(fd) + i, err := time.ParseDuration(fv) if err != nil { return err } @@ -185,7 +243,7 @@ func (c *flagConfig) flagBool(v reflect.Value, fn, fv, fd string) error { if !ok { return ErrInvalidValue } - i, err := strconv.ParseBool(fd) + i, err := strconv.ParseBool(fv) if err != nil { return err } @@ -207,11 +265,11 @@ func (c *flagConfig) flagInt(v reflect.Value, fn, fv, fd string) error { if !ok { return ErrInvalidValue } - i, err := strconv.ParseInt(fd, 10, 64) + i, err := strconv.ParseInt(fv, 10, 64) if err != nil { return err } - flag.IntVar(nv, fn, int(i), fd) + flag.IntVar(nv, fn, int(i), fv) return nil } @@ -220,11 +278,11 @@ func (c *flagConfig) flagInt64(v reflect.Value, fn, fv, fd string) error { if !ok { return ErrInvalidValue } - i, err := strconv.ParseInt(fd, 10, 64) + i, err := strconv.ParseInt(fv, 10, 64) if err != nil { return err } - flag.Int64Var(nv, fn, int64(i), fd) + flag.Int64Var(nv, fn, int64(i), fv) return nil } @@ -233,11 +291,11 @@ func (c *flagConfig) flagUint(v reflect.Value, fn, fv, fd string) error { if !ok { return ErrInvalidValue } - i, err := strconv.ParseUint(fd, 10, 64) + i, err := strconv.ParseUint(fv, 10, 64) if err != nil { return err } - flag.UintVar(nv, fn, uint(i), fd) + flag.UintVar(nv, fn, uint(i), fv) return nil } @@ -246,11 +304,11 @@ func (c *flagConfig) flagUint64(v reflect.Value, fn, fv, fd string) error { if !ok { return ErrInvalidValue } - i, err := strconv.ParseUint(fd, 10, 64) + i, err := strconv.ParseUint(fv, 10, 64) if err != nil { return err } - flag.Uint64Var(nv, fn, uint64(i), fd) + flag.Uint64Var(nv, fn, uint64(i), fv) return nil } @@ -259,11 +317,11 @@ func (c *flagConfig) flagFloat64(v reflect.Value, fn, fv, fd string) error { if !ok { return ErrInvalidValue } - i, err := strconv.ParseFloat(fd, 64) + i, err := strconv.ParseFloat(fv, 64) if err != nil { return err } - flag.Float64Var(nv, fn, float64(i), fd) + flag.Float64Var(nv, fn, float64(i), fv) return nil } @@ -277,31 +335,74 @@ func (c *flagConfig) flagStringSlice(v reflect.Value, fn, fv, fd string) error { } func getFlagOpts(tf string) (string, string, string) { - ret := make([]string, 3) - vals := strings.Split(tf, ",") - f := 0 - for _, val := range vals { - p := strings.Split(val, "=") - switch p[0] { + var name, desc, def string + delim := "," + + var buf string + for idx := 0; idx < len(tf); idx++ { + buf += string(tf[idx]) + switch buf { case "name": - f = 0 + ndx := idx + 2 + stop := "," + var quote bool + for ; ndx < len(tf); ndx++ { + if string(tf[ndx]) == stop { + if quote { + ndx++ + } + break + } + if string(tf[ndx]) == "'" { + stop = "'" + quote = true + continue + } + name += string(tf[ndx]) + } + idx = ndx + buf = "" case "desc": - f = 1 + ndx := idx + 2 + stop := "," + var quote bool + for ; ndx < len(tf); ndx++ { + if string(tf[ndx]) == stop { + if quote { + ndx++ + } + break + } + if string(tf[ndx]) == "'" { + stop = "'" + quote = true + continue + } + desc += string(tf[ndx]) + } + idx = ndx + buf = "" case "default": - f = 2 - default: - ret[f] += "," + val - continue - } - ret[f] = p[1] - } - for idx := range ret { - if ret[idx][0] == '\'' { - ret[idx] = ret[idx][1:] - } - if ret[idx][len(ret[idx])-1] == '\'' { - ret[idx] = ret[idx][:len(ret[idx])-1] + ndx := idx + 2 + stop := "," + var quote bool + for ; ndx < len(tf); ndx++ { + if string(tf[ndx]) == stop && (stop != delim) { + if quote { + ndx++ + } + break + } + if string(tf[ndx]) == "'" { + stop = "'" + quote = true + continue + } + def += string(tf[ndx]) + } + idx = ndx + buf = "" } } - return ret[0], ret[1], ret[2] + return name, desc, def }