diff --git a/libs/drpy.js b/libs/drpy.js index dee1593b1fb6af702c5b9440bcdad992d6eb067a..a194bd51eb8c3d1e1ac713fbb328ee81647daf7a 100644 --- a/libs/drpy.js +++ b/libs/drpy.js @@ -1466,6 +1466,15 @@ function playParse(playObj){ 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; + if(rule.url.includes('[')&&rule.url.includes(']')){ + let u1 = rule.url.split('[')[0] + let u2 = rule.url.split('[')[1].split(']')[0] + rule.url = rule.host && rule.url?urljoin(rule.host,u1)+'['+urljoin(rule.host,u2)+']':rule.url; + }else{ + rule.url = rule.host && rule.url ? urljoin(rule.host,rule.url) : rule.url; + } + rule.searchUrl = rule.host && rule.searchUrl ? urljoin(rule.host,rule.searchUrl) : rule.searchUrl; + rule.timeout = rule.timeout||5000; rule.encoding = rule.编码||rule.encoding||'utf-8'; if(rule.headers && typeof(rule.headers) === 'object'){ @@ -1503,7 +1512,7 @@ function home(filter) { console.log("home"); let homeObj = { filter:rule.filter||false, - MY_URL: rule.host, + MY_URL: rule.homeUrl, class_name: rule.class_name || '', class_url: rule.class_url || '', class_parse: rule.class_parse || '', @@ -1538,7 +1547,7 @@ function homeVod(params) { */ function category(tid, pg, filter, extend) { let cateObj = { - url: urljoin(rule.host, rule.url), + url: rule.url, 一级: rule.一级, tid: tid, pg: parseInt(pg), @@ -1604,7 +1613,7 @@ function play(flag, id, flags) { */ function search(wd, quick) { let searchObj = { - searchUrl: urljoin(rule.host, rule.searchUrl), + searchUrl: rule.searchUrl, 搜索: rule.搜索, wd: wd, //pg: pg, diff --git a/templates/config.txt b/templates/config.txt index dd8d1506283d28787e749bc17e064fac552dbac4..d241ca8e11d85b6dddf95a43152556edc9113928 100644 --- a/templates/config.txt +++ b/templates/config.txt @@ -19,7 +19,8 @@ "key":"dr_{{ rule.name }}", "name":"{{ rule.name }}(drpy)", "type":3, - "api":"{{ host }}/libs/drpy.min.js", + #"api":"{{ host }}/libs/drpy.min.js", + "api":"{{ host }}/libs/drpy.js", "searchable": {{ rule.searchable }}, "quickSearch": {{ rule.quickSearch }}, "filterable": {{ rule.filterable }},