mirror of
https://gitclone.com/github.com/MetaCubeX/Clash.Meta
synced 2025-02-23 06:33:14 +08:00
chore: direct using structure package decode proxy-name
This commit is contained in:
parent
f020b20ab9
commit
794645b7f8
@ -1,6 +1,7 @@
|
|||||||
package provider
|
package provider
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
@ -10,6 +11,8 @@ import (
|
|||||||
"github.com/metacubex/mihomo/component/resource"
|
"github.com/metacubex/mihomo/component/resource"
|
||||||
C "github.com/metacubex/mihomo/constant"
|
C "github.com/metacubex/mihomo/constant"
|
||||||
types "github.com/metacubex/mihomo/constant/provider"
|
types "github.com/metacubex/mihomo/constant/provider"
|
||||||
|
|
||||||
|
"github.com/dlclark/regexp2"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -28,11 +31,13 @@ type healthCheckSchema struct {
|
|||||||
|
|
||||||
type OverrideProxyNameSchema struct {
|
type OverrideProxyNameSchema struct {
|
||||||
// matching expression for regex replacement
|
// matching expression for regex replacement
|
||||||
Pattern string `provider:"pattern"`
|
Pattern *regexp2.Regexp `provider:"pattern"`
|
||||||
// the new content after regex matching
|
// the new content after regex matching
|
||||||
Target string `provider:"target"`
|
Target string `provider:"target"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var _ encoding.TextUnmarshaler = (*regexp2.Regexp)(nil) // ensure *regexp2.Regexp can decode direct by structure package
|
||||||
|
|
||||||
type OverrideSchema struct {
|
type OverrideSchema struct {
|
||||||
TFO *bool `provider:"tfo,omitempty"`
|
TFO *bool `provider:"tfo,omitempty"`
|
||||||
MPTcp *bool `provider:"mptcp,omitempty"`
|
MPTcp *bool `provider:"mptcp,omitempty"`
|
||||||
|
@ -404,18 +404,10 @@ func proxiesParseAndFilter(filter string, excludeFilter string, excludeTypeArray
|
|||||||
name := mapping["name"].(string)
|
name := mapping["name"].(string)
|
||||||
mapping["name"] = name + *field.Interface().(*string)
|
mapping["name"] = name + *field.Interface().(*string)
|
||||||
case "proxy-name":
|
case "proxy-name":
|
||||||
exprList, ok := field.Interface().([]OverrideProxyNameSchema)
|
|
||||||
if !ok {
|
|
||||||
return nil, fmt.Errorf("can't parse proxy-provider override proxy-name, please see the docs example config")
|
|
||||||
}
|
|
||||||
// Iterate through all naming replacement rules and perform the replacements.
|
// Iterate through all naming replacement rules and perform the replacements.
|
||||||
for _, expr := range exprList {
|
for _, expr := range override.ProxyName {
|
||||||
name := mapping["name"].(string)
|
name := mapping["name"].(string)
|
||||||
nameReg, err := regexp2.Compile(expr.Pattern, regexp2.None)
|
newName, err := expr.Pattern.Replace(name, expr.Target, 0, -1)
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("parse proxy name regular expression %q error: %w", expr.Pattern, err)
|
|
||||||
}
|
|
||||||
newName, err := nameReg.Replace(name, expr.Target, 0, -1)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("proxy name replace error: %w", err)
|
return nil, fmt.Errorf("proxy name replace error: %w", err)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user