diff --git a/controllers/home.py b/controllers/home.py index ae32e1b3fa00a908228688ab662acb9c74922bf0..18635ef2681f788ebfe6049592b0288723abd019 100644 --- a/controllers/home.py +++ b/controllers/home.py @@ -225,10 +225,11 @@ def config_gen(): 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) - print(set_local) - set_area = render_template('config.txt',pys=pys,rules=getRules('js'),alists=alists,alists_str=alists_str,live_url=get_live_url(new_conf,1),mode=1,host=getHost(1),jxs=jxs) - set_online = render_template('config.txt',pys=pys,rules=getRules('js'),alists=alists,alists_str=alists_str,live_url=get_live_url(new_conf,2),mode=1,host=getHost(2),jxs=jxs) + rules = getRules('js') + set_local = render_template('config.txt',pys=pys,rules=rules,alists=alists,alists_str=alists_str,live_url=get_live_url(new_conf,0),mode=0,host=getHost(0),jxs=jxs) + # print(set_local) + set_area = render_template('config.txt',pys=pys,rules=rules,alists=alists,alists_str=alists_str,live_url=get_live_url(new_conf,1),mode=1,host=getHost(1),jxs=jxs) + set_online = render_template('config.txt',pys=pys,rules=rules,alists=alists,alists_str=alists_str,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: customConfig = getCustonDict(0) set_dict = custom_merge(parseText(set_local), customConfig) diff --git a/js/rules.py b/js/rules.py index 19f9ce9974e2b939e5373b483a646a09fdc710e8..1422b1928329515d81262b8862aaa17681a74c08 100644 --- a/js/rules.py +++ b/js/rules.py @@ -44,7 +44,9 @@ def getRules(path='cache'): js = js_path[i] with open(js,encoding='utf-8') as f: code = f.read() - codes.append(code.replace('rule',f'rule{i}',1)) + new_code = 'var muban = JSON.parse(JSON.stringify(mubanDict));\n'+code.replace('rule',f'rule{i}',1) + # new_code = ''+code.replace('rule',f'rule{i}',1) + codes.append(new_code) newCodes = before + '\n'+ '\n'.join(codes) # print(newCodes) ctx.execute(newCodes) diff --git "a/js/\345\205\224\345\260\217\350\264\235.js" "b/js/\345\205\224\345\260\217\350\264\235.js" index 5bd6e9eb395703aa08208d317d9cdfd45052bb1e..e63105e825810bec102f3be710760c4b556b71f8 100644 --- "a/js/\345\205\224\345\260\217\350\264\235.js" +++ "b/js/\345\205\224\345\260\217\350\264\235.js" @@ -23,4 +23,5 @@ var rule = { 二级:'*', 搜索:'.list-con&&.items;.text&&Text;mip-img&&src;.time&&Text;a&&href', quickSearch:0, + searchable:1, } \ No newline at end of file diff --git "a/js/\345\245\207\347\217\215\345\274\202\345\205\275.js" "b/js/\345\245\207\347\217\215\345\274\202\345\205\275.js" index 9105ce4b9a57610457f3a18d7af2cbeb8cae0462..4dd789210de7aa5a634892826ec421d16edb03e7 100644 --- "a/js/\345\245\207\347\217\215\345\274\202\345\205\275.js" +++ "b/js/\345\245\207\347\217\215\345\274\202\345\205\275.js" @@ -5,6 +5,7 @@ var rule = { // detailUrl:'https://pcw-api.iqiyi.com/albums/album/avlistinfo?aid=fyid&size=2000&page=1', detailUrl:'https://pcw-api.iqiyi.com/video/video/videoinfowithuser/fyid?agent_type=1&authcookie=&subkey=fyid&subscribe=1', searchUrl:'https://search.video.iqiyi.com/o?if=html5&key=**&pageNum=fypage&pos=1&pageSize=24&site=iqiyi', + searchable:1, filterable:1, filter:{'1': [{'key': 'mode', 'name': '综合排序', 'value': [{'n': '全部', 'v': ''}, {'n': '热播榜', 'v': 11}, {'n': '好评榜', 'v': 8}, {'n': '新上线', 'v': 4}]}, {'key': 'year', 'name': '全部年份', 'value': [{'n': '全部', 'v': ''}, {'n': '2022', 'v': 2022}, {'n': '2021', 'v': 2021}, {'n': '2020', 'v': 2020}, {'n': '2019', 'v': 2019}, {'n': '2018', 'v': 2018}, {'n': '2017', 'v': 2017}, {'n': '2016-2011', 'v': '2011_2016'}, {'n': '2010-2000', 'v': '2000_2010'}, {'n': '90年代', 'v': '1990_1999'}, {'n': '80年代', 'v': '1980_1989'}, {'n': '更早', 'v': '1964_1979'}]}, {'key': 'is_purchase', 'name': '全部资费', 'value': [{'n': '全部', 'v': ''}, {'n': '免费', 'v': 0}, {'n': '会员', 'v': 1}, {'n': '付费', 'v': 2}]}, {'key': 'three_category_id', 'name': '地区', 'value': [{'n': '全部', 'v': ''}, {'n': '华语', 'v': 1}, {'n': '香港地区', 'v': 28997}, {'n': '美国', 'v': 2}, {'n': '欧洲', 'v': 3}, {'n': '韩国', 'v': 4}, {'n': '日本', 'v': 308}, {'n': '泰国', 'v': 1115}, {'n': '印度', 'v': 28999}, {'n': '其它', 'v': 5}]}, {'key': '18001', 'name': '类型', 'value': [{'n': '全部', 'v': ''}, {'n': '喜剧', 'v': 8}, {'n': '爱情', 'v': 6}, {'n': '动作', 'v': 11}, {'n': '枪战', 'v': 131}, {'n': '犯罪', 'v': 291}, {'n': '惊悚', 'v': 128}, {'n': '恐怖', 'v': 10}, {'n': '悬疑', 'v': 289}, {'n': '动画', 'v': 12}, {'n': '家庭', 'v': 27356}, {'n': '奇幻', 'v': 1284}, {'n': '魔幻', 'v': 129}, {'n': '科幻', 'v': 9}, {'n': '战争', 'v': 7}, {'n': '青春', 'v': 130}]}, {'key': '27396', 'name': '规格', 'value': [{'n': '全部', 'v': ''}, {'n': '巨制', 'v': 27397}, {'n': '院线', 'v': 27815}, {'n': '独播', 'v': 30149}, {'n': '网络电影', 'v': 27401}]}], '2': [{'key': 'mode', 'name': '综合排序', 'value': [{'n': '全部', 'v': ''}, {'n': '热播榜', 'v': 11}, {'n': '好评榜', 'v': 8}, {'n': '新上线', 'v': 4}]}, {'key': 'year', 'name': '全部年份', 'value': [{'n': '全部', 'v': ''}, {'n': '2022', 'v': 2022}, {'n': '2021', 'v': 2021}, {'n': '2020', 'v': 2020}, {'n': '2019', 'v': 2019}, {'n': '2018', 'v': 2018}, {'n': '2017', 'v': 2017}, {'n': '2016-2011', 'v': '2011_2016'}, {'n': '2010-2000', 'v': '2000_2010'}, {'n': '90年代', 'v': '1990_1999'}, {'n': '80年代', 'v': '1980_1989'}, {'n': '更早', 'v': '1964_1979'}]}, {'key': 'is_purchase', 'name': '全部资费', 'value': [{'n': '全部', 'v': ''}, {'n': '免费', 'v': 0}, {'n': '会员', 'v': 1}, {'n': '付费', 'v': 2}]}, {'key': 'three_category_id', 'name': '地区', 'value': [{'n': '全部', 'v': ''}, {'n': '内地', 'v': 15}, {'n': '港剧', 'v': 16}, {'n': '韩剧', 'v': 17}, {'n': '美剧', 'v': 18}, {'n': '日剧', 'v': 309}, {'n': '泰剧', 'v': 1114}, {'n': '台湾地区', 'v': 1117}, {'n': '英剧', 'v': 28916}, {'n': '其它', 'v': 19}]}, {'key': '18003', 'name': '类型', 'value': [{'n': '全部', 'v': ''}, {'n': '自制', 'v': 11992}, {'n': '古装', 'v': 24}, {'n': '言情', 'v': 20}, {'n': '武侠', 'v': 23}, {'n': '偶像', 'v': 30}, {'n': '家庭', 'v': 1654}, {'n': '青春', 'v': 1653}, {'n': '都市', 'v': 24064}, {'n': '喜剧', 'v': 135}, {'n': '战争', 'v': 27916}, {'n': '军旅', 'v': 1655}, {'n': '谍战', 'v': 290}, {'n': '悬疑', 'v': 32}, {'n': '罪案', 'v': 149}, {'n': '穿越', 'v': 148}, {'n': '宫廷', 'v': 139}, {'n': '历史', 'v': 21}, {'n': '神话', 'v': 145}, {'n': '科幻', 'v': 34}, {'n': '年代', 'v': 27}, {'n': '农村', 'v': 29}, {'n': '商战', 'v': 140}, {'n': '剧情', 'v': 24063}, {'n': '奇幻', 'v': 27881}, {'n': '网剧', 'v': 24065}, {'n': '竖短片', 'v': 32839}]}], '3': [{'key': 'mode', 'name': '综合排序', 'value': [{'n': '全部', 'v': ''}, {'n': '热播榜', 'v': 11}, {'n': '好评榜', 'v': 8}, {'n': '新上线', 'v': 4}]}, {'key': 'year', 'name': '全部年份', 'value': [{'n': '全部', 'v': ''}, {'n': '2022', 'v': 2022}, {'n': '2021', 'v': 2021}, {'n': '2020', 'v': 2020}, {'n': '2019', 'v': 2019}, {'n': '2018', 'v': 2018}, {'n': '2017', 'v': 2017}, {'n': '2016-2011', 'v': '2011_2016'}, {'n': '2010-2000', 'v': '2000_2010'}, {'n': '90年代', 'v': '1990_1999'}, {'n': '80年代', 'v': '1980_1989'}, {'n': '更早', 'v': '1964_1979'}]}, {'key': 'is_purchase', 'name': '全部资费', 'value': [{'n': '全部', 'v': ''}, {'n': '免费', 'v': 0}, {'n': '会员', 'v': 1}, {'n': '付费', 'v': 2}]}, {'key': 'three_category_id', 'name': '地区', 'value': [{'n': '全部', 'v': ''}, {'n': '国内', 'v': 20323}, {'n': '国外', 'v': 20324}]}, {'key': '18004', 'name': '类型', 'value': [{'n': '全部', 'v': ''}, {'n': '人文', 'v': 70}, {'n': '美食', 'v': 33908}, {'n': '医疗', 'v': 33924}, {'n': '自然', 'v': 33933}, {'n': '萌宠', 'v': 33945}, {'n': '财经', 'v': 33953}, {'n': '罪案', 'v': 33960}, {'n': '竞技', 'v': 33967}, {'n': '灾难', 'v': 33974}, {'n': '军事', 'v': 72}, {'n': '历史', 'v': 74}, {'n': '探险', 'v': 73}, {'n': '社会', 'v': 71}, {'n': '科技', 'v': 28119}, {'n': '旅游', 'v': 310}]}, {'key': '28467', 'name': '出品方', 'value': [{'n': '全部', 'v': ''}, {'n': 'BBC', 'v': 28468}, {'n': '美国历史频道', 'v': 28470}, {'n': '探索频道', 'v': 28471}, {'n': '央视记录', 'v': 28472}, {'n': '北京纪实频道', 'v': 28473}, {'n': '上海纪实频道', 'v': 28474}, {'n': '朗思文化', 'v': 28476}, {'n': 'CNEX', 'v': 28477}, {'n': '五星传奇', 'v': 28478}, {'n': 'IMG', 'v': 28479}, {'n': 'NHK', 'v': 28480}, {'n': '爱奇艺出品', 'v': 31283}, {'n': 'Netflix', 'v': 31286}]}, {'key': '29076', 'name': '片种', 'value': [{'n': '全部', 'v': ''}, {'n': '纪录电影', 'v': 29077}, {'n': '系列纪录片', 'v': 29078}, {'n': '网络纪录片', 'v': 29082}, {'n': '纪实栏目', 'v': 29083}]}, {'key': '31294', 'name': '时长', 'value': [{'n': '全部', 'v': ''}, {'n': '微纪录', 'v': 29079}, {'n': '长纪录', 'v': 29080}, {'n': '短纪录', 'v': 29081}]}], '4': [{'key': 'mode', 'name': '综合排序', 'value': [{'n': '全部', 'v': ''}, {'n': '热播榜', 'v': 11}, {'n': '好评榜', 'v': 8}, {'n': '新上线', 'v': 4}]}, {'key': 'year', 'name': '全部年份', 'value': [{'n': '全部', 'v': ''}, {'n': '2022', 'v': 2022}, {'n': '2021', 'v': 2021}, {'n': '2020', 'v': 2020}, {'n': '2019', 'v': 2019}, {'n': '2018', 'v': 2018}, {'n': '2017', 'v': 2017}, {'n': '2016-2011', 'v': '2011_2016'}, {'n': '2010-2000', 'v': '2000_2010'}, {'n': '90年代', 'v': '1990_1999'}, {'n': '80年代', 'v': '1980_1989'}, {'n': '更早', 'v': '1964_1979'}]}, {'key': 'is_purchase', 'name': '全部资费', 'value': [{'n': '全部', 'v': ''}, {'n': '免费', 'v': 0}, {'n': '会员', 'v': 1}, {'n': '付费', 'v': 2}]}, {'key': 'three_category_id', 'name': '地区', 'value': [{'n': '全部', 'v': ''}, {'n': '中国大陆', 'v': 37}, {'n': '日本', 'v': 38}, {'n': '韩国', 'v': 1106}, {'n': '欧美', 'v': 30218}, {'n': '其它', 'v': 40}]}, {'key': '30219', 'name': '版本', 'value': [{'n': '全部', 'v': ''}, {'n': '动画', 'v': 30220}, {'n': '特摄', 'v': 30223}, {'n': '布袋戏', 'v': 30224}, {'n': '特别篇', 'v': 32782}, {'n': '动态漫画', 'v': 32783}, {'n': '动画电影', 'v': 32784}, {'n': '竖版视频', 'v': 32785}, {'n': '轻动画', 'v': 33482}, {'n': '短剧', 'v': 33483}]}, {'key': '30225', 'name': '风格', 'value': [{'n': '全部', 'v': ''}, {'n': '搞笑', 'v': 30230}, {'n': '热血', 'v': 30232}, {'n': '催泪', 'v': 30233}, {'n': '治愈', 'v': 30234}, {'n': '励志', 'v': 30237}, {'n': '机战', 'v': 30241}, {'n': '恋爱', 'v': 30243}, {'n': '科幻', 'v': 30245}, {'n': '奇幻', 'v': 30247}, {'n': '推理', 'v': 30248}, {'n': '校园', 'v': 30249}, {'n': '日常', 'v': 30252}, {'n': '历史', 'v': 30254}, {'n': '美食', 'v': 30255}, {'n': '职场', 'v': 30256}, {'n': '偶像', 'v': 30258}, {'n': '泡面', 'v': 30265}, {'n': '冒险', 'v': 30267}, {'n': '竞技', 'v': 30268}, {'n': '合家欢', 'v': 30270}, {'n': '武侠', 'v': 32792}, {'n': '玄幻', 'v': 32793}]}, {'key': '32795', 'name': '新类型', 'value': [{'n': '全部', 'v': ''}, {'n': '轻小说改编', 'v': 32796}, {'n': '漫画改编', 'v': 32797}, {'n': '游戏改编', 'v': 32798}, {'n': '原创', 'v': 32799}]}], '6': [{'key': 'mode', 'name': '综合排序', 'value': [{'n': '全部', 'v': ''}, {'n': '热播榜', 'v': 11}, {'n': '好评榜', 'v': 8}, {'n': '新上线', 'v': 4}]}, {'key': 'year', 'name': '全部年份', 'value': [{'n': '全部', 'v': ''}, {'n': '2022', 'v': 2022}, {'n': '2021', 'v': 2021}, {'n': '2020', 'v': 2020}, {'n': '2019', 'v': 2019}, {'n': '2018', 'v': 2018}, {'n': '2017', 'v': 2017}, {'n': '2016-2011', 'v': '2011_2016'}, {'n': '2010-2000', 'v': '2000_2010'}, {'n': '90年代', 'v': '1990_1999'}, {'n': '80年代', 'v': '1980_1989'}, {'n': '更早', 'v': '1964_1979'}]}, {'key': 'is_purchase', 'name': '全部资费', 'value': [{'n': '全部', 'v': ''}, {'n': '免费', 'v': 0}, {'n': '会员', 'v': 1}, {'n': '付费', 'v': 2}]}, {'key': 'three_category_id', 'name': '地区', 'value': [{'n': '全部', 'v': ''}, {'n': '内地', 'v': 151}, {'n': '港台', 'v': 152}, {'n': '韩国', 'v': 33306}, {'n': '欧美', 'v': 154}, {'n': '其它', 'v': 1113}]}, {'key': '18014', 'name': '类型', 'value': [{'n': '全部', 'v': ''}, {'n': '播报', 'v': 155}, {'n': '访谈', 'v': 156}, {'n': '游戏', 'v': 158}, {'n': '晚会', 'v': 292}, {'n': '曲艺', 'v': 293}, {'n': '脱口秀', 'v': 2118}, {'n': '真人秀', 'v': 2224}, {'n': '竞技', 'v': 30278}, {'n': '爱奇艺出品', 'v': 30279}, {'n': '竞演', 'v': 33860}]}, {'key': '33162', 'name': '题材', 'value': [{'n': '全部', 'v': ''}, {'n': '音乐', 'v': 33163}, {'n': '舞蹈', 'v': 33172}, {'n': '文化', 'v': 33173}, {'n': '美食', 'v': 33182}, {'n': '伦理', 'v': 33184}, {'n': '相亲', 'v': 33193}, {'n': '纪实', 'v': 33195}, {'n': '生活', 'v': 33196}, {'n': '亲子', 'v': 33197}, {'n': '少儿', 'v': 33198}, {'n': '财经', 'v': 33199}, {'n': '健康', 'v': 33200}, {'n': '时尚', 'v': 33203}, {'n': '旅游', 'v': 33205}, {'n': '教育', 'v': 33206}, {'n': '其它', 'v': 33220}, {'n': '爱情', 'v': 33316}, {'n': '搞笑', 'v': 33317}, {'n': '益智', 'v': 33318}, {'n': '职场', 'v': 33319}, {'n': '语言', 'v': 33530}, {'n': '辩论', 'v': 33531}, {'n': '演讲', 'v': 33843}]}], '5': [{'key': 'mode', 'name': '综合排序', 'value': [{'n': '全部', 'v': ''}, {'n': '热播榜', 'v': 11}, {'n': '好评榜', 'v': 8}, {'n': '新上线', 'v': 4}]}, {'key': 'year', 'name': '全部年份', 'value': [{'n': '全部', 'v': ''}, {'n': '2022', 'v': 2022}, {'n': '2021', 'v': 2021}, {'n': '2020', 'v': 2020}, {'n': '2019', 'v': 2019}, {'n': '2018', 'v': 2018}, {'n': '2017', 'v': 2017}, {'n': '2016-2011', 'v': '2011_2016'}, {'n': '2010-2000', 'v': '2000_2010'}, {'n': '90年代', 'v': '1990_1999'}, {'n': '80年代', 'v': '1980_1989'}, {'n': '更早', 'v': '1964_1979'}]}, {'key': 'is_purchase', 'name': '全部资费', 'value': [{'n': '全部', 'v': ''}, {'n': '免费', 'v': 0}, {'n': '会员', 'v': 1}, {'n': '付费', 'v': 2}]}, {'key': 'three_category_id', 'name': '地区', 'value': [{'n': '全部', 'v': ''}, {'n': '内地', 'v': 221}, {'n': '港台', 'v': 220}, {'n': '欧美', 'v': 219}, {'n': '日韩', 'v': 218}, {'n': '拉美', 'v': 217}, {'n': '亚洲地区', 'v': 216}, {'n': '非洲', 'v': 215}]}, {'key': '18009', 'name': '语种', 'value': [{'n': '全部', 'v': ''}, {'n': '普通话', 'v': 91}, {'n': '粤语', 'v': 92}, {'n': '闽南语', 'v': 93}, {'n': '英语', 'v': 94}, {'n': '日语', 'v': 95}, {'n': '韩语', 'v': 96}, {'n': '其它', 'v': 97}]}, {'key': '23554', 'name': '音乐类型', 'value': [{'n': '全部', 'v': ''}, {'n': '单曲MV', 'v': 23556}, {'n': '单曲现场', 'v': 23557}, {'n': '演唱会', 'v': 23558}, {'n': '新闻', 'v': 23559}, {'n': '访谈', 'v': 23560}, {'n': '音乐记录', 'v': 23561}, {'n': '音乐周边', 'v': 23562}, {'n': '音乐节目', 'v': 23563}, {'n': '影视原声', 'v': 23564}, {'n': '音乐短片', 'v': 23565}, {'n': '其他', 'v': 23566}]}], '16': [{'key': 'mode', 'name': '综合排序', 'value': [{'n': '全部', 'v': ''}, {'n': '热播榜', 'v': 11}, {'n': '好评榜', 'v': 8}, {'n': '新上线', 'v': 4}]}, {'key': 'year', 'name': '全部年份', 'value': [{'n': '全部', 'v': ''}, {'n': '2022', 'v': 2022}, {'n': '2021', 'v': 2021}, {'n': '2020', 'v': 2020}, {'n': '2019', 'v': 2019}, {'n': '2018', 'v': 2018}, {'n': '2017', 'v': 2017}, {'n': '2016-2011', 'v': '2011_2016'}, {'n': '2010-2000', 'v': '2000_2010'}, {'n': '90年代', 'v': '1990_1999'}, {'n': '80年代', 'v': '1980_1989'}, {'n': '更早', 'v': '1964_1979'}]}, {'key': 'is_purchase', 'name': '全部资费', 'value': [{'n': '全部', 'v': ''}, {'n': '免费', 'v': 0}, {'n': '会员', 'v': 1}, {'n': '付费', 'v': 2}]}, {'key': '18061', 'name': '类型', 'value': [{'n': '全部', 'v': ''}, {'n': '喜剧', 'v': 1296}, {'n': '爱情', 'v': 1297}, {'n': '动作', 'v': 1298}, {'n': '奇幻', 'v': 1299}, {'n': '惊悚', 'v': 1300}, {'n': '悬疑', 'v': 1301}, {'n': '青春', 'v': 1302}]}]}, // url:'https://pcw-api.iqiyi.com/search/recommend/list?channel_id=fyclass&data_type=1&is_purchase=&mode=24&page_id=fypage&ret_num=48&three_category_id=', diff --git "a/js/\346\250\241\346\235\277.js" "b/js/\346\250\241\346\235\277.js" index 93699707e1c8e28bd759ccc75a43682c2eaeb10e..6447cebb050d41fc1757aa8d8a9dc1d2c5c17cb4 100644 --- "a/js/\346\250\241\346\235\277.js" +++ "b/js/\346\250\241\346\235\277.js" @@ -10,7 +10,7 @@ Object.assign = function () { } return target; }; -var muban = { +var mubanDict = { // 模板字典 mxpro:{ title:'', host:'', @@ -147,4 +147,5 @@ vfed:{ }, -}; \ No newline at end of file +}; +var muban = JSON.parse(JSON.stringify(mubanDict)); \ No newline at end of file diff --git "a/js/\350\205\276\344\272\221\351\251\276\351\233\276.js" "b/js/\350\205\276\344\272\221\351\251\276\351\233\276.js" index c319ac5f16298dc4da1605fe968e91b0fcaa3b61..34347237c384b4781bde9f7683a427f5561aade6 100644 --- "a/js/\350\205\276\344\272\221\351\251\276\351\233\276.js" +++ "b/js/\350\205\276\344\272\221\351\251\276\351\233\276.js" @@ -4,6 +4,7 @@ var rule = { homeUrl:'/channel/choice?listpage=1&channel=choice&sort=18&_all=1', detailUrl:'https://node.video.%71%71.com/x/api/float_vinfo2?cid=fyid', searchUrl:'https://node.video.%71%71.com/x/api/msearch?keyWord=**', + searchable:1, url:'/channel/fyclass?listpage=fypage&channel=fyclass&sort=18&_all=1', headers:{ 'User-Agent':'PC_UA' diff --git "a/js/\350\223\235\345\205\211\345\275\261\351\231\242.js" "b/js/\350\223\235\345\205\211\345\275\261\351\231\242.js" index f81ed50e700e29b7b3a9588f62cf584afa30235d..43dff7db82a8bedc0f5050e8c99a5593f2916123 100644 --- "a/js/\350\223\235\345\205\211\345\275\261\351\231\242.js" +++ "b/js/\350\223\235\345\205\211\345\275\261\351\231\242.js" @@ -2,6 +2,6 @@ var rule = Object.assign(muban.mxpro,{ title:'蓝光影院', host:'https://lgyy.cc', url:'/vodshow/fyclass--------fypage---.html', - searchUrl:'/vodsearch/**-------------.html', - class_parse:'.navbar-items li:gt(1):lt(6);a&&Text;a&&href;.*/(.*?).html', +searchUrl:'/vodsearch/**-------------.html', +class_parse:'.navbar-items li:gt(1):lt(6);a&&Text;a&&href;.*/(.*?).html', }); \ No newline at end of file diff --git a/readme.md b/readme.md index edde9725b5092bd756103715872b61d944a17af1..2fb590e56b447efccd4c296c92977566a5af2f16 100644 --- a/readme.md +++ b/readme.md @@ -49,6 +49,7 @@ ###### 2022/09/13 - [X] 1.升级至3.5.8 - [X] 2.迁移alist.conf文件,修改默认模板,增加模板url参数支持fyfilter变量从此支持更多筛选场景 +- [X] 3.升级至3.5.9,修复重大bug:模板继承导致的自动生成配置的搜索开关异常问题 ###### 2022/09/12 ###### 特别说明:仅pluto 1.4.2以上版本支持此项目的筛选及自定义播放免嗅 - [X] 1.升级至3.5.7 @@ -217,7 +218,7 @@ var rule = { quickSearch:0,//是否启用快速搜索, filterable:0,//是否启用筛选, filter:{},// 筛选条件字典 - // 筛选网站传参,会自动传到分类链接下(本示例中的url参数) + // 筛选网站传参,会自动传到分类链接下(本示例中的url参数)-url里参数为fyfilter,可参考蓝莓影视.js filter_url:'style={{fl.style}}&zone={{fl.zone}}&year={{fl.year}}&fee={{fl.fee}}&order={{fl.order}}', // 注意,由于猫有配置缓存,搜索配置没法热加载，修改了js不需要重启服务器 // 但是需要tv_box进设置里换源使配置重新装载 diff --git a/txt/pycms0.json b/txt/pycms0.json index dd8752627f147e4dc3b561290a5724dff5c59a6e..6804870beefcf2896c5ae787cbbce3a65e62880e 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": [ @@ -246,6 +246,15 @@ "type": 1, "api": "http://localhost:5705/vod?rule=夜空", "searchable": 1, + "quickSearch": 0, + "filterable": 0 + }, + { + "key": "dr_大米星球", + "name": "大米星球(道长)", + "type": 1, + "api": "http://localhost:5705/vod?rule=大米星球", + "searchable": 1, "quickSearch": 1, "filterable": 0 }, @@ -255,7 +264,7 @@ "type": 1, "api": "http://localhost:5705/vod?rule=奇珍异兽", "searchable": 1, - "quickSearch": 1, + "quickSearch": 0, "filterable": 1 }, { @@ -312,13 +321,22 @@ "quickSearch": 1, "filterable": 0 }, + { + "key": "dr_番茄影视", + "name": "番茄影视(道长)", + "type": 1, + "api": "http://localhost:5705/vod?rule=番茄影视", + "searchable": 1, + "quickSearch": 1, + "filterable": 0 + }, { "key": "dr_看视界", "name": "看视界(道长)", "type": 1, "api": "http://localhost:5705/vod?rule=看视界", - "searchable": 1, - "quickSearch": 1, + "searchable": 0, + "quickSearch": 0, "filterable": 0 }, { @@ -327,7 +345,7 @@ "type": 1, "api": "http://localhost:5705/vod?rule=腾云驾雾", "searchable": 1, - "quickSearch": 1, + "quickSearch": 0, "filterable": 0 }, { @@ -654,16 +672,6 @@ "quickSearch": 0, "filterable": 1 }, - { - "key": "csp_biubiu_555电影", - "name": "🎁555电影(XB)", - "type": 3, - "api": "csp_XBiubiu", - "searchable": 1, - "quickSearch": 1, - "filterable": 0, - "ext": "clan://TVBox/MaooXB/555dy.json" - }, { "key": "csp_biubiu_骚火电影", "name": "🔥骚火电影(XB)", @@ -674,26 +682,6 @@ "filterable": 0, "ext": "clan://TVBox/MaooXB/shdy.json" }, - { - "key": "csp_biubiu_LIBVIO", - "name": "🔷LIBVIO(XB)", - "type": 3, - "api": "csp_XBiubiu", - "searchable": 1, - "quickSearch": 1, - "filterable": 0, - "ext": "clan://TVBox/MaooXB/LIBVIO.json" - }, - { - "key": "csp_biubiu_大米星球", - "name": "⭐️大米星球(XB)", - "type": 3, - "api": "csp_XBiubiu", - "searchable": 1, - "quickSearch": 1, - "filterable": 0, - "ext": "clan://TVBox/MaooXB/dmxq.json" - }, { "key": "csp_biubiu_厂长资源-蓝光", "name": "💎厂长资源(XB)", @@ -714,16 +702,6 @@ "filterable": 0, "ext": "clan://TVBox/MaooXB/bdys.json" }, - { - "key": "csp_biubiu_在线之家", - "name": "📀在线之家(XB)", - "type": 3, - "api": "csp_XBiubiu", - "searchable": 1, - "quickSearch": 1, - "filterable": 0, - "ext": "clan://TVBox/MaooXB/zxzj.json" - }, { "key": "csp_xpath_naifeiorg", "name": "👑奈飞中文(XPF)", @@ -754,26 +732,6 @@ "filterable": 0, "ext": "clan://TVBox/MaooXB/dunkfun.json" }, - { - "key": "csp_biubiu_影视工厂", - "name": "🎯影视工厂(XB)", - "type": 3, - "api": "csp_XBiubiu", - "searchable": 1, - "quickSearch": 1, - "filterable": 0, - "ext": "clan://TVBox/MaooXB/ysgc2.json" - }, - { - "key": "csp_biubiu_瓜皮TV", - "name": "🍉瓜皮TV(XB)", - "type": 3, - "api": "csp_XBiubiu", - "searchable": 1, - "quickSearch": 1, - "filterable": 0, - "ext": "clan://TVBox/MaooXB/guapiTV.json" - }, { "key": "csp_biubiu_奈落影院", "name": "💧奈落影院(XB)", diff --git a/txt/pycms1.json b/txt/pycms1.json index 784de7d8f0acae0fc02dc7f0b22f3a88632d23d4..af8ecebe6a70e355885aee77cd714cfba2fdfa9b 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": [ @@ -246,6 +246,15 @@ "type": 1, "api": "http://192.168.3.224:5705/vod?rule=夜空", "searchable": 1, + "quickSearch": 0, + "filterable": 0 + }, + { + "key": "dr_大米星球", + "name": "大米星球(道长)", + "type": 1, + "api": "http://192.168.3.224:5705/vod?rule=大米星球", + "searchable": 1, "quickSearch": 1, "filterable": 0 }, @@ -255,7 +264,7 @@ "type": 1, "api": "http://192.168.3.224:5705/vod?rule=奇珍异兽", "searchable": 1, - "quickSearch": 1, + "quickSearch": 0, "filterable": 1 }, { @@ -312,13 +321,22 @@ "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": "看视界(道长)", "type": 1, "api": "http://192.168.3.224:5705/vod?rule=看视界", - "searchable": 1, - "quickSearch": 1, + "searchable": 0, + "quickSearch": 0, "filterable": 0 }, { @@ -327,7 +345,7 @@ "type": 1, "api": "http://192.168.3.224:5705/vod?rule=腾云驾雾", "searchable": 1, - "quickSearch": 1, + "quickSearch": 0, "filterable": 0 }, { @@ -654,16 +672,6 @@ "quickSearch": 0, "filterable": 1 }, - { - "key": "csp_biubiu_555电影", - "name": "🎁555电影(XB)", - "type": 3, - "api": "csp_XBiubiu", - "searchable": 1, - "quickSearch": 1, - "filterable": 0, - "ext": "clan://TVBox/MaooXB/555dy.json" - }, { "key": "csp_biubiu_骚火电影", "name": "🔥骚火电影(XB)", @@ -674,26 +682,6 @@ "filterable": 0, "ext": "clan://TVBox/MaooXB/shdy.json" }, - { - "key": "csp_biubiu_LIBVIO", - "name": "🔷LIBVIO(XB)", - "type": 3, - "api": "csp_XBiubiu", - "searchable": 1, - "quickSearch": 1, - "filterable": 0, - "ext": "clan://TVBox/MaooXB/LIBVIO.json" - }, - { - "key": "csp_biubiu_大米星球", - "name": "⭐️大米星球(XB)", - "type": 3, - "api": "csp_XBiubiu", - "searchable": 1, - "quickSearch": 1, - "filterable": 0, - "ext": "clan://TVBox/MaooXB/dmxq.json" - }, { "key": "csp_biubiu_厂长资源-蓝光", "name": "💎厂长资源(XB)", @@ -714,16 +702,6 @@ "filterable": 0, "ext": "clan://TVBox/MaooXB/bdys.json" }, - { - "key": "csp_biubiu_在线之家", - "name": "📀在线之家(XB)", - "type": 3, - "api": "csp_XBiubiu", - "searchable": 1, - "quickSearch": 1, - "filterable": 0, - "ext": "clan://TVBox/MaooXB/zxzj.json" - }, { "key": "csp_xpath_naifeiorg", "name": "👑奈飞中文(XPF)", @@ -754,26 +732,6 @@ "filterable": 0, "ext": "clan://TVBox/MaooXB/dunkfun.json" }, - { - "key": "csp_biubiu_影视工厂", - "name": "🎯影视工厂(XB)", - "type": 3, - "api": "csp_XBiubiu", - "searchable": 1, - "quickSearch": 1, - "filterable": 0, - "ext": "clan://TVBox/MaooXB/ysgc2.json" - }, - { - "key": "csp_biubiu_瓜皮TV", - "name": "🍉瓜皮TV(XB)", - "type": 3, - "api": "csp_XBiubiu", - "searchable": 1, - "quickSearch": 1, - "filterable": 0, - "ext": "clan://TVBox/MaooXB/guapiTV.json" - }, { "key": "csp_biubiu_奈落影院", "name": "💧奈落影院(XB)", diff --git a/txt/pycms2.json b/txt/pycms2.json index 9f9ded73dcb164a3c4ee7f7fc346082b6f9e4ae4..7b96465c2251e85359771aa90d891dfd35de690f 100644 --- a/txt/pycms2.json +++ b/txt/pycms2.json @@ -1,6 +1,6 @@ { "wallpaper": "http://cms1.nokia.press/pics", - "dr_count": 28, + "dr_count": 30, "mode": 1, "spider": "http://cms1.nokia.press/liveslib", "drives": [ @@ -246,6 +246,15 @@ "type": 1, "api": "http://cms1.nokia.press/vod?rule=夜空", "searchable": 1, + "quickSearch": 0, + "filterable": 0 + }, + { + "key": "dr_大米星球", + "name": "大米星球(道长)", + "type": 1, + "api": "http://cms1.nokia.press/vod?rule=大米星球", + "searchable": 1, "quickSearch": 1, "filterable": 0 }, @@ -255,7 +264,7 @@ "type": 1, "api": "http://cms1.nokia.press/vod?rule=奇珍异兽", "searchable": 1, - "quickSearch": 1, + "quickSearch": 0, "filterable": 1 }, { @@ -312,13 +321,22 @@ "quickSearch": 1, "filterable": 0 }, + { + "key": "dr_番茄影视", + "name": "番茄影视(道长)", + "type": 1, + "api": "http://cms1.nokia.press/vod?rule=番茄影视", + "searchable": 1, + "quickSearch": 1, + "filterable": 0 + }, { "key": "dr_看视界", "name": "看视界(道长)", "type": 1, "api": "http://cms1.nokia.press/vod?rule=看视界", - "searchable": 1, - "quickSearch": 1, + "searchable": 0, + "quickSearch": 0, "filterable": 0 }, { @@ -327,7 +345,7 @@ "type": 1, "api": "http://cms1.nokia.press/vod?rule=腾云驾雾", "searchable": 1, - "quickSearch": 1, + "quickSearch": 0, "filterable": 0 }, { @@ -654,16 +672,6 @@ "quickSearch": 0, "filterable": 1 }, - { - "key": "csp_biubiu_555电影", - "name": "🎁555电影(XB)", - "type": 3, - "api": "csp_XBiubiu", - "searchable": 1, - "quickSearch": 1, - "filterable": 0, - "ext": "clan://TVBox/MaooXB/555dy.json" - }, { "key": "csp_biubiu_骚火电影", "name": "🔥骚火电影(XB)", @@ -674,26 +682,6 @@ "filterable": 0, "ext": "clan://TVBox/MaooXB/shdy.json" }, - { - "key": "csp_biubiu_LIBVIO", - "name": "🔷LIBVIO(XB)", - "type": 3, - "api": "csp_XBiubiu", - "searchable": 1, - "quickSearch": 1, - "filterable": 0, - "ext": "clan://TVBox/MaooXB/LIBVIO.json" - }, - { - "key": "csp_biubiu_大米星球", - "name": "⭐️大米星球(XB)", - "type": 3, - "api": "csp_XBiubiu", - "searchable": 1, - "quickSearch": 1, - "filterable": 0, - "ext": "clan://TVBox/MaooXB/dmxq.json" - }, { "key": "csp_biubiu_厂长资源-蓝光", "name": "💎厂长资源(XB)", @@ -714,16 +702,6 @@ "filterable": 0, "ext": "clan://TVBox/MaooXB/bdys.json" }, - { - "key": "csp_biubiu_在线之家", - "name": "📀在线之家(XB)", - "type": 3, - "api": "csp_XBiubiu", - "searchable": 1, - "quickSearch": 1, - "filterable": 0, - "ext": "clan://TVBox/MaooXB/zxzj.json" - }, { "key": "csp_xpath_naifeiorg", "name": "👑奈飞中文(XPF)", @@ -754,26 +732,6 @@ "filterable": 0, "ext": "clan://TVBox/MaooXB/dunkfun.json" }, - { - "key": "csp_biubiu_影视工厂", - "name": "🎯影视工厂(XB)", - "type": 3, - "api": "csp_XBiubiu", - "searchable": 1, - "quickSearch": 1, - "filterable": 0, - "ext": "clan://TVBox/MaooXB/ysgc2.json" - }, - { - "key": "csp_biubiu_瓜皮TV", - "name": "🍉瓜皮TV(XB)", - "type": 3, - "api": "csp_XBiubiu", - "searchable": 1, - "quickSearch": 1, - "filterable": 0, - "ext": "clan://TVBox/MaooXB/guapiTV.json" - }, { "key": "csp_biubiu_奈落影院", "name": "💧奈落影院(XB)",