diff --git a/app.py b/app.py index 6faa41de34a4c8a2b4e772efb542bd7dcb6dc4cf..3b67766356588f915692c2e4a54922b6d95f791a 100644 --- a/app.py +++ b/app.py @@ -404,13 +404,25 @@ def random_pics(): else: return redirect(config.WALL_PAPER) +def get_live_url(new_conf,mode): + host = getHost(mode) + live_url = host + '/lives' if new_conf.get('LIVE_MODE', + 1) == 0 else 'https://gitcode.net/qq_26898231/TVBox/-/raw/main/live/0830zb.txt' + live_url = base64Encode(live_url) + return live_url + @app.route('/config/') def config_render(mode): # print(dict(app.config)) if mode == 1: jyw_ip = getHost(mode) logger.info(jyw_ip) - html = render_template('config.txt',rules=getRules('js'),host=getHost(mode),mode=mode,jxs=getJxs(),base64Encode=base64Encode,config=dict(app.config)) + new_conf = dict(app.config) + host = getHost(mode) + jxs = getJxs() + live_url = get_live_url(new_conf,mode) + # html = render_template('config.txt',rules=getRules('js'),host=host,mode=mode,jxs=jxs,base64Encode=base64Encode,config=new_conf) + html = render_template('config.txt',rules=getRules('js'),host=host,mode=mode,jxs=jxs,live_url=live_url,config=new_conf) response = make_response(html) response.headers['Content-Type'] = 'application/json; charset=utf-8' return response @@ -432,10 +444,12 @@ def get_lives(): def config_gen(): # 生成文件 os.makedirs('txt',exist_ok=True) - jxs=getJxs() - set_local = render_template('config.txt',rules=getRules('js'),base64Encode=base64Encode,mode=0,host=getHost(0),jxs=jxs) - set_area = render_template('config.txt',rules=getRules('js'),base64Encode=base64Encode,mode=1,host=getHost(1),jxs=jxs) - set_online = render_template('config.txt',rules=getRules('js'),base64Encode=base64Encode,mode=1,host=getHost(2),jxs=jxs) + new_conf = dict(app.config) + jxs = getJxs() + set_local = render_template('config.txt',rules=getRules('js'),live_url=get_live_url(new_conf,0),mode=0,host=getHost(0),jxs=jxs) + print(set_local) + set_area = render_template('config.txt',rules=getRules('js'),live_url=get_live_url(new_conf,1),mode=1,host=getHost(1),jxs=jxs) + set_online = render_template('config.txt',rules=getRules('js'),live_url=get_live_url(new_conf,2),mode=1,host=getHost(2),jxs=jxs) with open('txt/pycms0.json','w+',encoding='utf-8') as f: set_dict = json.loads(set_local) f.write(json.dumps(set_dict,ensure_ascii=False,indent=4)) diff --git a/templates/config.txt b/templates/config.txt index 38f2450d69832cc648982ca6c82642e193f32a7d..3a0f55a0b39979d3e330999c015da47aaee33a58 100644 --- a/templates/config.txt +++ b/templates/config.txt @@ -48,7 +48,7 @@ }{% if loop.last==False %},{% endif %}{% endfor %} ], "flags": ["youku", "qq", "iqiyi", "qiyi", "letv", "sohu", "tudou","xigua","cntv","1905", "pptv", "mgtv", "wasu", "bilibili", "renrenmi"], -"lives":[{"group":"redirect","channels":[{"name":"直播","urls":["proxy://do=live&type=txt&ext={% if config.LIVE_MODE==0 %}{{base64Encode(host+'/lives')}}{% else %}{{ base64Encode('https://gitcode.net/qq_26898231/TVBox/-/raw/main/live/0830zb.txt')}}{% endif %}"]}]}], +"lives":[{"group":"redirect","channels":[{"name":"直播","urls":["proxy://do=live&type=txt&ext={{live_url}}"]}]}], "ijk": [{ "group": "软解码", "options": [{ diff --git a/txt/issue.txt b/txt/issue.txt index 205ad97278b1bab3bba8ad14f09257f23682199d..efb3086256da9c9c51ef5045ebb4f14c591aa2e1 100644 --- a/txt/issue.txt +++ b/txt/issue.txt @@ -18,5 +18,6 @@ assert subprocess.call( 下面格式原版tv_box才能用? "live","urls":["proxy://do=live&type=txt&ext=aHR0cHM6Ly9naXRjb2RlLm5ldC9xcV8yNjg5ODIzMS9UVkJveC8tL3Jhdy9tYWluL2xpdmUvMDgzMHpiLnR4dA=="]}]}], "lives":[{"group":"redirect","channels":[{"name":"直播","urls":["proxy://do=live&type=txt&ext={{ base64Encode(host+'/lives') }}"]}]}], +"lives":[{"group":"redirect","channels":[{"name":"直播","urls":["proxy://do=live&type=txt&ext={% if config.LIVE_MODE==0 %}{{base64Encode(host+'/lives')}}{% else %}{{ base64Encode('https://gitcode.net/qq_26898231/TVBox/-/raw/main/live/0830zb.txt')}}{% endif %}"]}]}], diff --git a/txt/pycms0.json b/txt/pycms0.json index e7533abf70f5a6e15a5b0536b6d0e809c50fcedb..16feb770c512d4d27012ce14fc6fbdcd920f2250 100644 --- a/txt/pycms0.json +++ b/txt/pycms0.json @@ -579,7 +579,7 @@ { "name": "直播", "urls": [ - "proxy://do=live&type=txt&ext=aHR0cDovL2xvY2FsaG9zdDo1NzA1L2xpdmVz" + "proxy://do=live&type=txt&ext=aHR0cHM6Ly9naXRjb2RlLm5ldC9xcV8yNjg5ODIzMS9UVkJveC8tL3Jhdy9tYWluL2xpdmUvMDgzMHpiLnR4dA==" ] } ] diff --git a/txt/pycms1.json b/txt/pycms1.json index 47e2bf49ce12c2e1651751f8925bfdabe65c9cc1..6c786901104303ceb105fbfd55d8bf1cdc4fff48 100644 --- a/txt/pycms1.json +++ b/txt/pycms1.json @@ -579,7 +579,7 @@ { "name": "直播", "urls": [ - "proxy://do=live&type=txt&ext=aHR0cDovLzE5Mi4xNjguMTAuOTk6NTcwNS9saXZlcw==" + "proxy://do=live&type=txt&ext=aHR0cHM6Ly9naXRjb2RlLm5ldC9xcV8yNjg5ODIzMS9UVkJveC8tL3Jhdy9tYWluL2xpdmUvMDgzMHpiLnR4dA==" ] } ] diff --git a/txt/pycms2.json b/txt/pycms2.json index 1925b71c27b10f22d1447e45cd4e44ff13235d76..ea1845dc40cb8b379115d06b3d1521787aafe7b0 100644 --- a/txt/pycms2.json +++ b/txt/pycms2.json @@ -579,7 +579,7 @@ { "name": "直播", "urls": [ - "proxy://do=live&type=txt&ext=aHR0cDovL2Ntcy5ub2tpYS5wcmVzcy9saXZlcw==" + "proxy://do=live&type=txt&ext=aHR0cHM6Ly9naXRjb2RlLm5ldC9xcV8yNjg5ODIzMS9UVkJveC8tL3Jhdy9tYWluL2xpdmUvMDgzMHpiLnR4dA==" ] } ]