发布新版本

controllers/cms.py

@@ -75,7 +75,7 @@ py_ctx = {
 'requests':requests,'print':print,'base64Encode':base64Encode,'baseDecode':baseDecode,
 'log':logger.info,'fetch':fetch,'post':post,'request':request,'getCryptoJS':getCryptoJS,
 'buildUrl':buildUrl,'getHome':getHome,'setDetail':setDetail,'join':join,'urljoin2':urljoin2,
-'PC_UA':PC_UA,'MOBILE_UA':MOBILE_UA,'UC_UA':UC_UA,'IOS_UA':IOS_UA,
+'PC_UA':PC_UA,'MOBILE_UA':MOBILE_UA,'UC_UA':UC_UA,'UA':UA,'IOS_UA':IOS_UA,
 'setItem':setItem,'getItem':getItem,'clearItem':clearItem,'stringify':stringify,'encodeUrl':encodeUrl,
 'requireObj':requireObj,'md5':md5
 }
@@ -737,6 +737,7 @@ class CMS:
 
         else:
             p = p.split(';')  # 解析
+            # print(len(p))
             if len(p) < 5:
                 return self.blank()
 
@@ -962,8 +963,10 @@ class CMS:
     def detailOneVod(self,id,fyclass='',show_name=False):
         vod = self.blank_vod()
         detailUrl = str(id)
+        # print(detailUrl)
         if not detailUrl.startswith('http') and not '/' in detailUrl:
             url = self.detailUrl.replace('fyid', detailUrl).replace('fyclass',fyclass)
+            # print(url)
         elif '/' in detailUrl:
             url = urljoin(self.homeUrl,detailUrl)
         else:

js/version.txt

-3.7.14
\ No newline at end of file
+3.7.15
\ No newline at end of file

js/百忙无果.js

+var rule = {
+    title:'百忙无果',
+    host:'https://pianku.api.%6d%67%74%76.com',
+    homeUrl:'',
+    searchUrl:'https://mobileso.bz.%6d%67%74%76.com/pc/search/v1?q=**&pn=fypage&pc=10',
+    detailUrl:'https://pcweb.api.mgtv.com/episode/list?page=1&size=50&video_id=fyid',
+    searchable:2,
+    quickSearch:0,
+    filterable:1,
+    multi:1,
+    // 分类链接fypage参数支持1个()表达式
+    url:'/rider/list/pcweb/v3?platform=pcweb&channelId=fyclass&pn=fypage&pc=80&hudong=1&_support=10000000&kind=a1&area=a1',
+    filter_url:'year={{fl.year or "all"}}&sort={{fl.sort or "c1"}}&chargeInfo={{fl.chargeInfo or "all"}}',
+    headers:{
+        'User-Agent':'PC_UA'
+    },
+    timeout:5000,
+    class_name:'电视剧&电影&综艺&动漫&纪录片&教育',
+    class_url:'2&3&1&50&51&115',
+    filter:{'2': [{'key': 'chargeInfo', 'name': '付费类型', 'value': [{'n': '全部', 'v': 'all'}, {'n': '免费', 'v': 'b1'}, {'n': 'vip', 'v': 'b2'}, {'n': 'VIP用券', 'v': 'b3'}, {'n': '付费点播', 'v': 'b4'}]}, {'key': 'sort', 'name': '排序', 'value': [{'n': '最新', 'v': 'c1'}, {'n': '最热', 'v': 'c2'}, {'n': '知乎高分', 'v': 'c4'}]}, {'key': 'year', 'name': '年代', 'value': [{'n': '全部', 'v': 'all'}, {'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'}, {'n': '2014', 'v': '2014'}, {'n': '2013', 'v': '2013'}, {'n': '2012', 'v': '2012'}, {'n': '2011', 'v': '2011'}, {'n': '2010', 'v': '2010'}, {'n': '2009', 'v': '2009'}, {'n': '2008', 'v': '2008'}, {'n': '2007', 'v': '2007'}, {'n': '2006', 'v': '2006'}, {'n': '2005', 'v': '2005'}, {'n': '2004', 'v': '2004'}]}], '3': [{'key': 'chargeInfo', 'name': '付费类型', 'value': [{'n': '全部', 'v': 'all'}, {'n': '免费', 'v': 'b1'}, {'n': 'vip', 'v': 'b2'}, {'n': 'VIP用券', 'v': 'b3'}, {'n': '付费点播', 'v': 'b4'}]}, {'key': 'sort', 'name': '排序', 'value': [{'n': '最新', 'v': 'c1'}, {'n': '最热', 'v': 'c2'}, {'n': '知乎高分', 'v': 'c4'}]}, {'key': 'year', 'name': '年代', 'value': [{'n': '全部', 'v': 'all'}, {'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'}, {'n': '2014', 'v': '2014'}, {'n': '2013', 'v': '2013'}, {'n': '2012', 'v': '2012'}, {'n': '2011', 'v': '2011'}, {'n': '2010', 'v': '2010'}, {'n': '2009', 'v': '2009'}, {'n': '2008', 'v': '2008'}, {'n': '2007', 'v': '2007'}, {'n': '2006', 'v': '2006'}, {'n': '2005', 'v': '2005'}, {'n': '2004', 'v': '2004'}]}], '1': [{'key': 'chargeInfo', 'name': '付费类型', 'value': [{'n': '全部', 'v': 'all'}, {'n': '免费', 'v': 'b1'}, {'n': 'vip', 'v': 'b2'}, {'n': 'VIP用券', 'v': 'b3'}, {'n': '付费点播', 'v': 'b4'}]}, {'key': 'sort', 'name': '排序', 'value': [{'n': '最新', 'v': 'c1'}, {'n': '最热', 'v': 'c2'}, {'n': '知乎高分', 'v': 'c4'}]}, {'key': 'year', 'name': '年代', 'value': [{'n': '全部', 'v': 'all'}, {'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'}, {'n': '2014', 'v': '2014'}, {'n': '2013', 'v': '2013'}, {'n': '2012', 'v': '2012'}, {'n': '2011', 'v': '2011'}, {'n': '2010', 'v': '2010'}, {'n': '2009', 'v': '2009'}, {'n': '2008', 'v': '2008'}, {'n': '2007', 'v': '2007'}, {'n': '2006', 'v': '2006'}, {'n': '2005', 'v': '2005'}, {'n': '2004', 'v': '2004'}]}], '50': [{'key': 'chargeInfo', 'name': '付费类型', 'value': [{'n': '全部', 'v': 'all'}, {'n': '免费', 'v': 'b1'}, {'n': 'vip', 'v': 'b2'}, {'n': 'VIP用券', 'v': 'b3'}, {'n': '付费点播', 'v': 'b4'}]}, {'key': 'sort', 'name': '排序', 'value': [{'n': '最新', 'v': 'c1'}, {'n': '最热', 'v': 'c2'}, {'n': '知乎高分', 'v': 'c4'}]}, {'key': 'year', 'name': '年代', 'value': [{'n': '全部', 'v': 'all'}, {'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'}, {'n': '2014', 'v': '2014'}, {'n': '2013', 'v': '2013'}, {'n': '2012', 'v': '2012'}, {'n': '2011', 'v': '2011'}, {'n': '2010', 'v': '2010'}, {'n': '2009', 'v': '2009'}, {'n': '2008', 'v': '2008'}, {'n': '2007', 'v': '2007'}, {'n': '2006', 'v': '2006'}, {'n': '2005', 'v': '2005'}, {'n': '2004', 'v': '2004'}]}], '51': [{'key': 'chargeInfo', 'name': '付费类型', 'value': [{'n': '全部', 'v': 'all'}, {'n': '免费', 'v': 'b1'}, {'n': 'vip', 'v': 'b2'}, {'n': 'VIP用券', 'v': 'b3'}, {'n': '付费点播', 'v': 'b4'}]}, {'key': 'sort', 'name': '排序', 'value': [{'n': '最新', 'v': 'c1'}, {'n': '最热', 'v': 'c2'}, {'n': '知乎高分', 'v': 'c4'}]}, {'key': 'year', 'name': '年代', 'value': [{'n': '全部', 'v': 'all'}, {'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'}, {'n': '2014', 'v': '2014'}, {'n': '2013', 'v': '2013'}, {'n': '2012', 'v': '2012'}, {'n': '2011', 'v': '2011'}, {'n': '2010', 'v': '2010'}, {'n': '2009', 'v': '2009'}, {'n': '2008', 'v': '2008'}, {'n': '2007', 'v': '2007'}, {'n': '2006', 'v': '2006'}, {'n': '2005', 'v': '2005'}, {'n': '2004', 'v': '2004'}]}], '115': [{'key': 'chargeInfo', 'name': '付费类型', 'value': [{'n': '全部', 'v': 'all'}, {'n': '免费', 'v': 'b1'}, {'n': 'vip', 'v': 'b2'}, {'n': 'VIP用券', 'v': 'b3'}, {'n': '付费点播', 'v': 'b4'}]}, {'key': 'sort', 'name': '排序', 'value': [{'n': '最新', 'v': 'c1'}, {'n': '最热', 'v': 'c2'}, {'n': '知乎高分', 'v': 'c4'}]}, {'key': 'year', 'name': '年代', 'value': [{'n': '全部', 'v': 'all'}, {'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'}, {'n': '2014', 'v': '2014'}, {'n': '2013', 'v': '2013'}, {'n': '2012', 'v': '2012'}, {'n': '2011', 'v': '2011'}, {'n': '2010', 'v': '2010'}, {'n': '2009', 'v': '2009'}, {'n': '2008', 'v': '2008'}, {'n': '2007', 'v': '2007'}, {'n': '2006', 'v': '2006'}, {'n': '2005', 'v': '2005'}, {'n': '2004', 'v': '2004'}]}]},
+    limit:20,
+    play_parse:true,
+    // 手动调用解析请求json的url,此lazy不方便
+    lazy:'js:print(input);fetch_params.headers["user-agent"]=MOBILE_UA;let html=request(input);let rurl=html.match(/window\\.open\\(\'(.*?)\',/)[1];rurl=urlDeal(rurl);input={parse:1,url:rurl};',
+    // 推荐:'.list_item;img&&alt;img&&src;a&&Text;a&&data-float',
+    一级:'json:data.hitDocs;title;img;updateInfo||rightCorner.text;playPartId',
+    // 一级:'json:data.hitDocs;title;img;updateInfo;playPartId',
+    二级:'',
+    二级:'js:log(input);',
+    二级:'js:fetch_params.headers.Referer="https://www.mgtv.com";fetch_params.headers["User-Agent"]=UA;pdfh=jsp.pdfh;pdfa=jsp.pdfa;pd=jsp.pd;vod={};let d=[];let html=request(input);let json=JSON.parse(html);let host="https://www.mgtv.com";let ourl=json.data.list.length>0?json.data.list[0].url:json.data.series[0].url;if(!/^http/.test(ourl)){ourl=host+ourl}fetch_params.headers["User-Agent"]=MOBILE_UA;html=request(ourl);if(html.includes("window.location =")){print("开始获取ourl");ourl=pdfh(html,"meta[http-equiv=refresh]&&content").split("url=")[1];print("获取到ourl:"+ourl);html=request(ourl)}try{let details=pdfh(html,".m-details&&Html").replace(/h1>/,"h6>").replace(/div/g,"br");let actor="",director="",time="";if(/播出时间/.test(details)){actor=pdfh(html,"p:eq(5)&&Text").substr(0,25);director=pdfh(html,"p:eq(4)&&Text");time=pdfh(html,"p:eq(3)&&Text")}else{actor=pdfh(html,"p:eq(4)&&Text").substr(0,25);director=pdfh(html,"p:eq(3)&&Text");time="已完结"}let _img=pd(html,".video-img&&img&&src");let JJ=pdfh(html,".desc&&Text").split("简介：")[1];let _desc=time;vod.type_name=pdfh(html,"p:eq(0)&&Text").substr(0,6);vod.vod_actor=actor;vod.vod_director=director;vod.vod_remarks=_desc;vod.vod_pic=_img;vod.vod_content=JJ}catch(e){log("获取影片信息发生错误:"+e.message)}function getRjpg(imgUrl,xs){xs=xs||3;let picSize=/jpg_/.test(imgUrl)?imgUrl.split("jpg_")[1].split(".")[0]:false;let rjpg=false;if(picSize){let a=parseInt(picSize.split("x")[0])*xs;let b=parseInt(picSize.split("x")[1])*xs;rjpg=a+"x"+b+".jpg"}let img=/jpg_/.test(imgUrl)&&rjpg?imgUrl.replace(imgUrl.split("jpg_")[1],rjpg):imgUrl;return img}if(json.data.total===1&&json.data.list.length===1){let data=json.data.list[0];let url="https://www.mgtv.com"+data.url;d.push({title:data.t4,desc:data.t2,pic_url:getRjpg(data.img),url:url})}else if(json.data.list.length>1){for(let i=1;i<=json.data.total_page;i++){if(i>1){json=JSON.parse(fetch(input.replace("page=1","page="+i),{}))}json.data.list.forEach(function(data){let url="https://www.mgtv.com"+data.url;if(data.isIntact=="1"){d.push({title:data.t4,desc:data.t2,pic_url:getRjpg(data.img),url:url})}})}}else{print(input+"暂无片源")}vod.vod_play_from="mgtv";vod.vod_play_url=d.map(function(it){return it.title+"$"+it.url}).join("#");setResult(d);',
+    搜索:'',
+    搜索:'js:fetch_params.headers.Referer="https://www.mgtv.com";fetch_params.headers["User-Agent"]=UA;let d=[];let html=request(input);let json=JSON.parse(html);json.data.contents.forEach(function(data){if(data.data.sourceList||data.data.yearList){let list=data.data.sourceList?data.data.sourceList:data.data.yearList[0].sourceList;let desc="";list.forEach(function(it){desc+=it.name+"\\t"});if(list[0].source==="imgo"){let img=data.data.pic?data.data.pic:data.data.yearList[0].pic;d.push({title:data.data.title?data.data.title:data.data.yearList[0].title,img:img,content:data.data.story?data.data.story:data.data.yearList[0].story,desc:data.data.playTime,url:list[0].vid})}}});setResult(d);',
+}
\ No newline at end of file

py/芒果二级.js

+js:
+// log(input);
+fetch_params.headers.Referer = 'https://www.mgtv.com';
+fetch_params.headers['User-Agent'] = UA;
+pdfh = jsp.pdfh;
+pdfa = jsp.pdfa;
+pd = jsp.pd;
+vod = {};
+let d = [];
+let html = request(input);
+let json = JSON.parse(html);
+let host = 'https://www.mgtv.com';
+let ourl = json.data.list.length>0?json.data.list[0].url:json.data.series[0].url;
+if(!/^http/.test(ourl)){
+    ourl = host+ourl
+}
+// print(ourl);
+fetch_params.headers['User-Agent'] = MOBILE_UA;
+html = request(ourl);
+if(html.includes('window.location =')){
+    print('开始获取ourl');
+    ourl = pdfh(html,'meta[http-equiv=refresh]&&content').split('url=')[1];
+    print('获取到ourl:'+ourl);
+    html = request(ourl);
+}
+//影片信息
+try{
+    // print(html);
+    let details = pdfh(html, '.m-details&&Html').replace(/h1>/,'h6>').replace(/div/g, 'br');//详情网页
+    let actor='',director='',time='';
+    if (/播出时间/.test(details)) {
+        actor = pdfh(html, 'p:eq(5)&&Text').substr(0,25);
+        director = pdfh(html, 'p:eq(4)&&Text');
+        time = pdfh(html, 'p:eq(3)&&Text');
+    }else{
+        actor = pdfh(html, 'p:eq(4)&&Text').substr(0,25);
+        director = pdfh(html, 'p:eq(3)&&Text');
+        time = '已完结';
+    }
+    let _img = pd(html,'.video-img&&img&&src');
+    let JJ = pdfh(html,'.desc&&Text').split("简介：")[1];//简介
+    let _desc = time;//更新，时间
+
+     // vod.vod_name = name;
+     vod.type_name = pdfh(html, 'p:eq(0)&&Text').substr(0,6);
+     vod.vod_actor = actor;
+     vod.vod_director = director;
+     vod.vod_remarks = _desc;
+     vod.vod_pic = _img;
+     vod.vod_content = JJ;
+}catch(e){
+    log('获取影片信息发生错误:'+e.message);
+}
+// print(vod);
+function getRjpg(imgUrl,xs){
+    xs = xs||3;
+    let picSize = /jpg_/.test(imgUrl)?imgUrl.split('jpg_')[1].split('.')[0]:false;
+    let rjpg = false;
+    if(picSize){
+        let a = parseInt(picSize.split('x')[0])*xs;
+        let b = parseInt(picSize.split('x')[1])*xs;
+        rjpg = a+'x'+b+'.jpg';
+    }
+    let img = /jpg_/.test(imgUrl)&&rjpg?imgUrl.replace(imgUrl.split('jpg_')[1],rjpg):imgUrl;
+    return img
+}
+// log(json.data.total+","+json.data.list.length);
+if (json.data.total === 1 && json.data.list.length===1) {
+    let data= json.data.list[0];
+    let url = 'https://www.mgtv.com' + data.url;
+    d.push({
+        title: data.t4,
+        desc: data.t2,
+        pic_url:getRjpg(data.img),
+        url: url,
+    });
+} else if(json.data.list.length>1){
+    for (let i = 1; i <= json.data.total_page; i++) {
+        if (i > 1) {
+            json = JSON.parse(fetch(input.replace('page=1', 'page=' + i), {}));
+        }
+        json.data.list.forEach(function (data){
+            let url = 'https://www.mgtv.com' + data.url;
+            if (data.isIntact == '1') {
+                d.push({
+                    title: data.t4,
+                    desc: data.t2,
+                    pic_url: getRjpg(data.img),
+                    url: url,
+                });
+            }
+        });
+    }
+}else{
+    print(input+'暂无片源');
+}
+vod.vod_play_from = 'mgtv';
+vod.vod_play_url = d.map(function (it){
+    return it.title + '$' + it.url;
+}).join('#');
+setResult(d);
\ No newline at end of file

py/芒果搜索.js

+js:
+fetch_params.headers.Referer = 'https://www.mgtv.com';
+fetch_params.headers['User-Agent'] = UA;
+let d = [];
+let html = request(input);
+let json = JSON.parse(html);
+json.data.contents.forEach(function (data){
+    if (data.data.sourceList || data.data.yearList) {
+        let list = data.data.sourceList ? data.data.sourceList : data.data.yearList[0].sourceList;
+        let desc = '';
+        list.forEach(function (it){
+            desc += it.name + '\t';
+        });
+        if (list[0].source === 'imgo') {
+          let img = data.data.pic ? data.data.pic : data.data.yearList[0].pic;
+            d.push({
+                title: data.data.title ? data.data.title : data.data.yearList[0].title,
+                img:img ,
+                content: data.data.story ? data.data.story : data.data.yearList[0].story,
+                desc: data.data.playTime,
+                url: list[0].vid
+            });
+        }
+    }
+
+});
+setResult(d);
\ No newline at end of file

py/芒果筛选.py

+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# File  : 芒果筛选.py
+# Author: DaShenHan&道长-----先苦后甜，任凭晚风拂柳颜------
+# Date  : 2022/9/25
+
+cates = '2&3&1&50&51&115'.split('&')
+fl_dict = {}
+
+for cate in cates:
+    fls = []
+    fls.append({
+        'key':'chargeInfo',
+        'name':'付费类型',
+        'value':[{'n':'全部','v':'all'},{'n':'免费','v':'b1'},{'n':'vip','v':'b2'},{'n':'VIP用券','v':'b3'},{'n':'付费点播','v':'b4'}],
+    })
+    fls.append({
+        'key': 'sort',
+        'name': '排序',
+        'value': [{'n': '最新', 'v': 'c1'}, {'n': '最热', 'v': 'c2'}, {'n': '知乎高分', 'v': 'c4'}],
+    })
+    year_value = [{'n': str(2022-i), 'v': str(2022-i)} for i in range(19)]
+    year_value = [{'n': '全部', 'v': 'all'}]+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

@@ -51,6 +51,8 @@
 - [X] 2.新增了 jiexi/无名.js作为示例,接受vipUrl返回realUrl
 - [X] 3.修复腾云驾雾并增加通用筛选
 - [X] 4.自建解析增加重定向方法,方便明面上隐藏真实来源的解析地址
+- [X] 5.自建js文件自动解析到配置
+- [X] 6.增加百忙无果源
 ###### 2022/09/23
 - [X] 1.v3.7.5 优化了首图2模板的搜索定位以及几个相关的源
 - [X] 2.二级渲染功能拆分,js单独调用

utils/htmlParser.py

@@ -104,6 +104,7 @@ class jsoup:
                 ret = urljoin(self.MY_URL, ret)
             if ret:
                 break
+        # print(ret)
         return ret
 
     def pj(self, html, parse:str):
@@ -119,6 +120,7 @@ class jsoup:
                 return ''
         if not parse.startswith('$.'):
             parse = f'$.{parse}'
+        # print(html)
         # print(parse)
         ret = jsonpath(html,parse)
         # print(ret)