mirror of https://github.com/v2fly/v2ray-core.git
fix test break for TOML JSON convertion
Based on352072d51a/cmd/tomljson/main.go (L56)
Commit0f7345ba76
updated toml library version, however, the library have changed its check logic for input. This issue is now fixed.
This commit is contained in:
parent
054e667983
commit
f7ba3d0341
|
@ -1,20 +1,36 @@
|
||||||
package json
|
package json
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"io"
|
||||||
|
|
||||||
"github.com/pelletier/go-toml"
|
"github.com/pelletier/go-toml"
|
||||||
)
|
)
|
||||||
|
|
||||||
// FromTOML convert toml to json
|
// FromTOML convert toml to json
|
||||||
func FromTOML(v []byte) ([]byte, error) {
|
func FromTOML(v []byte) ([]byte, error) {
|
||||||
m := make(map[string]interface{})
|
tomlReader := bytes.NewReader(v)
|
||||||
if err := toml.Unmarshal(v, &m); err != nil {
|
jsonStr, err := jsonFromTomlReader(tomlReader)
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
j, err := json.Marshal(m)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return j, nil
|
return []byte(jsonStr), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func jsonFromTomlReader(r io.Reader) (string, error) {
|
||||||
|
tree, err := toml.LoadReader(r)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return mapToJSON(tree)
|
||||||
|
}
|
||||||
|
|
||||||
|
func mapToJSON(tree *toml.Tree) (string, error) {
|
||||||
|
treeMap := tree.ToMap()
|
||||||
|
bytes, err := json.MarshalIndent(treeMap, "", " ")
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return string(bytes[:]), nil
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue