2020-11-28 14:06:03 +00:00
|
|
|
// 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
|
improve commands (#648)
* stat show json refactor
> will show {} since scripts should expect it, its the json style of blank value
* combine statistics commands to one
* code optimize
* fix runtime flag
* remove json indent
* change overridden to override
* api bi -json
* convert stdin support
code optimize
* writeRow() code optimize
add stats tittle
revert back to restartlogger
* api log -restart
* follow log
* codeql
* move -json to shared flags
* flags optimize
* update flag descriptions
* change "-v" of "api bo" to duration
* change "-expire" of "tls cert" to days
* cmds short description optimize
* fix multiple log followers
* Format loader refactor
* "infra/conf/merge" refactor
* "LoadConfig" refactor
* add "infra/conf/mergers"
* contribute to it will benifit `v2ray run`,`v2ray test`,`v2ray convert`
* easily add new formats, by just adding a converter like json.FromTOML
* default format auto, to all cmds above
* auto detect input format
* mixed formats support
* better stdin behavior
* don't wait if no content
* don't use 'stdin:' placeholder
* `v2ray test` now behaves exactly the same with `v2ray run`, including stdin reading
* api ado, adi, rmo, rmi refactor
* support folders to files resolving, mixed formats
* remove remaining 'stdin:' placeholders
* fix tests
* os.Stdin.Stat() behaves different in platforms, removed
* code optimize
Co-authored-by: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
2021-02-21 15:02:42 +00:00
|
|
|
// it supports only map[string]interface{} type for any children of the map tree
|
2020-11-28 14:06:03 +00:00
|
|
|
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
|
|
|
|
}
|