升级

controllers/cms.py

@@ -1053,7 +1053,7 @@ class CMS:
                         vod_tab_list.append(vlist)
                     vod_play_url = vod_play_url.join(vod_tab_list)
 
-            # print(vod_play_url)
+            print(vod_play_url)
             vod['vod_play_from'] = vod_play_from
             # print(vod_play_from)
             vod['vod_play_url'] = vod_play_url

js/version.txt

-3.9.14beta1
\ No newline at end of file
+3.9.14beta2
\ No newline at end of file

js/荐片.js

+// 道长 drpy仓库 https://gitcode.net/qq_32394351/dr_py
+// drpy安卓本地搭建说明 https://gitcode.net/qq_32394351/dr_py/-/blob/master/%E5%AE%89%E5%8D%93%E6%9C%AC%E5%9C%B0%E6%90%AD%E5%BB%BA%E8%AF%B4%E6%98%8E.md
+// Pluto Player官方TG https://t.me/PlutoPlayer
+// Pluto Player官方TG https://t.me/PlutoPlayerChannel
+
+var rule = {
+    title:'荐片',
+    host:'http://api2.rinhome.com',
+    homeUrl:'',//网站的首页链接,用于分类获取和推荐获取
+	url:'/api/crumb/list?area=0&sort=hot&category_id=fyclass&page=fypage&type=0&limit=24&year=0',
+    class_name:'全部&电影&电视剧&动漫&综艺',
+    class_url:'0&1&2&3&4',
+    detailUrl:'/api/node/detail?channel=wandoujia&token=&id=fyid',//二级详情拼接链接(json格式用)
+    searchUrl:'/api/video/search?key=**&page=fypage',
+    searchable:2,
+    quickSearch:0,
+    headers:{
+		'User-Agent':'jianpian-android/350',
+		'JPAUTH':'y261ow7kF2dtzlxh1GS9EB8nbTxNmaK/QQIAjctlKiEv'
+	},
+    timeout:5000,
+    limit:8,
+    play_parse:true,
+    play_json:[{
+      re:'*',
+      json:{
+          parse:0,
+          jx:0
+      }
+    }],
+    lazy:'',
+    double:true,
+	推荐:'json:data;room;*;cover;*;*',
+	一级:'json:data;title;path;playlist.title;id',
+    二级:{
+    title:'data.title',
+    desc:';data.description;data.id',
+    img:'data.thumbnail',
+    content:'data.thumbnail',
+    is_json:1,
+    tabs:'js:TABS=[];if(html.data.have_ftp_ur == 1){TABS.push("边下边播超清版")}if(html.data.have_m3u8_ur == 1){TABS.push("在线点播普清版")}',
+    lists:'js:log(TABS);LISTS=[];TABS.forEach(function(tab){if(/边下边播/.test(tab)){let ftp=html.data.new_ftp_list;let d=ftp.map(function(it){return it.title+"$"+(/m3u8/.test(it.url)?play_url+it.url:"tvbox-xg:"+it.url)});LISTS.push(d)}else if(/在线点播/.test(tab)){let m3u=html.data.new_m3u8_list;let d=m3u.map(function(it){return it.title+"$"+(/m3u8/.test(it.url)?play_url+it.url:"tvbox-xg:"+it.url)});LISTS.push(d)}});',
+    },
+    搜索:'json:data;*;thumbnail;mask;*',
+}
\ No newline at end of file

libs/drpy.js

@@ -33,7 +33,7 @@ function init_test(){
 }
 
 let rule = {};
-const VERSION = '3.9.14beta1';
+const VERSION = '3.9.14beta2';
 /** 已知问题记录
  * 1.影魔的jinjia2引擎不支持 {{fl}}对象直接渲染 (有能力解决的话尽量解决下，支持对象直接渲染字符串转义,如果加了|safe就不转义)[影魔牛逼，最新的文件发现这问题已经解决了]
  * Array.prototype.append = Array.prototype.push; 这种js执行后有毛病,for in 循环列表会把属性给打印出来 (这个大毛病需要重点排除一下)
@@ -1619,7 +1619,9 @@ function detailParse(detailObj){
             if(p.tabs.startsWith('js:')){
                 print('开始执行tabs代码:'+p.tabs);
                 if(html&&typeof (html)!=='string'){
-                    html = html.rr(html.ele).toString();
+                    try { // 假装是jq的对象拿来转换一下字符串,try为了防止json的情况报错
+                        html = html.rr(html.ele).toString();
+                    }catch (e) {}
                 }
                 var input = MY_URL;
                 eval(p.tabs.replace('js:',''));
@@ -1653,9 +1655,13 @@ function detailParse(detailObj){
             if(p.lists.startsWith('js:')){
                 print('开始执行lists代码:'+p.lists);
                 if(html&&typeof (html)!=='string'){
-                    html = html.rr(html.ele).toString();
+                    // 假装是jq的对象拿来转换一下字符串,try为了防止json的情况报错
+                    try {
+                        html = html.rr(html.ele).toString();
+                    }catch (e) {}
                 }
                 var input = MY_URL;
+                var play_url = '';
                 eval(p.lists.replace('js:',''));
                 vod_play_url = LISTS.map(it=>it.join('#')).join(vod_play_url);
             }else{
@@ -1761,12 +1767,16 @@ function playParse(playObj){
     }else{
         lazy_play =  common_play;
     }
+    // print('play_json:'+typeof(rule.play_json));
+    // console.log(Array.isArray(rule.play_json));
     if(Array.isArray(rule.play_json) && rule.play_json.length >0){ // 数组情况判断长度大于0
         let web_url = lazy_play.url;
         for(let pjson of rule.play_json){
             if(pjson.re && (pjson.re==='*'||web_url.match(new RegExp(pjson.re)))){
                 if(pjson.json && typeof(pjson.json)==='object'){
                     let base_json = pjson.json;
+                    // print('开始合并:');
+                    // print(base_json);
                     lazy_play = Object.assign(lazy_play,base_json);
                     break;
                 }

py/荐片选集列表.js

+js:
+log(TABS);
+LISTS=[];
+TABS.forEach(function (tab){
+    if(/边下边播/.test(tab)){
+    let ftp = html.data.new_ftp_list;
+    let d = ftp.map(function (it){
+       return it.title+'$'+(/m3u8/.test(it.url)?play_url+it.url:'tvbox-xg:'+it.url)
+    });
+    LISTS.push(d);
+    }else if(/在线点播/.test(tab)){
+    let m3u = html.data.new_m3u8_list;
+    let d=m3u.map(function (it){
+        return it.title+'$'+(/m3u8/.test(it.url)?play_url+it.url:'tvbox-xg:'+it.url);
+    });
+    LISTS.push(d);
+    }
+});
\ No newline at end of file

readme.md

@@ -51,6 +51,7 @@
 - [X] 源新增了play_json属性和与之对应的哔哩直播,jrs看直播等源
 - [X] 修复俊版无法搜索问题(还需要壳子彻底解决console.log函数问题,无法打印大数据)
 - [X] 升级至3.9.14,drpy.js代码中开始记录版本号
+- [X] 升级至3.9.14beta2 json优化并增加荐片源
 ###### 2022/10/20
 - [X] 新增了几个源
 - [X] 修复乐猪TV源并记录已知问题