diff --git a/base/rules.db b/base/rules.db index c2089ee30c8a42dc1afcb6863af3c599193f63d0..1414a80857c52a0d7edb12293f75513257f71f92 100644 Binary files a/base/rules.db and b/base/rules.db differ diff --git a/js/drpy.js b/js/drpy.js index 0e1521d3f60e1efff76c7ff21446170c93bf45bb..81b7fd3cc19af16fb34dc17f535212d4261a9cec 100644 --- a/js/drpy.js +++ b/js/drpy.js @@ -8,7 +8,7 @@ var rule = { quickSearch:1, filterable:1, // 分类链接fypage参数支持1个()表达式 - url:'/?pg=fypage&class=fyclass&douban=', + url:'/?pg=fypage&class=fyclass&douban={{douban}}', filter_url:'fl={{fl}}', headers:{ "Host": "frodo.douban.com", @@ -30,7 +30,7 @@ var rule = { lazy:'', // 推荐:'.list_item;img&&alt;img&&src;a&&Text;a&&data-float', 一级:'', - 一级:'js:let d=[];let douban=input.split("douban=")[1].split("&")[0];let douban_api_host="http://api.douban.com/api/v2";let miniapp_apikey="0ac44ae016490db2204ce0a042db2916";const count=30;function miniapp_request(path,query){try{let url=douban_api_host+path;query.apikey=miniapp_apikey;fetch_params.headers=oheaders;url=buildUrl(url,query);let html=fetch(url,fetch_params);if(/request_error/.test(html)){print(html)}return JSON.parse(html)}catch(e){print("发生了错误:"+e.message);return{}}}function cate_filter(d,douban){douban=douban||"";try{let res={};if(MY_CATE==="interests"){if(douban){let status=MY_FL.status||"mark";let subtype_tag=MY_FL.subtype_tag||"";let year_tag=MY_FL.year_tag||"全部";let path="/user/"+douban+"/interests";res=miniapp_request(path,{type:"movie",status:status,subtype_tag:subtype_tag,year_tag:year_tag,start:(MY_PAGE-1)*count,count:count})}else{return{}}}else if(MY_CATE==="hot_gaia"){let sort=MY_FL.sort||"recommend";let area=MY_FL.area||"全部";let path="/movie/"+MY_CATE;res=miniapp_request(path,{area:area,sort:sort,start:(MY_PAGE-1)*count,count:count})}else if(MY_CATE==="tv_hot"||MY_CATE==="show_hot"){let stype=MY_FL.type||MY_CATE;let path="/subject_collection/"+stype+"/items";res=miniapp_request(path,{start:(MY_PAGE-1)*count,count:count})}else if(MY_CATE.startsWith("rank_list")){let id=MY_CATE==="rank_list_movie"?"movie_real_time_hotest":"tv_real_time_hotest";id=MY_FL.榜单||id;let path="/subject_collection/"+id+"/items";res=miniapp_request(path,{start:(MY_PAGE-1)*count,count:count})}else{let path="/"+MY_CATE+"/recommend";let selected_categories;let tags;let sort;if(Object.keys(MY_FL).length>0){sort=MY_FL.sort||"T";tags=Object.values(MY_FL).join(",");if(MY_CATE==="movie"){selected_categories={"类型":MY_FL.类型||"","地区":MY_FL.地区||""}}else{selected_categories={"类型":MY_FL.类型||"","形式":MY_FL.类型?MY_FL.类型+"地区":"","地区":MY_FL.地区||""}}}else{sort="T";tags="";if(MY_CATE==="movie"){selected_categories={"类型":"","地区":""}}else{selected_categories={"类型":"","形式":"","地区":""}}}let params={tags:tags,sort:sort,refresh:0,selected_categories:stringify(selected_categories),start:(MY_PAGE-1)*count,count:count};res=miniapp_request(path,params)}let result={page:MY_PAGE,pagecount:Math.ceil(res.total/count),limit:count,total:res.total};let items=[];if(/^rank_list|tv_hot|show_hot/.test(MY_CATE)){items=res["subject_collection_items"]}else if(MY_CATE==="interests"){res["interests"].forEach(function(it){items.push(it.subject)})}else{items=res.items}let lists=[];items.forEach(function(item){if(item.type==="movie"||item.type==="tv"){let rating=item.rating?item.rating.value:"";let rat_str=rating||"暂无评分";let title=item.title;let honor=item.honor_infos||[];let honor_str=honor.map(function(it){return it.title}).join("|");let vod_obj={vod_name:title!=="未知电影"?title:"暂不支持展示",vod_pic:item.pic.normal,vod_remarks:rat_str+" "+honor_str};let vod_obj_d={url:item.type+"$"+item.id,title:title!=="未知电影"?title:"暂不支持展示",pic_url:item.pic.normal,desc:rat_str+" "+honor_str};lists.push(vod_obj);d.push(vod_obj_d)}});result.list=lists;return result}catch(e){print(e.message)}return{}}let res=cate_filter(d);setResult2(res);', + 一级:'js:let d=[];let douban=input.split("douban=")[1].split("&")[0];let douban_api_host="http://api.douban.com/api/v2";let miniapp_apikey="0ac44ae016490db2204ce0a042db2916";const count=30;function miniapp_request(path,query){try{let url=douban_api_host+path;query.apikey=miniapp_apikey;fetch_params.headers=oheaders;url=buildUrl(url,query);let html=fetch(url,fetch_params);if(/request_error/.test(html)){print(html)}return JSON.parse(html)}catch(e){print("发生了错误:"+e.message);return{}}}function cate_filter(d,douban){douban=douban||"";try{let res={};if(MY_CATE==="interests"){if(douban){let status=MY_FL.status||"mark";let subtype_tag=MY_FL.subtype_tag||"";let year_tag=MY_FL.year_tag||"全部";let path="/user/"+douban+"/interests";res=miniapp_request(path,{type:"movie",status:status,subtype_tag:subtype_tag,year_tag:year_tag,start:(MY_PAGE-1)*count,count:count})}else{return{}}}else if(MY_CATE==="hot_gaia"){let sort=MY_FL.sort||"recommend";let area=MY_FL.area||"全部";let path="/movie/"+MY_CATE;res=miniapp_request(path,{area:area,sort:sort,start:(MY_PAGE-1)*count,count:count})}else if(MY_CATE==="tv_hot"||MY_CATE==="show_hot"){let stype=MY_FL.type||MY_CATE;let path="/subject_collection/"+stype+"/items";res=miniapp_request(path,{start:(MY_PAGE-1)*count,count:count})}else if(MY_CATE.startsWith("rank_list")){let id=MY_CATE==="rank_list_movie"?"movie_real_time_hotest":"tv_real_time_hotest";id=MY_FL.榜单||id;let path="/subject_collection/"+id+"/items";res=miniapp_request(path,{start:(MY_PAGE-1)*count,count:count})}else{let path="/"+MY_CATE+"/recommend";let selected_categories;let tags;let sort;if(Object.keys(MY_FL).length>0){sort=MY_FL.sort||"T";tags=Object.values(MY_FL).join(",");if(MY_CATE==="movie"){selected_categories={"类型":MY_FL.类型||"","地区":MY_FL.地区||""}}else{selected_categories={"类型":MY_FL.类型||"","形式":MY_FL.类型?MY_FL.类型+"地区":"","地区":MY_FL.地区||""}}}else{sort="T";tags="";if(MY_CATE==="movie"){selected_categories={"类型":"","地区":""}}else{selected_categories={"类型":"","形式":"","地区":""}}}let params={tags:tags,sort:sort,refresh:0,selected_categories:stringify(selected_categories),start:(MY_PAGE-1)*count,count:count};res=miniapp_request(path,params)}let result={page:MY_PAGE,pagecount:Math.ceil(res.total/count),limit:count,total:res.total};let items=[];if(/^rank_list|tv_hot|show_hot/.test(MY_CATE)){items=res["subject_collection_items"]}else if(MY_CATE==="interests"){res["interests"].forEach(function(it){items.push(it.subject)})}else{items=res.items}let lists=[];items.forEach(function(item){if(item.type==="movie"||item.type==="tv"){let rating=item.rating?item.rating.value:"";let rat_str=rating||"暂无评分";let title=item.title;let honor=item.honor_infos||[];let honor_str=honor.map(function(it){return it.title}).join("|");let vod_obj={vod_name:title!=="未知电影"?title:"暂不支持展示",vod_pic:item.pic.normal,vod_remarks:rat_str+" "+honor_str};let vod_obj_d={url:item.type+"$"+item.id,title:title!=="未知电影"?title:"暂不支持展示",pic_url:item.pic.normal,desc:rat_str+" "+honor_str};lists.push(vod_obj);d.push(vod_obj_d)}});result.list=lists;return result}catch(e){print(e.message)}return{}}let res=cate_filter(d,douban);setResult2(res);', 二级:'', 搜索:'', } \ No newline at end of file diff --git a/js/version.txt b/js/version.txt index 5a1874519f709455b7bc15cb1b76ecb6fba0ed98..d83e8e64060a3a6b2bcdb0a11853bdb1fe5eaea2 100644 --- a/js/version.txt +++ b/js/version.txt @@ -1 +1 @@ -3.9.22 \ No newline at end of file +3.9.22beta1 \ No newline at end of file diff --git "a/py/drpy\344\270\200\347\272\247.js" "b/py/drpy\344\270\200\347\272\247.js" index c8d5755c667dab50e4d6013afda6d1ad0f6c2680..a36eefa0e2c6f22f5047e16a97879def52e6331a 100644 --- "a/py/drpy\344\270\200\347\272\247.js" +++ "b/py/drpy\344\270\200\347\272\247.js" @@ -13,6 +13,8 @@ function miniapp_request(path, query) { query.apikey = miniapp_apikey; fetch_params.headers = oheaders; url = buildUrl(url, query); + // print(url); + // print(fetch_params); let html = fetch(url, fetch_params); if(/request_error/.test(html)){ print(html); @@ -30,6 +32,7 @@ function cate_filter(d, douban) { try { let res = {}; if (MY_CATE === "interests") { + // print(douban); if (douban) { let status = MY_FL.status || "mark"; let subtype_tag = MY_FL.subtype_tag || ""; @@ -166,5 +169,5 @@ function cate_filter(d, douban) { } return {} } -let res = cate_filter(d); +let res = cate_filter(d,douban); setResult2(res); \ No newline at end of file diff --git a/readme.md b/readme.md index 709b70025445d22f07fbed0c5294b4a9d3c73b0c..282b40babe6866b9dd3ba4786fe57b58f013d2de 100644 --- a/readme.md +++ b/readme.md @@ -40,6 +40,7 @@ [JS引擎的选择](./python最强js引擎.md) +[我的豆瓣](./static/img/豆瓣.png) [搭建教程](./安卓本地搭建说明.md) | [install_help](https://jason-ray.notion.site/jason-ray/Pluto-TVB-706da08332804a19ab012b4f8385df64) |[goorm](./道长乱说.md) |[大佬地盘](./大佬友链.md) [dr项目QQ官群](https://qm.qq.com/cgi-bin/qm/qr?k=H2KwcXrMdiR5M2blHR5gjZzPfN_S3N_C&jump_from=webapi) [参考T4](https://github.com/sec-an/TV_Spider/blob/main/spider/sp360.py) @@ -53,6 +54,7 @@ - [X] 设置中心增加自定义环境变量,演示源:007影视.js - [X] 界面优化，升级至3.9.22 - [X] 修复自建鸿途解析 +- [X] 增加我的豆瓣配置,环境变量为 douban 例如 {"douban":"自己的豆瓣id"} ###### 2022/11/20 - [X] 维护一波可用的自建解析 - [X] 未来功能-解析管理中心增加了对解析的点击访问测试 diff --git "a/static/img/\350\261\206\347\223\243.png" "b/static/img/\350\261\206\347\223\243.png" new file mode 100644 index 0000000000000000000000000000000000000000..2c10aa46bc74dc476cc23d24cab9e3ff1b37ee97 Binary files /dev/null and "b/static/img/\350\261\206\347\223\243.png" differ