修复腾云驾雾源

controllers/cms.py

@@ -702,6 +702,7 @@ class CMS:
         if fypage == 1 and self.test('[\[\]]',url):
             url = url.split('[')[1].split(']')[0]
         # print(url)
+        logger.info(url)
         p = self.一级
         jsp = jsoup(self.url)
         videos = []
@@ -752,11 +753,13 @@ class CMS:
                 r = requests.get(url, headers=self.headers, timeout=self.timeout)
                 html = self.checkHtml(r)
                 print(self.headers)
-                print(html)
+                # print(html)
                 if is_json:
                     html = self.dealJson(html)
                     html = json.loads(html)
                 # print(html)
+                # with open('1.html',mode='w+',encoding='utf-8') as f:
+                #     f.write(html)
                 items = pdfa(html,p[0].replace('json:','',1))
             except:
                 pass
@@ -1107,7 +1110,7 @@ class CMS:
                     r = requests.get(url, headers=self.headers, timeout=self.timeout)
                     r.encoding = self.encoding
                     html = r.text
-                if not show_name and not html.find(key) > -1:
+                if not show_name and not str(html).find(key) > -1:
                     logger.info('搜索结果源码未包含关键字,疑似搜索失败,正为您打印结果源码')
                     print(html)
 

js/version.txt

-3.7.10
\ No newline at end of file
+3.7.11
\ No newline at end of file

