diff --git a/base/rules.db b/base/rules.db index 11efcbae7e5daea71f7f26c83e8f68d54ac3e267..0c71c3ca9ef2fbb5649ceeffc478324f3bec9d64 100644 Binary files a/base/rules.db and b/base/rules.db differ diff --git "a/js/\347\231\276\345\277\231\346\227\240\346\236\234.js" "b/js/\347\231\276\345\277\231\346\227\240\346\236\234.js" index c459b9b6755d8ce79de57e77a37dc9766e29c9f9..96d175de7d8de28941786802c7e48340a177e59c 100644 --- "a/js/\347\231\276\345\277\231\346\227\240\346\236\234.js" +++ "b/js/\347\231\276\345\277\231\346\227\240\346\236\234.js" @@ -22,7 +22,7 @@ var rule = { limit:20, play_parse:true, // 手动调用解析请求json的url,此lazy不方便 - lazy:'js:print(input);fetch_params.headers["user-agent"]=MOBILE_UA;let html=request(input);let rurl=html.match(/window\\.open\\(\'(.*?)\',/)[1];rurl=urlDeal(rurl);input={parse:1,url:rurl};', + // lazy:'js:print(input);fetch_params.headers["user-agent"]=MOBILE_UA;let html=request(input);let rurl=html.match(/window\\.open\\(\'(.*?)\',/)[1];rurl=urlDeal(rurl);input={parse:1,url:rurl};', // 推荐:'.list_item;img&&alt;img&&src;a&&Text;a&&data-float', 一级:'json:data.hitDocs;title;img;updateInfo||rightCorner.text;playPartId', // 一级:'json:data.hitDocs;title;img;updateInfo;playPartId', diff --git a/libs/drpy.js b/libs/drpy.js index 72df7bfc4b8515f7e83fae5d3154ace1ca2160fe..70e0882505b17811f4b63a86a9072cb999d78f00 100644 --- a/libs/drpy.js +++ b/libs/drpy.js @@ -218,8 +218,10 @@ function setResult(d){ return [] } VODS = []; - // console.log(JSON.stringify(d)); + print(221); + console.log(JSON.stringify(d)); d.forEach(function (it){ + print(it); let obj = { vod_id:it.url||'', vod_name: it.title||'', @@ -227,6 +229,7 @@ function setResult(d){ vod_content: it.content||'', vod_pic: it.pic_url||it.img||'', }; + print(obj); let keys = Object.keys(it); if(keys.includes('tname')){ obj.type_name = it.tname||''; @@ -246,8 +249,12 @@ function setResult(d){ if(keys.includes('area')){ obj.vod_area = it.area||''; } + print(251); VODS.push(obj); + print(VODS); }); + print(256); + print(VODS); return VODS } function setResult2(res){ @@ -751,6 +758,7 @@ function request(url,obj){ console.log('request:'+url); let res = req(url, obj); let html = res.content||''; + // console.log(html); if(obj.withHeaders){ let htmlWithHeaders = res.headers; htmlWithHeaders.body = html; @@ -1200,14 +1208,15 @@ function searchParse(searchObj) { } catch (e) { return '{}' } - return JSON.stringify({ - 'page': parseInt(searchObj.pg), - 'pagecount': 10, - 'limit': 20, - 'total': 100, - 'list': d, - }); + } + return JSON.stringify({ + 'page': parseInt(searchObj.pg), + 'pagecount': 10, + 'limit': 20, + 'total': 100, + 'list': d, + }); } /** diff --git "a/py/\350\212\222\346\236\234\346\220\234\347\264\242.js" "b/py/\350\212\222\346\236\234\346\220\234\347\264\242.js" index fe265457dfd7ebfc3deae9a225e19ad801780ac5..84dd0582aeff795debb1ce59d4e16c066ebfbbc9 100644 --- "a/py/\350\212\222\346\236\234\346\220\234\347\264\242.js" +++ "b/py/\350\212\222\346\236\234\346\220\234\347\264\242.js" @@ -12,7 +12,7 @@ json.data.contents.forEach(function (data){ desc += it.name + '\t'; }); if (list[0].source === 'imgo') { - let img = data.data.pic ? data.data.pic : data.data.yearList[0].pic; + let img = data.data.pic ? data.data.pic : data.data.yearList[0].pic; d.push({ title: data.data.title ? data.data.title : data.data.yearList[0].title, img:img , @@ -22,6 +22,5 @@ json.data.contents.forEach(function (data){ }); } } - }); setResult(d); \ No newline at end of file