ro

LM-Firefly · Nov 13, 2024 · d2552df · d2552df
1 parent db61566
commit d2552df
Show file tree

Hide file tree

Showing 12 changed files with 68 additions and 504 deletions.
diff --git a/Subconverter-base/AIO-NoReject.ini b/Subconverter-base/AIO-NoReject.ini
@@ -22,8 +22,8 @@ rename=(流媒体)|(-M)|(原生IP)|(解锁)@[M]
 rename=(.*)([0-9].*[0-9])(静态解锁|动态解锁|原生解锁|解锁|动态原生|静态原生|原生)@$1$2[M]
 rename=(.*)(\b[0-9][0-9]\b)(静态解锁|动态解锁|原生解锁|解锁|动态原生|静态原生|原生)@$1$2[M]
 rename=(.*)([0-9].*[0-9])(\|[\w].*[0-9])@$1$2
+rename=(.*)(NO)(.?[0-9]?[0-9]?[0-9])$@$1 $3
 rename=((CN[0-9]•)|^)(⓪|❶|❷|❸|❻)(TJ\.|gR\.|V2\.|H2\.|SS\.)@
-;rename=^(.*)(HK(?!(B|T|G)))([\u4e00-\u9fa5])@香港 $3
 rename=^(.*)(HK(?!B|G|T))([\u4e00-\u9fa5].*)@香港 $3
 rename=^(HK)([0-9].*)@香港 $2
 rename=^(HKBN)(.*)@香港HKBN $2
@@ -56,20 +56,8 @@ rename=(◆)@
 rename=((\|NF)|(\|NF\*)|(\|BBC)|(\|abema)|(\|动画疯)|(\|Netflix)|(\|動畫瘋)|(\|Hulu)|(\|\[注册Netflix\])|(\|HBO)|(\|TVB)|(\|D\+)|(\|Yp)|(\|Y2B P)|(\|AI)|(解锁流媒体)|(原生IP))@[M]
 rename=\[M\].*\[M\]@[M]
 rename=\[CM\]|\[CU\]|\[BT\/PT专用\]|\[荐\]|\[Beta\]|\[移动\]|\[联通\]|\[综合\]|\[备用\]|\[阿里云\]|\[测试\]|\[v6\]|高速|100m限速|CDN加速|Game|PPCW|Sakura@
-rename=\[0\.2\]@[x0.2]
-rename=\[0\.5\]@[x0.5]
-rename=\[0\.7\]@[x0.7]
-rename=\[0\.8\]@[x0.8]
-rename=\[0\.9\]@[x0.9]
-rename=(\[1\]|倍率1)@[x1]
-rename=\[1\.2\]@[x1.2]
-rename=(\[1\.5\])(-1.5x)@[x1.5]
-rename=(\[2\])|(-2x)@[x2]
-rename=(\[3\])|(-3x)@[x3]
-rename=(\[5\]|倍率5)@[x5]
-rename=\[8\]@[x8]
-rename=\[10\]@[x10]
 ;rename=(?!<=[\]|\)])$@[x1]
+rename=(x|X)([0-9]?.?[0-9]?[0-9])@[x$2]
 rename=(.*)(\[)(倍率:)(.*[0-9])(\])@$1[x$4]
 rename=(\[x.*[0-9]\])(.*)@$2$1
 rename=(.*)( )(.*[0-9])(倍率)@$1[x$3]

diff --git a/Subconverter-base/AIO-NoReject.toml b/Subconverter-base/AIO-NoReject.toml
@@ -59,14 +59,14 @@ replace = "$1$2[M]"
 match = "(.*)([0-9].*[0-9])(\\|[\\w].*[0-9])"
 replace = "$1$2"
 
+[[node_pref.rename_node]]
+match = "(.*)(NO)(.?[0-9]?[0-9]?[0-9])$"
+replace = "$1 $3"
+
 [[node_pref.rename_node]]
 match = "((CN[0-9]•)|^)(⓪|❶|❷|❸|❻)(TJ\\.|gR\\.|V2\\.|H2\\.|SS\\.)"
 replace = ""
 
