1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-29 02:35:23 +00:00
v2fly/infra/conf/merge
Jebbs ff59bd37ce
v5: New multi-json loader (#451)
* 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
2020-11-28 22:06:03 +08:00
..
errors.generated.go v5: New multi-json loader (#451) 2020-11-28 22:06:03 +08:00
file.go v5: New multi-json loader (#451) 2020-11-28 22:06:03 +08:00
map.go v5: New multi-json loader (#451) 2020-11-28 22:06:03 +08:00
merge_test.go v5: New multi-json loader (#451) 2020-11-28 22:06:03 +08:00
merge.go v5: New multi-json loader (#451) 2020-11-28 22:06:03 +08:00
priority.go v5: New multi-json loader (#451) 2020-11-28 22:06:03 +08:00
rules.go v5: New multi-json loader (#451) 2020-11-28 22:06:03 +08:00
tag.go v5: New multi-json loader (#451) 2020-11-28 22:06:03 +08:00