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

code optimize

Browse Source
This commit is contained in:
jebbs 2022-10-13 14:33:23 +08:00
parent 2bac71dc36
commit 5cc3a37b46
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/conf/mergers/merge.go
View File

@ -1,7 +1,6 @@
package mergers package mergers
import ( import (
"errors"
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
@ -13,7 +12,7 @@ import (
func MergeAs(formatName Format, input interface{}, m map[string]interface{}) error { func MergeAs(formatName Format, input interface{}, m map[string]interface{}) error {
f, found := mergersByName[formatName] f, found := mergersByName[formatName]
if !found { if !found {
return fmt.Errorf("format merger not found for: %s", formatName) return fmt.Errorf("unknown format: %s", formatName)
} }
return f.Merge(input, m) return f.Merge(input, m)
} }
@ -51,7 +50,7 @@ func Merge(input interface{}, target map[string]interface{}) error {
return err return err
} }
default: default:
return errors.New("unknow merge input type") return fmt.Errorf("unknow supported input type: %T", input)
} }
return nil return nil
} }
@ -63,7 +62,7 @@ func mergeSingleFile(input interface{}, m map[string]interface{}) error {
lext := strings.ToLower(ext) lext := strings.ToLower(ext)
f, found := mergersByExt[lext] f, found := mergersByExt[lext]
if !found { if !found {
return fmt.Errorf("unmergeable format extension: %s", ext) return fmt.Errorf("unsupported file extension: %s", ext)
} }
return f.Merge(file, m) return f.Merge(file, m)
} }
@ -80,7 +79,7 @@ func mergeSingleFile(input interface{}, m map[string]interface{}) error {
} }
errs = append(errs, fmt.Sprintf("[%s] %s", f.Name, err)) errs = append(errs, fmt.Sprintf("[%s] %s", f.Name, err))
} }
return fmt.Errorf("tried all mergers but failed for: \n\n%s\n\nreason:\n\n %s", input, strings.Join(errs, "\n ")) return fmt.Errorf("tried all formats but failed for: \n\n%s\n\nerrors:\n\n %s", input, strings.Join(errs, "\n "))
} }
func getExtension(filename string) string { func getExtension(filename string) string {