xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: clean up code

Browse source
This commit is contained in:
gVisor bot 2023-03-14 14:23:10 +08:00
parent 492a334eed
commit a2e1f0d956
1 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
config/config.go
View file

@ -989,30 +989,27 @@ func parseNameServerPolicy(nsPolicy map[string]any, preferH3 bool) (map[string][
re := regexp.MustCompile(`[a-zA-Z0-9\-]+\.[a-zA-Z]{2,}(\.[a-zA-Z]{2,})?`) re := regexp.MustCompile(`[a-zA-Z0-9\-]+\.[a-zA-Z]{2,}(\.[a-zA-Z]{2,})?`)
for k, v := range nsPolicy { for k, v := range nsPolicy {
if strings.Contains(k, "geosite:") { if strings.Contains(k, ",") {
subkeys := strings.Split(k, ":") if strings.Contains(k, "geosite:") {
subkeys = subkeys[1:] subkeys := strings.Split(k, ":")
subkeys = strings.Split(subkeys[0], ",") subkeys = subkeys[1:]
//log.Infoln("subkeys:%+v", subkeys) subkeys = strings.Split(subkeys[0], ",")
for _, subkey := range subkeys { for _, subkey := range subkeys {
newKey := "geosite:" + subkey newKey := "geosite:" + subkey
//log.Infoln("newKey:%+v", newKey) updatedPolicy[newKey] = v
updatedPolicy[newKey] = v }
} } else if re.MatchString(k) {
} else if re.MatchString(k) { subkeys := strings.Split(k, ",")
subkeys := strings.Split(k, ",") for _, subkey := range subkeys {
//log.Infoln("subkeys:%+v", subkeys) updatedPolicy[subkey] = v
for _, subkey := range subkeys { }
updatedPolicy[subkey] = v
} }
} else { } else {
updatedPolicy[k] = v updatedPolicy[k] = v
} }
} }
//log.Infoln("updatedPolicy:%+v", updatedPolicy)
for domain, server := range updatedPolicy { for domain, server := range updatedPolicy {
servers, err := utils.ToStringSlice(server) servers, err := utils.ToStringSlice(server)
if err != nil { if err != nil {
return nil, err return nil, err