diff --git a/base/config.py b/base/config.py index 79cf493..676af9c 100644 --- a/base/config.py +++ b/base/config.py @@ -63,4 +63,5 @@ THREAD = True # 开启windows多线程调用 GEVENT = True # windows开启此参数就不走gevent,方便调试 SPECIAL = '腾云驾雾:腾讯&奇珍异兽:爱奇艺&百忙无果:芒果&优酷&哔哩影视&Alist&CMS_非凡资源:非凡&CMS_量子资源:量子' # 特殊优选 SPIDER_JAR = 'custom_spider_qy0627.jar' +ZB_PLAYER = '1' # 在线直播播放器 EXT_FUNC = '[{"host":"ss.rongliren.com","rule":["m3u8?id="]},{"host":"hei17.com","rule":["img.hei17.com","storage/uploads/",".m3u8$"]},{"name":"量子","hosts":["vip.lz","hd.lz"],"regex":["#EXT-X-DISCONTINUITY\\\\r*\\\\n*#EXTINF:6.433333,[\\\\s\\\\S]*?#EXT-X-DISCONTINUITY"]},{"name":"非凡","hosts":["vip.ffzy","hd.ffzy"],"regex":["#EXT-X-DISCONTINUITY\\\\r*\\\\n*#EXTINF:6.666667,[\\\\s\\\\S]*?#EXT-X-DISCONTINUITY"]},{"host":"piaku.cc","rule":[".mp4",".m3u8","?auth_token","m3u8"]},{"host":"v.3412.net.cn","rule":[".mp4","security-token=","aliyuncs.com","m3u8"]},{"host":"jx.jsonplayer.com","rule":[".mp4",".m3u8","?vkey=","110.42.2.115","m3u8"]},{"host":"movie.bulei.cc","rule":[".mp4",".m3u8","?vkey=","1ftn_handler","http://1.71.18.153","mu.dcd1.cn","aliyundrive.net","m3u8"]},{"host":"rebozj.pro","rule":[".mp4",".m3u8","https://p3-sign.douyinpic.com","m3u8"]},{"host":"brovod.com","rule":[".m3u8"]},{"host":"https://www1.gntv.live","rule":[".m3u8","m3u8?","4k.clyjx.cn:97"]},{"host":"renren.pro","rule":[".m3u8"]},{"host":"https://v.3412.net.cn","rule":[".m3u8",".m3u8?",".mp4"]},{"host":"v.t-ui.cn","rule":[".m3u8","m3u8?","vip.ffzy-play4.com"]},{"host":"cj.ffzyapi.com","rule":[".m3u8","m3u8?"]},{"host":"siguyy.com","rule":["mp4",".m3u8","https://ccp-bj29-video-preview.oss-enet.aliyuncs.com","aliyuncs.com"]},{"name":"火山嗅探","hosts":["huoshan.com"],"regex":["item_id="]},{"name":"抖音嗅探","hosts":["douyin.com"],"regex":["is_play_url="]}]' \ No newline at end of file diff --git a/controllers/admin.py b/controllers/admin.py index 680f24e..3a5d332 100644 --- a/controllers/admin.py +++ b/controllers/admin.py @@ -64,7 +64,9 @@ def admin_settings(): # 管理员界面 # print(conf_lists) jar_lists = get_jar_list() SPIDER_JAR = lsg.getItem('SPIDER_JAR', 'custom_spider.jar') - return render_template('settings.html', conf_lists=conf_lists, jar_lists=jar_lists, jar_now=SPIDER_JAR, + ZB_PLAYER = lsg.getItem('ZB_PLAYER', '1') + # print('ZB_PLAYER:',ZB_PLAYER) + return render_template('settings.html', conf_lists=conf_lists, jar_lists=jar_lists, jar_now=SPIDER_JAR,player_now=ZB_PLAYER, ver=getLocalVer()) @@ -592,5 +594,6 @@ def admin_lives_web(): 'url':line.split(',')[1], }) print(lives) - # lsg = storage_service() - return render_template('lives.html',ver=getLocalVer(),lives=lives) \ No newline at end of file + lsg = storage_service() + zb_player = lsg.getItem('ZB_PLAYER','1') + return render_template('lives.html',ver=getLocalVer(),lives=lives,zb_player=zb_player) \ No newline at end of file diff --git a/controllers/service.py b/controllers/service.py index e36ee71..13d8470 100644 --- a/controllers/service.py +++ b/controllers/service.py @@ -26,7 +26,7 @@ class storage_service(object): 'LAZYPARSE_MODE', 'WALL_PAPER_ENABLE', 'WALL_PAPER', 'UNAME', 'PWD', 'LIVE_MODE', 'CATE_EXCLUDE', 'TAB_EXCLUDE', 'SEARCH_TIMEOUT', 'SEARCH_LIMIT', 'MULTI_MODE', 'XR_MODE', 'JS_PROXY', 'UPDATE_PROXY', 'ENV', 'ALI_TOKEN', 'OCR_API', - 'SPECIAL', 'SPIDER_JAR', 'EXT_FUNC', 'JS_MAX_LENGTH'] + 'SPECIAL', 'SPIDER_JAR','ZB_PLAYER', 'EXT_FUNC', 'JS_MAX_LENGTH'] for conf in conf_list: if not self.hasItem(conf): print(f'开始初始化{conf}') @@ -35,12 +35,12 @@ class storage_service(object): @classmethod def getStoreConf(self): # MAX_CONTENT_LENGTH 最大上传和端口ip一样是顶级配置,无法外部修改的 - conf_list = ['LIVE_URL', 'LIVE_MODE', 'PLAY_URL', 'PID_URL', 'USE_PY', 'FORCE_UP','JS_MODE', 'JS0_DISABLE', 'JS0_PASSWORD', + conf_list = ['LIVE_URL', 'LIVE_MODE','ZB_PLAYER', 'PLAY_URL', 'PID_URL', 'USE_PY', 'FORCE_UP','JS_MODE', 'JS0_DISABLE', 'JS0_PASSWORD', 'PLAY_DISABLE', 'LAZYPARSE_MODE', 'WALL_PAPER_ENABLE', 'WALL_PAPER', 'UNAME', 'PWD', 'CATE_EXCLUDE', 'TAB_EXCLUDE', 'SEARCH_TIMEOUT', 'SEARCH_LIMIT', 'MULTI_MODE', 'XR_MODE', 'JS_PROXY', 'UPDATE_PROXY', 'ENV', 'SPECIAL', 'SPIDER_JAR', 'EXT_FUNC', 'JS_MAX_LENGTH', 'ALI_TOKEN', 'OCR_API'] - conf_name_list = ['直播地址', '直播模式', '远程地址', '进程管理链接', '启用py源','强制下载', 'js模式', '禁用js0', + conf_name_list = ['直播地址', '直播模式', '播放器','远程地址', '进程管理链接', '启用py源','强制下载', 'js模式', '禁用js0', 'js0密码', '禁用免嗅', '免嗅模式', '启用壁纸', '壁纸链接', '管理账号', '管理密码', '分类排除', '线路排除', '聚搜超时', '搜索条数', '多源模式', '仙人模式', '源代理', '升级代理', '环境变量', '优选源', '挂载JAR', '辅助规则', '源体积', '阿里tk', 'OCR接口'] diff --git a/doc/更新日志.md b/doc/更新日志.md index 8ef869b..1cbaa41 100644 --- a/doc/更新日志.md +++ b/doc/更新日志.md @@ -1,5 +1,6 @@ ###### 2023/11/23 - [X] 3.9.49beta6 检测升级逻辑优化，增加强制下载逻辑开关 +- [X] 3.9.49beta7 增加网页直播的播放器选择功能 ###### 2023/11/22 - [X] 3.9.49beta1 增加网页直播功能 - [X] 3.9.49beta2 修复post搜索兼容性。带#传递搜索参数将不再处理[]逻辑 diff --git a/js/version.txt b/js/version.txt index b2afa1e..8e54ff2 100644 --- a/js/version.txt +++ b/js/version.txt @@ -1 +1 @@ -3.9.49beta6 \ No newline at end of file +3.9.49beta7 \ No newline at end of file diff --git a/templates/lives.html b/templates/lives.html index 12a145d..554ad2e 100644 --- a/templates/lives.html +++ b/templates/lives.html @@ -51,7 +51,7 @@
{% for live in lives %}
- +

{{ live.title }}
diff --git a/templates/settings.html b/templates/settings.html index 0fb2fab..a9d0fc7 100644 --- a/templates/settings.html +++ b/templates/settings.html @@ -140,9 +140,9 @@ {{ conf.name }}: - {% if conf.key!="SPIDER_JAR" %} + {% if conf.key not in ["SPIDER_JAR","ZB_PLAYER"] %} - {% else %} + {% elif conf.key=="SPIDER_JAR" %} + {% elif conf.key=="ZB_PLAYER" %} + + {% endif %} 编辑 保存