js/腾云驾雾.js

 var rule = {
     title:'腾云驾雾',
     host:'https://v.%71%71.com',
-    homeUrl:'/channel/choice?listpage=1&channel=choice&sort=18&_all=1',
+    // homeUrl:'/channel/choice?listpage=1&channel=choice&sort=18&_all=1',
+    homeUrl:'/x/bu/pagesheet/list?_all=1&append=1&channel=choice&listpage=1&offset=0&pagesize=21&iarea=-1&sort=18',
     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:2,
+    filterable:1,
     multi:1,
-    url:'/channel/fyclass?listpage=fypage&channel=fyclass&sort=18&_all=1',
+    // url:'/channel/fyclass?listpage=fypage&channel=fyclass&sort=18&_all=1',
+    url:'/x/bu/pagesheet/list?_all=1&append=1&channel=fyclass&listpage=1&offset=((fypage-1)*21)&pagesize=21&iarea=-1',
+    filter_url:'sort={{fl.sort or 18}}&year={{fl.year}}&pay={{fl.pay}}',
+    filter:{'choice': [{'key': 'sort', 'name': '排序', 'value': [{'n': '最热', 'v': '18'}, {'n': '最新', 'v': '19'}, {'n': '好评', 'v': '16'}, {'n': '高分好评', 'v': '21'}]}, {'key': 'pay', 'name': '资费', 'value': [{'n': '全部', 'v': '-1'}, {'n': '免费', 'v': '867'}, {'n': '会员', 'v': '6'}]}, {'key': 'year', 'name': '年代', 'value': [{'n': '全部', 'v': '-1'}, {'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', 'v': '2016'}, {'n': '2015', 'v': '2015'}]}], 'tv': [{'key': 'sort', 'name': '排序', 'value': [{'n': '最热', 'v': '18'}, {'n': '最新', 'v': '19'}, {'n': '好评', 'v': '16'}, {'n': '高分好评', 'v': '21'}]}, {'key': 'pay', 'name': '资费', 'value': [{'n': '全部', 'v': '-1'}, {'n': '免费', 'v': '867'}, {'n': '会员', 'v': '6'}]}, {'key': 'year', 'name': '年代', 'value': [{'n': '全部', 'v': '-1'}, {'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', 'v': '2016'}, {'n': '2015', 'v': '2015'}]}], 'movie': [{'key': 'sort', 'name': '排序', 'value': [{'n': '最热', 'v': '18'}, {'n': '最新', 'v': '19'}, {'n': '好评', 'v': '16'}, {'n': '高分好评', 'v': '21'}]}, {'key': 'pay', 'name': '资费', 'value': [{'n': '全部', 'v': '-1'}, {'n': '免费', 'v': '867'}, {'n': '会员', 'v': '6'}]}, {'key': 'year', 'name': '年代', 'value': [{'n': '全部', 'v': '-1'}, {'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', 'v': '2016'}, {'n': '2015', 'v': '2015'}]}], 'variety': [{'key': 'sort', 'name': '排序', 'value': [{'n': '最热', 'v': '18'}, {'n': '最新', 'v': '19'}, {'n': '好评', 'v': '16'}, {'n': '高分好评', 'v': '21'}]}, {'key': 'pay', 'name': '资费', 'value': [{'n': '全部', 'v': '-1'}, {'n': '免费', 'v': '867'}, {'n': '会员', 'v': '6'}]}, {'key': 'year', 'name': '年代', 'value': [{'n': '全部', 'v': '-1'}, {'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', 'v': '2016'}, {'n': '2015', 'v': '2015'}]}], 'cartoon': [{'key': 'sort', 'name': '排序', 'value': [{'n': '最热', 'v': '18'}, {'n': '最新', 'v': '19'}, {'n': '好评', 'v': '16'}, {'n': '高分好评', 'v': '21'}]}, {'key': 'pay', 'name': '资费', 'value': [{'n': '全部', 'v': '-1'}, {'n': '免费', 'v': '867'}, {'n': '会员', 'v': '6'}]}, {'key': 'year', 'name': '年代', 'value': [{'n': '全部', 'v': '-1'}, {'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', 'v': '2016'}, {'n': '2015', 'v': '2015'}]}], 'child': [{'key': 'sort', 'name': '排序', 'value': [{'n': '最热', 'v': '18'}, {'n': '最新', 'v': '19'}, {'n': '好评', 'v': '16'}, {'n': '高分好评', 'v': '21'}]}, {'key': 'pay', 'name': '资费', 'value': [{'n': '全部', 'v': '-1'}, {'n': '免费', 'v': '867'}, {'n': '会员', 'v': '6'}]}, {'key': 'year', 'name': '年代', 'value': [{'n': '全部', 'v': '-1'}, {'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', 'v': '2016'}, {'n': '2015', 'v': '2015'}]}], 'doco': [{'key': 'sort', 'name': '排序', 'value': [{'n': '最热', 'v': '18'}, {'n': '最新', 'v': '19'}, {'n': '好评', 'v': '16'}, {'n': '高分好评', 'v': '21'}]}, {'key': 'pay', 'name': '资费', 'value': [{'n': '全部', 'v': '-1'}, {'n': '免费', 'v': '867'}, {'n': '会员', 'v': '6'}]}, {'key': 'year', 'name': '年代', 'value': [{'n': '全部', 'v': '-1'}, {'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', 'v': '2016'}, {'n': '2015', 'v': '2015'}]}]},
     headers:{
         'User-Agent':'PC_UA'
     },

py/腾讯筛选.py

+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# File  : 腾讯筛选.py
+# Author: DaShenHan&道长-----先苦后甜，任凭晚风拂柳颜------
+# Date  : 2022/9/25
+
+
+cates = 'choice&tv&movie&variety&cartoon&child&doco'.split('&')
+fl_dict = {}
+
+for cate in cates:
+    fls = []
+    fls.append({
+        'key':'sort',
+        'name':'排序',
+        'value':[{'n':'最热','v':'18'},{'n':'最新','v':'19'},{'n':'好评','v':'16'},{'n':'高分好评','v':'21'}],
+    })
+    fls.append({
+        'key': 'pay',
+        'name': '资费',
+        'value': [{'n': '全部', 'v': '-1'}, {'n': '免费', 'v': '867'}, {'n': '会员', 'v': '6'}],
+    })
+    year_value = [{'n': str(2022-i), 'v': str(2022-i)} for i in range(8)]
+    year_value = [{'n': '全部', 'v': '-1'}]+year_value
+    fls.append({
+        'key': 'year',
+        'name': '年代',
+        'value': year_value,
+    })
+    fl_dict[cate] = fls
+print(fl_dict)
\ No newline at end of file

readme.md

@@ -49,6 +49,7 @@
 ###### 2022/09/25
 - [X] 1.v3.7.10 增加了自定义解析功能,解析.conf支持变量{{host}}
 - [X] 2.新增了 jiexi/无名.js作为示例,接受vipUrl返回realUrl
+- [X] 3.修复腾云驾雾并增加通用筛选
 ###### 2022/09/23
 - [X] 1.v3.7.5 优化了首图2模板的搜索定位以及几个相关的源
 - [X] 2.二级渲染功能拆分,js单独调用