Shikong/Clash.Meta
1
0
Fork 0
mirror of https://gitclone.com/github.com/MetaCubeX/Clash.Meta synced 2025-02-23 20:52:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: Allow customization of GLOBAL

Browse Source
This commit is contained in:
xishang0128 2024-05-25 08:09:59 +08:00
parent 0b6ae6ffb8
commit 846bdfa812
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/config.go
View File

@ -716,8 +716,11 @@ func parseProxies(cfg *RawConfig) (proxies map[string]C.Proxy, providersMap map[
groupsConfig := cfg.ProxyGroup groupsConfig := cfg.ProxyGroup
providersConfig := cfg.ProxyProvider providersConfig := cfg.ProxyProvider
var proxyList []string var (
var AllProxies []string proxyList []string
AllProxies []string
hasGlobal bool
)
proxiesList := list.New() proxiesList := list.New()
groupsList := list.New() groupsList := list.New()
@ -750,6 +753,9 @@ func parseProxies(cfg *RawConfig) (proxies map[string]C.Proxy, providersMap map[
if !existName { if !existName {
return nil, nil, fmt.Errorf("proxy group %d: missing name", idx) return nil, nil, fmt.Errorf("proxy group %d: missing name", idx)
} }
if groupName == "GLOBAL" {
hasGlobal = true
}
proxyList = append(proxyList, groupName) proxyList = append(proxyList, groupName)
groupsList.PushBack(mapping) groupsList.PushBack(mapping)
} }
@ -801,6 +807,7 @@ func parseProxies(cfg *RawConfig) (proxies map[string]C.Proxy, providersMap map[
pd, _ := provider.NewCompatibleProvider(provider.ReservedName, ps, hc) pd, _ := provider.NewCompatibleProvider(provider.ReservedName, ps, hc)
providersMap[provider.ReservedName] = pd providersMap[provider.ReservedName] = pd
if !hasGlobal {
global := outboundgroup.NewSelector( global := outboundgroup.NewSelector(
&outboundgroup.GroupCommonOption{ &outboundgroup.GroupCommonOption{
Name: "GLOBAL", Name: "GLOBAL",
@ -808,6 +815,7 @@ func parseProxies(cfg *RawConfig) (proxies map[string]C.Proxy, providersMap map[
[]providerTypes.ProxyProvider{pd}, []providerTypes.ProxyProvider{pd},
) )
proxies["GLOBAL"] = adapter.NewProxy(global) proxies["GLOBAL"] = adapter.NewProxy(global)
}
ProxiesList = proxiesList ProxiesList = proxiesList
GroupsList = groupsList GroupsList = groupsList
if ParsingProxiesCallback != nil { if ParsingProxiesCallback != nil {