From d35c4af8cec6df8b891cbfc7716af9b460376fe1 Mon Sep 17 00:00:00 2001
From: "guorong.zheng" <360996299@qq.com>
Date: Fri, 2 Aug 2024 17:13:11 +0800
Subject: [PATCH] feat:multicast
---
config.py | 5 +++--
multicast_map.py | 3 ++-
subscribe/request.py | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/config.py b/config.py
index d030461..fed6828 100644
--- a/config.py
+++ b/config.py
@@ -17,7 +17,7 @@ favorite_list = [
]
open_online_search = False
favorite_page_num = 5
-default_page_num = 3
+default_page_num = 5
urls_limit = 15
open_keep_all = False
open_sort = True
@@ -27,11 +27,12 @@ recent_days = 30
ipv_type = "ipv4"
domain_blacklist = ["epg.pw"]
url_keywords_blacklist = []
-open_subscribe = False
+open_subscribe = True
subscribe_urls = [
"https://m3u.ibert.me/txt/fmml_dv6.txt",
"https://m3u.ibert.me/txt/o_cn.txt",
"https://m3u.ibert.me/txt/j_iptv.txt",
+ "https://github.moeyy.xyz/https://raw.githubusercontent.com/PizazzGY/TVBox/main/live.txt",
]
open_multicast = True
region_list = ["all"]
diff --git a/multicast_map.py b/multicast_map.py
index 95c6a64..220cf67 100644
--- a/multicast_map.py
+++ b/multicast_map.py
@@ -1,3 +1,4 @@
region_url = {
- "广东": "https://ghproxy.net/raw.githubusercontent.com/xisohi/IPTV-Multicast-source/main/guangdong/telecom.txt"
+ "广东": "https://chinaiptv.pages.dev/guangdong/guangdong.txt",
+ "上海": "https://chinaiptv.pages.dev/shanghai/telecom.txt",
}
diff --git a/subscribe/request.py b/subscribe/request.py
index 6b81aa5..ded50fd 100644
--- a/subscribe/request.py
+++ b/subscribe/request.py
@@ -19,7 +19,7 @@ async def get_channels_by_subscribe_urls(urls=None, callback=None):
"""
subscribe_results = {}
pattern = r"^(.*?),(?!#genre#)(.*?)$"
- subscribe_urls_len = len(config.subscribe_urls)
+ subscribe_urls_len = len(urls if urls else config.subscribe_urls)
pbar = tqdm_asyncio(total=subscribe_urls_len, desc="Processing subscribe")
start_time = time()
callback(f"正在获取订阅源更新, 共{subscribe_urls_len}个订阅源", 0)