diff --git a/base/config.py b/base/config.py index 6883e17832b727ed774bd7d73b2c766e0cfbfaf8..50e7a9c8a75bdb3bc0fdc4cb5a55cab154bc2393 100644 --- a/base/config.py +++ b/base/config.py @@ -31,6 +31,7 @@ RETRY_CNT = 3 # 验证码重试次数 OCR_API = 'http://dm.mudery.com:10000' # 验证码识别接口,传参数data UNAME = 'admin' # 管理员账号 PWD = 'drpy' # 管理员密码 +USE_PY = 0 # 开启py源 MAX_CONTENT_LENGTH = 1 * 1024 * 1024/100 # 100 kB LIVE_MODE = 0 # 0 本地 1外网 LIVE_URL = 'https://gitcode.net/qq_26898231/TVBox/-/raw/main/live/zb.txt' # 初始化外网直播地址(后续在管理界面改) diff --git a/controllers/admin.py b/controllers/admin.py index dc4862be7b3e8de0fbd78f7d1f206f912d82d82c..1f697504981082cdf43c18d9ada423abdc5467e0 100644 --- a/controllers/admin.py +++ b/controllers/admin.py @@ -33,11 +33,13 @@ admin = Blueprint("admin", __name__) def admin_index(): # 管理员界面 lsg = storage_service() live_url = lsg.getItem('LIVE_URL') + use_py = lsg.getItem('USE_PY') print(f'live_url:',live_url) if not verfy_token(): return render_template('login.html') + live_url = lsg.getItem('LIVE_URL') - return render_template('admin.html', rules=getRules('js'), ver=getLocalVer(), live_url=live_url) + return render_template('admin.html', pystate=use_py,rules=getRules('js'), ver=getLocalVer(), live_url=live_url) @admin.route("/view/",methods=['GET']) def admin_view_rule(name): @@ -115,6 +117,27 @@ def admin_write_live_url(): msg = f'已修改的配置记录id为:{id}' return R.success(msg) +@admin.route('/change_use_py') +def admin_change_use_py(): + if not verfy_token(): + return R.failed('请登录后再试') + lsg = storage_service() + use_py = lsg.getItem('USE_PY') + new_use_py = '' if use_py else '1' + state = '开启' if new_use_py else '关闭' + id = lsg.setItem('USE_PY', new_use_py) + msg = f'已修改的配置记录id为:{id},结果为{state}' + return R.success(msg) + +# @admin.route('/get_use_py') +# def admin_get_use_py(): +# if not verfy_token(): +# return R.failed('请登录后再试') +# lsg = storage_service() +# use_py = lsg.getItem('USE_PY') +# state = 1 if use_py else 0 +# return R.success(state) + @admin.route('/upload', methods=['GET', 'POST']) def upload_file(): if not verfy_token(): diff --git a/controllers/home.py b/controllers/home.py index e21e569d3fd54c7ac914b6eedb6cb55f569b1e23..b45e5fd71bb491f084ee7d96c43749bdd4cc2bbe 100644 --- a/controllers/home.py +++ b/controllers/home.py @@ -180,8 +180,11 @@ def config_render(mode): except Exception as e: logger.info(f'用户自定义配置加载失败:{e}') jxs = getJxs() - pys = getPys() - print(pys) + lsg = storage_service() + use_py = lsg.getItem('USE_PY') + # pys = getPys() if cfg.get('USE_PY') else [] + pys = getPys() if use_py else [] + # print(pys) alists = getAlist() alists_str = json.dumps(alists, ensure_ascii=False) live_url = get_live_url(new_conf,mode) @@ -201,7 +204,10 @@ def config_gen(): os.makedirs('txt',exist_ok=True) new_conf = cfg jxs = getJxs() - pys = getPys() + # pys = getPys() if cfg.get('USE_PY') else [] + lsg = storage_service() + use_py = lsg.getItem('USE_PY') + pys = getPys() if use_py else False alists = getAlist() alists_str = json.dumps(alists,ensure_ascii=False) set_local = render_template('config.txt',pys=pys,rules=getRules('js'),alists=alists,alists_str=alists_str,live_url=get_live_url(new_conf,0),mode=0,host=getHost(0),jxs=jxs) diff --git a/controllers/service.py b/controllers/service.py index 0c74244928fdee725bbe8d39f89f766980fa82d6..b7d44af5d090839c7b5a0c120c1fbd68630664fe 100644 --- a/controllers/service.py +++ b/controllers/service.py @@ -21,6 +21,10 @@ class storage_service(object): print('开始初始化lsg') self.setItem('LIVE_URL', cfg.get('LIVE_URL')) + # if not self.getItem('USE_PY'): + # print('开始初始化USE_PY') + # self.setItem('USE_PY', '1' if cfg.get('USE_PY') else '') + @classmethod def getItem(self, key, value=''): return Storage.getItem(key,value) diff --git a/js/version.txt b/js/version.txt index 3ec370e154b23d02b25cd92d09634cee2ae75c04..81f1b89fea79f17010cedfba6db27160134a1882 100644 --- a/js/version.txt +++ b/js/version.txt @@ -1 +1 @@ -3.4.5 \ No newline at end of file +3.4.7 \ No newline at end of file diff --git a/models/rules.db b/models/rules.db index 7f162051936025886c761008807a1aafedec958d..fd82c28ca2ca2db7f55d5a6ca635e52a2d218de8 100644 Binary files a/models/rules.db and b/models/rules.db differ diff --git a/readme.md b/readme.md index 832b2fd07ddd9aece615a79d9e08ff68fbe60d1f..4af220253294fda7e8f0d4f7922e39d5dc0fabe4 100644 --- a/readme.md +++ b/readme.md @@ -48,7 +48,8 @@ [获取本地设备信息](https://m.jb51.net/article/140716.htm) ###### 2022/09/10 - [X] 1.升级至3.4.4.增加小强迷源,增加二级重定向属性(提供重定向后的源码,让代码重新取重定向过后的线路和播放列表) -- [X] 1.升级至3.4.5.增加兔小贝儿歌源,优化json:细节处理以及详情页拼接细节 +- [X] 2.升级至3.4.5.增加兔小贝儿歌源,优化json:细节处理以及详情页拼接细节 +- [X] 3.升级至3.4.7 后台管理增加了py源开关 ###### 2022/09/09 - [X] 1.增加西瓜源,修复一级不支持lazy的bug - [X] 2.兄弟们dockerhub没法push镜像不知道咋回事,3.4.1的镜像自己用docker目录下的文件build吧 diff --git a/templates/admin.html b/templates/admin.html index adcb5b8f41cce14115d2f9de828566e34243f3d9..99b77034e80f800245f7ca7baebf450792173e55 100644 --- a/templates/admin.html +++ b/templates/admin.html @@ -164,6 +164,20 @@ } }); + $('#use_py').click(function (){ + $.get("/admin/change_use_py",function(data,status){ + console.log(data); + if(data.code === 200){ + alert(data.msg); + location.reload(); + }else{ + alert(data.msg); + console.log('升级失败了...'); + return false + } + }); + }); + }); function getFileSize(fileObj) { $('#file_size').text('文件大小为:'+fileObj.files[0].size/1024+'kb'); @@ -184,6 +198,8 @@ function getFileSize(fileObj) { id="write_lives">修改直播源 + diff --git a/templates/config.txt b/templates/config.txt index 1f18e0a67b2d9b01b51ed743a7c413212a204830..01a1ac8d59de670f9b94d2ddb29465a97d512a45 100644 --- a/templates/config.txt +++ b/templates/config.txt @@ -24,6 +24,7 @@ "quickSearch": {{ rule.quickSearch }}, "filterable": {{ rule.filterable }} }{% endif %}{% if loop.last==False %},{% endif %}{% endfor %} +{% if pys %} ,{% for py in pys %}{ "key":"{{ py.name }}", "name":"{{ py.name }}(Pyramid)", @@ -34,6 +35,7 @@ "filterable": {{ py.filterable }}, "ext": "{{ host }}/txt/py/{{ py.name }}.py" }{% if loop.last==False %},{% endif %}{% endfor %} +{% endif %} ], "parses": [{ "name": "🌐Ⓤ", diff --git a/txt/pycms0.json b/txt/pycms0.json index b95ea2e65f0e0247f68a7d8116e985c75997b5eb..038aa70fd3f7277982d797594208102bf73f82c4 100644 --- a/txt/pycms0.json +++ b/txt/pycms0.json @@ -1,6 +1,6 @@ { "wallpaper": "http://localhost:5705/pics", - "dr_count": 28, + "dr_count": 30, "mode": 0, "spider": "http://localhost:5705/liveslib", "drives": [ @@ -204,6 +204,15 @@ "quickSearch": 1, "filterable": 0 }, + { + "key": "dr_兔小贝", + "name": "兔小贝(道长)", + "type": 1, + "api": "http://localhost:5705/vod?rule=兔小贝", + "searchable": 1, + "quickSearch": 0, + "filterable": 0 + }, { "key": "dr_养端", "name": "养端(道长)", @@ -267,6 +276,15 @@ "quickSearch": 1, "filterable": 0 }, + { + "key": "dr_小强迷", + "name": "小强迷(道长)", + "type": 1, + "api": "http://localhost:5705/vod?rule=小强迷", + "searchable": 1, + "quickSearch": 1, + "filterable": 0 + }, { "key": "dr_小猫咪", "name": "小猫咪(道长)", diff --git a/txt/pycms1.json b/txt/pycms1.json index 4e449711f4625d6e567c60d85241214f77b44c5d..dbea2e5a40038834310b76bfe011f1eaad480d19 100644 --- a/txt/pycms1.json +++ b/txt/pycms1.json @@ -1,6 +1,6 @@ { "wallpaper": "http://192.168.3.224:5705/pics", - "dr_count": 28, + "dr_count": 30, "mode": 1, "spider": "http://192.168.3.224:5705/liveslib", "drives": [ @@ -204,6 +204,15 @@ "quickSearch": 1, "filterable": 0 }, + { + "key": "dr_兔小贝", + "name": "兔小贝(道长)", + "type": 1, + "api": "http://192.168.3.224:5705/vod?rule=兔小贝", + "searchable": 1, + "quickSearch": 0, + "filterable": 0 + }, { "key": "dr_养端", "name": "养端(道长)", @@ -267,6 +276,15 @@ "quickSearch": 1, "filterable": 0 }, + { + "key": "dr_小强迷", + "name": "小强迷(道长)", + "type": 1, + "api": "http://192.168.3.224:5705/vod?rule=小强迷", + "searchable": 1, + "quickSearch": 1, + "filterable": 0 + }, { "key": "dr_小猫咪", "name": "小猫咪(道长)", diff --git a/txt/pycms2.json b/txt/pycms2.json index 8606bf9881346b2d4da4d69ca43e3b71ebcb3cf4..e5b8c6e848a1826bd55525952e271b16a36d2165 100644 --- a/txt/pycms2.json +++ b/txt/pycms2.json @@ -1,6 +1,6 @@ { "wallpaper": "http://cms.nokia.press/pics", - "dr_count": 28, + "dr_count": 30, "mode": 1, "spider": "http://cms.nokia.press/liveslib", "drives": [ @@ -204,6 +204,15 @@ "quickSearch": 1, "filterable": 0 }, + { + "key": "dr_兔小贝", + "name": "兔小贝(道长)", + "type": 1, + "api": "http://cms.nokia.press/vod?rule=兔小贝", + "searchable": 1, + "quickSearch": 0, + "filterable": 0 + }, { "key": "dr_养端", "name": "养端(道长)", @@ -267,6 +276,15 @@ "quickSearch": 1, "filterable": 0 }, + { + "key": "dr_小强迷", + "name": "小强迷(道长)", + "type": 1, + "api": "http://cms.nokia.press/vod?rule=小强迷", + "searchable": 1, + "quickSearch": 1, + "filterable": 0 + }, { "key": "dr_小猫咪", "name": "小猫咪(道长)",