-# [[node_pref.rename_node]]
-# match = "^(.*)(HK(?!(B|T|G)))([\u4e00-\u9fa5])"
-# replace = "香港 $3"
-
 [[node_pref.rename_node]]
 match = "^(.*)(HK(?!B|G|T))([\u4e00-\u9fa5].*)"
 replace = "香港 $3"
@@ -195,62 +195,14 @@ replace = "[M]"
 match = "\\[CM\\]|\\[CU\\]|\\[BT\\/PT专用\\]|\\[荐\\]|\\[Beta\\]|\\[移动\\]|\\[联通\\]|\\[综合\\]|\\[备用\\]|\\[阿里云\\]|\\[测试\\]|\\[v6\\]|高速|100m限速|CDN加速|Game|PPCW|Sakura"
 replace = ""
 
-[[node_pref.rename_node]]
-match = "\\[0\\.2\\]"
-replace = "[x0.2]"
-
-[[node_pref.rename_node]]
-match = "\\[0\\.5\\]"
-replace = "[x0.5]"
-
-[[node_pref.rename_node]]
-match = "\\[0\\.7\\]"
-replace = "[x0.7]"
-
-[[node_pref.rename_node]]
-match = "\\[0\\.8\\]"
-replace = "[x0.8]"
-
-[[node_pref.rename_node]]
-match = "\\[0\\.9\\]"
-replace = "[x0.9]"
-
-[[node_pref.rename_node]]
-match = "(\\[1\\]|倍率1)"
-replace = "[x1]"
-
-[[node_pref.rename_node]]
-match = "\\[1\\.2\\]"
-replace = "[x1.2]"
-
-[[node_pref.rename_node]]
-match = "(\\[1\\.5\\])(-1.5x)"
-replace = "[x1.5]"
-
-[[node_pref.rename_node]]
-match = "(\\[2\\])|(-2x)"
-replace = "[x2]"
-
-[[node_pref.rename_node]]
-match = "(\\[3\\])|(-3x)"
-replace = "[x3]"
-
-[[node_pref.rename_node]]
-match = "(\\[5\\]|倍率5)"
-replace = "[x5]"
-
-[[node_pref.rename_node]]
-match = "\\[8\\]"
-replace = "[x8]"
-
-[[node_pref.rename_node]]
-match = "\\[10\\]"
-replace = "[x10]"
-
 # [[node_pref.rename_node]]
 # match = "(?!<=[\\]|\\)])$"
 # replace = "[x1]"
 
+[[node_pref.rename_node]]
+match = "(x|X)([0-9]?.?[0-9]?[0-9])"
+replace = "[x$2]"
+
 [[node_pref.rename_node]]
 match = "(.*)(\\[)(倍率:)(.*[0-9])(\\])"
 replace = "$1[x$4]"

diff --git a/Subconverter-base/AIO.ini b/Subconverter-base/AIO.ini
@@ -22,8 +22,8 @@ rename=(流媒体)|(-M)|(原生IP)|(解锁)@[M]
 rename=(.*)([0-9].*[0-9])(静态解锁|动态解锁|原生解锁|解锁|动态原生|静态原生|原生)@$1$2[M]
 rename=(.*)(\b[0-9][0-9]\b)(静态解锁|动态解锁|原生解锁|解锁|动态原生|静态原生|原生)@$1$2[M]
 rename=(.*)([0-9].*[0-9])(\|[\w].*[0-9])@$1$2
+rename=(.*)(NO)(.?[0-9]?[0-9]?[0-9])$@$1 $3
 rename=((CN[0-9]•)|^)(⓪|❶|❷|❸|❻)(TJ\.|gR\.|V2\.|H2\.|SS\.)@
-;rename=^(.*)(HK(?!(B|T|G)))([\u4e00-\u9fa5])@香港 $3
 rename=^(.*)(HK(?!B|G|T))([\u4e00-\u9fa5].*)@香港 $3
 rename=^(HK)([0-9].*)@香港 $2
 rename=^(HKBN)(.*)@香港HKBN $2
