From fd48c6df8a160ab56dd42fefd1074e62e09b6a21 Mon Sep 17 00:00:00 2001 From: H1JK Date: Sat, 7 Jan 2023 12:24:28 +0800 Subject: [PATCH] chore: Fix fmt in #321 Replace all double spaces to tabs due to Go fmt proposal. --- adapter/outboundgroup/fallback.go | 5 ++- adapter/outboundgroup/groupbase.go | 56 ++++++++++++++------------- adapter/outboundgroup/loadbalance.go | 4 +- adapter/outboundgroup/parser.go | 2 +- adapter/outboundgroup/relay.go | 2 +- adapter/outboundgroup/selector.go | 2 +- adapter/outboundgroup/urltest.go | 2 +- adapter/provider/parser.go | 8 ++-- adapter/provider/provider.go | 57 ++++++++++++++-------------- common/convert/converter.go | 8 ++-- 10 files changed, 75 insertions(+), 71 deletions(-) diff --git a/adapter/outboundgroup/fallback.go b/adapter/outboundgroup/fallback.go index 22ca6db98..34365d0e4 100644 --- a/adapter/outboundgroup/fallback.go +++ b/adapter/outboundgroup/fallback.go @@ -4,11 +4,12 @@ import ( "context" "encoding/json" "errors" + "time" + "github.com/Dreamacro/clash/adapter/outbound" "github.com/Dreamacro/clash/component/dialer" C "github.com/Dreamacro/clash/constant" "github.com/Dreamacro/clash/constant/provider" - "time" ) type Fallback struct { @@ -132,7 +133,7 @@ func NewFallback(option *GroupCommonOption, providers []provider.ProxyProvider) }, option.Filter, option.ExcludeFilter, - option.ExcludeType, + option.ExcludeType, providers, }), disableUDP: option.DisableUDP, diff --git a/adapter/outboundgroup/groupbase.go b/adapter/outboundgroup/groupbase.go index 53c08ad63..fee24bd6a 100644 --- a/adapter/outboundgroup/groupbase.go +++ b/adapter/outboundgroup/groupbase.go @@ -3,24 +3,26 @@ package outboundgroup import ( "context" "fmt" + "strings" + "sync" + "time" + "github.com/Dreamacro/clash/adapter/outbound" C "github.com/Dreamacro/clash/constant" "github.com/Dreamacro/clash/constant/provider" types "github.com/Dreamacro/clash/constant/provider" "github.com/Dreamacro/clash/log" "github.com/Dreamacro/clash/tunnel" + "github.com/dlclark/regexp2" "go.uber.org/atomic" - "strings" - "sync" - "time" ) type GroupBase struct { *outbound.Base filterRegs []*regexp2.Regexp excludeFilterReg *regexp2.Regexp - excludeTypeArray []string + excludeTypeArray []string providers []provider.ProxyProvider failedTestMux sync.Mutex failedTimes int @@ -34,7 +36,7 @@ type GroupBaseOption struct { outbound.BaseOption filter string excludeFilter string - excludeType string + excludeType string providers []provider.ProxyProvider } @@ -43,10 +45,10 @@ func NewGroupBase(opt GroupBaseOption) *GroupBase { if opt.excludeFilter != "" { excludeFilterReg = regexp2.MustCompile(opt.excludeFilter, 0) } - var excludeTypeArray []string - if opt.excludeType!="" { - excludeTypeArray=strings.Split(opt.excludeType,"|") - } + var excludeTypeArray []string + if opt.excludeType != "" { + excludeTypeArray = strings.Split(opt.excludeType, "|") + } var filterRegs []*regexp2.Regexp if opt.filter != "" { @@ -60,7 +62,7 @@ func NewGroupBase(opt GroupBaseOption) *GroupBase { Base: outbound.NewBase(opt.BaseOption), filterRegs: filterRegs, excludeFilterReg: excludeFilterReg, - excludeTypeArray: excludeTypeArray, + excludeTypeArray: excludeTypeArray, providers: opt.providers, failedTesting: atomic.NewBool(false), } @@ -155,24 +157,24 @@ func (gb *GroupBase) GetProxies(touch bool) []C.Proxy { } proxies = newProxies } - if gb.excludeTypeArray !=nil{ - var newProxies []C.Proxy - for _, p := range proxies { - mType := p.Type().String() - flag:=false - for i := range gb.excludeTypeArray { - if(strings.EqualFold(mType,gb.excludeTypeArray[i])){ - flag=true - } + if gb.excludeTypeArray != nil { + var newProxies []C.Proxy + for _, p := range proxies { + mType := p.Type().String() + flag := false + for i := range gb.excludeTypeArray { + if strings.EqualFold(mType, gb.excludeTypeArray[i]) { + flag = true + } - } - if(flag){ - continue - } - newProxies = append(newProxies, p) - } - proxies = newProxies - } + } + if flag { + continue + } + newProxies = append(newProxies, p) + } + proxies = newProxies + } if gb.excludeFilterReg != nil { var newProxies []C.Proxy diff --git a/adapter/outboundgroup/loadbalance.go b/adapter/outboundgroup/loadbalance.go index 0098c5058..7dc4d3d3c 100644 --- a/adapter/outboundgroup/loadbalance.go +++ b/adapter/outboundgroup/loadbalance.go @@ -5,11 +5,11 @@ import ( "encoding/json" "errors" "fmt" - "github.com/Dreamacro/clash/common/cache" "net" "time" "github.com/Dreamacro/clash/adapter/outbound" + "github.com/Dreamacro/clash/common/cache" "github.com/Dreamacro/clash/common/murmur3" "github.com/Dreamacro/clash/component/dialer" C "github.com/Dreamacro/clash/constant" @@ -229,7 +229,7 @@ func NewLoadBalance(option *GroupCommonOption, providers []provider.ProxyProvide }, option.Filter, option.ExcludeFilter, - option.ExcludeType, + option.ExcludeType, providers, }), strategyFn: strategyFn, diff --git a/adapter/outboundgroup/parser.go b/adapter/outboundgroup/parser.go index d8c6db51a..ebae562a9 100644 --- a/adapter/outboundgroup/parser.go +++ b/adapter/outboundgroup/parser.go @@ -31,7 +31,7 @@ type GroupCommonOption struct { DisableUDP bool `group:"disable-udp,omitempty"` Filter string `group:"filter,omitempty"` ExcludeFilter string `group:"exclude-filter,omitempty"` - ExcludeType string `group:"exclude-type,omitempty"` + ExcludeType string `group:"exclude-type,omitempty"` } func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, providersMap map[string]types.ProxyProvider) (C.ProxyAdapter, error) { diff --git a/adapter/outboundgroup/relay.go b/adapter/outboundgroup/relay.go index 908204a57..b466b1ff2 100644 --- a/adapter/outboundgroup/relay.go +++ b/adapter/outboundgroup/relay.go @@ -191,7 +191,7 @@ func NewRelay(option *GroupCommonOption, providers []provider.ProxyProvider) *Re }, "", "", - "", + "", providers, }), } diff --git a/adapter/outboundgroup/selector.go b/adapter/outboundgroup/selector.go index de0e3c505..6356d10e6 100644 --- a/adapter/outboundgroup/selector.go +++ b/adapter/outboundgroup/selector.go @@ -100,7 +100,7 @@ func NewSelector(option *GroupCommonOption, providers []provider.ProxyProvider) }, option.Filter, option.ExcludeFilter, - option.ExcludeType, + option.ExcludeType, providers, }), selected: "COMPATIBLE", diff --git a/adapter/outboundgroup/urltest.go b/adapter/outboundgroup/urltest.go index 1ded16560..27cef9c64 100644 --- a/adapter/outboundgroup/urltest.go +++ b/adapter/outboundgroup/urltest.go @@ -144,7 +144,7 @@ func NewURLTest(option *GroupCommonOption, providers []provider.ProxyProvider, o option.Filter, option.ExcludeFilter, - option.ExcludeType, + option.ExcludeType, providers, }), fastSingle: singledo.NewSingle[C.Proxy](time.Second * 10), diff --git a/adapter/provider/parser.go b/adapter/provider/parser.go index 3fdedce79..fc5ed9368 100644 --- a/adapter/provider/parser.go +++ b/adapter/provider/parser.go @@ -3,10 +3,10 @@ package provider import ( "errors" "fmt" - "github.com/Dreamacro/clash/component/resource" "time" "github.com/Dreamacro/clash/common/structure" + "github.com/Dreamacro/clash/component/resource" C "github.com/Dreamacro/clash/constant" types "github.com/Dreamacro/clash/constant/provider" ) @@ -27,7 +27,7 @@ type proxyProviderSchema struct { Interval int `provider:"interval,omitempty"` Filter string `provider:"filter,omitempty"` ExcludeFilter string `provider:"exclude-filter,omitempty"` - ExcludeType string `provider:"exclude-type,omitempty"` + ExcludeType string `provider:"exclude-type,omitempty"` HealthCheck healthCheckSchema `provider:"health-check,omitempty"` } @@ -64,7 +64,7 @@ func ParseProxyProvider(name string, mapping map[string]any) (types.ProxyProvide interval := time.Duration(uint(schema.Interval)) * time.Second filter := schema.Filter excludeFilter := schema.ExcludeFilter - excludeType:=schema.ExcludeType + excludeType := schema.ExcludeType - return NewProxySetProvider(name, interval, filter, excludeFilter,excludeType,vehicle, hc) + return NewProxySetProvider(name, interval, filter, excludeFilter, excludeType, vehicle, hc) } diff --git a/adapter/provider/provider.go b/adapter/provider/provider.go index e32c2becc..7d7ba9771 100644 --- a/adapter/provider/provider.go +++ b/adapter/provider/provider.go @@ -5,8 +5,6 @@ import ( "encoding/json" "errors" "fmt" - "github.com/dlclark/regexp2" - "gopkg.in/yaml.v3" "net/http" "runtime" "strings" @@ -19,6 +17,9 @@ import ( C "github.com/Dreamacro/clash/constant" types "github.com/Dreamacro/clash/constant/provider" "github.com/Dreamacro/clash/log" + + "github.com/dlclark/regexp2" + "gopkg.in/yaml.v3" ) const ( @@ -141,15 +142,15 @@ func stopProxyProvider(pd *ProxySetProvider) { _ = pd.Fetcher.Destroy() } -func NewProxySetProvider(name string, interval time.Duration, filter string, excludeFilter string,excludeType string, vehicle types.Vehicle, hc *HealthCheck) (*ProxySetProvider, error) { +func NewProxySetProvider(name string, interval time.Duration, filter string, excludeFilter string, excludeType string, vehicle types.Vehicle, hc *HealthCheck) (*ProxySetProvider, error) { excludeFilterReg, err := regexp2.Compile(excludeFilter, 0) if err != nil { return nil, fmt.Errorf("invalid excludeFilter regex: %w", err) } - var excludeTypeArray []string - if excludeType !=""{ - excludeTypeArray=strings.Split(excludeType,"|") - } + var excludeTypeArray []string + if excludeType != "" { + excludeTypeArray = strings.Split(excludeType, "|") + } var filterRegs []*regexp2.Regexp for _, filter := range strings.Split(filter, "`") { @@ -169,7 +170,7 @@ func NewProxySetProvider(name string, interval time.Duration, filter string, exc healthCheck: hc, } - fetcher := resource.NewFetcher[[]C.Proxy](name, interval, vehicle, proxiesParseAndFilter(filter, excludeFilter, excludeTypeArray,filterRegs, excludeFilterReg), proxiesOnUpdate(pd)) + fetcher := resource.NewFetcher[[]C.Proxy](name, interval, vehicle, proxiesParseAndFilter(filter, excludeFilter, excludeTypeArray, filterRegs, excludeFilterReg), proxiesOnUpdate(pd)) pd.Fetcher = fetcher pd.getSubscriptionInfo() @@ -267,7 +268,7 @@ func proxiesOnUpdate(pd *proxySetProvider) func([]C.Proxy) { } } -func proxiesParseAndFilter(filter string, excludeFilter string,excludeTypeArray []string, filterRegs []*regexp2.Regexp, excludeFilterReg *regexp2.Regexp) resource.Parser[[]C.Proxy] { +func proxiesParseAndFilter(filter string, excludeFilter string, excludeTypeArray []string, filterRegs []*regexp2.Regexp, excludeFilterReg *regexp2.Regexp) resource.Parser[[]C.Proxy] { return func(buf []byte) ([]C.Proxy, error) { schema := &ProxySchema{} @@ -287,27 +288,27 @@ func proxiesParseAndFilter(filter string, excludeFilter string,excludeTypeArray proxiesSet := map[string]struct{}{} for _, filterReg := range filterRegs { for idx, mapping := range schema.Proxies { - if nil !=excludeTypeArray && len(excludeTypeArray)>0{ - mType,ok:=mapping["type"] - if !ok { - continue - } - pType,ok:=mType.(string) - if !ok { - continue - } - flag:=false - for i := range excludeTypeArray { - if(strings.EqualFold(pType,excludeTypeArray[i])){ - flag=true - } + if nil != excludeTypeArray && len(excludeTypeArray) > 0 { + mType, ok := mapping["type"] + if !ok { + continue + } + pType, ok := mType.(string) + if !ok { + continue + } + flag := false + for i := range excludeTypeArray { + if strings.EqualFold(pType, excludeTypeArray[i]) { + flag = true + } - } - if(flag){ - continue - } + } + if flag { + continue + } - } + } mName, ok := mapping["name"] if !ok { continue diff --git a/common/convert/converter.go b/common/convert/converter.go index 1b0e8cf30..da69f9d01 100644 --- a/common/convert/converter.go +++ b/common/convert/converter.go @@ -162,10 +162,10 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) { if jsonDc.Decode(&values) != nil { continue } - tempName,ok:=values["ps"].(string) - if !ok{ - continue - } + tempName, ok := values["ps"].(string) + if !ok { + continue + } name := uniqueName(names, tempName) vmess := make(map[string]any, 20)