history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: 调整解析逻辑

Browse Source
This commit is contained in:
adlyq
2022-06-02 17:03:08 +08:00
parent 3b038310ab
commit fa3e0c726e
3 changed files with 28 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
rule/logic/common.go
View File

@ -62,21 +62,18 @@ func payloadToRule(subPayload string) (C.Rule, error) {
}
func parseRule(tp, payload string, params []string) (parsed C.Rule, parseErr error) {
parsed, parseErr = ruleparser.ParseSameRule(tp, payload, "", params)
if ruleparser.IsUnsupported(parseErr) {
switch tp {
case "AND":
parsed, parseErr = NewAND(payload, "")
case "OR":
parsed, parseErr = NewOR(payload, "")
case "NOT":
parsed, parseErr = NewNOT(payload, "")
case "RULE-SET":
noResolve := RC.HasNoResolve(params)
parsed, parseErr = RP.NewRuleSet(payload, "", noResolve)
default:
parseErr = ruleparser.NewUnsupportedError(tp)
}
switch tp {
case "AND":
parsed, parseErr = NewAND(payload, "")
case "OR":
parsed, parseErr = NewOR(payload, "")
case "NOT":
parsed, parseErr = NewNOT(payload, "")
case "RULE-SET":
noResolve := RC.HasNoResolve(params)
parsed, parseErr = RP.NewRuleSet(payload, "", noResolve)
default:
parsed, parseErr = ruleparser.ParseSameRule(tp, payload, "", params)
}
if parseErr != nil {