@@ -56,20 +56,8 @@ rename=(◆)@
 rename=((\|NF)|(\|NF\*)|(\|BBC)|(\|abema)|(\|动画疯)|(\|Netflix)|(\|動畫瘋)|(\|Hulu)|(\|\[注册Netflix\])|(\|HBO)|(\|TVB)|(\|D\+)|(\|Yp)|(\|Y2B P)|(\|AI)|(解锁流媒体)|(原生IP))@[M]
 rename=\[M\].*\[M\]@[M]
 rename=\[CM\]|\[CU\]|\[BT\/PT专用\]|\[荐\]|\[Beta\]|\[移动\]|\[联通\]|\[综合\]|\[备用\]|\[阿里云\]|\[测试\]|\[v6\]|高速|100m限速|CDN加速|Game|PPCW|Sakura@
-rename=\[0\.2\]@[x0.2]
-rename=\[0\.5\]@[x0.5]
-rename=\[0\.7\]@[x0.7]
-rename=\[0\.8\]@[x0.8]
-rename=\[0\.9\]@[x0.9]
-rename=(\[1\]|倍率1)@[x1]
-rename=\[1\.2\]@[x1.2]
-rename=(\[1\.5\])(-1.5x)@[x1.5]
-rename=(\[2\])|(-2x)@[x2]
-rename=(\[3\])|(-3x)@[x3]
-rename=(\[5\]|倍率5)@[x5]
-rename=\[8\]@[x8]
-rename=\[10\]@[x10]
 ;rename=(?!<=[\]|\)])$@[x1]
+rename=(x|X)([0-9]?.?[0-9]?[0-9])@[x$2]
 rename=(.*)(\[)(倍率:)(.*[0-9])(\])@$1[x$4]
 rename=(\[x.*[0-9]\])(.*)@$2$1
 rename=(.*)( )(.*[0-9])(倍率)@$1[x$3]

diff --git a/Subconverter-base/AIO.toml b/Subconverter-base/AIO.toml
@@ -59,14 +59,14 @@ replace = "$1$2[M]"
 match = "(.*)([0-9].*[0-9])(\\|[\\w].*[0-9])"
 replace = "$1$2"
 
+[[node_pref.rename_node]]
+match = "(.*)(NO)(.?[0-9]?[0-9]?[0-9])$"
+replace = "$1 $3"
+
 [[node_pref.rename_node]]
 match = "((CN[0-9]•)|^)(⓪|❶|❷|❸|❻)(TJ\\.|gR\\.|V2\\.|H2\\.|SS\\.)"
 replace = ""
 
-# [[node_pref.rename_node]]
-# match = "^(.*)(HK(?!(B|T|G)))([\u4e00-\u9fa5])"
-# replace = "香港 $3"
-
 [[node_pref.rename_node]]
 match = "^(.*)(HK(?!B|G|T))([\u4e00-\u9fa5].*)"
 replace = "香港 $3"
@@ -195,62 +195,14 @@ replace = "[M]"
 match = "\\[CM\\]|\\[CU\\]|\\[BT\\/PT专用\\]|\\[荐\\]|\\[Beta\\]|\\[移动\\]|\\[联通\\]|\\[综合\\]|\\[备用\\]|\\[阿里云\\]|\\[测试\\]|\\[v6\\]|高速|100m限速|CDN加速|Game|PPCW|Sakura"
 replace = ""
 
