From 697a8243bcd28ea74587fa5a0d24987925e7cf6a Mon Sep 17 00:00:00 2001
From: hjdhnx <hjd124579>
Date: Fri, 7 Oct 2022 19:29:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E7=B1=BB=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0vod=5Fid=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libs/drpy.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/libs/drpy.js b/libs/drpy.js
index 70e0882..ed132e0 100644
--- a/libs/drpy.js
+++ b/libs/drpy.js
@@ -1100,7 +1100,7 @@ function categoryParse(cateObj) {
                 let list = _pdfa(html, p[0]);
                 list.forEach(it => {
                     let links = p[4].split('+').map(p4=>{
-                        return !rule.detailUrl?_pd(p4, p[4],MY_URL):_pdfh(it, p[4]);
+                        return !rule.detailUrl?_pd(it, p4,MY_URL):_pdfh(it, p4);
                     });
                     let link = links.join('$');
                     let vod_id = rule.detailUrl?MY_CATE+'$'+link:link;
@@ -1446,7 +1446,10 @@ function playParse(playObj){
         rule.url = rule.url||'';
         rule.double = rule.double||false;
         rule.homeUrl = rule.homeUrl||'';
+        rule.detailUrl = rule.detailUrl||'';
         rule.searchUrl = rule.searchUrl||'';
+        rule.homeUrl = rule.host&&rule.homeUrl?urljoin(rule.host,rule.homeUrl):(rule.homeUrl||rule.host);
+        rule.detailUrl = rule.host&&rule.detailUrl?urljoin(rule.host,rule.detailUrl):rule.detailUrl;
         rule.timeout = rule.timeout||5000;
         rule.encoding = rule.编码||rule.encoding||'utf-8';
         if(rule.headers && typeof(rule.headers) === 'object'){
@@ -1498,13 +1501,11 @@ function home(filter) {
  * @returns {string}
  */
 function homeVod(params) {
-    let homeUrl = rule.host&&rule.homeUrl?urljoin(rule.host,rule.homeUrl):(rule.homeUrl||rule.host);
-    let detailUrl = rule.host&&rule.detailUrl?urljoin(rule.host,rule.detailUrl):rule.detailUrl;
     let homeVodObj = {
         推荐:rule.推荐,
         double:rule.double,
-        homeUrl:homeUrl,
-        detailUrl:detailUrl
+        homeUrl:rule.homeUrl,
+        detailUrl:rule.detailUrl
     };
     return homeVodParse(homeVodObj)
     // return "{}";
@@ -1545,8 +1546,6 @@ function detail(vod_url) {
     }
     let detailUrl = vod_url;
     let url;
-    rule.homeUrl = urljoin(rule.host,rule.homeUrl);
-    rule.detailUrl = urljoin(rule.host,rule.detailUrl);
     if(!detailUrl.startsWith('http')&&!detailUrl.includes('/')){
         url = rule.detailUrl.replaceAll('fyid', detailUrl).replaceAll('fyclass',fyclass);
     }else if(detailUrl.includes('/')){
-- 
GitLab