chunyu/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-06-13 21:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: improve listable parsing

Browse Source
This commit is contained in:
septs 2023-10-08 11:27:04 +08:00
parent e885666eb2
commit 39dbb8c156
No known key found for this signature in database
GPG Key ID: 65144037AFA516E1
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
option/types.go
View File

@ -52,16 +52,16 @@ func (a *ListenAddress) Build() netip.Addr {
type NetworkList string type NetworkList string
func (v *NetworkList) UnmarshalJSON(content []byte) error { func (v *NetworkList) UnmarshalJSON(content []byte) (err error) {
var networkList []string var networkList []string
err := json.Unmarshal(content, &networkList) if len(content) > 0 && content[0] != '[' {
networkList = make([]string, 1)
err = json.Unmarshal(content, &networkList[0])
} else {
err = json.Unmarshal(content, &networkList)
}
if err != nil { if err != nil {
var networkItem string return
err = json.Unmarshal(content, &networkItem)
if err != nil {
return err
}
networkList = []string{networkItem}
} }
for _, networkName := range networkList { for _, networkName := range networkList {
switch networkName { switch networkName {
@ -72,7 +72,7 @@ func (v *NetworkList) UnmarshalJSON(content []byte) error {
} }
} }
*v = NetworkList(strings.Join(networkList, "\n")) *v = NetworkList(strings.Join(networkList, "\n"))
return nil return
} }
func (v NetworkList) Build() []string { func (v NetworkList) Build() []string {
@ -85,25 +85,20 @@ func (v NetworkList) Build() []string {
type Listable[T comparable] []T type Listable[T comparable] []T
func (l Listable[T]) MarshalJSON() ([]byte, error) { func (l Listable[T]) MarshalJSON() ([]byte, error) {
arrayList := []T(l) if len(l) == 1 {
if len(arrayList) == 1 { return json.Marshal(l[0])
return json.Marshal(arrayList[0])
} }
return json.Marshal(arrayList) return json.Marshal([]T(l))
} }
func (l *Listable[T]) UnmarshalJSON(content []byte) error { func (l *Listable[T]) UnmarshalJSON(content []byte) (err error) {
err := json.Unmarshal(content, (*[]T)(l)) if len(content) > 0 && content[0] != '[' {
if err == nil { var element T
return nil err = json.Unmarshal(content, &element)
*l = []T{element}
return
} }
var singleItem T return json.Unmarshal(content, (*[]T)(l))
newError := json.Unmarshal(content, &singleItem)
if newError != nil {
return E.Errors(err, newError)
}
*l = []T{singleItem}
return nil
} }
type DomainStrategy dns.DomainStrategy type DomainStrategy dns.DomainStrategy