Compare commits

..

No commits in common. "master" and "v3.4.0" have entirely different histories.

14 changed files with 170 additions and 716 deletions

View File

@ -1,24 +0,0 @@
---
name: Bug report
about: For reporting bugs in go-micro
title: "[BUG]"
labels: ''
assignees: ''
---
**Describe the bug**
1. What are you trying to do?
2. What did you expect to happen?
3. What happens instead?
**How to reproduce the bug:**
If possible, please include a minimal code snippet here.
**Environment:**
Go Version: please paste `go version` output here
```
please paste `go env` output here
```

View File

@ -1,17 +0,0 @@
---
name: Feature request / Enhancement
about: If you have a need not served by go-micro
title: "[FEATURE]"
labels: ''
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Additional context**
Add any other context or screenshots about the feature request here.

View File

@ -1,14 +0,0 @@
---
name: Question
about: Ask a question about go-micro
title: ''
labels: ''
assignees: ''
---
Before asking, please check if your question has already been answered:
1. Check the documentation - https://micro.mu/docs/
2. Check the examples and plugins - https://github.com/micro/examples & https://github.com/micro/go-plugins
3. Search existing issues

View File

@ -1,9 +0,0 @@
## Pull Request template
Please, go through these steps before clicking submit on this PR.
1. Give a descriptive title to your PR.
2. Provide a description of your changes.
3. Make sure you have some relevant tests.
4. Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes (if applicable).
**PLEASE REMOVE THIS TEMPLATE BEFORE SUBMITTING**

View File

@ -1,29 +0,0 @@
name: lint
on:
pull_request:
types: [opened, reopened, synchronize]
branches:
- master
- v3
- v4
jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: checkout code
uses: actions/checkout@v4
with:
filter: 'blob:none'
- name: setup go
uses: actions/setup-go@v5
with:
cache-dependency-path: "**/*.sum"
go-version: 'stable'
- name: setup deps
run: go get -v ./...
- name: run lint
uses: https://github.com/golangci/golangci-lint-action@v6
with:
version: 'latest'

View File

@ -1,34 +0,0 @@
name: test
on:
pull_request:
types: [opened, reopened, synchronize]
branches:
- master
- v3
- v4
push:
branches:
- master
- v3
- v4
jobs:
test:
runs-on: ubuntu-latest
steps:
- name: checkout code
uses: actions/checkout@v4
with:
filter: 'blob:none'
- name: setup go
uses: actions/setup-go@v5
with:
cache-dependency-path: "**/*.sum"
go-version: 'stable'
- name: setup deps
run: go get -v ./...
- name: run test
env:
INTEGRATION_TESTS: yes
run: go test -mod readonly -v ./...

View File

@ -1,53 +0,0 @@
name: test
on:
pull_request:
types: [opened, reopened, synchronize]
branches:
- master
- v3
- v4
push:
branches:
- master
- v3
- v4
jobs:
test:
runs-on: ubuntu-latest
steps:
- name: checkout code
uses: actions/checkout@v4
with:
filter: 'blob:none'
- name: checkout tests
uses: actions/checkout@v4
with:
ref: master
filter: 'blob:none'
repository: unistack-org/micro-tests
path: micro-tests
- name: setup go
uses: actions/setup-go@v5
with:
cache-dependency-path: "**/*.sum"
go-version: 'stable'
- name: setup go work
env:
GOWORK: /workspace/${{ github.repository_owner }}/go.work
run: |
go work init
go work use .
go work use micro-tests
- name: setup deps
env:
GOWORK: /workspace/${{ github.repository_owner }}/go.work
run: go get -v ./...
- name: run tests
env:
INTEGRATION_TESTS: yes
GOWORK: /workspace/${{ github.repository_owner }}/go.work
run: |
cd micro-tests
go test -mod readonly -v ./... || true

View File

@ -1,5 +0,0 @@
run:
concurrency: 8
deadline: 5m
issues-exit-code: 1
tests: true

227
flag.go
View File

