diff --git a/js/mp4us.js b/js/mp4us.js index 0369ee2c..fb072324 100644 --- a/js/mp4us.js +++ b/js/mp4us.js @@ -60,6 +60,9 @@ if (tabsm === true){ if (tabse === true){ TABS.push("電驢"); } +if (tabsa.length + tabsq.length > 1){ + TABS.push("選擇右側綫路"); +} let tmpIndex; tmpIndex=1; tabsa.forEach(function(it){ @@ -89,19 +92,27 @@ d.forEach(function(it){ log('dygang burl >>>>>>>>>>>>>>>>>>>>>>>>>>' + burl); let loopresult = title + '$' + burl; if (burl.startsWith("https://www.aliyundrive.com/s/")){ + if (false){ if (TABS.length==1){ burl = "http://127.0.0.1:9978/proxy?do=ali&type=push&confirm=0&url=" + encodeURIComponent(burl); }else{ burl = "http://127.0.0.1:9978/proxy?do=ali&type=push&url=" + encodeURIComponent(burl); } + }else{ + burl = "push://" + burl; + } loopresult = title + '$' + burl; lista.push(loopresult); }else if (burl.startsWith("https://pan.quark.cn/s/")){ + if (false){ if (TABS.length==1){ burl = "http://127.0.0.1:9978/proxy?do=quark&type=push&confirm=0&url=" + encodeURIComponent(burl); }else{ burl = "http://127.0.0.1:9978/proxy?do=quark&type=push&url=" + encodeURIComponent(burl); } + }else{ + burl = "push://" + burl; + } loopresult = title + '$' + burl; listq.push(loopresult); }else if (burl.startsWith("magnet")){ @@ -116,6 +127,9 @@ if (listm.length>0){ if (liste.length>0){ LISTS.push(liste.reverse()); } +if (lista.length + listq.length > 1){ + LISTS.push(["選擇右側綫路,或3秒後自動跳過$http://127.0.0.1:10079/delay/"]); +} lista.forEach(function(it){ LISTS.push([it]); }); @@ -135,7 +149,7 @@ if (rule_fetch_params.headers.Cookie.startsWith("http")){ log('mp4us seach cookie>>>>>>>>>>>>>' + rule_fetch_params.headers.Cookie); let _fetch_params = JSON.parse(JSON.stringify(rule_fetch_params)); //log("mp4us search params>>>>>>>>>>>>>>>" + JSON.stringify(_fetch_params)); -let search_html = request( HOST + '/search/' + KEY + '-1.html', _fetch_params) +let search_html = request( HOST + '/search/' + encodeURIComponent(KEY) + '-1.html', _fetch_params) //log("mp4us search result>>>>>>>>>>>>>>>" + search_html); let d=[]; //'div#list_all li;img.lazy&&alt;img.lazy&&src;div.text_info h2&&Text;a&&href;p.info&&Text', diff --git a/js/xb6v.js b/js/xb6v.js index 499ab402..cfd57a95 100644 --- a/js/xb6v.js +++ b/js/xb6v.js @@ -29,55 +29,55 @@ var rule = { limit:6, 推荐:'', 推荐:`js: - pdfh=jsp.pdfh;pdfa=jsp.pdfa;pd=jsp.pd; - let d = []; - let html = request(input); - let list = pdfa(html, 'div.mainleft ul#post_container li'); - list.forEach(it => { - d.push({ - title: pdfh(it, 'div.thumbnail img&&alt'), - desc: pdfh(it, 'div.info&&span.info_date&&Text') + ' / ' + pdfh(it, 'div.info&&span.info_category&&Text'), - pic_url: pd(it, 'div.thumbnail img&&src', HOST), - url: pdfh(it, 'div.thumbnail&&a&&href') - }); - }); - setResult(d); +pdfh=jsp.pdfh;pdfa=jsp.pdfa;pd=jsp.pd; +let d = []; +let html = request(input); +let list = pdfa(html, 'div.mainleft ul#post_container li'); +list.forEach(it => { + d.push({ + title: pdfh(it, 'div.thumbnail img&&alt'), + desc: pdfh(it, 'div.info&&span.info_date&&Text') + ' / ' + pdfh(it, 'div.info&&span.info_category&&Text'), + pic_url: pd(it, 'div.thumbnail img&&src', HOST), + url: pdfh(it, 'div.thumbnail&&a&&href') + }); +}); +setResult(d); `, 一级:'', 一级:`js: - pdfh=jsp.pdfh;pdfa=jsp.pdfa;pd=jsp.pd; - let d = []; - if (MY_CATE !== 'qian50m.html') { - let turl = (MY_PAGE === 1)? '/' : '/index_'+ MY_PAGE + '.html'; - input = rule.homeUrl + MY_CATE + turl; - let html = request(input); - let list = pdfa(html, 'div.mainleft ul#post_container li'); - list.forEach(it => { - d.push({ - title: pdfh(it, 'div.thumbnail img&&alt'), - desc: pdfh(it, 'div.info&&span.info_date&&Text') + ' / ' + pdfh(it, 'div.info&&span.info_category&&Text'), - pic_url: pd(it, 'div.thumbnail img&&src', HOST), - url: pdfh(it, 'div.thumbnail&&a&&href') - }); - }) - }else{ - input = rule.homeUrl + MY_CATE; - let html = request(input); - let list = pdfa(html, 'div.container div#tab-content&&ul&&li'); - list.forEach(it => { - let title = pdfh(it, 'a&&Text'); - if (title!==""){ - d.push({ - title: title, - desc: pdfh(it, 'a&&Text'), - pic_url: '', - url: pdfh(it, 'a&&href') - }); - } - }) +pdfh=jsp.pdfh;pdfa=jsp.pdfa;pd=jsp.pd; +let d = []; +if (MY_CATE !== 'qian50m.html') { + let turl = (MY_PAGE === 1)? '/' : '/index_'+ MY_PAGE + '.html'; + input = rule.homeUrl + MY_CATE + turl; + let html = request(input); + let list = pdfa(html, 'div.mainleft ul#post_container li'); + list.forEach(it => { + d.push({ + title: pdfh(it, 'div.thumbnail img&&alt'), + desc: pdfh(it, 'div.info&&span.info_date&&Text') + ' / ' + pdfh(it, 'div.info&&span.info_category&&Text'), + pic_url: pd(it, 'div.thumbnail img&&src', HOST), + url: pdfh(it, 'div.thumbnail&&a&&href') + }); + }) +}else{ + input = rule.homeUrl + MY_CATE; + let html = request(input); + let list = pdfa(html, 'div.container div#tab-content&&ul&&li'); + list.forEach(it => { + let title = pdfh(it, 'a&&Text'); + if (title!==""){ + d.push({ + title: title, + desc: pdfh(it, 'a&&Text'), + pic_url: '', + url: pdfh(it, 'a&&href') + }); } - setResult(d); - `, + }) +} +setResult(d); +`, 二级:{ title:"div.article_container h1&&Text", img:"div#post_content img&&src", @@ -116,6 +116,9 @@ if (tabsm === true){ if (tabse === true){ TABS.push("電驢"); } +if (tabsa.length + tabsq.length > 1){ + TABS.push("選擇右側綫路"); +} let tmpIndex; tmpIndex=1; tabsa.forEach(function(it){ @@ -149,19 +152,27 @@ d.forEach(function(it){ log('xb6v burl >>>>>>>>>>>>>>>>>>>>>>>>>>' + burl); let loopresult = title + '$' + burl; if (burl.startsWith("https://www.aliyundrive.com/s/")){ + if (false){ if (TABS.length==1){ burl = "http://127.0.0.1:9978/proxy?do=ali&type=push&confirm=0&url=" + encodeURIComponent(burl); }else{ burl = "http://127.0.0.1:9978/proxy?do=ali&type=push&url=" + encodeURIComponent(burl); } + }else{ + burl = "push://" + burl; + } loopresult = title + '$' + burl; lista.push(loopresult); }else if (burl.startsWith("https://pan.quark.cn/s/")){ + if (false){ if (TABS.length==1){ burl = "http://127.0.0.1:9978/proxy?do=quark&type=push&confirm=0&url=" + encodeURIComponent(burl); }else{ burl = "http://127.0.0.1:9978/proxy?do=quark&type=push&url=" + encodeURIComponent(burl); } + }else{ + burl = "push://" + burl; + } loopresult = title + '$' + burl; listq.push(loopresult); }else if (burl.startsWith("magnet")){ @@ -212,6 +223,9 @@ if (listm.length>0){ if (liste.length>0){ LISTS.push(liste); } +if (lista.length + listq.length > 1){ + LISTS.push(["選擇右側綫路,或3秒後自動跳過$http://127.0.0.1:10079/delay/"]); +} lista.forEach(function(it){ LISTS.push([it]); }); @@ -238,7 +252,7 @@ delete(_fetch_params.headers['Content-Type']); Object.assign(_fetch_params, postData); log("xb6v search postData>>>>>>>>>>>>>>>" + JSON.stringify(_fetch_params)); let search_html = request( HOST + '/e/search/index.php', _fetch_params, true); -log("xb6v search result>>>>>>>>>>>>>>>" + search_html); +//log("xb6v search result>>>>>>>>>>>>>>>" + search_html); let d=[]; let dlist = pdfa(search_html, 'div.mainleft&&ul#post_container&&li'); dlist.forEach(function(it){