更新

MetaCubeX · Jan 3, 2025 · 37d2ad1 · 37d2ad1
1 parent 9745c9a
commit 37d2ad1
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 21 deletions.
diff --git a/docs/config/proxy-groups/index.en.md b/docs/config/proxy-groups/index.en.md
@@ -124,7 +124,7 @@ Excludes nodes that meet keywords or [regular expressions](https://github.com/zi
 
 Regular expressions are not supported. Split by `|`, exclude based on node type, only excluding [ingress outbound proxies](#proxies)
 
-For supported types, please refer to [Adapter Type](https://github.com/MetaCubeX/mihomo/blob/fbead56ec97ae93f904f4476df1741af718c9c2a/constant/adapters.go#L18-L45)
+For supported types, please refer to [Adapter Type](https://github.com/MetaCubeX/mihomo/blob/fbead56ec97ae93f904f4476df1741af718c9c2a/constant/adapters.go#L18-L45), ignore case sensitivity
 
 ## expected-status
 

diff --git a/docs/config/proxy-groups/index.md b/docs/config/proxy-groups/index.md
@@ -124,7 +124,7 @@ proxy-groups:
 
 不支持正则表达式，通过 `|` 分割，根据节点类型排除，仅排除[引入出站代理](#proxies)
 
-支持类型请参阅[Adapter Type](https://github.com/MetaCubeX/mihomo/blob/fbead56ec97ae93f904f4476df1741af718c9c2a/constant/adapters.go#L18-L45)
+支持类型请参阅[Adapter Type](https://github.com/MetaCubeX/mihomo/blob/fbead56ec97ae93f904f4476df1741af718c9c2a/constant/adapters.go#L18-L45)，无视大小写
 
 ## expected-status
 

diff --git a/docs/example/conf.md b/docs/example/conf.md
@@ -149,40 +149,48 @@
           - name: 香港
             type: select
             include-all: true
+            exclude-type: direct
             filter: "(?i)港|hk|hongkong|hong kong"
 
           - name: 台湾
             type: select
             include-all: true
+            exclude-type: direct
             filter: "(?i)台|tw|taiwan"
 
           - name: 日本
             type: select
             include-all: true
+            exclude-type: direct
             filter: "(?i)日|jp|japan"
 
           - name: 美国
             type: select
             include-all: true
+            exclude-type: direct
             filter: "(?i)美|us|unitedstates|united states"
 
           - name: 新加坡
             type: select
             include-all: true
+            exclude-type: direct
             filter: "(?i)(新|sg|singapore)"
 
           - name: 其它地区
             type: select
             include-all: true
+            exclude-type: direct
             filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates)).*"
 
           - name: 全部节点
             type: select
             include-all: true
+            exclude-type: direct
 
           - name: 自动选择
             type: url-test
             include-all: true
+            exclude-type: direct
             tolerance: 10
 
         rules:
@@ -355,40 +363,48 @@
           - name: 香港
             type: select
             include-all: true
+            exclude-type: direct
             filter: "(?i)港|hk|hongkong|hong kong"
         
           - name: 台湾
             type: select
             include-all: true
+            exclude-type: direct
             filter: "(?i)台|tw|taiwan"
         
           - name: 日本
             type: select
             include-all: true
+            exclude-type: direct
             filter: "(?i)日|jp|japan"
         
           - name: 美国
             type: select
             include-all: true
+            exclude-type: direct
             filter: "(?i)美|us|unitedstates|united states"
         
           - name: 新加坡
             type: select
             include-all: true
+            exclude-type: direct
             filter: "(?i)(新|sg|singapore)"
         
           - name: 其它地区
             type: select
             include-all: true
+            exclude-type: direct
             filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates)).*"
         
           - name: 全部节点
             type: select
             include-all: true
+            exclude-type: direct
         
           - name: 自动选择
             type: url-test
             include-all: true
+            exclude-type: direct
             tolerance: 10
         
         rules:
@@ -546,19 +562,19 @@
         - {name: 国内, type: select, proxies: [直连, 默认, 香港, 香港自动选择, 台湾, 台湾自动选择, 日本, 日本自动选择, 新加坡, 新加坡自动选择, 美国, 美国自动选择, 其它地区, 全部节点, 自动选择], icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/China_Map.png"}
         - {name: 其他, <<: *pr, icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/Final.png"}
           #分隔,下面是地区分组
-        - {name: 香港, type: select, include-all: true, filter: "(?i)港|hk|hongkong|hong kong", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/HK.png"}
-        - {name: 台湾, type: select, include-all: true, filter: "(?i)台|tw|taiwan", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/TW.png"}
-        - {name: 日本, type: select, include-all: true, filter: "(?i)日|jp|japan", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/JP.png"}
-        - {name: 美国, type: select, include-all: true, filter: "(?i)美|us|unitedstates|united states", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/US.png"}
-        - {name: 新加坡, type: select, include-all: true, filter: "(?i)(新|sg|singapore)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/SG.png"}
-        - {name: 其它地区, type: select, include-all: true, filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates)).*", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/Available.png"}
+        - {name: 香港, type: select, include-all: true, filter: "(?i)(?!直连)(港|hk|hongkong|hong kong)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/HK.png"}
+        - {name: 台湾, type: select, include-all: true, filter: "(?i)(?!直连)(台|tw|taiwan)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/TW.png"}
+        - {name: 日本, type: select, include-all: true, filter: "(?i)(?!直连)(日|jp|japan)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/JP.png"}
+        - {name: 美国, type: select, include-all: true, filter: "(?i)(?!直连)(美|us|unitedstates|united states)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/US.png"}
+        - {name: 新加坡, type: select, include-all: true, filter: "(?i)(?!直连)(新|sg|singapore)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/SG.png"}
+        - {name: 其它地区, type: select, include-all: true, filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates|直连)).*", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/Available.png"}
         - {name: 自动选择, type: url-test, include-all: true, tolerance: 10, icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/Auto.png"}
         - {name: 全部节点, type: select, include-all: true, icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/Global.png"}
 
-        - {name: 香港自动选择,type: url-test, include-all: true, filter: "(?i)港|hk|hongkong|hong kong", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/HK.png"}
-        - {name: 台湾自动选择,type: url-test, include-all: true, filter: "(?i)台|tw|taiwan", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/TW.png"}
-        - {name: 日本自动选择,type: url-test, include-all: true, filter: "(?i)日|jp|japan", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/JP.png"}
-        - {name: 美国自动选择,type: url-test, include-all: true, filter: "(?i)美|us|unitedstates|united states", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/US.png"}
+        - {name: 香港自动选择,type: url-test, include-all: true, filter: "(?i)(?!直连)(港|hk|hongkong|hong kong)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/HK.png"}
+        - {name: 台湾自动选择,type: url-test, include-all: true, filter: "(?i)(?!直连)(台|tw|taiwan)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/TW.png"}
+        - {name: 日本自动选择,type: url-test, include-all: true, filter: "(?i)(?!直连)(日|jp|japan)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/JP.png"}
+        - {name: 美国自动选择,type: url-test, include-all: true, filter: "(?i)(?!直连)(美|us|unitedstates|united states)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/US.png"}
         - {name: 新加坡自动选择,type: url-test, include-all: true, filter: "(?i)(新|sg|singapore)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/SG.png"}
 
         rules:

diff --git a/docs/example/geox b/docs/example/geox
@@ -146,40 +146,48 @@ proxy-groups:
   - name: 香港
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)港|hk|hongkong|hong kong"
 
   - name: 台湾
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)台|tw|taiwan"
 
   - name: 日本
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)日|jp|japan"
 
   - name: 美国
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)美|us|unitedstates|united states"
 
   - name: 新加坡
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)(新|sg|singapore)"
 
   - name: 其它地区
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates)).*"
 
   - name: 全部节点
     type: select
     include-all: true
+    exclude-type: direct
 
   - name: 自动选择
     type: url-test
     include-all: true
+    exclude-type: direct
     tolerance: 10
 
 rules:

diff --git a/docs/example/mrs b/docs/example/mrs
@@ -139,40 +139,48 @@ proxy-groups:
   - name: 香港
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)港|hk|hongkong|hong kong"
 
   - name: 台湾
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)台|tw|taiwan"
 
   - name: 日本
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)日|jp|japan"
 
   - name: 美国
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)美|us|unitedstates|united states"
 
   - name: 新加坡
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)(新|sg|singapore)"
 
   - name: 其它地区
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates)).*"
 
   - name: 全部节点
     type: select
     include-all: true
