Skip to content

Commit

Permalink
chore: direct using structure package decode proxy-name
Browse files Browse the repository at this point in the history
  • Loading branch information
wwqgtxx committed Sep 19, 2024
1 parent f020b20 commit 794645b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
7 changes: 6 additions & 1 deletion adapter/provider/parser.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package provider

import (
"encoding"
"errors"
"fmt"
"time"
Expand All @@ -10,6 +11,8 @@ import (
"github.com/metacubex/mihomo/component/resource"
C "github.com/metacubex/mihomo/constant"
types "github.com/metacubex/mihomo/constant/provider"

"github.com/dlclark/regexp2"
)

var (
Expand All @@ -28,11 +31,13 @@ type healthCheckSchema struct {

type OverrideProxyNameSchema struct {
// matching expression for regex replacement
Pattern string `provider:"pattern"`
Pattern *regexp2.Regexp `provider:"pattern"`
// the new content after regex matching
Target string `provider:"target"`
}

var _ encoding.TextUnmarshaler = (*regexp2.Regexp)(nil) // ensure *regexp2.Regexp can decode direct by structure package

type OverrideSchema struct {
TFO *bool `provider:"tfo,omitempty"`
MPTcp *bool `provider:"mptcp,omitempty"`
Expand Down
12 changes: 2 additions & 10 deletions adapter/provider/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -404,18 +404,10 @@ func proxiesParseAndFilter(filter string, excludeFilter string, excludeTypeArray
name := mapping["name"].(string)
mapping["name"] = name + *field.Interface().(*string)
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.
for _, expr := range exprList {
for _, expr := range override.ProxyName {
name := mapping["name"].(string)
nameReg, err := regexp2.Compile(expr.Pattern, regexp2.None)
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)
newName, err := expr.Pattern.Replace(name, expr.Target, 0, -1)
if err != nil {
return nil, fmt.Errorf("proxy name replace error: %w", err)
}
Expand Down

0 comments on commit 794645b

Please sign in to comment.