From d0731a4c9401b5bb1b94b00360693311f22d90b5 Mon Sep 17 00:00:00 2001 From: hjdhnx Date: Fri, 16 Sep 2022 19:08:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=81=9A=E6=90=9C=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base/rules.db | Bin 40960 -> 40960 bytes controllers/vod.py | 8 ++++++++ "js/360\345\275\261\350\247\206.js" | 1 + "js/\345\205\224\345\260\217\350\264\235.js" | 1 + ...62\351\245\255\345\275\261\350\247\206.js" | 2 +- "js/\347\234\213\350\247\206\347\225\214.js" | 2 +- 6 files changed, 12 insertions(+), 2 deletions(-) diff --git a/base/rules.db b/base/rules.db index 6e0be6de697cdb1496db5f963d7f98a5c9e5a23a..a9538ccb0ab3de71035f83979e6168c58a04fc4a 100644 GIT binary patch delta 57 zcmZoTz|?SnX@WH4$B8n|j2|~9^a(2%nx`6Cn46m#7#pXW8CaSd8ziNsS{fOcC#5DE NBqdvH<`enU4FD-v5{du- delta 57 zcmZoTz|?SnX@WH4`-w8njPExl^a(4NCMBnu8kiXakwvn3qM1RGL0XbglBs!8vO!{^ LiRorOkx$(KIZ+b* diff --git a/controllers/vod.py b/controllers/vod.py index e42a308..65a8fda 100644 --- a/controllers/vod.py +++ b/controllers/vod.py @@ -45,11 +45,18 @@ def vod_home(): return None def multi_search(wd): + t1 = time() rules = getRules('js')['list'] + rule_names = list(map(lambda x:x['name'],rules)) rules_exclude = ['drpy'] new_rules = list(filter(lambda x: x.get('searchable', 0) and x.get('name', '') not in rules_exclude, rules)) search_sites = [new_rule['name'] for new_rule in new_rules] + nosearch_sites = set(rule_names) ^ set(search_sites) + nosearch_sites.remove('drpy') + # print(nosearch_sites) logger.info(f'开始聚搜{wd},共计{len(search_sites)}个规则') + logger.info(f'不支持聚搜的规则,共计{len(nosearch_sites)}个规则:{",".join(nosearch_sites)}') + # print(search_sites) timeout = 5 res = [] with open('js/模板.js', encoding='utf-8') as f: @@ -70,6 +77,7 @@ def vod_home(): import atexit atexit.unregister(thread._python_exit) executor.shutdown = lambda wait: None + logger.info(f'drpy聚搜{len(search_sites)}个源共计耗时{get_interval(t1)}毫秒') return jsonify({ "list": res }) diff --git "a/js/360\345\275\261\350\247\206.js" "b/js/360\345\275\261\350\247\206.js" index 20c27ad..fe85cd8 100644 --- "a/js/360\345\275\261\350\247\206.js" +++ "b/js/360\345\275\261\350\247\206.js" @@ -12,6 +12,7 @@ var rule = { class_name:'电视剧&电影&综艺&动漫', class_url:'2&1&3&4', limit:5, + searchable:2, play_parse:true, lazy:'js:input=input.split("?")[0];log(input);', // 疑似t4专用的 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 91d0ee8..905d963 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" @@ -5,6 +5,7 @@ var rule = { url:'/list/mip-data?typeId=fyclass&page=fypage&callback=', detailUrl:'/play/fyid', searchUrl:'/search/index?key=**', + searchable:2, headers:{ 'User-Agent':'MOBILE_UA' }, diff --git "a/js/\345\271\262\351\245\255\345\275\261\350\247\206.js" "b/js/\345\271\262\351\245\255\345\275\261\350\247\206.js" index 65ebeb0..5abee36 100644 --- "a/js/\345\271\262\351\245\255\345\275\261\350\247\206.js" +++ "b/js/\345\271\262\351\245\255\345\275\261\350\247\206.js" @@ -8,7 +8,7 @@ var rule = { "Cookie": "searchneed=ok" }, searchUrl:'/vodsearch/**----------fypage---.html', - searchable:0, + searchable:2, // class_name:'电影&网剧&剧集&动漫&综艺&记录', // class_url:'20&1&2&3&4&23', class_parse:'.stui-header__menu li:gt(0):lt(5);a&&Text;a&&href;/(\\d+).html', diff --git "a/js/\347\234\213\350\247\206\347\225\214.js" "b/js/\347\234\213\350\247\206\347\225\214.js" index 5a61856..e77b120 100644 --- "a/js/\347\234\213\350\247\206\347\225\214.js" +++ "b/js/\347\234\213\350\247\206\347\225\214.js" @@ -3,6 +3,6 @@ title:'看视界', host:'https://www.1080kan.cc', url:'/show/fyclass--------fypage---.html', searchUrl:'/search/**----------fypage---.html', -searchable:0, +searchable:2, class_parse:'.navbar-items li:gt(1):lt(6);a&&Text;a&&href;.*/(.*?).html', }); \ No newline at end of file -- GitLab