Merge pull request #289 from Guovin/dev

Dev
Guovin · Sep 2, 2024 · b167c25 · b167c25
2 parents 25fefac + f49b6d3
commit b167c25
Show file tree

Hide file tree

Showing 99 changed files with 11,032 additions and 37 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -94,7 +94,7 @@ jobs:
             from utils.config import config
             import os
             final_file = config.get("Settings", "final_file")
-            final_m3u_file = os.path.splitext(user_final_file)[0] + ".m3u"
+            final_m3u_file = os.path.splitext(final_file)[0] + ".m3u"
           except: 
             final_m3u_file = "output/result.m3u"
           print(final_m3u_file)')

diff --git a/config/config.ini b/config/config.ini
@@ -18,11 +18,11 @@ open_m3u_result = True
 url_keywords_blacklist = 
 open_subscribe = False
 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 = False
-multicast_region_list = 广东
+open_multicast = True
+multicast_region_list = 全部
 multicast_page_num = 3
 open_proxy = False
-open_driver = True
+open_driver = False
 open_hotel = True
 open_hotel_tonkiang = False
 open_hotel_fofa = True

diff --git a/updates/multicast/request.py b/updates/multicast/request.py
@@ -243,12 +243,13 @@ def process_channel_by_multicast(region, type):
             data = result.get("data")
 
             if data:
-                region_type_results = search_region_type_result[region][type]
                 for item in data:
                     url = item.get("url")
                     date = item.get("date")
                     if url:
-                        region_type_results.append((url, date, None))
+                        search_region_type_result[region][type].append(
+                            (url, date, None)
+                        )
     channels = get_channel_multicast_result(
         name_region_type_result, search_region_type_result
     )

