Shikong/Clash.Meta
1
0
Fork 0
mirror of https://gitclone.com/github.com/MetaCubeX/Clash.Meta synced 2024-11-15 13:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 类型转换错误导致规则解析错误

Browse Source
This commit is contained in:
adlyq 2022-06-02 15:43:27 +08:00
parent 6709936a8f
commit 3b038310ab
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rule/logic/common.go
View File

@ -5,6 +5,7 @@ import (
"github.com/Dreamacro/clash/common/collections" "github.com/Dreamacro/clash/common/collections"
C "github.com/Dreamacro/clash/constant" C "github.com/Dreamacro/clash/constant"
RC "github.com/Dreamacro/clash/rule/common" RC "github.com/Dreamacro/clash/rule/common"
RP "github.com/Dreamacro/clash/rule/provider"
"github.com/Dreamacro/clash/rule/ruleparser" "github.com/Dreamacro/clash/rule/ruleparser"
"regexp" "regexp"
"strings" "strings"
@ -70,6 +71,9 @@ func parseRule(tp, payload string, params []string) (parsed C.Rule, parseErr err
parsed, parseErr = NewOR(payload, "") parsed, parseErr = NewOR(payload, "")
case "NOT": case "NOT":
parsed, parseErr = NewNOT(payload, "") parsed, parseErr = NewNOT(payload, "")
case "RULE-SET":
noResolve := RC.HasNoResolve(params)
parsed, parseErr = RP.NewRuleSet(payload, "", noResolve)
default: default:
parseErr = ruleparser.NewUnsupportedError(tp) parseErr = ruleparser.NewUnsupportedError(tp)
} }

2
rule/ruleparser/ruleparser.go
View File

@ -62,6 +62,6 @@ func NewUnsupportedError(tp any) *UnsupportedError {
} }
func IsUnsupported(err error) bool { func IsUnsupported(err error) bool {
_, ok := err.(UnsupportedError) _, ok := err.(*UnsupportedError)
return ok return ok
} }