mirror of
https://github.com/v2fly/v2ray-core.git
synced 2024-06-10 18:00:43 +00: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
39 lines
1014 B
Go
39 lines
1014 B
Go
package json
|
|
|
|
//go:generate go run v2ray.com/core/common/errors/errorgen
|
|
|
|
import (
|
|
"io"
|
|
"os"
|
|
|
|
"v2ray.com/core"
|
|
"v2ray.com/core/common"
|
|
"v2ray.com/core/common/cmdarg"
|
|
"v2ray.com/core/main/confloader"
|
|
)
|
|
|
|
func init() {
|
|
common.Must(core.RegisterConfigLoader(&core.ConfigFormat{
|
|
Name: []string{"JSON"},
|
|
Extension: []string{".json", ".jsonc"},
|
|
Loader: func(input interface{}) (*core.Config, error) {
|
|
switch v := input.(type) {
|
|
case cmdarg.Arg:
|
|
r, err := confloader.LoadExtConfig(v, os.Stdin)
|
|
if err != nil {
|
|
return nil, newError("failed to execute v2ctl to convert config file.").Base(err).AtWarning()
|
|
}
|
|
return core.LoadConfig("protobuf", "", r)
|
|
case io.Reader:
|
|
r, err := confloader.LoadExtConfig([]string{"stdin:"}, os.Stdin)
|
|
if err != nil {
|
|
return nil, newError("failed to execute v2ctl to convert config file.").Base(err).AtWarning()
|
|
}
|
|
return core.LoadConfig("protobuf", "", r)
|
|
default:
|
|
return nil, newError("unknown type")
|
|
}
|
|
},
|
|
}))
|
|
}
|