-[[node_pref.rename_node]]
-match = "\\[0\\.2\\]"
-replace = "[x0.2]"
-
-[[node_pref.rename_node]]
-match = "\\[0\\.5\\]"
-replace = "[x0.5]"
-
-[[node_pref.rename_node]]
-match = "\\[0\\.7\\]"
-replace = "[x0.7]"
-
-[[node_pref.rename_node]]
-match = "\\[0\\.8\\]"
-replace = "[x0.8]"
-
-[[node_pref.rename_node]]
-match = "\\[0\\.9\\]"
-replace = "[x0.9]"
-
-[[node_pref.rename_node]]
-match = "(\\[1\\]|倍率1)"
-replace = "[x1]"
-
-[[node_pref.rename_node]]
-match = "\\[1\\.2\\]"
-replace = "[x1.2]"
-
-[[node_pref.rename_node]]
-match = "(\\[1\\.5\\])(-1.5x)"
-replace = "[x1.5]"
-
-[[node_pref.rename_node]]
-match = "(\\[2\\])|(-2x)"
-replace = "[x2]"
-
-[[node_pref.rename_node]]
-match = "(\\[3\\])|(-3x)"
-replace = "[x3]"
-
-[[node_pref.rename_node]]
-match = "(\\[5\\]|倍率5)"
-replace = "[x5]"
-
-[[node_pref.rename_node]]
-match = "\\[8\\]"
-replace = "[x8]"
-
-[[node_pref.rename_node]]
-match = "\\[10\\]"
-replace = "[x10]"
-
 # [[node_pref.rename_node]]
 # match = "(?!<=[\\]|\\)])$"
 # replace = "[x1]"
 
+[[node_pref.rename_node]]
+match = "(x|X)([0-9]?.?[0-9]?[0-9])"
+replace = "[x$2]"
+
 [[node_pref.rename_node]]
 match = "(.*)(\\[)(倍率:)(.*[0-9])(\\])"
 replace = "$1[x$4]"

diff --git a/Subconverter-base/AllSub-AdBlock.toml b/Subconverter-base/AllSub-AdBlock.toml
@@ -59,14 +59,14 @@ replace = "$1$2[M]"
 match = "(.*)([0-9].*[0-9])(\\|[\\w].*[0-9])"
 replace = "$1$2"
 
+[[node_pref.rename_node]]
+match = "(.*)(NO)(.?[0-9]?[0-9]?[0-9])$"
+replace = "$1 $3"
+
 [[node_pref.rename_node]]
 match = "((CN[0-9]•)|^)(⓪|❶|❷|❸|❻)(TJ\\.|gR\\.|V2\\.|H2\\.|SS\\.)"
 replace = ""
 
-# [[node_pref.rename_node]]
-# match = "^(.*)(HK(?!(B|T|G)))([\u4e00-\u9fa5])"
-# replace = "香港 $3"
-
 [[node_pref.rename_node]]
 match = "^(.*)(HK(?!B|G|T))([\u4e00-\u9fa5].*)"
 replace = "香港 $3"
@@ -195,62 +195,14 @@ replace = "[M]"
 match = "\\[CM\\]|\\[CU\\]|\\[BT\\/PT专用\\]|\\[荐\\]|\\[Beta\\]|\\[移动\\]|\\[联通\\]|\\[综合\\]|\\[备用\\]|\\[阿里云\\]|\\[测试\\]|\\[v6\\]|高速|100m限速|CDN加速|Game|PPCW|Sakura"
 replace = ""
 
-[[node_pref.rename_node]]
-match = "\\[0\\.2\\]"
-replace = "[x0.2]"
-
-[[node_pref.rename_node]]
-match = "\\[0\\.5\\]"
-replace = "[x0.5]"
-
-[[node_pref.rename_node]]
-match = "\\[0\\.7\\]"
-replace = "[x0.7]"
-
-[[node_pref.rename_node]]
-match = "\\[0\\.8\\]"
-replace = "[x0.8]"
-
-[[node_pref.rename_node]]
-match = "\\[0\\.9\\]"
-replace = "[x0.9]"
-
-[[node_pref.rename_node]]
-match = "(\\[1\\]|倍率1)"
-replace = "[x1]"
-
-[[node_pref.rename_node]]
-match = "\\[1\\.2\\]"
-replace = "[x1.2]"
-
-[[node_pref.rename_node]]
-match = "(\\[1\\.5\\])(-1.5x)"
-replace = "[x1.5]"
-
-[[node_pref.rename_node]]
-match = "(\\[2\\])|(-2x)"
-replace = "[x2]"
-
-[[node_pref.rename_node]]
-match = "(\\[3\\])|(-3x)"
-replace = "[x3]"
-
-[[node_pref.rename_node]]
-match = "(\\[5\\]|倍率5)"
-replace = "[x5]"
-
-[[node_pref.rename_node]]
-match = "\\[8\\]"
-replace = "[x8]"
-
-[[node_pref.rename_node]]
-match = "\\[10\\]"
-replace = "[x10]"
-
 # [[node_pref.rename_node]]
 # match = "(?!<=[\\]|\\)])$"
 # replace = "[x1]"
 
