1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-04-18 11:39:11 -04:00

abstract type for conf load func

This commit is contained in:
vcptr
2019-12-14 23:29:54 +08:00
parent 61e95e06c0
commit 1bb34bfe17
5 changed files with 95 additions and 57 deletions

View File

@@ -3,31 +3,35 @@ package json
//go:generate errorgen
import (
"encoding/json"
"io"
"io/ioutil"
"v2ray.com/core"
"v2ray.com/core/common"
"v2ray.com/core/common/buf"
"v2ray.com/core/common/cmdarg"
"v2ray.com/core/common/platform/ctlcmd"
"v2ray.com/core/infra/conf/serial"
)
func init() {
common.Must(core.RegisterConfigLoader(&core.ConfigFormat{
Name: "JSON",
Extension: []string{"json"},
Loader: func(input io.Reader) (*core.Config, error) {
fns := []string{}
data, _ := ioutil.ReadAll(input)
json.Unmarshal(data, &fns)
jsonContent, err := ctlcmd.Run(append([]string{"config"}, fns...), nil)
if err != nil {
return nil, newError("failed to execute v2ctl to convert config file.").Base(err).AtWarning()
Loader: func(input interface{}) (*core.Config, error) {
switch v := input.(type) {
case cmdarg.Arg:
jsonContent, err := ctlcmd.Run(append([]string{"config"}, v...), nil)
if err != nil {
return nil, newError("failed to execute v2ctl to convert config file.").Base(err).AtWarning()
}
return core.LoadConfig("protobuf", "", &buf.MultiBufferContainer{
MultiBuffer: jsonContent,
})
case io.Reader:
return serial.LoadJSONConfig(v)
default:
return nil, newError("unknow type")
}
return core.LoadConfig("protobuf", "", &buf.MultiBufferContainer{
MultiBuffer: jsonContent,
})
},
}))
}