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

fix: 调整not规则判断子规则数量，逻辑规则返回payload采用解析后结果

Browse Source
This commit is contained in:
Skyxim 2022-05-29 19:54:11 +08:00
parent c7355510a2
commit 0e1601e5b6
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rule/logic/and.go
View File

@ -1,8 +1,10 @@
package logic
import (
"fmt"
C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/rule/common"
"strings"
)
type AND struct {
@ -25,13 +27,17 @@ func NewAND(payload string, adapter string) (*AND, error) {
}
and.rules = rules
payloads := make([]string, 0, len(rules))
for _, rule := range rules {
payloads = append(payloads, fmt.Sprintf("(%s)", rule.Payload()))
if rule.ShouldResolveIP() {
and.needIP = true
break
}
}
and.payload = strings.Join(payloads, " && ")
return and, nil
}

11
rule/logic/not.go
View File

@ -18,19 +18,18 @@ func (not *NOT) ShouldFindProcess() bool {
}
func NewNOT(payload string, adapter string) (*NOT, error) {
not := &NOT{Base: &common.Base{}, payload: payload, adapter: adapter}
not := &NOT{Base: &common.Base{}, adapter: adapter}
rule, err := parseRuleByPayload(payload)
if err != nil {
return nil, err
}
if len(rule) > 1 {
return nil, fmt.Errorf("not rule can contain at most one rule")
if len(rule) != 1 {
return nil, fmt.Errorf("not rule must contain one rule")
}
if len(rule) > 0 {
not.rule = rule[0]
}
not.rule = rule[0]
not.payload = fmt.Sprintf("!(%s)", rule[0].Payload())
return not, nil
}

5
rule/logic/or.go
View File

@ -1,8 +1,10 @@
package logic
import (
"fmt"
C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/rule/common"
"strings"
)
type OR struct {
@ -51,12 +53,15 @@ func NewOR(payload string, adapter string) (*OR, error) {
}
or.rules = rules
payloads := make([]string, 0, len(rules))
for _, rule := range rules {
payloads = append(payloads, fmt.Sprintf("(%s)", rule.Payload()))
if rule.ShouldResolveIP() {
or.needIP = true
break
}
}
or.payload = strings.Join(payloads, " || ")
return or, nil
}