+[[node_pref.rename_node]]
+match = "(x|X)([0-9]?.?[0-9]?[0-9])"
+replace = "[x$2]"
+
 [[node_pref.rename_node]]
 match = "(.*)(\\[)(倍率:)(.*[0-9])(\\])"
 replace = "$1[x$4]"

diff --git a/Subconverter-base/AllSub-NoReject.ini b/Subconverter-base/AllSub-NoReject.ini
@@ -22,8 +22,8 @@ rename=(流媒体)|(-M)|(原生IP)|(解锁)@[M]
 rename=(.*)([0-9].*[0-9])(静态解锁|动态解锁|原生解锁|解锁|动态原生|静态原生|原生|-M|流媒体|原生IP)@$1$2[M]
 rename=(.*)(\b[0-9][0-9]\b)(静态解锁|动态解锁|原生解锁|解锁|动态原生|静态原生|原生|-M|流媒体|原生IP)@$1$2[M]
 rename=(.*)([0-9].*[0-9])(\|[\w].*[0-9])@$1$2
+rename=(.*)(NO)(.?[0-9]?[0-9]?[0-9])$@$1 $3
 rename=((CN[0-9]•)|^)(⓪|❶|❷|❸|❻)(TJ\.|gR\.|V2\.|H2\.|SS\.)@
-;rename=^(.*)(HK(?!(B|T|G)))([\u4e00-\u9fa5])@香港 $3
 rename=^(.*)(HK(?!B|G|T))([\u4e00-\u9fa5].*)@香港 $3
 rename=^(HK)([0-9].*)@香港 $2
 rename=^(HKBN)(.*)@香港HKBN $2
@@ -56,20 +56,8 @@ rename=(◆)@
 rename=((\|NF)|(\|NF\*)|(\|BBC)|(\|abema)|(\|动画疯)|(\|Netflix)|(\|動畫瘋)|(\|Hulu)|(\|\[注册Netflix\])|(\|HBO)|(\|TVB)|(\|D\+)|(\|Yp)|(\|Y2B P)|(\|AI)|(解锁流媒体)|(原生IP))@[M]
 rename=\[M\].*\[M\]@[M]
 rename=\[CM\]|\[CU\]|\[BT\/PT专用\]|\[荐\]|\[Beta\]|\[移动\]|\[联通\]|\[综合\]|\[备用\]|\[阿里云\]|\[测试\]|\[v6\]|高速|100m限速|CDN加速|Game|PPCW|Sakura@
-rename=\[0\.2\]@[x0.2]
-rename=\[0\.5\]@[x0.5]
-rename=\[0\.7\]@[x0.7]
-rename=\[0\.8\]@[x0.8]
-rename=\[0\.9\]@[x0.9]
-rename=(\[1\]|倍率1)@[x1]
-rename=\[1\.2\]@[x1.2]
-rename=(\[1\.5\])(-1.5x)@[x1.5]
-rename=(\[2\])|(-2x)@[x2]
-rename=(\[3\])|(-3x)@[x3]
-rename=(\[5\]|倍率5)@[x5]
-rename=\[8\]@[x8]
-rename=\[10\]@[x10]
 ;rename=(?!<=[\]|\)])$@[x1]
+rename=(x|X)([0-9]?.?[0-9]?[0-9])@[x$2]
 rename=(.*)(\[)(倍率:)(.*[0-9])(\])@$1[x$4]
 rename=(\[x.*[0-9]\])(.*)@$2$1
 rename=(.*)( )(.*[0-9])(倍率)@$1[x$3]