From d072d06e4903c8e819e6ec43e93259ad83971e85 Mon Sep 17 00:00:00 2001 From: gVisor bot Date: Sat, 4 Jun 2022 03:25:33 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E4=B8=8E=E5=8C=85=E5=90=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.go | 4 ++-- {rule => rules}/common/base.go | 0 {rule => rules}/common/domain.go | 0 {rule => rules}/common/domain_keyword.go | 0 {rule => rules}/common/domain_suffix.go | 0 {rule => rules}/common/final.go | 0 {rule => rules}/common/geoip.go | 0 {rule => rules}/common/geosite.go | 0 {rule => rules}/common/in_type.go | 0 {rule => rules}/common/ipcidr.go | 0 {rule => rules}/common/ipsuffix.go | 0 {rule => rules}/common/network_type.go | 0 {rule => rules}/common/port.go | 0 {rule => rules}/common/process.go | 0 {rule => rules}/common/uid.go | 0 {rule => rules}/logic/and.go | 2 +- {rule => rules}/logic/common.go | 0 {rule => rules}/logic/logic_test.go | 0 {rule => rules}/logic/not.go | 2 +- {rule => rules}/logic/or.go | 2 +- {rule => rules}/parser.go | 8 ++++---- {rule => rules}/provider/classical_strategy.go | 0 {rule => rules}/provider/domain_strategy.go | 0 {rule => rules}/provider/fetcher.go | 0 {rule => rules}/provider/ipcidr_strategy.go | 0 {rule => rules}/provider/parse.go | 4 ++-- {rule => rules}/provider/provider.go | 0 {rule => rules}/provider/rule_set.go | 2 +- {rule => rules}/ruleparser/ruleparser.go | 2 +- 29 files changed, 13 insertions(+), 13 deletions(-) rename {rule => rules}/common/base.go (100%) rename {rule => rules}/common/domain.go (100%) rename {rule => rules}/common/domain_keyword.go (100%) rename {rule => rules}/common/domain_suffix.go (100%) rename {rule => rules}/common/final.go (100%) rename {rule => rules}/common/geoip.go (100%) rename {rule => rules}/common/geosite.go (100%) rename {rule => rules}/common/in_type.go (100%) rename {rule => rules}/common/ipcidr.go (100%) rename {rule => rules}/common/ipsuffix.go (100%) rename {rule => rules}/common/network_type.go (100%) rename {rule => rules}/common/port.go (100%) rename {rule => rules}/common/process.go (100%) rename {rule => rules}/common/uid.go (100%) rename {rule => rules}/logic/and.go (96%) rename {rule => rules}/logic/common.go (100%) rename {rule => rules}/logic/logic_test.go (100%) rename {rule => rules}/logic/not.go (95%) rename {rule => rules}/logic/or.go (96%) rename {rule => rules}/parser.go (82%) rename {rule => rules}/provider/classical_strategy.go (100%) rename {rule => rules}/provider/domain_strategy.go (100%) rename {rule => rules}/provider/fetcher.go (100%) rename {rule => rules}/provider/ipcidr_strategy.go (100%) rename {rule => rules}/provider/parse.go (95%) rename {rule => rules}/provider/provider.go (100%) rename {rule => rules}/provider/rule_set.go (96%) rename {rule => rules}/ruleparser/ruleparser.go (97%) diff --git a/config/config.go b/config/config.go index 153dbcf3..4d620f8e 100644 --- a/config/config.go +++ b/config/config.go @@ -16,8 +16,8 @@ import ( "time" "github.com/Dreamacro/clash/common/utils" - R "github.com/Dreamacro/clash/rule" - RP "github.com/Dreamacro/clash/rule/provider" + R "github.com/Dreamacro/clash/rules" + RP "github.com/Dreamacro/clash/rules/provider" "github.com/Dreamacro/clash/adapter" "github.com/Dreamacro/clash/adapter/outbound" diff --git a/rule/common/base.go b/rules/common/base.go similarity index 100% rename from rule/common/base.go rename to rules/common/base.go diff --git a/rule/common/domain.go b/rules/common/domain.go similarity index 100% rename from rule/common/domain.go rename to rules/common/domain.go diff --git a/rule/common/domain_keyword.go b/rules/common/domain_keyword.go similarity index 100% rename from rule/common/domain_keyword.go rename to rules/common/domain_keyword.go diff --git a/rule/common/domain_suffix.go b/rules/common/domain_suffix.go similarity index 100% rename from rule/common/domain_suffix.go rename to rules/common/domain_suffix.go diff --git a/rule/common/final.go b/rules/common/final.go similarity index 100% rename from rule/common/final.go rename to rules/common/final.go diff --git a/rule/common/geoip.go b/rules/common/geoip.go similarity index 100% rename from rule/common/geoip.go rename to rules/common/geoip.go diff --git a/rule/common/geosite.go b/rules/common/geosite.go similarity index 100% rename from rule/common/geosite.go rename to rules/common/geosite.go diff --git a/rule/common/in_type.go b/rules/common/in_type.go similarity index 100% rename from rule/common/in_type.go rename to rules/common/in_type.go diff --git a/rule/common/ipcidr.go b/rules/common/ipcidr.go similarity index 100% rename from rule/common/ipcidr.go rename to rules/common/ipcidr.go diff --git a/rule/common/ipsuffix.go b/rules/common/ipsuffix.go similarity index 100% rename from rule/common/ipsuffix.go rename to rules/common/ipsuffix.go diff --git a/rule/common/network_type.go b/rules/common/network_type.go similarity index 100% rename from rule/common/network_type.go rename to rules/common/network_type.go diff --git a/rule/common/port.go b/rules/common/port.go similarity index 100% rename from rule/common/port.go rename to rules/common/port.go diff --git a/rule/common/process.go b/rules/common/process.go similarity index 100% rename from rule/common/process.go rename to rules/common/process.go diff --git a/rule/common/uid.go b/rules/common/uid.go similarity index 100% rename from rule/common/uid.go rename to rules/common/uid.go diff --git a/rule/logic/and.go b/rules/logic/and.go similarity index 96% rename from rule/logic/and.go rename to rules/logic/and.go index 876bd71b..edcb0e04 100644 --- a/rule/logic/and.go +++ b/rules/logic/and.go @@ -3,7 +3,7 @@ package logic import ( "fmt" C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/rule/common" + "github.com/Dreamacro/clash/rules/common" "strings" ) diff --git a/rule/logic/common.go b/rules/logic/common.go similarity index 100% rename from rule/logic/common.go rename to rules/logic/common.go diff --git a/rule/logic/logic_test.go b/rules/logic/logic_test.go similarity index 100% rename from rule/logic/logic_test.go rename to rules/logic/logic_test.go diff --git a/rule/logic/not.go b/rules/logic/not.go similarity index 95% rename from rule/logic/not.go rename to rules/logic/not.go index 4259acbd..d72076fc 100644 --- a/rule/logic/not.go +++ b/rules/logic/not.go @@ -3,7 +3,7 @@ package logic import ( "fmt" C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/rule/common" + "github.com/Dreamacro/clash/rules/common" ) type NOT struct { diff --git a/rule/logic/or.go b/rules/logic/or.go similarity index 96% rename from rule/logic/or.go rename to rules/logic/or.go index 80b8eef3..f8295552 100644 --- a/rule/logic/or.go +++ b/rules/logic/or.go @@ -3,7 +3,7 @@ package logic import ( "fmt" C "github.com/Dreamacro/clash/constant" - "github.com/Dreamacro/clash/rule/common" + "github.com/Dreamacro/clash/rules/common" "strings" ) diff --git a/rule/parser.go b/rules/parser.go similarity index 82% rename from rule/parser.go rename to rules/parser.go index 05d01e32..13154dc3 100644 --- a/rule/parser.go +++ b/rules/parser.go @@ -2,10 +2,10 @@ package rules import ( C "github.com/Dreamacro/clash/constant" - RC "github.com/Dreamacro/clash/rule/common" - "github.com/Dreamacro/clash/rule/logic" - RP "github.com/Dreamacro/clash/rule/provider" - "github.com/Dreamacro/clash/rule/ruleparser" + RC "github.com/Dreamacro/clash/rules/common" + "github.com/Dreamacro/clash/rules/logic" + RP "github.com/Dreamacro/clash/rules/provider" + "github.com/Dreamacro/clash/rules/ruleparser" ) func ParseRule(tp, payload, target string, params []string) (parsed C.Rule, parseErr error) { diff --git a/rule/provider/classical_strategy.go b/rules/provider/classical_strategy.go similarity index 100% rename from rule/provider/classical_strategy.go rename to rules/provider/classical_strategy.go diff --git a/rule/provider/domain_strategy.go b/rules/provider/domain_strategy.go similarity index 100% rename from rule/provider/domain_strategy.go rename to rules/provider/domain_strategy.go diff --git a/rule/provider/fetcher.go b/rules/provider/fetcher.go similarity index 100% rename from rule/provider/fetcher.go rename to rules/provider/fetcher.go diff --git a/rule/provider/ipcidr_strategy.go b/rules/provider/ipcidr_strategy.go similarity index 100% rename from rule/provider/ipcidr_strategy.go rename to rules/provider/ipcidr_strategy.go diff --git a/rule/provider/parse.go b/rules/provider/parse.go similarity index 95% rename from rule/provider/parse.go rename to rules/provider/parse.go index 1cbe79c2..51452d09 100644 --- a/rule/provider/parse.go +++ b/rules/provider/parse.go @@ -6,8 +6,8 @@ import ( "github.com/Dreamacro/clash/common/structure" C "github.com/Dreamacro/clash/constant" P "github.com/Dreamacro/clash/constant/provider" - RC "github.com/Dreamacro/clash/rule/common" - "github.com/Dreamacro/clash/rule/ruleparser" + RC "github.com/Dreamacro/clash/rules/common" + "github.com/Dreamacro/clash/rules/ruleparser" "time" ) diff --git a/rule/provider/provider.go b/rules/provider/provider.go similarity index 100% rename from rule/provider/provider.go rename to rules/provider/provider.go diff --git a/rule/provider/rule_set.go b/rules/provider/rule_set.go similarity index 96% rename from rule/provider/rule_set.go rename to rules/provider/rule_set.go index 5d0cb67a..81419818 100644 --- a/rule/provider/rule_set.go +++ b/rules/provider/rule_set.go @@ -4,7 +4,7 @@ import ( "fmt" C "github.com/Dreamacro/clash/constant" P "github.com/Dreamacro/clash/constant/provider" - "github.com/Dreamacro/clash/rule/common" + "github.com/Dreamacro/clash/rules/common" ) type RuleSet struct { diff --git a/rule/ruleparser/ruleparser.go b/rules/ruleparser/ruleparser.go similarity index 97% rename from rule/ruleparser/ruleparser.go rename to rules/ruleparser/ruleparser.go index 55f63f82..64294374 100644 --- a/rule/ruleparser/ruleparser.go +++ b/rules/ruleparser/ruleparser.go @@ -3,7 +3,7 @@ package ruleparser import ( "fmt" C "github.com/Dreamacro/clash/constant" - RC "github.com/Dreamacro/clash/rule/common" + RC "github.com/Dreamacro/clash/rules/common" ) func ParseSameRule(tp, payload, target string, params []string) (parsed C.Rule, parseErr error) {