diff --git a/updates/multicast/rtp/上海_电信.txt b/updates/multicast/rtp/上海_电信.txt
@@ -0,0 +1,105 @@
+电信,#genre#
+新闻综合,rtp://239.45.3.209:5140
+东方卫视,rtp://239.45.3.146:5140
+都市频道,rtp://239.45.3.236:5140
+纪实人文,rtp://239.45.3.212:5140
+东方影视,rtp://239.45.3.237:5140
+第一财经,rtp://239.45.3.211:5140
+五星体育,rtp://239.45.3.210:5140
+哈哈炫动,rtp://239.45.1.55:5140
+上视外语,rtp://239.45.1.127:5140
+都市剧场,rtp://239.45.3.136:5140
+欢笑剧场,rtp://239.45.3.196:5140
+欢笑剧场,rtp://239.45.1.4:5140
+全纪实,rtp://239.45.3.135:5140
+动漫秀场,rtp://239.45.3.134:5140
+生活时尚,rtp://239.45.3.132:5140
+游戏风云,rtp://239.45.3.131:5140
+MAX极速汽车,rtp://239.45.3.49:5140
+教育台,rtp://239.45.3.122:5140#rtp://239.45.3.252:5140
+东方财经,rtp://239.45.1.119:5140#rtp://239.45.3.192:5140
+七彩戏剧,rtp://239.45.3.61:5140#rtp://239.45.1.112:5140
+法治天地,rtp://239.45.1.46:5140
+浦东频道,rtp://239.45.3.248:5140
+崇明电视,rtp://239.45.1.54:5140
+嘉定频道,rtp://239.45.3.185:5140
+金色频道,rtp://239.45.1.118:5140#rtp://239.45.3.51:5140
+健康人生,rtp://239.45.3.214:5140
+百事通超级体育,rtp://239.45.3.139:5140
+百事通4K,rtp://239.45.1.42:5140#rtp://239.45.3.107:5140
+百事通4K（备）,rtp://239.45.3.107:5140
+CCTV1综合,rtp://239.45.3.145:5140
+CCTV2财经,rtp://239.45.1.109:5140
+CCTV3综艺,rtp://239.45.1.68:5140
+CCTV4中文国际,rtp://239.45.0.2:5140
+CCTV5体育,rtp://239.45.1.69:5140
+CCTV6电影,rtp://239.45.1.70:5140
+CCTV7国防军事,rtp://239.45.3.56:5140
+CCTV8电视剧,rtp://239.45.1.71:5140
+CCTV9记录,rtp://239.45.3.4:5140#rtp://239.45.1.108:5140
+CCTV10科教,rtp://239.45.3.8:5140
+CCTV11戏曲,rtp://239.45.1.196:5140
+CCTV12社会与法,rtp://239.45.3.10:5140
+CCTV13新闻,rtp://239.45.1.198:5140
+CCTV14少儿,rtp://239.45.3.23:5140
+CCTV15音乐,rtp://239.45.1.200:5140
+CCTV-17农村农业,rtp://239.45.3.52:5140
+CGTN,rtp://239.45.1.194:5140
+中国教育-1,rtp://239.45.1.125:5140
+中国教育-2,rtp://239.45.1.52:5140
+中国教育-4,rtp://239.45.1.50:5140
+浙江卫视,rtp://239.45.3.178:5140
+江苏卫视,rtp://239.45.3.177:5140
+湖南卫视,rtp://239.45.3.228:5140#rtp://239.45.3.233:5140
+北京卫视,rtp://239.45.3.229:5140
+广东卫视,rtp://239.45.3.230:5140
+深圳卫视,rtp://239.45.3.231:5140
+黑龙江卫视,rtp://239.45.3.232:5140
+山东卫视,rtp://239.45.3.238:5140
+湖北卫视,rtp://239.45.3.239:5140
+安徽卫视,rtp://239.45.1.120:5140
+东南卫视,rtp://239.45.1.121:5140
+江西卫视,rtp://239.45.1.122:5140
+辽宁卫视,rtp://239.45.1.123:5140
+天津卫视,rtp://239.45.1.124:5140
+四川卫视,rtp://239.45.1.83:5140
+重庆卫视,rtp://239.45.1.84:5140
+贵州卫视,rtp://239.45.1.80:5140
+海南卫视,rtp://239.45.1.81:5140
+河北卫视,rtp://239.45.1.44:5140
+金鹰纪实,rtp://239.45.1.45:5140
+宁夏卫视,rtp://239.45.1.213:5140#rtp://239.45.3.176:5140
+广西卫视,rtp://239.45.0.5:5140
+吉林卫视,rtp://239.45.0.6:5140
+山西卫视,rtp://239.45.1.229:5140#rtp://239.45.3.171:5140
+青海卫视,rtp://239.45.1.230:5140#rtp://239.45.3.172:5140
+西藏卫视,rtp://239.45.1.231:5140#rtp://239.45.3.173:5140
+陕西卫视,rtp://239.45.1.232:5140#rtp://239.45.3.174:5140
+云南卫视,rtp://239.45.0.4:5140
+甘肃卫视,rtp://239.45.1.234:5140#rtp://239.45.3.175:5140
+内蒙古卫视,rtp://239.45.1.238:5140#rtp://239.45.3.221:5140
+河南卫视,rtp://239.45.0.3:5140
+新疆卫视,rtp://239.45.1.116:5140#rtp://239.45.3.142:5140
+兵团卫视,rtp://239.45.1.117:5140#rtp://239.45.3.143:5140
+三沙卫视,rtp://239.45.1.82:5140
+康巴卫视,rtp://239.45.1.251:5140
+金鹰卡通,rtp://239.45.3.118:5140#rtp://239.45.3.119:5140
+嘉佳卡通,rtp://239.45.1.48:5140
+卡酷少儿,rtp://239.45.0.8:5140
+北京冬奥纪实,rtp://239.45.1.14:5140
+中国天气,rtp://239.45.1.47:5140
+陶瓷,rtp://239.45.3.50:5140
+东方购物-1HD,rtp://239.45.3.74:5140
+东方购物-2HD,rtp://239.45.3.75:5140
+东方购物-3HD,rtp://239.45.3.207:5140
+东方购物-4HD,rtp://239.45.3.208:5140
+东方购物-5HD,rtp://239.45.3.253:5140
+聚鲨环球精选,rtp://239.45.3.123:5140
+央广购物,rtp://239.45.3.213:5140
+家家购物,rtp://239.45.3.179:5140
+快乐购物,rtp://239.45.1.53:5140
+优购物,rtp://239.45.1.114:5140#rtp://239.45.3.186:5140
+好享购物,rtp://239.45.1.253:5140
+中央购物,rtp://239.45.3.79:5140
+家有购物,rtp://239.45.1.43:5140
+
diff --git a/updates/multicast/rtp/上海_移动.txt b/updates/multicast/rtp/上海_移动.txt
@@ -0,0 +1 @@
+移动,#genre#
diff --git a/updates/multicast/rtp/上海_联通.txt b/updates/multicast/rtp/上海_联通.txt
@@ -0,0 +1,98 @@
+联通,#genre#
+CCTV-1,http://140.207.241.2:8080/live/program/live/cctv1hd/4000000/mnf.m3u8
+CCTV-2,http://140.207.241.2:8080/live/program/live/cctv2/1300000/mnf.m3u8
+CCTV-3,http://140.207.241.3:8080/live/program/live/cctv3hd/4000000/mnf.m3u8
+CCTV-4,http://140.207.241.2:8080/live/program/live/cctv4/1300000/mnf.m3u8
+CCTV-5,http://140.207.241.3:8080/live/program/live/cctv5hd/4000000/mnf.m3u8
+CCTV-5+,http://140.207.241.3:8080/live/program/live/cctv5phd/4000000/mnf.m3u8
+CCTV-6,http://140.207.241.3:8080/live/program/live/cctv6hd/4000000/mnf.m3u8
+CCTV-7,http://140.207.241.2:8080/live/program/live/cctv7/1300000/mnf.m3u8
+CCTV-8,http://140.207.241.3:8080/live/program/live/cctv8hd/4000000/mnf.m3u8
+CCTV-9,http://140.207.241.2:8080/live/program/live/cctv9/1200000/mnf.m3u8
+CCTV-10,http://140.207.241.3:8080/live/program/live/cctv10hd/4000000/mnf.m3u8
+CCTV-11,http://140.207.241.2:8080/live/program/live/cctv11/1300000/mnf.m3u8
+CCTV-12,http://140.207.241.2:8080/live/program/live/cctv12/1300000/mnf.m3u8
+CCTV-13,http://140.207.241.2:8080/live/program/live/cctvxw/1300000/mnf.m3u8
+CCTV-14,http://140.207.241.3:8080/live/program/live/cctvsehd/4000000/mnf.m3u8
+CCTV-15,http://140.207.241.2:8080/live/program/live/cctvyy/1300000/mnf.m3u8
+安徽卫视,http://140.207.241.2:8080/live/program/live/ahwshd/4000000/mnf.m3u8
+北京卫视,http://140.207.241.2:8080/live/program/live/bjwshd/4000000/mnf.m3u8
+兵团卫视,http://140.207.241.2:8080/live/program/live/btws/1300000/mnf.m3u8
+东方卫视,http://140.207.241.2:8080/live/program/live/hddfws/4000000/mnf.m3u8
+东南卫视,http://140.207.241.2:8080/live/program/live/dnwshd/4000000/mnf.m3u8
+甘肃卫视,http://140.207.241.2:8080/live/program/live/gsws/1300000/mnf.m3u8
+广东卫视,http://140.207.241.2:8080/live/program/live/gdwshd/4000000/mnf.m3u8
+四川卫视,http://140.207.241.2:8080/live/program/live/scws/1300000/mnf.m3u8
+天津卫视,http://140.207.241.2:8080/live/program/live/tjwshd/4000000/mnf.m3u8
+广西卫视,http://140.207.241.2:8080/live/program/live/gxws/1300000/mnf.m3u8
+重庆卫视,http://140.207.241.2:8080/live/program/live/cqws/1300000/mnf.m3u8
+贵州卫视,http://140.207.241.2:8080/live/program/live/gzws/1300000/mnf.m3u8
+云南卫视,http://140.207.241.2:8080/live/program/live/ynws/1300000/mnf.m3u8
+浙江卫视,http://140.207.241.2:8080/live/program/live/zjwshd/4000000/mnf.m3u8
+海南卫视,http://140.207.241.2:8080/live/program/live/lyws/1300000/mnf.m3u8
+河北卫视,http://140.207.241.2:8080/live/program/live/hbws/1300000/mnf.m3u8
+河南卫视,http://140.207.241.2:8080/live/program/live/hnws/1300000/mnf.m3u8
+黑龙江卫视,http://140.207.241.2:8080/live/program/live/hljwshd/4000000/mnf.m3u8
+湖北卫视,http://140.207.241.2:8080/live/program/live/hbwshd/4000000/mnf.m3u8
+西藏卫视,http://140.207.241.2:8080/:80/live/program/live/xzws/2500000/d1.m3u8
+新疆卫视,http://140.207.241.2:8080/live/program/live/xjws/1300000/mnf.m3u8
+湖南卫视,http://140.207.241.2:8080/live/program/live/hnwshd/4000000/mnf.m3u8
+吉林卫视,http://140.207.241.2:8080/live/program/live/jlws/1300000/mnf.m3u8
+江苏卫视,http://140.207.241.2:8080/live/program/live/jswshd/4000000/mnf.m3u8
+江西卫视,http://140.207.241.2:8080/live/program/live/jxwshd/4000000/d1.m3u8
+辽宁卫视,http://140.207.241.2:8080/live/program/live/lnwshd/4000000/mnf.m3u8
+内蒙古卫视,http://140.207.241.2:8080/live/program/live/nmgws/1300000/mnf.m3u8
+青海卫视,http://140.207.241.2:8080/live/program/live/qhws/1300000/mnf.m3u8
+厦门卫视,http://140.207.241.2:8080/live/program/live/xmws/1300000/mnf.m3u8
+山东卫视,http://140.207.241.2:8080/live/program/live/sdwshd/4000000/mnf.m3u8
+山西卫视,http://140.207.241.2:8080/live/program/live/shanxiws/1300000/mnf.m3u8
+深圳卫视,http://140.207.241.2:8080/live/program/live/szwshd/4000000/mnf.m3u8
+陕西卫视,http://140.207.241.2:8080/live/program/live/sxws/1300000/mnf.m3u8
+上海ICS,http://140.207.241.2:8080/live/program/live/wypdhd/4000000/mnf.m3u8
+上海第一财经,http://140.207.241.3:8080/live/program/live/dycjhd/4000000/mnf.m3u8
+上海东方影视,http://140.207.241.3:8080/live/program/live/dsjpdhd/4000000/mnf.m3u8
+上海都市,http://140.207.241.2:8080/live/program/live/ylpdhd/4000000/mnf.m3u8
+七彩戏剧,http://140.207.241.2:8080/live/program/live/qcxj/1300000/mnf.m3u8
+全纪实,http://140.207.241.2:8080/live/program/live/qjshd/4000000/mnf.m3u8
+动漫秀场,http://140.207.241.2:8080/live/program/live/dmxchd/4000000/mnf.m3u8
+都市剧场,http://140.207.241.2:8080/live/program/live/dsjchd/4000000/mnf.m3u8
+哈哈炫动,http://140.207.241.2:8080/live/program/live/hhxdhd/4000000/mnf.m3u8
+法治天地,http://140.207.241.2:8080/live/program/live/fztd/1300000/mnf.m3u8
+第一财经,http://140.207.241.2:8080/live/program/live/dycjhd/4000000/mnf.m3u8
+东方财经·浦东,http://140.207.241.2:8080/live/program/live/dfcj/1300000/mnf.m3u8
+上海哈哈炫动,http://140.207.241.3:8080/live/program/live/hhxdhd/4000000/mnf.m3u8
+上海纪实人文,http://140.207.241.2:8080/live/program/live/jspdhd/4000000/mnf.m3u8
+上海五星体育,http://140.207.241.3:8080/live/program/live/ssty/4000000/mnf.m3u8
+上海新闻综合,http://140.207.241.2:8080/live/program/live/xwzhhd/4000000/mnf.m3u8
+极速汽车,http://140.207.241.2:8080/live/program/live/jsqchd/4000000/mnf.m3u8
+嘉佳卡通,http://140.207.241.2:8080/live/program/live/jjkt/1300000/mnf.m3u8
+金色频道,http://140.207.241.2:8080/live/program/live/jingsepd/1300000/mnf.m3u8
+东方影视,http://140.207.241.2:8080/live/program/live/dsjpdhd/4000000/mnf.m3u8
+欢笑剧场,http://140.207.241.2:8080/live/program/live/hxjchd/4000000/mnf.m3u8
+金鹰卡通,http://140.207.241.2:8080/live/program/live/jykt/1300000/mnf.m3u8
+劲爆体育,http://140.207.241.2:8080/live/program/live/jbtyhd/4000000/mnf.m3u8
+生活时尚,http://140.207.241.2:8080/live/program/live/shsshd/4000000/mnf.m3u8
+五星体育,http://140.207.241.2:8080/live/program/live/ssty/4000000/mnf.m3u8
+魅力足球,http://140.207.241.2:8080/live/program/live/mlyyhd/4000000/mnf.m3u8
+新视觉,http://140.207.241.2:8080/live/program/live/xsjhd/4000000/mnf.m3u8
+游戏风云,http://140.207.241.2:8080/live/program/live/yxfyhd/4000000/mnf.m3u8
+中国供销,http://140.207.241.2:8080/live/program/live/zggxpd/1300000/mnf.m3u8
+中国天气,http://140.207.241.2:8080/live/program/live/zgqx/1300000/mnf.m3u8
+SiTV动漫秀场,http://140.207.241.3:8080/live/program/live/dmxchd/4000000/mnf.m3u8
+SiTV都市剧场,http://140.207.241.3:8080/live/program/live/dsjchd/4000000/mnf.m3u8
+SiTV欢笑剧场,http://140.207.241.3:8080/live/program/live/hxjchd/4000000/mnf.m3u8
+SiTV极速汽车,http://140.207.241.3:8080/live/program/live/jsqchd/4000000/mnf.m3u8
+SiTV劲爆体育,http://140.207.241.3:8080/live/program/live/jbtyhd/4000000/mnf.m3u8
+SiTV魅力足球,http://140.207.241.3:8080/live/program/live/mlyyhd/4000000/mnf.m3u8
+SiTV全纪实,http://140.207.241.3:8080/live/program/live/qjshd/4000000/mnf.m3u8
+SiTV生活时尚,http://140.207.241.3:8080/live/program/live/shsshd/4000000/mnf.m3u8
+SiTV新视觉,http://140.207.241.3:8080/live/program/live/xsjhd/4000000/mnf.m3u8
+SiTV幸福彩,http://140.207.241.3:8080/live/program/live/xfchd/4000000/mnf.m3u8
+SiTV游戏风云,http://140.207.241.3:8080/live/program/live/yxfyhd/4000000/mnf.m3u8
+百事通体育,http://140.207.241.3:8080/live/program/live/hdnba1/4000000/mnf.m3u8
+百事通体育,http://140.207.241.3:8080/live/program/live/hdnba2/4000000/mnf.m3u8
+百事通体育,http://140.207.241.3:8080/live/program/live/hdnba3/4000000/mnf.m3u8
+百事通体育,http://140.207.241.3:8080/live/program/live/hdnba4/4000000/mnf.m3u8
+百事通体育,http://140.207.241.3:8080/live/program/live/hdnba5/4000000/mnf.m3u8
+百事通体育,http://140.207.241.3:8080/live/program/live/hdnba6/4000000/mnf.m3u8
+百事通体育,http://140.207.241.3:8080/live/program/live/hdnba7/4000000/mnf.m3u8