xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rule/logic/common.go
View file

@ -62,8 +62,6 @@ func payloadToRule(subPayload string) (C.Rule, error) {
} }
func parseRule(tp, payload string, params []string) (parsed C.Rule, parseErr 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 { switch tp {
case "AND": case "AND":
parsed, parseErr = NewAND(payload, "") parsed, parseErr = NewAND(payload, "")
@ -75,8 +73,7 @@ func parseRule(tp, payload string, params []string) (parsed C.Rule, parseErr err
noResolve := RC.HasNoResolve(params) noResolve := RC.HasNoResolve(params)
parsed, parseErr = RP.NewRuleSet(payload, "", noResolve) parsed, parseErr = RP.NewRuleSet(payload, "", noResolve)
default: default:
parseErr = ruleparser.NewUnsupportedError(tp) parsed, parseErr = ruleparser.ParseSameRule(tp, payload, "", params)
}
} }
if parseErr != nil { if parseErr != nil {

5
rule/parser.go
View file

@ -9,8 +9,6 @@ import (
) )
func ParseRule(tp, payload, target string, params []string) (parsed C.Rule, parseErr error) { func ParseRule(tp, payload, target string, params []string) (parsed C.Rule, parseErr error) {
parsed, parseErr = ruleparser.ParseSameRule(tp, payload, target, params)
if ruleparser.IsUnsupported(parseErr) {
switch tp { switch tp {
case "AND": case "AND":
parsed, parseErr = logic.NewAND(payload, target) parsed, parseErr = logic.NewAND(payload, target)
@ -25,8 +23,7 @@ func ParseRule(tp, payload, target string, params []string) (parsed C.Rule, pars
parsed = RC.NewMatch(target) parsed = RC.NewMatch(target)
parseErr = nil parseErr = nil
default: default:
parseErr = ruleparser.NewUnsupportedError(tp) parsed, parseErr = ruleparser.ParseSameRule(tp, payload, target, params)
}
} }
if parseErr != nil { if parseErr != nil {

19
rule/ruleparser/ruleparser.go
View file

@ -44,24 +44,7 @@ func ParseSameRule(tp, payload, target string, params []string) (parsed C.Rule,
case "IN-TYPE": case "IN-TYPE":
parsed, parseErr = RC.NewInType(payload, target) parsed, parseErr = RC.NewInType(payload, target)
default: default:
parseErr = NewUnsupportedError(tp) parseErr = fmt.Errorf("unsupported rule type %s", tp)
} }
return return
} }
type UnsupportedError struct {
err string
}
func (ue UnsupportedError) Error() string {
return ue.err
}
func NewUnsupportedError(tp any) *UnsupportedError {
return &UnsupportedError{err: fmt.Sprintf("unsupported rule type %s", tp)}
}
func IsUnsupported(err error) bool {
_, ok := err.(*UnsupportedError)
return ok
}