mirror of
https://github.com/v2fly/v2ray-core.git
synced 2025-02-20 23:47:21 -05:00
fix test break for TOML JSON convertion
Based on 352072d51a/cmd/tomljson/main.go (L56)
Commit 0f7345ba76c7a91506ce3363f1c5301cbbc1f542 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
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"io"
|
||||
|
||||
"github.com/pelletier/go-toml"
|
||||
)
|
||||
|
||||
// FromTOML convert toml to json
|
||||
func FromTOML(v []byte) ([]byte, error) {
|
||||
m := make(map[string]interface{})
|
||||
if err := toml.Unmarshal(v, &m); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
j, err := json.Marshal(m)
|
||||
tomlReader := bytes.NewReader(v)
|
||||
jsonStr, err := jsonFromTomlReader(tomlReader)
|
||||
if err != nil {
|
||||
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…
x
Reference in New Issue
Block a user