@ -1,18 +1,14 @@
package flag // import "go.unistack.org/micro-config-flag/v4" package flag
import ( import (
"context" "context"
"errors" "errors"
"flag" "flag"
"fmt"
"os"
"reflect" "reflect"
"strings"
"time" "time"
"go.unistack.org/micro/v4/config" "github.com/unistack-org/micro/v3/config"
"go.unistack.org/micro/v4/options" rutil "github.com/unistack-org/micro/v3/util/reflect"
rutil "go.unistack.org/micro/v4/util/reflect"
) )
var ( var (
@ -30,69 +26,32 @@ var (
*/ */
type flagConfig struct { type flagConfig struct {
fset *flag.FlagSet
opts config.Options opts config.Options
name string
env string
} }
func (c *flagConfig) Options() config.Options { func (c *flagConfig) Options() config.Options {
return c.opts return c.opts
} }
func (c *flagConfig) Init(opts ...options.Option) error { func (c *flagConfig) Init(opts ...config.Option) error {
var err error
for _, o := range opts { for _, o := range opts {
if err = o(&c.opts); err != nil { o(&c.opts)
return err
} }
}
if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
return err
}
c.configure()
fields, err := rutil.StructFields(c.opts.Struct) fields, err := rutil.StructFields(c.opts.Struct)
if err != nil { if err != nil {
if !c.opts.AllowFail {
return err return err
} }
if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
return err
}
return nil
}
for _, sf := range fields { for _, sf := range fields {
tf, ok := sf.Field.Tag.Lookup(c.opts.StructTag) tf, ok := sf.Field.Tag.Lookup(c.opts.StructTag)
if !ok { if !ok {
continue 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 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: case time.Duration:
err = c.flagDuration(sf.Value, fn, fv, fd) err = c.flagDuration(sf.Value, fn, fv, fd)
rcheck = false rcheck = false
@ -100,17 +59,9 @@ func (c *flagConfig) Init(opts ...options.Option) error {
err = c.flagTime(sf.Value, fn, fv, fd) err = c.flagTime(sf.Value, fn, fv, fd)
rcheck = false rcheck = false
} }
if err != nil { if err != nil {
if !c.opts.AllowFail {
return err return err
} }
if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
return err
}
return nil
}
if !rcheck { if !rcheck {
continue continue
@ -141,60 +92,23 @@ func (c *flagConfig) Init(opts ...options.Option) error {
err = c.flagMap(sf.Value, fn, fv, fd) err = c.flagMap(sf.Value, fn, fv, fd)
} }
if err != nil { if err != nil {
if !c.opts.AllowFail {
return err 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 return nil
} }
func (c *flagConfig) Load(ctx context.Context, opts ...options.Option) error { func (c *flagConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
if c.opts.SkipLoad != nil && c.opts.SkipLoad(ctx, c) {
return nil
}
options := config.NewLoadOptions(opts...) options := config.NewLoadOptions(opts...)
_ = options _ = 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 // TODO: allow merge, append and so
flag.Parse() flag.Parse()
return nil return nil
} }
func (c *flagConfig) Save(ctx context.Context, opts ...options.Option) error { func (c *flagConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) {
return nil
}
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 return nil
} }
@ -206,129 +120,10 @@ func (c *flagConfig) Name() string {
return c.opts.Name return c.opts.Name
} }
func (c *flagConfig) Watch(ctx context.Context, opts ...options.Option) (config.Watcher, error) { func NewConfig(opts ...config.Option) config.Config {
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 ...options.Option) config.Config {
options := config.NewOptions(opts...) options := config.NewOptions(opts...)
if len(options.StructTag) == 0 { if len(options.StructTag) == 0 {
options.StructTag = DefaultStructTag options.StructTag = DefaultStructTag
} }
return &flagConfig{opts: options}
c := &flagConfig{opts: options}
c.configure()
return c
} }

View File

@ -2,67 +2,47 @@ package flag
import ( import (
"context" "context"
"flag"
"os" "os"
"testing" "testing"
"time" "time"
"go.unistack.org/micro/v4/config" "github.com/unistack-org/micro/v3/config"
) )
func TestLoad(t *testing.T) { func TestLoad(t *testing.T) {
time.Local = time.UTC
os.Args = append(os.Args, "-broker", "5566:33") os.Args = append(os.Args, "-broker", "5566:33")
os.Args = append(os.Args, "-verbose") os.Args = append(os.Args, "-verbose")
os.Args = append(os.Args, "-wait", "5s") os.Args = append(os.Args, "-wait", "5s")
os.Args = append(os.Args, "-addr", "33,44") os.Args = append(os.Args, "-addr", "33,44")
os.Args = append(os.Args, "-time", time.RFC822) os.Args = append(os.Args, "-time", time.RFC822)
os.Args = append(os.Args, "-metadata", "key=20") 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 { type Config struct {
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'"` Broker string `flag:"name=broker,desc='description with, comma',default='127.0.0.1:9092'"`
WithoutDesc string `flag:"name=without_desc,default='without_default'"` Verbose bool `flag:"name=verbose,desc='verbose output',default='false'"`
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'"` Addr []string `flag:"name=addr,desc='addrs',default='127.0.0.1:9092'"`
Wait time.Duration `flag:"name=wait,desc='wait time',default='2s'"` Wait time.Duration `flag:"name=wait,desc='wait time',default='2s'"`
Verbose bool `flag:"name=verbose,desc='verbose output',default='false'"` 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=''"`
} }
ctx := context.Background() ctx := context.Background()
cfg := &Config{Nested: &NestedConfig{}} cfg := &Config{}
c := NewConfig(config.Struct(cfg), TimeFormat(time.RFC822), FlagErrorHandling(flag.ContinueOnError)) c := NewConfig(config.Struct(cfg), TimeFormat(time.RFC822))
if err := c.Init(); err != nil { if err := c.Init(); err != nil {
t.Fatalf("init failed: %v", err) t.Fatal(err)
}
// double init test
if err := c.Init(); err != nil {
t.Fatalf("init failed: %v", err)
} }
if err := c.Load(ctx); err != nil { if err := c.Load(ctx); err != nil {
t.Fatalf("load failed: %v", err) t.Fatal(err)
} }
if cfg.Broker != "5566:33" { if cfg.Broker != "5566:33" {
t.Fatalf("failed to parse flags broker value invalid: %#+v", cfg) t.Fatalf("failed to parse flags broker value invalid: %#+v", cfg)
} }
if tf := cfg.Time.Format(time.RFC822); tf != "02 Jan 06 15:04 MST" { if tf := cfg.Time.Format(time.RFC822); tf != "02 Jan 06 14:32 MSK" {
t.Fatalf("parse time error: %s != %s", tf, "02 Jan 06 15:04 MST") t.Fatalf("parse time error: %v", cfg.Time)
} }
if len(cfg.Components) != 2 { t.Logf("cfg %#+v", cfg)
t.Fatalf("cant parse map components %#+v", cfg)
}
} }

11
go.mod
View File

@ -1,10 +1,5 @@
module go.unistack.org/micro-config-flag/v4 module github.com/unistack-org/micro-config-flag/v3
go 1.18 go 1.16
require go.unistack.org/micro/v4 v4.0.17 require github.com/unistack-org/micro/v3 v3.4.0
require (
dario.cat/mergo v1.0.0 // indirect
github.com/google/uuid v1.6.0 // indirect
)

25
go.sum
View File

@ -1,9 +1,18 @@
dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
go.unistack.org/micro/v4 v4.0.17 h1:mF7uM+J4ILdG+1fcwzKYCwDlxhdbF/e1WnGzKKLnIXc= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
go.unistack.org/micro/v4 v4.0.17/go.mod h1:ZDgU9931vm2l7X6RN/6UuwRIVp24GRdmQ7dKmegArk4= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
github.com/unistack-org/micro/v3 v3.4.0 h1:z9F3lgAb2j4cZ1ib5qBj66JPYUAzR4sNIJqUDjVwyVQ=
github.com/unistack-org/micro/v3 v3.4.0/go.mod h1:LXmPfbJnJNvL0kQs8HfnkV3Wya2Wb+C7keVq++RCZnk=
golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
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=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

View File

@ -1,63 +1,26 @@
package flag package flag
import ( import (
"flag" "github.com/unistack-org/micro/v3/config"
"go.unistack.org/micro/v4/options"
) )
type sliceDelimKey struct{} type sliceDelimKey struct{}
// SliceDelim set the slice delimeter // SliceDelim set the slice delimeter
func SliceDelim(s string) options.Option { func SliceDelim(s string) config.Option {
return options.ContextOption(sliceDelimKey{}, s) return config.SetOption(sliceDelimKey{}, s)
} }
type mapDelimKey struct{} type mapDelimKey struct{}
// MapDelim set the map delimeter // MapDelim set the map delimeter
func MapDelim(s string) options.Option { func MapDelim(s string) config.Option {
return options.ContextOption(mapDelimKey{}, s) return config.SetOption(mapDelimKey{}, s)
} }
type timeFormatKey struct{} type timeFormatKey struct{}
// TimeFormat set the time format // TimeFormat set the time format
func TimeFormat(s string) options.Option { func TimeFormat(s string) config.Option {
return options.ContextOption(timeFormatKey{}, s) return config.SetOption(timeFormatKey{}, s)
}
type flagSetKey struct{}
// FlagSet set flag set name
func FlagSet(f *flag.FlagSet) options.Option {
return options.ContextOption(flagSetKey{}, f)
}
type flagSetNameKey struct{}
// FlagSetName set flag set name
func FlagSetName(n string) options.Option {
return options.ContextOption(flagSetNameKey{}, n)
}
type flagSetErrorHandlingKey struct{}
// FlagErrorHandling set flag set error handling
func FlagErrorHandling(eh flag.ErrorHandling) options.Option {
return options.ContextOption(flagSetErrorHandlingKey{}, eh)
}
type flagSetUsageKey struct{}
// FlagUsage set flag set usage func
func FlagUsage(fn func()) options.Option {
return options.ContextOption(flagSetUsageKey{}, fn)
}
type flagEnvKey struct{}
// FlagEnv set flag set usage func
func FlagEnv(n string) options.Option {
return options.ContextOption(flagEnvKey{}, n)
} }

319
util.go
View File

@ -2,139 +2,12 @@ package flag
import ( import (
"flag" "flag"
"fmt"
"reflect" "reflect"
"strconv" "strconv"
"strings" "strings"
"time" "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) { func convertType(v reflect.Value, t reflect.Kind) (reflect.Value, error) {
switch v.Kind() { switch v.Kind() {
case reflect.String: case reflect.String:
@ -178,12 +51,50 @@ func (c *flagConfig) flagSlice(v reflect.Value, fn, fv, fd string) error {
} }
} }
v.Set(reflect.MakeSlice(v.Type(), 0, 0)) flag.Func(fn, fd, func(s string) error {
mp := &sliceValue{v: v, def: fv, delim: delim} p := strings.Split(s, delim)
if err := mp.Set(fv); err != nil { 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 return err
} }
flag.Var(mp, fn, fd) 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
})
return nil return nil
} }
@ -194,12 +105,43 @@ func (c *flagConfig) flagMap(v reflect.Value, fn, fv, fd string) error {
delim = d delim = d
} }
} }
v.Set(reflect.MakeMapWithSize(v.Type(), 0)) flag.Func(fn, fd, func(s string) error {
mp := &mapValue{v: v, def: fv, delim: delim} ps := strings.Split(s, delim)
if err := mp.Set(fv); err != nil { 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 return err
} }
flag.Var(mp, fn, fd) 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
})
return nil return nil
} }
@ -230,7 +172,7 @@ func (c *flagConfig) flagDuration(v reflect.Value, fn, fv, fd string) error {
if !ok { if !ok {
return ErrInvalidValue return ErrInvalidValue
} }
i, err := time.ParseDuration(fv) i, err := time.ParseDuration(fd)
if err != nil { if err != nil {
return err return err
} }
@ -243,7 +185,7 @@ func (c *flagConfig) flagBool(v reflect.Value, fn, fv, fd string) error {
if !ok { if !ok {
return ErrInvalidValue return ErrInvalidValue
} }
i, err := strconv.ParseBool(fv) i, err := strconv.ParseBool(fd)
if err != nil { if err != nil {
return err return err
} }
@ -265,11 +207,11 @@ func (c *flagConfig) flagInt(v reflect.Value, fn, fv, fd string) error {
if !ok { if !ok {
return ErrInvalidValue return ErrInvalidValue
} }
i, err := strconv.ParseInt(fv, 10, 64) i, err := strconv.ParseInt(fd, 10, 64)
if err != nil { if err != nil {
return err return err
} }
flag.IntVar(nv, fn, int(i), fv) flag.IntVar(nv, fn, int(i), fd)
return nil return nil
} }
@ -278,11 +220,11 @@ func (c *flagConfig) flagInt64(v reflect.Value, fn, fv, fd string) error {
if !ok { if !ok {
return ErrInvalidValue return ErrInvalidValue
} }
i, err := strconv.ParseInt(fv, 10, 64) i, err := strconv.ParseInt(fd, 10, 64)
if err != nil { if err != nil {
return err return err
} }
flag.Int64Var(nv, fn, int64(i), fv) flag.Int64Var(nv, fn, int64(i), fd)
return nil return nil
} }
@ -291,11 +233,11 @@ func (c *flagConfig) flagUint(v reflect.Value, fn, fv, fd string) error {
if !ok { if !ok {
return ErrInvalidValue return ErrInvalidValue
} }
i, err := strconv.ParseUint(fv, 10, 64) i, err := strconv.ParseUint(fd, 10, 64)
if err != nil { if err != nil {
return err return err
} }
flag.UintVar(nv, fn, uint(i), fv) flag.UintVar(nv, fn, uint(i), fd)
return nil return nil
} }
@ -304,11 +246,11 @@ func (c *flagConfig) flagUint64(v reflect.Value, fn, fv, fd string) error {
if !ok { if !ok {
return ErrInvalidValue return ErrInvalidValue
} }
i, err := strconv.ParseUint(fv, 10, 64) i, err := strconv.ParseUint(fd, 10, 64)
if err != nil { if err != nil {
return err return err
} }
flag.Uint64Var(nv, fn, uint64(i), fv) flag.Uint64Var(nv, fn, uint64(i), fd)
return nil return nil
} }
@ -317,15 +259,14 @@ func (c *flagConfig) flagFloat64(v reflect.Value, fn, fv, fd string) error {
if !ok { if !ok {
return ErrInvalidValue return ErrInvalidValue
} }
i, err := strconv.ParseFloat(fv, 64) i, err := strconv.ParseFloat(fd, 64)
if err != nil { if err != nil {
return err return err
} }
flag.Float64Var(nv, fn, float64(i), fv) flag.Float64Var(nv, fn, float64(i), fd)
return nil return nil
} }
/*
func (c *flagConfig) flagStringSlice(v reflect.Value, fn, fv, fd string) error { func (c *flagConfig) flagStringSlice(v reflect.Value, fn, fv, fd string) error {
nv, ok := v.Addr().Interface().(*string) nv, ok := v.Addr().Interface().(*string)
if !ok { if !ok {
@ -334,77 +275,33 @@ func (c *flagConfig) flagStringSlice(v reflect.Value, fn, fv, fd string) error {
flag.StringVar(nv, fn, fv, fd) flag.StringVar(nv, fn, fv, fd)
return nil return nil
} }
*/
func getFlagOpts(tf string) (string, string, string) { func getFlagOpts(tf string) (string, string, string) {
var name, desc, def string ret := make([]string, 3)
delim := "," vals := strings.Split(tf, ",")
f := 0
var buf string for _, val := range vals {
for idx := 0; idx < len(tf); idx++ { p := strings.Split(val, "=")
buf += string(tf[idx]) switch p[0] {
switch buf {
case "name": case "name":
ndx := idx + 2 f = 0
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": case "desc":
ndx := idx + 2 f = 1
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": case "default":
ndx := idx + 2 f = 2
stop := "," default:
var quote bool ret[f] += "," + val
for ; ndx < len(tf); ndx++ {
if string(tf[ndx]) == stop && (stop != delim) {
if quote {
ndx++
}
break
}
if string(tf[ndx]) == "'" {
stop = "'"
quote = true
continue continue
} }
def += string(tf[ndx]) ret[f] = p[1]
} }
idx = ndx for idx := range ret {
buf = "" if ret[idx][0] == '\'' {
ret[idx] = ret[idx][1:]
}
if ret[idx][len(ret[idx])-1] == '\'' {
ret[idx] = ret[idx][:len(ret[idx])-1]
} }
} }
return name, desc, def return ret[0], ret[1], ret[2]
} }