unistack-org/micro-config-file
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases 24 Wiki Activity

update

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов
2021-06-21 16:18:05 +03:00
parent 832fdb5ab6
commit ddc561f85f
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
file.go
View File

@@ -50,7 +50,7 @@ func (c *fileConfig) Init(opts ...config.Option) error {
return nil
}
func (c *fileConfig) Load(ctx context.Context) error {
func (c *fileConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
for _, fn := range c.opts.BeforeLoad {
if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
return err
@@ -69,7 +69,15 @@ func (c *fileConfig) Load(ctx context.Context) error {
if err == nil {
err = c.opts.Codec.Unmarshal(buf, src)
if err == nil {
err = mergo.Merge(c.opts.Struct, src, mergo.WithOverride, mergo.WithTypeCheck, mergo.WithAppendSlice)
options := config.NewLoadOptions(opts...)
mopts := []func(*mergo.Config){mergo.WithTypeCheck}
if options.Override {
mopts = append(mopts, mergo.WithOverride)
}
if options.Append {
mopts = append(mopts, mergo.WithAppendSlice)
}
err = mergo.Merge(c.opts.Struct, src, mopts...)
}
}
}
@@ -87,7 +95,7 @@ func (c *fileConfig) Load(ctx context.Context) error {
return nil
}
func (c *fileConfig) Save(ctx context.Context) error {
func (c *fileConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
for _, fn := range c.opts.BeforeSave {
if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
return err