1
0
mirror of https://github.com/nitezs/sub2clash.git synced 2024-12-24 11:04:42 -05:00
This commit is contained in:
Nite07 2023-09-15 08:51:22 +08:00
parent fe2f47865e
commit 282649aca0

View File

@ -121,8 +121,25 @@ func MergeSubAndTemplate(temp *model.Subscription, sub *model.Subscription) {
// 将订阅中的节点添加到模板中 // 将订阅中的节点添加到模板中
temp.Proxies = append(temp.Proxies, sub.Proxies...) temp.Proxies = append(temp.Proxies, sub.Proxies...)
// 将订阅中的策略组添加到模板中 // 将订阅中的策略组添加到模板中
skipGroups := []string{"全球直连", "广告拦截", "手动切换"}
for i := range temp.ProxyGroups { for i := range temp.ProxyGroups {
skip := false
for _, v := range skipGroups {
if strings.Contains(temp.ProxyGroups[i].Name, v) {
if v == "手动切换" {
proxies := make([]string, 0, len(sub.Proxies))
for _, p := range sub.Proxies {
proxies = append(proxies, p.Name)
}
temp.ProxyGroups[i].Proxies = proxies
}
skip = true
continue
}
}
if !skip {
temp.ProxyGroups[i].Proxies = append(temp.ProxyGroups[i].Proxies, countryGroupNames...) temp.ProxyGroups[i].Proxies = append(temp.ProxyGroups[i].Proxies, countryGroupNames...)
} }
}
temp.ProxyGroups = append(temp.ProxyGroups, sub.ProxyGroups...) temp.ProxyGroups = append(temp.ProxyGroups, sub.ProxyGroups...)
} }