+    exclude-type: direct
 
   - name: 自动选择
     type: url-test
     include-all: true
+    exclude-type: direct
     tolerance: 10
 
 rules:

diff --git a/docs/example/stash b/docs/example/stash
@@ -55,19 +55,19 @@ proxy-groups:
 - {name: 国内, type: select, proxies: [直连, 默认, 香港, 香港自动选择, 台湾, 台湾自动选择, 日本, 日本自动选择, 新加坡, 新加坡自动选择, 美国, 美国自动选择, 其它地区, 全部节点, 自动选择], icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/China_Map.png"}
 - {name: 其他, <<: *pr, icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/Final.png"}
   #分隔,下面是地区分组
-- {name: 香港, type: select, include-all: true, filter: "(?i)港|hk|hongkong|hong kong", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/HK.png"}
-- {name: 台湾, type: select, include-all: true, filter: "(?i)台|tw|taiwan", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/TW.png"}
-- {name: 日本, type: select, include-all: true, filter: "(?i)日|jp|japan", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/JP.png"}
-- {name: 美国, type: select, include-all: true, filter: "(?i)美|us|unitedstates|united states", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/US.png"}
+- {name: 香港, type: select, include-all: true, filter: "(?i)(?!直连)(港|hk|hongkong|hong kong)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/HK.png"}
+- {name: 台湾, type: select, include-all: true, filter: "(?i)(?!直连)(台|tw|taiwan)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/TW.png"}
+- {name: 日本, type: select, include-all: true, filter: "(?i)(?!直连)(日|jp|japan)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/JP.png"}
+- {name: 美国, type: select, include-all: true, filter: "(?i)(?!直连)(美|us|unitedstates|united states)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/US.png"}
 - {name: 新加坡, type: select, include-all: true, filter: "(?i)(新|sg|singapore)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/SG.png"}
-- {name: 其它地区, type: select, include-all: true, filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates)).*", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/Available.png"}
+- {name: 其它地区, type: select, include-all: true, filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates|直连)).*", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/Available.png"}
 - {name: 自动选择, type: url-test, include-all: true, tolerance: 10, icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/Auto.png"}
 - {name: 全部节点, type: select, include-all: true, icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/Global.png"}
 
-- {name: 香港自动选择, type: url-test, include-all: true, filter: "(?i)港|hk|hongkong|hong kong", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/HK.png"}
-- {name: 台湾自动选择, type: url-test, include-all: true, filter: "(?i)台|tw|taiwan", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/TW.png"}
-- {name: 日本自动选择, type: url-test, include-all: true, filter: "(?i)日|jp|japan", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/JP.png"}
-- {name: 美国自动选择, type: url-test, include-all: true, filter: "(?i)美|us|unitedstates|united states", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/US.png"}
+- {name: 香港自动选择, type: url-test, include-all: true, filter: "(?i)(?!直连)(港|hk|hongkong|hong kong)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/HK.png"}
+- {name: 台湾自动选择, type: url-test, include-all: true, filter: "(?i)(?!直连)(台|tw|taiwan)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/TW.png"}
+- {name: 日本自动选择, type: url-test, include-all: true, filter: "(?i)(?!直连)(日|jp|japan)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/JP.png"}
+- {name: 美国自动选择, type: url-test, include-all: true, filter: "(?i)(?!直连)(美|us|unitedstates|united states)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/US.png"}
 - {name: 新加坡自动选择, type: url-test, include-all: true, filter: "(?i)(新|sg|singapore)", icon: "https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/mini/SG.png"}
 
 rules:

diff --git a/docs/example/text b/docs/example/text
@@ -139,40 +139,48 @@ proxy-groups:
   - name: 香港
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)港|hk|hongkong|hong kong"
 
   - name: 台湾
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)台|tw|taiwan"
 
   - name: 日本
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)日|jp|japan"
 
   - name: 美国
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)美|us|unitedstates|united states"
 
   - name: 新加坡
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)(新|sg|singapore)"
 
   - name: 其它地区
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates)).*"
 
   - name: 全部节点
     type: select
     include-all: true
+    exclude-type: direct
 
   - name: 自动选择
     type: url-test
     include-all: true
+    exclude-type: direct
     tolerance: 10
 
 rules:

diff --git a/docs/example/yaml b/docs/example/yaml
@@ -139,40 +139,48 @@ proxy-groups:
   - name: 香港
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)港|hk|hongkong|hong kong"
 
   - name: 台湾
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)台|tw|taiwan"
 
   - name: 日本
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)日|jp|japan"
 
   - name: 美国
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)美|us|unitedstates|united states"
 
   - name: 新加坡
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)(新|sg|singapore)"
 
   - name: 其它地区
     type: select
     include-all: true
+    exclude-type: direct
     filter: "(?i)^(?!.*(?:🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇨🇳|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates)).*"
 
   - name: 全部节点
     type: select
     include-all: true
+    exclude-type: direct
 
   - name: 自动选择
     type: url-test
     include-all: true
+    exclude-type: direct
     tolerance: 10
 
 rules: