From bc4b3e2e13070b7976801664959db38a2f31cb5d Mon Sep 17 00:00:00 2001 From: hjdhnx Date: Thu, 6 Oct 2022 12:09:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=20cateID=20=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E4=BF=9D=E7=95=99MY=5FCATE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/cms.py | 5 ++--- "js/\345\245\207\347\217\215\345\274\202\345\205\275.js" | 4 ++-- libs/drpy.js | 1 - ...61\345\245\207\350\211\272\344\270\200\347\272\247.js" | 8 ++++---- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/controllers/cms.py b/controllers/cms.py index a93f796..d60a96f 100644 --- a/controllers/cms.py +++ b/controllers/cms.py @@ -715,7 +715,6 @@ class CMS: 'oheaders': self.d.oheaders, 'fetch_params': {'headers': self.headers, 'timeout': self.d.timeout, 'encoding': self.d.encoding}, 'd': self.d, - 'cateID':fyclass, # 分类id 'MY_CATE':fyclass, # 分类id 'MY_FL':fl, # 筛选 'MY_PAGE':fypage, # 页数 @@ -885,7 +884,7 @@ class CMS: 'input': url, 'html': html, 'TYPE': 'detail', # 海阔js环境标志 - 'cateID': fyclass, # 当前分类 + 'MY_CATE': fyclass, # 分类id 'oheaders': self.d.oheaders, 'fetch_params': {'headers': self.headers, 'timeout': self.d.timeout, 'encoding': self.d.encoding}, 'd': self.d, @@ -983,7 +982,7 @@ class CMS: 'TYPE': 'detail', # 海阔js环境标志 # 'VID': id, # 传递的vod_id '二级': self.二级渲染, # 二级解析函数,可以解析dict - 'cateID': fyclass, # 当前分类 + 'MY_CATE': fyclass, # 分类id 'oheaders': self.d.oheaders, 'fetch_params': {'headers': self.headers, 'timeout': self.d.timeout, 'encoding': self.d.encoding}, 'd': self.d, diff --git "a/js/\345\245\207\347\217\215\345\274\202\345\205\275.js" "b/js/\345\245\207\347\217\215\345\274\202\345\205\275.js" index 7413993..f59aa5a 100644 --- "a/js/\345\245\207\347\217\215\345\274\202\345\205\275.js" +++ "b/js/\345\245\207\347\217\215\345\274\202\345\205\275.js" @@ -27,8 +27,8 @@ var rule = { // 一级:'json:.data.list;.name;.imageUrl;.latestOrder;.albumId', 推荐:'', // 推荐:'js:let d=[];fetch_params.headers["user-agent"]=PC_UA;pdfh=jsp.pdfh;pdfa=jsp.pdfa;pd=jsp.pd;let html=fetch(HOST,fetch_params);let lists=pdfa(html,".qy-mod-li");lists.forEach(function(it){try{let title=pdfh(it,"p.sub&&title");let desc=pdfh(it,".qy-mod-label&&Text");let pic_url=pd(it,"img&&src");d.push({title:title,desc:desc,img:pic_url})}catch(e){}});res=setResult(d);', - 一级:'js:let d=[];if(cateID==="16"){input=input.replace("channel_id=16","channel_id=1").split("three_category_id")[0];input+="three_category_id=27401"}else if(cateID==="5"){input=input.replace("data_type=1","data_type=2")}let html=request(input);let json=JSON.parse(html);if(json.code==="A00003"){fetch_params.headers["user-agent"]=PC_UA;json=JSON.parse(fetch(input,fetch_params))}json.data.list.forEach(function(data){if(data.channelId===1){desc=data.hasOwnProperty("score")?data.score+"分\\t":""}else if(data.channelId===2||data.channelId===4){if(data.latestOrder===data.videoCount){desc=(data.hasOwnProperty("score")?data.score+"分\\t":"")+data.latestOrder+"集全"}else{if(data.videoCount){desc=(data.hasOwnProperty("score")?data.score+"分\\t":"")+data.latestOrder+"/"+data.videoCount+"集"}else{desc="更新至 "+data.latestOrder+"集"}}}else if(data.channelId===6){desc=data.period+"期"}else if(data.channelId===5){desc=data.focus}else{if(data.latestOrder){desc="更新至 第"+data.latestOrder+"期"}else if(data.period){desc=data.period}else{desc=data.focus}}url=cateID+"$"+data.albumId;d.push({url:url,title:data.name,desc:desc,pic_url:data.imageUrl.replace(".jpg","_390_520.jpg?caplist=jpg,webp")})});setResult(d);', - // 一级:'js:let d=[];if(cateID==="16"){input=input.replace("channel_id=16","channel_id=1").split("three_category_id")[0];input+="three_category_id=27401"}else if(cateID==="5"){input=input.replace("data_type=1","data_type=2")}let html=fetch(input,fetch_params);let json=JSON.parse(html);if(json.code==="A00003"){fetch_params.headers["user-agent"]=PC_UA;json=JSON.parse(fetch(input,fetch_params))}json.data.list.forEach(function(data){if(data.channelId===1){desc=data.hasOwnProperty("score")?data.score+"分\\t":""}else if(data.channelId===2||data.channelId===4){if(data.latestOrder===data.videoCount){desc=(data.hasOwnProperty("score")?data.score+"分\\t":"")+data.latestOrder+"集全"}else{if(data.videoCount){desc=(data.hasOwnProperty("score")?data.score+"分\\t":"")+data.latestOrder+"/"+data.videoCount+"集"}else{desc="更新至 "+data.latestOrder+"集"}}}else if(data.channelId===6){desc=data.period+"期"}else if(data.channelId===5){desc=data.focus}else{if(data.latestOrder){desc="更新至 第"+data.latestOrder+"期"}else if(data.period){desc=data.period}else{desc=data.focus}}url=cateID+"$"+data.albumId;d.push({url:url,title:data.name,desc:desc,pic_url:data.imageUrl.replace(".jpg","_390_520.jpg?caplist=jpg,webp")})});setResult(d);', + 一级:'js:let d=[];if(MY_CATE==="16"){input=input.replace("channel_id=16","channel_id=1").split("three_category_id")[0];input+="three_category_id=27401"}else if(MY_CATE==="5"){input=input.replace("data_type=1","data_type=2")}let html=request(input);let json=JSON.parse(html);if(json.code==="A00003"){fetch_params.headers["user-agent"]=PC_UA;json=JSON.parse(fetch(input,fetch_params))}json.data.list.forEach(function(data){if(data.channelId===1){desc=data.hasOwnProperty("score")?data.score+"分\\t":""}else if(data.channelId===2||data.channelId===4){if(data.latestOrder===data.videoCount){desc=(data.hasOwnProperty("score")?data.score+"分\\t":"")+data.latestOrder+"集全"}else{if(data.videoCount){desc=(data.hasOwnProperty("score")?data.score+"分\\t":"")+data.latestOrder+"/"+data.videoCount+"集"}else{desc="更新至 "+data.latestOrder+"集"}}}else if(data.channelId===6){desc=data.period+"期"}else if(data.channelId===5){desc=data.focus}else{if(data.latestOrder){desc="更新至 第"+data.latestOrder+"期"}else if(data.period){desc=data.period}else{desc=data.focus}}url=MY_CATE+"$"+data.albumId;d.push({url:url,title:data.name,desc:desc,pic_url:data.imageUrl.replace(".jpg","_390_520.jpg?caplist=jpg,webp")})});setResult(d);', + // 一级:'js:let d=[];if(MY_CATE==="16"){input=input.replace("channel_id=16","channel_id=1").split("three_category_id")[0];input+="three_category_id=27401"}else if(MY_CATE==="5"){input=input.replace("data_type=1","data_type=2")}let html=fetch(input,fetch_params);let json=JSON.parse(html);if(json.code==="A00003"){fetch_params.headers["user-agent"]=PC_UA;json=JSON.parse(fetch(input,fetch_params))}json.data.list.forEach(function(data){if(data.channelId===1){desc=data.hasOwnProperty("score")?data.score+"分\\t":""}else if(data.channelId===2||data.channelId===4){if(data.latestOrder===data.videoCount){desc=(data.hasOwnProperty("score")?data.score+"分\\t":"")+data.latestOrder+"集全"}else{if(data.videoCount){desc=(data.hasOwnProperty("score")?data.score+"分\\t":"")+data.latestOrder+"/"+data.videoCount+"集"}else{desc="更新至 "+data.latestOrder+"集"}}}else if(data.channelId===6){desc=data.period+"期"}else if(data.channelId===5){desc=data.focus}else{if(data.latestOrder){desc="更新至 第"+data.latestOrder+"期"}else if(data.period){desc=data.period}else{desc=data.focus}}url=MY_CATE+"$"+data.albumId;d.push({url:url,title:data.name,desc:desc,pic_url:data.imageUrl.replace(".jpg","_390_520.jpg?caplist=jpg,webp")})});setResult(d);', // 一级:'json:.data.list;.name;.imageUrl;.playUrl;.latestOrder', // 二级:{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.name+data.subtitle;data.latestOrder","img":"data.imageUrl","desc":"data.categories;data.areas","content":"data.description","tabs":"data.name","lists":"data.playlinksdetail.#idv.default_url"}, diff --git a/libs/drpy.js b/libs/drpy.js index e2b60c8..96b6e33 100644 --- a/libs/drpy.js +++ b/libs/drpy.js @@ -803,7 +803,6 @@ function categoryParse(cateObj) { p = p.trim(); if(p.startsWith('js:')){ const MY_CATE = cateObj.tid; - const cateID = cateObj.tid; var MY_FL = cateObj.extend; const TYPE = 'cate'; var input = MY_URL; diff --git "a/py/\347\210\261\345\245\207\350\211\272\344\270\200\347\272\247.js" "b/py/\347\210\261\345\245\207\350\211\272\344\270\200\347\272\247.js" index df20f90..e93b6e1 100644 --- "a/py/\347\210\261\345\245\207\350\211\272\344\270\200\347\272\247.js" +++ "b/py/\347\210\261\345\245\207\350\211\272\344\270\200\347\272\247.js" @@ -1,10 +1,10 @@ js: -let d = []; // 一级固定返回VODS变量,内置变量有 cateID,detailUrl,setResult用法跟海阔相同 -if(cateID==='16'){//网络电影 +let d = []; // 一级固定返回VODS变量,内置变量有 MY_CATE,detailUrl,setResult用法跟海阔相同 +if(MY_CATE==='16'){//网络电影 input = input.replace("channel_id=16", "channel_id=1").split("three_category_id")[0]; input+= "three_category_id=27401"; // input+= "three_category_id=27401;must,地区;must,类型;must,规格;must"; -}else if(cateID==='5'){//音乐 +}else if(MY_CATE==='5'){//音乐 input = input.replace("data_type=1", "data_type=2"); } // let html = fetch(input,fetch_params); @@ -43,7 +43,7 @@ json.data.list.forEach(function (data){ } } // url = "https://pcw-api.iqiyi.com/video/video/videoinfowithuser/" + data.albumId + "?agent_type=1&authcookie=&subkey=" + data.albumId + "&subscribe=1"; - url = cateID +'$'+data.albumId; + url = MY_CATE +'$'+data.albumId; // d.push({ // vod_id:url, // vod_name: data.name, -- GitLab