更新源

0a55a277 · tloook · a038506e · 0a55a277 · 0a55a277 · 0a55a277
6 changed file
--- a/js/LIBVIO.js
+++ b/js/LIBVIO.js
 muban.首图2.二级.title = 'h1&&Text;.data:eq(0)&&Text'
 muban.首图2.二级.desc = '.data.hidden-xs&&Text;;;.data:eq(1)&&Text;.data:eq(4)&&Text'
+muban.首图2.二级.content = '.detail-content&&Text'
 var rule = {
 	title:'LIBVIO',
 	模板:'首图2',
@@ -7,7 +8,8 @@ var rule = {
 	host:'https://tv.libvio.cc',
 	// host:'https://libvio.me',
 	// url:'/type/fyclass-fypage.html',
-	url:'/show/fyclassfyfilter.html',
+	// url:'/show/fyclassfyfilter.html',
+	url:'/show_fyclassfyfilter.html',
 	filterable:1,//是否启用分类筛选,
 	filter_url:'-{{fl.area}}-{{fl.by}}--{{fl.lang}}----fypage---{{fl.year}}',
 	filter: {
@@ -22,10 +24,13 @@ var rule = {
 		'User-Agent':'MOBILE_UA',
 		'Referer':'https://tv.libvio.cc/'
 	},
-	class_parse:'.stui-header__menu li:gt(0):lt(7);a&&Text;a&&href;/(\\d+).html',
+	// class_parse:'.stui-header__menu li:gt(0):lt(7);a&&Text;a&&href;/(\\d+).html',
+	class_parse:'.stui-header__menu li;a&&Text;a&&href;/.*_(\\d+).html',
 	tab_exclude:'夸克网盘',
+	pagecount:{"27":1},
 	searchUrl:'/index.php/ajax/suggest?mid=1&wd=**',
-	detailUrl:'/detail/fyid.html', //非必填,二级详情拼接链接
+	// detailUrl:'/detail/fyid.html', //非必填,二级详情拼接链接
+	detailUrl:'/detail_fyid.html', //非必填,二级详情拼接链接
 	// searchUrl:'/search/**----------fypage---.html',
 	搜索:'json:list;name;pic;;id',
 }
\ No newline at end of file
--- a/js/version.txt
+++ b/js/version.txt
-3.9.41beta1
\ No newline at end of file
+3.9.41beta2
\ No newline at end of file
--- a/js/voflix.js
+++ b/js/voflix.js
 var rule={
    title:'VOFLIX HD',
-    host:'https://www.voflix.com',
+    // host:'https://www.voflix.com',
+    host:'https://www.voflix.me',
    // homeUrl:'/',
    // url:'/show/fyclass--------fypage---.html',
 	url:'/show/fyfilter.html',

--- a/js/创艺影视[V2].js
+++ b/js/创艺影视[V2].js
 var rule = {
 	title: '创艺影视[V2]', // csp_AppYsV2
 	host: 'http://www.30dian.cn',
-	// homeUrl:'/api.php/v1.vod/vodPhbAll',
-	homeUrl:'/api.php/v1.vod?limit=12&page=1',
+	homeUrl:'/api.php/v1.vod/vodPhbAll',
+	// homeUrl:'/api.php/v1.vod?limit=12&page=1',
 	// url: '/api.php/v1.vod?type=fyclass&limit=20&page=fypage',
 	url: '/api.php/v1.vod?type=fyclassfyfilter&limit=20&page=fypage',
 	filter_url:'&class={{fl.class}}&area={{fl.area}}&lang={{fl.lang}}&letter={{fl.letter}}&year={{fl.year}}&by={{fl.by}}',
@@ -26,8 +26,8 @@ var rule = {
 	// lazy:'js:input = /mp4/.test(input)?{jx:0,url:input,parse:0}:input',
 	lazy:'',
 	limit:6,
-	// 推荐:'json:data.zhui.vod_list;*;*;*;*',
-	推荐:'*',
+	推荐:'json:data.list[0].vod_list;*;*;*;*',
+	// 推荐:'*',
 	一级:'json:data.list;vod_name;vod_pic;vod_remarks;vod_id',
 	二级:'js:try{let html=request(input);print(html);html=JSON.parse(html);let node=html.data;VOD={vod_id:node["vod_id"],vod_name:node["vod_name"],vod_pic:node["vod_pic"],type_name:node["vod_class"],vod_year:node["vod_year"],vod_area:node["vod_area"],vod_remarks:node["vod_remarks"],vod_actor:node["vod_actor"],vod_director:node["vod_director"],vod_content:node["vod_content"].strip()};let episodes=node.vod_play_list;let playMap={};if(typeof play_url==="undefined"){var play_url=""}episodes.forEach(function(ep){let source=ep["from"];if(!playMap.hasOwnProperty(source)){playMap[source]=[]}playMap[source].append(ep["url"])});let playFrom=[];let playList=[];Object.keys(playMap).forEach(function(key){playFrom.append(key);playList.append(playMap[key])});let vod_play_from=playFrom.join("$$$");let vod_play_url=playList.join("$$$");VOD["vod_play_from"]=vod_play_from;VOD["vod_play_url"]=vod_play_url}catch(e){log("获取二级详情页发生错误:"+e.message)}',
 	搜索:'*',

--- a/js/时光影视.js
+++ b/js/时光影视.js
+// 搜索验证
+muban.海螺3.二级.title = 'h2&&Text;.hl-col-xs-12.hl-col-sm-4--em:eq(2)&&Text';
+muban.海螺3.二级.desc = '.hl-col-xs-12:eq(2)&&Text;;;.hl-col-xs-12--em:eq(3)&&Text;.hl-col-xs-12--em:eq(4)&&Text';
 var rule = {
-    title: '时光影视',
-    host: 'http://www.shigys.com',
-    class_name:'电影&电视剧&综艺&动漫&哔哩哔哩&独家',
-    class_url:'1&2&3&4&40&41',
-    homeUrl: '',
-    searchUrl: '/index.php/ajax/suggest?mid=1&wd=**',
-    searchable: 2,
-    quickSearch: 0,
-    headers:{'User-Agent':'MOBILE_UA'},
-    // 分类链接fypage参数支持1个()表达式
-    url: '/index.php/api/vod#type=fyclass&page=fypage',
-    detailUrl:'/index.php/vod/detail/id/fyid.html',
-    推荐:'.list-vod.flex .public-list-box;a&&title;.lazy&&data-original;.public-list-prb&&Text;a&&href',
-    一级:'',
-    一级:'js:let body=input.split("#")[1];let t=Math.round(new Date/1e3).toString();let key=md5("DS"+t+"DCC147D11943AF75");let url=input.split("#")[0];body=body+"&time="+t+"&key="+key;print(body);fetch_params.body=body;let html=post(url,fetch_params);let data=JSON.parse(html);VODS=data.list;',
-    二级:{
-		"title":".slide-info-title&&Text;.slide-info:eq(3)--strong&&Text",
-		"img":".detail-pic&&data-original",
-		"desc":".fraction&&Text;.slide-info-remarks:eq(1)&&Text;.slide-info-remarks:eq(2)&&Text;.slide-info:eq(2)--strong&&Text;.slide-info:eq(1)--strong&&Text",
-		"content":"#height_limit&&Text",
-		"tabs":".anthology.wow.fadeInUp.animated&&.swiper-wrapper&&a",
-		"tab_text":".swiper-slide&&Text",
-		"lists":".anthology-list-box:eq(#id)&&.anthology-list-play&&li"
-	},
+    title:'时光影视',
+    模板:'海螺3',
+    host:'https://www.shigys.com',
+    // url:'/index.php/vod/show/id/fyclass/page/fypage.html',
+    url:'/index.php/vod/show/id/fyclassfyfilter.html',
+    filterable:1,//是否启用分类筛选,
+    filter_url:'{{fl.area}}{{fl.by}}{{fl.class}}{{fl.lang}}{{fl.letter}}/page/fypage{{fl.year}}',
+    filter: {
+        "1":[{"key":"class","name":"类型","value":[{"n":"全部","v":""},{"n":"喜剧","v":"/class/喜剧"},{"n":"爱情","v":"/class/爱情"},{"n":"恐怖","v":"/class/恐怖"},{"n":"动作","v":"/class/动作"},{"n":"科幻","v":"/class/科幻"},{"n":"剧情","v":"/class/剧情"},{"n":"战争","v":"/class/战争"},{"n":"警匪","v":"/class/警匪"},{"n":"犯罪","v":"/class/犯罪"},{"n":"动画","v":"/class/动画"},{"n":"奇幻","v":"/class/奇幻"},{"n":"武侠","v":"/class/武侠"},{"n":"冒险","v":"/class/冒险"},{"n":"枪战","v":"/class/枪战"},{"n":"恐怖","v":"/class/恐怖"},{"n":"悬疑","v":"/class/悬疑"},{"n":"惊悚","v":"/class/惊悚"},{"n":"经典","v":"/class/经典"},{"n":"青春","v":"/class/青春"},{"n":"文艺","v":"/class/文艺"},{"n":"微电影","v":"/class/微电影"},{"n":"古装","v":"/class/古装"},{"n":"历史","v":"/class/历史"},{"n":"运动","v":"/class/运动"},{"n":"农村","v":"/class/农村"},{"n":"儿童","v":"/class/儿童"},{"n":"网络电影","v":"/class/网络电影"}]},{"key":"area","name":"地区","value":[{"n":"全部","v":""},{"n":"大陆","v":"/area/大陆"},{"n":"香港","v":"/area/香港"},{"n":"台湾","v":"/area/台湾"},{"n":"美国","v":"/area/美国"},{"n":"法国","v":"/area/法国"},{"n":"英国","v":"/area/英国"},{"n":"日本","v":"/area/日本"},{"n":"韩国","v":"/area/韩国"},{"n":"德国","v":"/area/德国"},{"n":"泰国","v":"/area/泰国"},{"n":"印度","v":"/area/印度"},{"n":"意大利","v":"/area/意大利"},{"n":"西班牙","v":"/area/西班牙"},{"n":"加拿大","v":"/area/加拿大"},{"n":"其他","v":"/area/其他"}]},{"key":"year","name":"年份","value":[{"n":"全部","v":""},{"n":"2023","v":"/year/2023"},{"n":"2022","v":"/year/2022"},{"n":"2021","v":"/year/2021"},{"n":"2020","v":"/year/2020"},{"n":"2019","v":"/year/2019"},{"n":"2018","v":"/year/2018"},{"n":"2017","v":"/year/2017"},{"n":"2016","v":"/year/2016"},{"n":"2015","v":"/year/2015"},{"n":"2014","v":"/year/2014"},{"n":"2013","v":"/year/2013"},{"n":"2012","v":"/year/2012"},{"n":"2011","v":"/year/2011"},{"n":"2010","v":"/year/2010"},{"n":"2009","v":"/year/2009"},{"n":"2008","v":"/year/2008"},{"n":"2007","v":"/year/2007"},{"n":"2006","v":"/year/2006"},{"n":"2005","v":"/year/2005"},{"n":"2004","v":"/year/2004"}]},{"key":"lang","name":"语言","value":[{"n":"全部","v":""},{"n":"国语","v":"/lang/国语"},{"n":"英语","v":"/lang/英语"},{"n":"粤语","v":"/lang/粤语"},{"n":"闽南语","v":"/lang/闽南语"},{"n":"韩语","v":"/lang/韩语"},{"n":"日语","v":"/lang/日语"},{"n":"法语","v":"/lang/法语"},{"n":"德语","v":"/lang/德语"},{"n":"其它","v":"/lang/其它"}]},{"key":"letter","name":"字母","value":[{"n":"全部","v":""},{"n":"A","v":"/letter/A"},{"n":"B","v":"/letter/B"},{"n":"C","v":"/letter/C"},{"n":"D","v":"/letter/D"},{"n":"E","v":"/letter/E"},{"n":"F","v":"/letter/F"},{"n":"G","v":"/letter/G"},{"n":"H","v":"/letter/H"},{"n":"I","v":"/letter/I"},{"n":"J","v":"/letter/J"},{"n":"K","v":"/letter/K"},{"n":"L","v":"/letter/L"},{"n":"M","v":"/letter/M"},{"n":"N","v":"/letter/N"},{"n":"O","v":"/letter/O"},{"n":"P","v":"/letter/P"},{"n":"Q","v":"/letter/Q"},{"n":"R","v":"/letter/R"},{"n":"S","v":"/letter/S"},{"n":"T","v":"/letter/T"},{"n":"U","v":"/letter/U"},{"n":"V","v":"/letter/V"},{"n":"W","v":"/letter/W"},{"n":"X","v":"/letter/X"},{"n":"Y","v":"/letter/Y"},{"n":"Z","v":"/letter/Z"},{"n":"0-9","v":"/letter/0-9"}]},{"key":"by","name":"排序","value":[{"n":"时间","v":"time"},{"n":"人气","v":"hits"},{"n":"评分","v":"score"}]}],
+        "2":[{"key":"class","name":"类型","value":[{"n":"全部","v":""},{"n":"古装","v":"/class/古装"},{"n":"战争","v":"/class/战争"},{"n":"青春偶像","v":"/class/青春偶像"},{"n":"喜剧","v":"/class/喜剧"},{"n":"家庭","v":"/class/家庭"},{"n":"犯罪","v":"/class/犯罪"},{"n":"动作","v":"/class/动作"},{"n":"奇幻","v":"/class/奇幻"},{"n":"剧情","v":"/class/剧情"},{"n":"历史","v":"/class/历史"},{"n":"经典","v":"/class/经典"},{"n":"乡村","v":"/class/乡村"},{"n":"情景","v":"/class/情景"},{"n":"商战","v":"/class/商战"},{"n":"网剧","v":"/class/网剧"},{"n":"其他","v":"/class/其他"}]},{"key":"area","name":"地区","value":[{"n":"全部","v":""},{"n":"内地","v":"/area/内地"},{"n":"韩国","v":"/area/韩国"},{"n":"香港","v":"/area/香港"},{"n":"台湾","v":"/area/台湾"},{"n":"日本","v":"/area/日本"},{"n":"美国","v":"/area/美国"},{"n":"泰国","v":"/area/泰国"},{"n":"英国","v":"/area/英国"},{"n":"新加坡","v":"/area/新加坡"},{"n":"其他","v":"/area/其他"}]},{"key":"year","name":"年份","value":[{"n":"全部","v":""},{"n":"2023","v":"/year/2023"},{"n":"2022","v":"/year/2022"},{"n":"2021","v":"/year/2021"},{"n":"2020","v":"/year/2020"},{"n":"2019","v":"/year/2019"},{"n":"2018","v":"/year/2018"},{"n":"2017","v":"/year/2017"},{"n":"2016","v":"/year/2016"},{"n":"2015","v":"/year/2015"},{"n":"2014","v":"/year/2014"},{"n":"2013","v":"/year/2013"},{"n":"2012","v":"/year/2012"},{"n":"2011","v":"/year/2011"},{"n":"2010","v":"/year/2010"},{"n":"2009","v":"/year/2009"},{"n":"2008","v":"/year/2008"},{"n":"2007","v":"/year/2007"},{"n":"2006","v":"/year/2006"},{"n":"2005","v":"/year/2005"},{"n":"2004","v":"/year/2004"}]},{"key":"lang","name":"语言","value":[{"n":"全部","v":""},{"n":"国语","v":"/lang/国语"},{"n":"英语","v":"/lang/英语"},{"n":"粤语","v":"/lang/粤语"},{"n":"闽南语","v":"/lang/闽南语"},{"n":"韩语","v":"/lang/韩语"},{"n":"日语","v":"/lang/日语"},{"n":"其它","v":"/lang/其它"}]},{"key":"letter","name":"字母","value":[{"n":"全部","v":""},{"n":"A","v":"/letter/A"},{"n":"B","v":"/letter/B"},{"n":"C","v":"/letter/C"},{"n":"D","v":"/letter/D"},{"n":"E","v":"/letter/E"},{"n":"F","v":"/letter/F"},{"n":"G","v":"/letter/G"},{"n":"H","v":"/letter/H"},{"n":"I","v":"/letter/I"},{"n":"J","v":"/letter/J"},{"n":"K","v":"/letter/K"},{"n":"L","v":"/letter/L"},{"n":"M","v":"/letter/M"},{"n":"N","v":"/letter/N"},{"n":"O","v":"/letter/O"},{"n":"P","v":"/letter/P"},{"n":"Q","v":"/letter/Q"},{"n":"R","v":"/letter/R"},{"n":"S","v":"/letter/S"},{"n":"T","v":"/letter/T"},{"n":"U","v":"/letter/U"},{"n":"V","v":"/letter/V"},{"n":"W","v":"/letter/W"},{"n":"X","v":"/letter/X"},{"n":"Y","v":"/letter/Y"},{"n":"Z","v":"/letter/Z"},{"n":"0-9","v":"/letter/0-9"}]},{"key":"by","name":"排序","value":[{"n":"时间","v":"time"},{"n":"人气","v":"hits"},{"n":"评分","v":"score"}]}],
+        "3":[{"key":"class","name":"类型","value":[{"n":"全部","v":""},{"n":"选秀","v":"/class/选秀"},{"n":"情感","v":"/class/情感"},{"n":"访谈","v":"/class/访谈"},{"n":"播报","v":"/class/播报"},{"n":"旅游","v":"/class/旅游"},{"n":"音乐","v":"/class/音乐"},{"n":"美食","v":"/class/美食"},{"n":"纪实","v":"/class/纪实"},{"n":"曲艺","v":"/class/曲艺"},{"n":"生活","v":"/class/生活"},{"n":"游戏互动","v":"/class/游戏互动"},{"n":"财经","v":"/class/财经"},{"n":"求职","v":"/class/求职"}]},{"key":"area","name":"地区","value":[{"n":"全部","v":""},{"n":"内地","v":"/area/内地"},{"n":"港台","v":"/area/港台"},{"n":"日韩","v":"/area/日韩"},{"n":"欧美","v":"/area/欧美"}]},{"key":"year","name":"年份","value":[{"n":"全部","v":""},{"n":"2023","v":"/year/2023"},{"n":"2022","v":"/year/2022"},{"n":"2021","v":"/year/2021"},{"n":"2020","v":"/year/2020"},{"n":"2019","v":"/year/2019"},{"n":"2018","v":"/year/2018"},{"n":"2017","v":"/year/2017"},{"n":"2016","v":"/year/2016"},{"n":"2015","v":"/year/2015"},{"n":"2014","v":"/year/2014"},{"n":"2013","v":"/year/2013"},{"n":"2012","v":"/year/2012"},{"n":"2011","v":"/year/2011"},{"n":"2010","v":"/year/2010"},{"n":"2009","v":"/year/2009"},{"n":"2008","v":"/year/2008"},{"n":"2007","v":"/year/2007"},{"n":"2006","v":"/year/2006"},{"n":"2005","v":"/year/2005"},{"n":"2004","v":"/year/2004"}]},{"key":"lang","name":"语言","value":[{"n":"全部","v":""},{"n":"国语","v":"/lang/国语"},{"n":"英语","v":"/lang/英语"},{"n":"粤语","v":"/lang/粤语"},{"n":"闽南语","v":"/lang/闽南语"},{"n":"韩语","v":"/lang/韩语"},{"n":"日语","v":"/lang/日语"},{"n":"其它","v":"/lang/其它"}]},{"key":"letter","name":"字母","value":[{"n":"全部","v":""},{"n":"A","v":"/letter/A"},{"n":"B","v":"/letter/B"},{"n":"C","v":"/letter/C"},{"n":"D","v":"/letter/D"},{"n":"E","v":"/letter/E"},{"n":"F","v":"/letter/F"},{"n":"G","v":"/letter/G"},{"n":"H","v":"/letter/H"},{"n":"I","v":"/letter/I"},{"n":"J","v":"/letter/J"},{"n":"K","v":"/letter/K"},{"n":"L","v":"/letter/L"},{"n":"M","v":"/letter/M"},{"n":"N","v":"/letter/N"},{"n":"O","v":"/letter/O"},{"n":"P","v":"/letter/P"},{"n":"Q","v":"/letter/Q"},{"n":"R","v":"/letter/R"},{"n":"S","v":"/letter/S"},{"n":"T","v":"/letter/T"},{"n":"U","v":"/letter/U"},{"n":"V","v":"/letter/V"},{"n":"W","v":"/letter/W"},{"n":"X","v":"/letter/X"},{"n":"Y","v":"/letter/Y"},{"n":"Z","v":"/letter/Z"},{"n":"0-9","v":"/letter/0-9"}]},{"key":"by","name":"排序","value":[{"n":"时间","v":"time"},{"n":"人气","v":"hits"},{"n":"评分","v":"score"}]}],
+        "4":[{"key":"class","name":"类型","value":[{"n":"全部","v":""},{"n":"热血","v":"/class/热血"},{"n":"科幻","v":"/class/科幻"},{"n":"推理","v":"/class/推理"},{"n":"搞笑","v":"/class/搞笑"},{"n":"冒险","v":"/class/冒险"},{"n":"萝莉","v":"/class/萝莉"},{"n":"校园","v":"/class/校园"},{"n":"动作","v":"/class/动作"},{"n":"机战","v":"/class/机战"},{"n":"运动","v":"/class/运动"},{"n":"战争","v":"/class/战争"},{"n":"情感","v":"/class/情感"},{"n":"少年","v":"/class/少年"},{"n":"少女","v":"/class/少女"},{"n":"社会","v":"/class/社会"},{"n":"原创","v":"/class/原创"},{"n":"亲子","v":"/class/亲子"},{"n":"益智","v":"/class/益智"},{"n":"励志","v":"/class/励志"},{"n":"其他","v":"/class/其他"}]},{"key":"area","name":"地区","value":[{"n":"全部","v":""},{"n":"大陆","v":"/area/大陆"},{"n":"日本","v":"/area/日本"},{"n":"欧美","v":"/area/欧美"},{"n":"其他","v":"/area/其他"}]},{"key":"year","name":"年份","value":[{"n":"全部","v":""},{"n":"2023","v":"/year/2023"},{"n":"2022","v":"/year/2022"},{"n":"2021","v":"/year/2021"},{"n":"2020","v":"/year/2020"},{"n":"2019","v":"/year/2019"},{"n":"2018","v":"/year/2018"},{"n":"2017","v":"/year/2017"},{"n":"2016","v":"/year/2016"},{"n":"2015","v":"/year/2015"},{"n":"2014","v":"/year/2014"},{"n":"2013","v":"/year/2013"},{"n":"2012","v":"/year/2012"},{"n":"2011","v":"/year/2011"},{"n":"2010","v":"/year/2010"},{"n":"2009","v":"/year/2009"},{"n":"2008","v":"/year/2008"},{"n":"2007","v":"/year/2007"},{"n":"2006","v":"/year/2006"},{"n":"2005","v":"/year/2005"},{"n":"2004","v":"/year/2004"}]},{"key":"lang","name":"语言","value":[{"n":"全部","v":""},{"n":"国语","v":"/lang/国语"},{"n":"英语","v":"/lang/英语"},{"n":"粤语","v":"/lang/粤语"},{"n":"闽南语","v":"/lang/闽南语"},{"n":"韩语","v":"/lang/韩语"},{"n":"日语","v":"/lang/日语"},{"n":"其它","v":"/lang/其它"}]},{"key":"letter","name":"字母","value":[{"n":"全部","v":""},{"n":"A","v":"/letter/A"},{"n":"B","v":"/letter/B"},{"n":"C","v":"/letter/C"},{"n":"D","v":"/letter/D"},{"n":"E","v":"/letter/E"},{"n":"F","v":"/letter/F"},{"n":"G","v":"/letter/G"},{"n":"H","v":"/letter/H"},{"n":"I","v":"/letter/I"},{"n":"J","v":"/letter/J"},{"n":"K","v":"/letter/K"},{"n":"L","v":"/letter/L"},{"n":"M","v":"/letter/M"},{"n":"N","v":"/letter/N"},{"n":"O","v":"/letter/O"},{"n":"P","v":"/letter/P"},{"n":"Q","v":"/letter/Q"},{"n":"R","v":"/letter/R"},{"n":"S","v":"/letter/S"},{"n":"T","v":"/letter/T"},{"n":"U","v":"/letter/U"},{"n":"V","v":"/letter/V"},{"n":"W","v":"/letter/W"},{"n":"X","v":"/letter/X"},{"n":"Y","v":"/letter/Y"},{"n":"Z","v":"/letter/Z"},{"n":"0-9","v":"/letter/0-9"}]},{"key":"by","name":"排序","value":[{"n":"时间","v":"time"},{"n":"人气","v":"hits"},{"n":"评分","v":"score"}]}],
+        "41":[{"key":"class","name":"类型","value":[{"n":"全部","v":""},{"n":"喜剧","v":"/class/喜剧"},{"n":"爱情","v":"/class/爱情"},{"n":"恐怖","v":"/class/恐怖"},{"n":"动作","v":"/class/动作"},{"n":"科幻","v":"/class/科幻"},{"n":"剧情","v":"/class/剧情"},{"n":"战争","v":"/class/战争"},{"n":"警匪","v":"/class/警匪"},{"n":"犯罪","v":"/class/犯罪"},{"n":"动画","v":"/class/动画"},{"n":"奇幻","v":"/class/奇幻"},{"n":"武侠","v":"/class/武侠"},{"n":"冒险","v":"/class/冒险"},{"n":"枪战","v":"/class/枪战"},{"n":"恐怖","v":"/class/恐怖"},{"n":"悬疑","v":"/class/悬疑"},{"n":"惊悚","v":"/class/惊悚"},{"n":"经典","v":"/class/经典"},{"n":"青春","v":"/class/青春"},{"n":"文艺","v":"/class/文艺"},{"n":"微电影","v":"/class/微电影"},{"n":"古装","v":"/class/古装"},{"n":"历史","v":"/class/历史"},{"n":"运动","v":"/class/运动"},{"n":"农村","v":"/class/农村"},{"n":"儿童","v":"/class/儿童"},{"n":"网络电影","v":"/class/网络电影"}]},{"key":"area","name":"地区","value":[{"n":"全部","v":""},{"n":"大陆","v":"/area/大陆"},{"n":"香港","v":"/area/香港"},{"n":"台湾","v":"/area/台湾"},{"n":"美国","v":"/area/美国"},{"n":"法国","v":"/area/法国"},{"n":"英国","v":"/area/英国"},{"n":"日本","v":"/area/日本"},{"n":"韩国","v":"/area/韩国"},{"n":"德国","v":"/area/德国"},{"n":"泰国","v":"/area/泰国"},{"n":"印度","v":"/area/印度"},{"n":"意大利","v":"/area/意大利"},{"n":"西班牙","v":"/area/西班牙"},{"n":"加拿大","v":"/area/加拿大"},{"n":"其他","v":"/area/其他"}]},{"key":"year","name":"年份","value":[{"n":"全部","v":""},{"n":"2023","v":"/year/2023"},{"n":"2022","v":"/year/2022"},{"n":"2021","v":"/year/2021"},{"n":"2020","v":"/year/2020"},{"n":"2019","v":"/year/2019"},{"n":"2018","v":"/year/2018"},{"n":"2017","v":"/year/2017"},{"n":"2016","v":"/year/2016"},{"n":"2015","v":"/year/2015"},{"n":"2014","v":"/year/2014"},{"n":"2013","v":"/year/2013"},{"n":"2012","v":"/year/2012"},{"n":"2011","v":"/year/2011"},{"n":"2010","v":"/year/2010"},{"n":"2009","v":"/year/2009"},{"n":"2008","v":"/year/2008"},{"n":"2007","v":"/year/2007"},{"n":"2006","v":"/year/2006"},{"n":"2005","v":"/year/2005"},{"n":"2004","v":"/year/2004"}]},{"key":"lang","name":"语言","value":[{"n":"全部","v":""},{"n":"国语","v":"/lang/国语"},{"n":"英语","v":"/lang/英语"},{"n":"粤语","v":"/lang/粤语"},{"n":"闽南语","v":"/lang/闽南语"},{"n":"韩语","v":"/lang/韩语"},{"n":"日语","v":"/lang/日语"},{"n":"法语","v":"/lang/法语"},{"n":"德语","v":"/lang/德语"},{"n":"其它","v":"/lang/其它"}]},{"key":"letter","name":"字母","value":[{"n":"全部","v":""},{"n":"A","v":"/letter/A"},{"n":"B","v":"/letter/B"},{"n":"C","v":"/letter/C"},{"n":"D","v":"/letter/D"},{"n":"E","v":"/letter/E"},{"n":"F","v":"/letter/F"},{"n":"G","v":"/letter/G"},{"n":"H","v":"/letter/H"},{"n":"I","v":"/letter/I"},{"n":"J","v":"/letter/J"},{"n":"K","v":"/letter/K"},{"n":"L","v":"/letter/L"},{"n":"M","v":"/letter/M"},{"n":"N","v":"/letter/N"},{"n":"O","v":"/letter/O"},{"n":"P","v":"/letter/P"},{"n":"Q","v":"/letter/Q"},{"n":"R","v":"/letter/R"},{"n":"S","v":"/letter/S"},{"n":"T","v":"/letter/T"},{"n":"U","v":"/letter/U"},{"n":"V","v":"/letter/V"},{"n":"W","v":"/letter/W"},{"n":"X","v":"/letter/X"},{"n":"Y","v":"/letter/Y"},{"n":"Z","v":"/letter/Z"},{"n":"0-9","v":"/letter/0-9"}]},{"key":"by","name":"排序","value":[{"n":"时间","v":"time"},{"n":"人气","v":"hits"},{"n":"评分","v":"score"}]}]
+    },
+    class_parse: '.hl-smnav.clearfix&&li;a&&Text;a&&href;.*/(\\d+).html',
+    lazy:"js:var html=JSON.parse(request(input).match(/r player_.*?=(.*?)</)[1]);var url=html.url;if(html.encrypt=='1'){url=unescape(url)}else if(html.encrypt=='2'){url=unescape(base64Decode(url))}if(/.m3u8|.mp4/.test(url)){input=url}else{input={jx:0,url:'https://jx.shigys.com/?url='+url,parse:1,header:JSON.stringify({'user-agent':'Mozilla/5.0'})}}",
+
+    // searchUrl:'/index.php/vod/search/page/fypage/wd/**.html',
+    searchUrl:'/index.php/ajax/suggest?mid=fypage&wd=**',
+    detailUrl:'/index.php/vod/detail/id/fyid.html', //非必填,二级详情拼接链接
    搜索:'json:list;name;pic;;id',
 }
\ No newline at end of file
--- a/js/石榴影院.js
+++ b/js/石榴影院.js
@@ -3,10 +3,15 @@ var rule={
    //host:'https://hei19.com',
    host:'https://hei17.com',
    // url:'/catalog?column=fyclass&sort=1&per_page=72&page=fypage',
-	url: '/catalog?column=fyclassfyfilter&per_page=72&page=fypage&sort=1',
-	filterable:1,//是否启用分类筛选,
-	filter_url:'&{{fl.class}}&{{fl.area}}&{{fl.year}}',
-	filter: {"1":[{"key":"class","name":"类型","value":[{"n":"全部","v":""},{"n":"剧情","v":"type=1"},{"n":"惊悚","v":"type=2"},{"n":"动作","v":"type=5"},{"n":"科幻","v":"type=9"},{"n":"奇幻","v":"type=11"},{"n":"爱情","v":"type=24"},{"n":"喜剧","v":"type=26"},{"n":"冒险","v":"type=27"},{"n":"犯罪","v":"type=28"},{"n":"战争","v":"type=29"},{"n":"动画","v":"type=34"},{"n":"同性","v":"type=44"},{"n":"历史","v":"type=45"},{"n":"恐怖","v":"type=47"},{"n":"悬疑","v":"type=48"},{"n":"传记","v":"type=49"},{"n":"纪录片","v":"type=53"},{"n":"古装","v":"type=57"},{"n":"家庭","v":"type=58"},{"n":"古装","v":"type=57"},{"n":"伦理","v":"type=85"}]},{"key":"area","name":"地区","value":[{"n":"不限","v":""},{"n":"中国大陆","v":"area=1"},{"n":"中国香港","v":"area=3"},{"n":"美国","v":"area=6"},{"n":"韩国","v":"area=9"},{"n":"日本","v":"area=10"},{"n":"印度","v":"area=11"},{"n":"英国","v":"area=12"},{"n":"法国","v":"area=13"},{"n":"俄罗斯","v":"area=16"},{"n":"丹麦","v":"area=22"},{"n":"澳大利亚","v":"area=23"},{"n":"德国","v":"area=24"}]},{"key":"year","name":"年份","value":[{"n":"全部","v":""},{"n":"2022","v":"year=51"},{"n":"2021","v":"year=52"},{"n":"2020","v":"year=53"},{"n":"2019","v":"year=54"},{"n":"2018","v":"year=55"},{"n":"2017","v":"year=56"},{"n":"2016","v":"year=57"},{"n":"2015","v":"year=58"},{"n":"2014","v":"year=59"},{"n":"2013","v":"year=60"},{"n":"2012","v":"year=61"},{"n":"2011","v":"year=62"}]}],"2":[{"key":"class","name":"类型","value":[{"n":"全部","v":""},{"n":"爱情","v":"type=7"},{"n":"喜剧","v":"type=8"},{"n":"犯罪","v":"type=10"},{"n":"奇幻","v":"type=15"},{"n":"悬疑","v":"type=17"},{"n":"剧情","v":"type=18"},{"n":"科幻","v":"type=21"},{"n":"恐怖","v":"type=22"},{"n":"惊悚","v":"type=23"},{"n":"历史","v":"type=25"},{"n":"动作","v":"type=31"},{"n":"同性","v":"type=32"},{"n":"战争","v":"type=35"},{"n":"传记","v":"type=38"},{"n":"运动","v":"type=42"},{"n":"音乐","v":"type=43"},{"n":"冒险","v":"type=50"},{"n":"纪录片","v":"type=52"},{"n":"家庭","v":"type=59"},{"n":"古装","v":"type=76"}]},{"key":"area","name":"地区","value":[{"n":"不限","v":""},{"n":"中国大陆","v":"area=1"},{"n":"中国台湾","v":"area=2"},{"n":"中国香港","v":"area=3"},{"n":"美国","v":"area=6"},{"n":"韩国","v":"area=9"},{"n":"日本","v":"area=10"},{"n":"英国","v":"area=12"},{"n":"法国","v":"area=13"},{"n":"乌克兰","v":"area=17"},{"n":"西班牙","v":"area=18"},{"n":"泰国","v":"area=25"},{"n":"加拿大","v":"area=32"}]},{"key":"year","name":"年份","value":[{"n":"全部","v":""},{"n":"2022","v":"year=51"},{"n":"2021","v":"year=52"},{"n":"2020","v":"year=53"},{"n":"2019","v":"year=54"},{"n":"2018","v":"year=55"},{"n":"2017","v":"year=56"},{"n":"2016","v":"year=57"},{"n":"2015","v":"year=58"},{"n":"2014","v":"year=59"},{"n":"2013","v":"year=60"},{"n":"2012","v":"year=61"},{"n":"2011","v":"year=62"}]}],"3":[{"key":"class","name":"类型","value":[{"n":"全部","v":""},{"n":"选秀","v":"type=12"},{"n":"情感","v":"type=61"},{"n":"美食","v":"type=62"},{"n":"音乐","v":"type=63"},{"n":"真人秀","v":"type=77"},{"n":"喜剧","v":"type=79"},{"n":"奇幻","v":"type=80"},{"n":"冒险","v":"type=81"},{"n":"脱口秀","v":"type=82"},{"n":"爱情","v":"type=83"},{"n":"家庭","v":"type=84"},{"n":"歌舞","v":"type=88"}]},{"key":"area","name":"地区","value":[{"n":"不限","v":""},{"n":"中国大陆","v":"area=1"},{"n":"中国台湾","v":"area=2"},{"n":"美国","v":"area=6"},{"n":"韩国","v":"area=9"},{"n":"日本","v":"area=10"},{"n":"西班牙","v":"area=18"},{"n":"巴西","v":"area=20"},{"n":"德国","v":"area=24"},{"n":"墨西哥","v":"area=29"}]},{"key":"year","name":"年份","value":[{"n":"全部","v":""},{"n":"2022","v":"year=51"},{"n":"2021","v":"year=52"},{"n":"2020","v":"year=53"},{"n":"2019","v":"year=54"},{"n":"2018","v":"year=55"},{"n":"2017","v":"year=56"},{"n":"2016","v":"year=57"},{"n":"2015","v":"year=58"},{"n":"2014","v":"year=59"},{"n":"2009","v":"year=32"},{"n":"2008","v":"year=33"},{"n":"2007","v":"year=34"}]}],"4":[{"key":"class","name":"类型","value":[{"n":"全部","v":""},{"n":"国漫","v":"type=13"},{"n":"日漫","v":"type=60"},{"n":"美漫","v":"type=65"},{"n":"动画","v":"type=66"},{"n":"奇幻","v":"type=67"},{"n":"冒险","v":"type=68"},{"n":"喜剧","v":"type=69"},{"n":"动作","v":"type=70"},{"n":"剧情","v":"type=71"},{"n":"古装","v":"type=72"},{"n":"同性","v":"type=73"},{"n":"武侠","v":"type=84"},{"n":"爱情","v":"type=75"},{"n":"惊悚","v":"type=92"}]},{"key":"area","name":"地区","value":[{"n":"不限","v":""},{"n":"中国大陆","v":"area=1"},{"n":"美国","v":"area=6"},{"n":"日本","v":"area=10"}]},{"key":"year","name":"年份","value":[{"n":"全部","v":""},{"n":"2022","v":"year=51"},{"n":"2021","v":"year=52"},{"n":"2020","v":"year=53"},{"n":"2019","v":"year=54"},{"n":"2018","v":"year=55"},{"n":"2017","v":"year=56"},{"n":"2016","v":"year=57"},{"n":"2015","v":"year=58"},{"n":"2014","v":"year=59"},{"n":"2013","v":"year=60"},{"n":"2012","v":"year=61"},{"n":"2011","v":"year=62"}]}]},
+    url: '/catalog?column=fyclassfyfilter&per_page=72&page=fypage&sort=1',
+    filterable:1,//是否启用分类筛选,
+    filter_url:'&{{fl.class}}&{{fl.area}}&{{fl.year}}',
+    filter: {
+        "1":[{"key":"class","name":"类型","value":[{"n":"全部","v":""},{"n":"剧情","v":"type=1"},{"n":"惊悚","v":"type=2"},{"n":"动作","v":"type=5"},{"n":"科幻","v":"type=9"},{"n":"奇幻","v":"type=11"},{"n":"爱情","v":"type=24"},{"n":"喜剧","v":"type=26"},{"n":"冒险","v":"type=27"},{"n":"犯罪","v":"type=28"},{"n":"战争","v":"type=29"},{"n":"动画","v":"type=34"},{"n":"同性","v":"type=44"},{"n":"历史","v":"type=45"},{"n":"恐怖","v":"type=47"},{"n":"悬疑","v":"type=48"},{"n":"传记","v":"type=49"},{"n":"纪录片","v":"type=53"},{"n":"古装","v":"type=57"},{"n":"家庭","v":"type=58"},{"n":"古装","v":"type=57"},{"n":"伦理","v":"type=85"}]},{"key":"area","name":"地区","value":[{"n":"不限","v":""},{"n":"中国大陆","v":"area=1"},{"n":"中国香港","v":"area=3"},{"n":"美国","v":"area=6"},{"n":"韩国","v":"area=9"},{"n":"日本","v":"area=10"},{"n":"印度","v":"area=11"},{"n":"英国","v":"area=12"},{"n":"法国","v":"area=13"},{"n":"俄罗斯","v":"area=16"},{"n":"丹麦","v":"area=22"},{"n":"澳大利亚","v":"area=23"},{"n":"德国","v":"area=24"}]},{"key":"year","name":"年份","value":[{"n":"全部","v":""},{"n":"2023","v":"year=50"},{"n":"2022","v":"year=51"},{"n":"2021","v":"year=52"},{"n":"2020","v":"year=53"},{"n":"2019","v":"year=54"},{"n":"2018","v":"year=55"},{"n":"2017","v":"year=56"},{"n":"2016","v":"year=57"},{"n":"2015","v":"year=58"},{"n":"2014","v":"year=59"},{"n":"2013","v":"year=60"},{"n":"2012","v":"year=61"},{"n":"2011","v":"year=62"}]}],
+        "2":[{"key":"class","name":"类型","value":[{"n":"全部","v":""},{"n":"爱情","v":"type=7"},{"n":"喜剧","v":"type=8"},{"n":"犯罪","v":"type=10"},{"n":"奇幻","v":"type=15"},{"n":"悬疑","v":"type=17"},{"n":"剧情","v":"type=18"},{"n":"科幻","v":"type=21"},{"n":"恐怖","v":"type=22"},{"n":"惊悚","v":"type=23"},{"n":"历史","v":"type=25"},{"n":"动作","v":"type=31"},{"n":"同性","v":"type=32"},{"n":"战争","v":"type=35"},{"n":"传记","v":"type=38"},{"n":"运动","v":"type=42"},{"n":"音乐","v":"type=43"},{"n":"冒险","v":"type=50"},{"n":"纪录片","v":"type=52"},{"n":"家庭","v":"type=59"},{"n":"古装","v":"type=76"}]},{"key":"area","name":"地区","value":[{"n":"不限","v":""},{"n":"中国大陆","v":"area=1"},{"n":"中国台湾","v":"area=2"},{"n":"中国香港","v":"area=3"},{"n":"美国","v":"area=6"},{"n":"韩国","v":"area=9"},{"n":"日本","v":"area=10"},{"n":"英国","v":"area=12"},{"n":"法国","v":"area=13"},{"n":"乌克兰","v":"area=17"},{"n":"西班牙","v":"area=18"},{"n":"泰国","v":"area=25"},{"n":"加拿大","v":"area=32"}]},{"key":"year","name":"年份","value":[{"n":"全部","v":""},{"n":"2023","v":"year=50"},{"n":"2022","v":"year=51"},{"n":"2021","v":"year=52"},{"n":"2020","v":"year=53"},{"n":"2019","v":"year=54"},{"n":"2018","v":"year=55"},{"n":"2017","v":"year=56"},{"n":"2016","v":"year=57"},{"n":"2015","v":"year=58"},{"n":"2014","v":"year=59"},{"n":"2013","v":"year=60"},{"n":"2012","v":"year=61"},{"n":"2011","v":"year=62"}]}],
+        "3":[{"key":"class","name":"类型","value":[{"n":"全部","v":""},{"n":"选秀","v":"type=12"},{"n":"情感","v":"type=61"},{"n":"美食","v":"type=62"},{"n":"音乐","v":"type=63"},{"n":"真人秀","v":"type=77"},{"n":"喜剧","v":"type=79"},{"n":"奇幻","v":"type=80"},{"n":"冒险","v":"type=81"},{"n":"脱口秀","v":"type=82"},{"n":"爱情","v":"type=83"},{"n":"家庭","v":"type=84"},{"n":"歌舞","v":"type=88"}]},{"key":"area","name":"地区","value":[{"n":"不限","v":""},{"n":"中国大陆","v":"area=1"},{"n":"中国台湾","v":"area=2"},{"n":"美国","v":"area=6"},{"n":"韩国","v":"area=9"},{"n":"日本","v":"area=10"},{"n":"西班牙","v":"area=18"},{"n":"巴西","v":"area=20"},{"n":"德国","v":"area=24"},{"n":"墨西哥","v":"area=29"}]},{"key":"year","name":"年份","value":[{"n":"全部","v":""},{"n":"2023","v":"year=50"},{"n":"2022","v":"year=51"},{"n":"2021","v":"year=52"},{"n":"2020","v":"year=53"},{"n":"2019","v":"year=54"},{"n":"2018","v":"year=55"},{"n":"2017","v":"year=56"},{"n":"2016","v":"year=57"},{"n":"2015","v":"year=58"},{"n":"2014","v":"year=59"},{"n":"2009","v":"year=32"},{"n":"2008","v":"year=33"},{"n":"2007","v":"year=34"}]}],
+        "4":[{"key":"class","name":"类型","value":[{"n":"全部","v":""},{"n":"国漫","v":"type=13"},{"n":"日漫","v":"type=60"},{"n":"美漫","v":"type=65"},{"n":"动画","v":"type=66"},{"n":"奇幻","v":"type=67"},{"n":"冒险","v":"type=68"},{"n":"喜剧","v":"type=69"},{"n":"动作","v":"type=70"},{"n":"剧情","v":"type=71"},{"n":"古装","v":"type=72"},{"n":"同性","v":"type=73"},{"n":"武侠","v":"type=84"},{"n":"爱情","v":"type=75"},{"n":"惊悚","v":"type=92"}]},{"key":"area","name":"地区","value":[{"n":"不限","v":""},{"n":"中国大陆","v":"area=1"},{"n":"美国","v":"area=6"},{"n":"日本","v":"area=10"}]},{"key":"year","name":"年份","value":[{"n":"全部","v":""},{"n":"2023","v":"year=50"},{"n":"2022","v":"year=51"},{"n":"2021","v":"year=52"},{"n":"2020","v":"year=53"},{"n":"2019","v":"year=54"},{"n":"2018","v":"year=55"},{"n":"2017","v":"year=56"},{"n":"2016","v":"year=57"},{"n":"2015","v":"year=58"},{"n":"2014","v":"year=59"},{"n":"2013","v":"year=60"},{"n":"2012","v":"year=61"},{"n":"2011","v":"year=62"}]}]
+    },
    searchUrl:'/search?type=1&keywords=**&page=fypage',
    searchable:2,//是否启用全局搜索,
    quickSearch:0,//是否启用快速搜索,
@@ -26,13 +31,13 @@ var rule={
    // 一级:'.media-list-2 li;a&&title;img&&src;.tag&&Text;a&&href',
    一级:'js:let d=[];let html=request(input);let jsonA=JSON.parse(html.match(/__NEXT_DATA__.*?({.*})/)[1]);print(jsonA);jsonA=jsonA.props.pageProps.mediaData.data;jsonA.forEach(function(it){d.push({title:it.name,img:it.cover,url:"https://hei17.com/detail/"+it.id,desc:it.tag})});setResult(d);',
    二级:{
-    	"title":".video-name&&Text;.video-desc-item div:lt(3)&&Text",
-    	"img":".content-top&&style",
-    	"desc":";;;.video-desc-starring&&Text;.video-desc-director&&Text",
-    	"content":".video-desc-single&&Text",
-    	"tabs":".play-box-mobile h2",
-    	"lists":".play-list:eq(#id) li"
-	},
+        "title":".video-name&&Text;.video-desc-item div:lt(3)&&Text",
+        "img":".content-top&&style",
+        "desc":";;;.video-desc-starring&&Text;.video-desc-director&&Text",
+        "content":".video-desc-single&&Text",
+        "tabs":".play-box-mobile h2",
+        "lists":".play-list:eq(#id) li"
+    },
    // 搜索:'.hl-list-wrap&&ul&&li;.hl-item-thumb&&title;.hl-lazy&&data-original;.hl-pic-text&&Text;a&&href',
    搜索:'js:let d=[];let html=request(input);let jsonA=JSON.parse(html.match(/__NEXT_DATA__.*?({.*})/)[1]);print(jsonA);jsonA=jsonA.props.pageProps.searchMovieList.data;jsonA.forEach(function(it){d.push({title:it.name,img:it.pic,url:"https://hei17.com/detail/"+it.id,desc:it.resolution})});setResult(d);',
-}
+}
\ No newline at end of file