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

refactor: 逻辑规则显示效果

Browse Source
This commit is contained in:
Skyxim 2022-05-30 13:58:37 +08:00
parent 1f95c74f1e
commit 11ddac2b5f
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rule/logic/and.go
View File

@ -29,15 +29,14 @@ func NewAND(payload string, adapter string) (*AND, error) {
and.rules = rules and.rules = rules
payloads := make([]string, 0, len(rules)) payloads := make([]string, 0, len(rules))
for _, rule := range rules { for _, rule := range rules {
payloads = append(payloads, fmt.Sprintf("(%s)", rule.Payload())) payloads = append(payloads, fmt.Sprintf("(%s,%s)", rule.RuleType().String(), rule.Payload()))
if rule.ShouldResolveIP() { if rule.ShouldResolveIP() {
and.needIP = true and.needIP = true
break break
} }
} }
and.payload = strings.Join(payloads, " && ") and.payload = fmt.Sprintf("(%s)", strings.Join(payloads, " && "))
return and, nil return and, nil
} }

2
rule/logic/not.go
View File

@ -29,7 +29,7 @@ func NewNOT(payload string, adapter string) (*NOT, error) {
} }
not.rule = rule[0] not.rule = rule[0]
not.payload = fmt.Sprintf("!(%s)", rule[0].Payload()) not.payload = fmt.Sprintf("(!(%s,%s))", rule[0].RuleType(), rule[0].Payload())
return not, nil return not, nil
} }

4
rule/logic/or.go
View File

@ -55,13 +55,13 @@ func NewOR(payload string, adapter string) (*OR, error) {
or.rules = rules or.rules = rules
payloads := make([]string, 0, len(rules)) payloads := make([]string, 0, len(rules))
for _, rule := range rules { for _, rule := range rules {
payloads = append(payloads, fmt.Sprintf("(%s)", rule.Payload())) payloads = append(payloads, fmt.Sprintf("(%s,%s)", rule.RuleType(), rule.Payload()))
if rule.ShouldResolveIP() { if rule.ShouldResolveIP() {
or.needIP = true or.needIP = true
break break
} }
} }
or.payload = strings.Join(payloads, " || ") or.payload = fmt.Sprintf("(%s)", strings.Join(payloads, " || "))
return or, nil return or, nil
} }