mirror of
https://github.com/v2fly/v2ray-core.git
synced 2024-12-22 10:08:15 -05:00
ff59bd37ce
* scalable commands column * new multi-json loader For both internal & external json loader This commit also: * applies -confdir to other formats, e.g. "yaml" in the future * multiple assign of -confdir is accepted * add flag to load confdir recursively * config loader can have alias name * json loader also accepts .jsonc * add merge command * add help topics for json merge, format loader * format loaders don't panic * apply lint style * add merge test * merge same tag in array, solve v2fly/discussion#97 * apply lint style * merge code optimize * fix merge cmdarg.Arg * update cmd description * improve merge logic * fix zero value overwrite * fix "null" lost after array merge * code optimize * fix merged slices not sorted * code optimize * add package doc * fix a typo
44 lines
1.1 KiB
Go
44 lines
1.1 KiB
Go
// Copyright 2020 Jebbs. All rights reserved.
|
|
// Use of this source code is governed by MIT
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package merge
|
|
|
|
import (
|
|
"fmt"
|
|
)
|
|
|
|
// mergeMaps merges source map into target
|
|
func mergeMaps(target map[string]interface{}, source map[string]interface{}) (err error) {
|
|
for key, value := range source {
|
|
target[key], err = mergeField(target[key], value)
|
|
if err != nil {
|
|
return
|
|
}
|
|
}
|
|
return
|
|
}
|
|
|
|
func mergeField(target interface{}, source interface{}) (interface{}, error) {
|
|
if source == nil {
|
|
return target, nil
|
|
}
|
|
if target == nil {
|
|
return source, nil
|
|
}
|
|
if slice, ok := source.([]interface{}); ok {
|
|
if tslice, ok := target.([]interface{}); ok {
|
|
tslice = append(tslice, slice...)
|
|
return tslice, nil
|
|
}
|
|
return nil, fmt.Errorf("value type mismatch, source is 'slice' but target not: %s", source)
|
|
} else if smap, ok := source.(map[string]interface{}); ok {
|
|
if tmap, ok := target.(map[string]interface{}); ok {
|
|
err := mergeMaps(tmap, smap)
|
|
return tmap, err
|
|
}
|
|
return nil, fmt.Errorf("value type mismatch, source is 'map[string]interface{}' but target not: %s", source)
|
|
}
|
|
return source, nil
|
|
}
|