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

Merge pull request #14 from Adlyq/Alpha

Browse source 
Fix the filter under proxy-group to filter other groups
This commit is contained in:
Meta 2022-02-27 00:34:08 +08:00 committed by GitHub
commit 5ad7237fa7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adapter/outboundgroup/common.go
View file

@ -29,6 +29,10 @@ func getProvidersProxies(providers []provider.ProxyProvider, touch bool, filter
//filterReg = regexp.MustCompile(filter) //filterReg = regexp.MustCompile(filter)
filterReg = regexp2.MustCompile(filter, 0) filterReg = regexp2.MustCompile(filter, 0)
for _, p := range proxies { for _, p := range proxies {
if p.Type() < 8 {
matchedProxies = append(matchedProxies, p)
}
//if filterReg.MatchString(p.Name()) { //if filterReg.MatchString(p.Name()) {
if mat, _ := filterReg.FindStringMatch(p.Name()); mat != nil { if mat, _ := filterReg.FindStringMatch(p.Name()); mat != nil {
matchedProxies = append(matchedProxies, p) matchedProxies = append(matchedProxies, p)

13
constant/adapters.go
View file

@ -14,6 +14,13 @@ const (
Direct AdapterType = iota Direct AdapterType = iota
Reject Reject
Compatible Compatible
Relay
Selector
Fallback
URLTest
LoadBalance
Shadowsocks Shadowsocks
ShadowsocksR ShadowsocksR
Snell Snell
@ -22,12 +29,6 @@ const (
Vmess Vmess
Vless Vless
Trojan Trojan
Relay
Selector
Fallback
URLTest
LoadBalance
) )
const ( const (