From 57e17ca4becc8d36e2397366ce68f542fec12658 Mon Sep 17 00:00:00 2001 From: wangsiyuan <2392948297@qq.com> Date: Thu, 23 Jan 2025 11:33:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=B0=E5=8A=A0=E5=9D=A1?= =?UTF-8?q?=E5=88=B0=20tag-=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- getTagProxyInfoToOpenwrtFormat.py | 2 +- get_us_proxies.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/getTagProxyInfoToOpenwrtFormat.py b/getTagProxyInfoToOpenwrtFormat.py index 0f77014..1ced8c1 100644 --- a/getTagProxyInfoToOpenwrtFormat.py +++ b/getTagProxyInfoToOpenwrtFormat.py @@ -153,7 +153,7 @@ def convert_subscription_to_config(subscription_url, regions_list): if __name__ == '__main__': # 订阅地址 - subscription_url = "https://link.nobodys.uk/api/v1/client/subscribe?token=26d553424da6d84dccb20dd05dc844c0" + subscription_url = "https://huaikhwang.central-world.org/api/v1/trails/bolster?token=26d553424da6d84dccb20dd05dc844c0" regions_list = ['香港', '新加坡', '美国'] # 转换并保存配置 diff --git a/get_us_proxies.py b/get_us_proxies.py index b2e3da3..b977ec8 100644 --- a/get_us_proxies.py +++ b/get_us_proxies.py @@ -26,6 +26,9 @@ def get_lines_containing_us(lines): for line in lines: if '美国' in line: lines_with_us.append(line) + + if '新加坡' in line: + lines_with_us.append(line) return lines_with_us @@ -68,6 +71,8 @@ def get_us_proxies(source_file): for proxy in data['proxies']: if '美国' in proxy['name']: us_proxies.append(proxy['name']) + if '新加坡' in proxy['name']: + us_proxies.append(proxy['name']) # print(us_proxies) return us_proxies @@ -97,7 +102,7 @@ def get_rules(source_file, groups_name_list, cache_files): '🎬 YouTube', '🎬 Netflix', '🎬 DisneyPlus', '🎬 巴哈姆特', '🎬 viuTV', '🎬 KKTV', '🎬 日本媒体', '🎬 韩国媒体', '🎬 AppleTV+', '🎬 HBOGO', '🎬 HBOMAX', '🎬 PrimeVideo', '🎬 EMBY', '🎬 Dazn', '🎶 TikTok', '🎵 Spotify', '🎵 AppleMusic', '🎵 TIDAL', '🎵 Qobuz', '🎬 B站东南亚', '🌏 国外流媒体', '🔖 OneDrive', '☁️ iCloud', - '🌏 国外网站', '🐟 漏网之鱼', "📲 Instagram"] + '🌏 国外网站', '🐟 漏网之鱼', "📲 Instagram","🎬 台湾媒体"] print(difference(groups_name_list, domestic)) if 'rules' in data: