diff --git a/base/rules.db b/base/rules.db index 7f0a1a2c418519e612f2331b2d35703fb84af652..bbee440feea6ab4267cf6213deaf7744b3fef58d 100644 Binary files a/base/rules.db and b/base/rules.db differ diff --git a/js/version.txt b/js/version.txt index be4e2e3dcaffdbffdae23ae1df322b680a506e4b..63cbc4fd7d70a3cc00c67fc2871fb7ce14d0ef49 100644 --- a/js/version.txt +++ b/js/version.txt @@ -1 +1 @@ -3.9.24beta1 \ No newline at end of file +3.9.24beta2 \ 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 f53b58c1d5e2d060a425cc16f708c843026ee626..2060711241db2598a247ef2aade9a530e91de0c2 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" @@ -29,6 +29,6 @@ var rule = { // 二级:{is_json:1,"title":"data.title;data.moviecategory[0]+data.moviecategory[1]","img":"data.cdncover","desc":"data.area[0];data.director[0]","content":"data.description","tabs":"data.playlink_sites;data.playlinksdetail.#idv.quality","lists":"data.playlinksdetail.#idv.default_url"}, // 二级:{is_json:1,"title":"data.title;data.moviecategory[0]+data.moviecategory[1]","img":"data.cdncover","desc":"data.area[0];data.director[0]","content":"data.description","tabs":"data.playlink_sites","lists":"data.playlinksdetail.#idv.default_url"}, 二级:'', - 二级:'js:VOD={};let d=[];let video_list=[];let video_lists=[];let list=[];let QZOutputJson;let html=fetch(input,fetch_params);let sourceId=/get_playsource/.test(input)?input.match(/id=(\\d*?)&/)[1]:input.split("cid=")[1];let cid=sourceId;let detailUrl="https://v.%71%71.com/detail/m/"+cid+".html";log("详情页:"+detailUrl);var pdfh=jsp.pdfh;var pd=jsp.pd;try{let json=JSON.parse(html);VOD={vod_url:input,vod_name:json.c.title,type_name:json.typ.join(","),vod_actor:json.nam.join(","),vod_year:json.c.year,vod_content:json.c.description,vod_remarks:json.rec,vod_pic:urljoin2(input,json.c.pic)}}catch(e){log("解析片名海报等基础信息发生错误:"+e.message)}if(/get_playsource/.test(input)){eval(html);let indexList=QZOutputJson.PlaylistItem.indexList;indexList.forEach(function(it){let dataUrl="https://s.video.qq.com/get_playsource?id="+sourceId+"&plat=2&type=4&data_type=3&range="+it+"&video_type=10&plname=qq&otype=json";eval(fetch(dataUrl,fetch_params));let vdata=QZOutputJson.PlaylistItem.videoPlayList;vdata.forEach(function(item){d.push({title:item.title,pic_url:item.pic,desc:item.episode_number+"\\t\\t\\t播放量："+item.thirdLine,url:item.playUrl})});video_lists=video_lists.concat(vdata)})}else{let json=JSON.parse(html);video_lists=json.c.video_ids;let url="https://v.qq.com/x/cover/"+sourceId+".html";if(json.c.type===10){let dataUrl="https://s.video.qq.com/get_playsource?id="+json.c.column_id+"&plat=2&type=2&data_type=3&video_type=8&plname=qq&otype=json";let o_html=fetch(dataUrl,fetch_params);eval(o_html);video_lists=[];let indexList=QZOutputJson.PlaylistItem.indexList;indexList.forEach(function(it){let dataUrl="https://s.video.qq.com/get_playsource?id="+json.c.column_id+"&plat=2&type=4&data_type=3&range="+it+"&video_type=10&plname=qq&otype=json";eval(fetch(dataUrl,fetch_params));let vdata=QZOutputJson.PlaylistItem.videoPlayList;vdata.forEach(function(item){d.push({title:item.title,pic_url:item.pic,desc:item.episode_number+"\\t\\t\\t播放量："+item.thirdLine,url:item.playUrl})});video_lists=video_lists.concat(vdata)})}else if(video_lists.length===1){d.push({title:"在线播放",url:url})}else if(video_lists.length>1){for(let i=0;i1){for(let i=0;i1?it1.category_map[1]:""})})})}}let yg=d.filter(function(it){return it.type&&it.type!=="正片"});let zp=d.filter(function(it){return!(it.type&&it.type!=="正片")});VOD.vod_play_from=yg.length<1?"qq":"qq$$$qq 预告及花絮";VOD.vod_play_url=yg.length<1?d.map(function(it){return it.title+"$"+it.url}).join("#"):[zp,yg].map(function(it){return it.map(function(its){return its.title+"$"+its.url}).join("#")}).join("$$$");', 搜索:'json:uiData;data[0].title;data[0].posterPic;.titleMarkLabelList[1].primeText;data[0].id;data[0].publishDate', } \ No newline at end of file diff --git "a/py/\350\205\276\350\256\257\344\272\214\347\272\247.js" "b/py/\350\205\276\350\256\257\344\272\214\347\272\247.js" index 457d9e796b4c8c30753682ce0937c44a3de021c9..60a102a8ba14685776141e9faebbacae7ccb15ae 100644 --- "a/py/\350\205\276\350\256\257\344\272\214\347\272\247.js" +++ "b/py/\350\205\276\350\256\257\344\272\214\347\272\247.js" @@ -103,6 +103,7 @@ if (/get_playsource/.test(input)) { pic_url: it1.pic160x90.replace('/160',''), desc: it1.video_checkup_time, url: url, + type:it1.category_map&&it1.category_map.length>1?it1.category_map[1]:'' }); }); }); @@ -111,7 +112,17 @@ if (/get_playsource/.test(input)) { } // print(d); -VOD.vod_play_from = 'qq'; -VOD.vod_play_url = d.map(function (it){ +let yg = d.filter(function (it){ + return (it.type&&it.type!=='正片') +}); +let zp = d.filter(function (it){ + return !(it.type&&it.type!=='正片') +}); +VOD.vod_play_from = yg.length<1?'qq':'qq$$$qq 预告及花絮'; +VOD.vod_play_url = yg.length<1?d.map(function (it){ return it.title + '$' + it.url; -}).join('#'); \ No newline at end of file +}).join('#'):[zp,yg].map(function (it){ + return it.map(function (its){ + return its.title + '$' + its.url; + }).join('#'); +}).join('$$$'); \ No newline at end of file diff --git a/readme.md b/readme.md index bc2a556d2dd0e55cc05e257285a67113d9728c4a..3db33b1c786cd802cce49f597a1fe0a48417093c 100644 --- a/readme.md +++ b/readme.md @@ -49,6 +49,8 @@ [dockerfile教程](https://blog.csdn.net/qq_46158060/article/details/125718218) [获取本地设备信息](https://blog.csdn.net/cui_yonghua/article/details/125508991) [获取本地设备信息](https://m.jb51.net/article/140716.htm) +###### 2022/11/25 +- [X] 优化腾云驾雾源,方便追剧 ###### 2022/11/24 - [X] 优化alist的历史记录和收藏 - [X] 设置中心环境变量增加前端的保存校验 diff --git a/templates/config.txt b/templates/config.txt index 4a48293c8d0650474e90530e0976e14c6dccf6a5..ad982386ef4b9e6009e0b7b9a3ca8d3bd655a205 100644 --- a/templates/config.txt +++ b/templates/config.txt @@ -79,14 +79,14 @@ "url": "{{ jx.url }}", "type": {{ jx.type }}, "ext": { - "flag": ["qiyi","imgo","爱奇艺", "奇艺", "qq", "腾讯", "youku", "优酷", "pptv", "PPTV", "letv", "乐视","leshi", "bilibili", "哔哩哔哩", "哔哩", "mgtv", "芒果","sohu", "xigua","fun","风行"], + "flag": ["qiyi","imgo","爱奇艺", "奇艺", "qq","qq 预告及花絮", "腾讯", "youku", "优酷", "pptv", "PPTV", "letv", "乐视","leshi", "bilibili", "哔哩哔哩", "哔哩", "mgtv", "芒果","sohu", "xigua","fun","风行"], "header": { "User-Agent": "{{ jx.ua }}" } } }{% if loop.last==False %},{% endif %}{% endfor %} ], -"flags": ["imgo","youku", "qq", "iqiyi", "qiyi","fun", "letv","leshi","sohu", "tudou","xigua","cntv","1905", "pptv", "mgtv", "wasu", "bilibili", "renrenmi"], +"flags": ["imgo","youku", "qq","qq 预告及花絮", "iqiyi", "qiyi","fun", "letv","leshi","sohu", "tudou","xigua","cntv","1905", "pptv", "mgtv", "wasu", "bilibili", "renrenmi"], "hotSearch": [{ "name": "mobilesearch", "request": {