From fac95071d6390b509ed3c1e6a46b0c5410e33033 Mon Sep 17 00:00:00 2001
From: n3rddd <119649988+n3rddd@users.noreply.github.com>
Date: Tue, 22 Aug 2023 21:04:48 +0800
Subject: [PATCH] Add files via upload

---
 JN/EXT/JS/4khdr.js     | 128 ++++++++++++-----------
 JN/EXT/JS/cilixiong.js |  17 ++--
 JN/EXT/JS/dygang.js    | 101 ++++++++++++++-----
 JN/EXT/JS/jiyingw.js   | 176 +++++++++++++++++++++-----------
 JN/EXT/JS/mp4us.js     | 127 +++++++++++++----------
 JN/EXT/JS/xb6v.js      | 223 +++++++++++++++++++++++++++++++++++++++++
 6 files changed, 565 insertions(+), 207 deletions(-)
 create mode 100644 JN/EXT/JS/xb6v.js

diff --git a/JN/EXT/JS/4khdr.js b/JN/EXT/JS/4khdr.js
index 96d3f58f..f897c362 100644
--- a/JN/EXT/JS/4khdr.js
+++ b/JN/EXT/JS/4khdr.js
@@ -37,27 +37,39 @@ var rule = {
 		tabs:`js:
 pdfh=jsp.pdfh;pdfa=jsp.pdfa;pd=jsp.pd;
 TABS=[]
-// log("4khdr 二级 html>>>>>>>>>>" + html);
-var d = pdfa(html, 'table.t_table');
-let magnetIndex=1;
-let aliIndex=1;
+let d = pdfa(html, 'table.t_table a');
+let tabsa = [];
+let tabsq = [];
+let tabsm = false;
+let tabse = false;
 d.forEach(function(it) {
-let burl = pdfh(it, 'a&&href');
-log("burl >>>>>>" + burl);
-if (burl.startsWith("https://www.aliyundrive.com/s/")){
-	let result = 'aliyun' + aliIndex;
-	aliIndex = aliIndex + 1;
-	TABS.push(result);
-}
+	let burl = pdfh(it, 'a&&href');
+	if (burl.startsWith("https://www.aliyundrive.com/s/")){
+		tabsa.push("阿里云盤");
+	}else if (burl.startsWith("https://pan.quark.cn/s/")){
+		tabsq.push("夸克云盤");
+	}else if (burl.startsWith("magnet")){
+		tabsm = true;
+	}else if (burl.startsWith("ed2k")){
+		tabse = true;
+	}
 });
-d.forEach(function(it) {
-let burl = pdfh(it, 'a&&href');
-log("burl >>>>>>" + burl);
-if (burl.startsWith("magnet")){
-	let result = 'magnet' + magnetIndex;
-	magnetIndex = magnetIndex + 1;
-	TABS.push(result);
+if (tabsm === true){
+	TABS.push("磁力");
 }
+if (tabse === true){
+	TABS.push("電驢");
+}
+let tmpIndex;
+tmpIndex=1;
+tabsa.forEach(function(it){
+	TABS.push(it + tmpIndex);
+	tmpIndex = tmpIndex + 1;
+});
+tmpIndex=1;
+tabsq.forEach(function(it){
+	TABS.push(it + tmpIndex);
+	tmpIndex = tmpIndex + 1;
 });
 log('4khdr TABS >>>>>>>>>>>>>>>>>>' + TABS);
 `,
@@ -65,52 +77,54 @@ log('4khdr TABS >>>>>>>>>>>>>>>>>>' + TABS);
 log(TABS);
 pdfh=jsp.pdfh;pdfa=jsp.pdfa;pd=jsp.pd;
 LISTS = [];
-var d = pdfa(html, 'table.t_table');
-TABS.forEach(function(tab) {
-log('tab >>>>>>>>' + tab);
-if (/^aliyun/.test(tab)) {
-	let targetindex = parseInt(tab.substring(6));
-	let index = 1;
-	d.forEach(function(it){
-		let burl = pdfh(it, 'a&&href');
-		if (burl.startsWith("https://www.aliyundrive.com/s/")){
-			if (index === targetindex){
-				let title = pdfh(it, 'a&&Text');
-				log('title >>>>>>>>>>>>>>>>>>>>>>>>>>' + title);
-				burl = "http://127.0.0.1:9978/proxy?do=ali&type=push&url=" + encodeURIComponent(burl);
-				log('burl >>>>>>>>>>>>>>>>>>>>>>>>>>' + burl);
-				let loopresult = title + '$' + burl;
-				LISTS.push([loopresult]);
-			}
-			index = index + 1;
+let d = pdfa(html, 'table.t_table a');
+let lista = [];
+let listq = [];
+let listm = [];
+let liste = [];
+d.forEach(function(it){
+	let burl = pdfh(it, 'a&&href');
+	let title = pdfh(it, 'a&&Text');
+	log('dygang title >>>>>>>>>>>>>>>>>>>>>>>>>>' + title);
+	log('dygang burl >>>>>>>>>>>>>>>>>>>>>>>>>>' + burl);
+	let loopresult = title + '$' + burl;
+	if (burl.startsWith("https://www.aliyundrive.com/s/")){
+		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);
 		}
-	});
-}
+		loopresult = title + '$' + burl;
+		lista.push(loopresult);
+	}else if (burl.startsWith("https://pan.quark.cn/s/")){
+		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);
+		}
+		loopresult = title + '$' + burl;
+		listq.push(loopresult);
+	}else if (burl.startsWith("magnet")){
+		listm.push(loopresult);
+	}else if (burl.startsWith("ed2k")){
+		liste.push(loopresult);
+	}
 });
-TABS.forEach(function(tab) {
-log('tab >>>>>>>>' + tab);
-if (/^magnet/.test(tab)) {
-	let targetindex = parseInt(tab.substring(6));
-	let index = 1;
-	d.forEach(function(it){
-		let burl = pdfh(it, 'a&&href');
-		if (burl.startsWith("magnet")){
-			if (index === targetindex){
-				let title = pdfh(it, 'a&&Text');
-				log('title >>>>>>>>>>>>>>>>>>>>>>>>>>' + title);
-				log('burl >>>>>>>>>>>>>>>>>>>>>>>>>>' + burl);
-				let loopresult = title + '$' + burl;
-				LISTS.push([loopresult]);
-			}
-			index = index + 1;
-		}
-	});
+if (listm.length>0){
+	LISTS.push(listm);
 }
+if (liste.length>0){
+	LISTS.push(liste);
+}
+lista.forEach(function(it){
+	LISTS.push([it]);
+});
+listq.forEach(function(it){
+	LISTS.push([it]);
 });
 `,
 
 	},
-	一级:'ul#waterfall li;a&&title;img&&src;div.auth.cl&&Text;a&&href',
 	搜索:`js:
 pdfh=jsp.pdfh;pdfa=jsp.pdfa;pd=jsp.pd;
 if (rule_fetch_params.headers.Cookie.startsWith("http")){
diff --git a/JN/EXT/JS/cilixiong.js b/JN/EXT/JS/cilixiong.js
index 95d7ea35..139f62d1 100644
--- a/JN/EXT/JS/cilixiong.js
+++ b/JN/EXT/JS/cilixiong.js
@@ -1,9 +1,10 @@
 var rule = {
 	title:'磁力熊[磁]',
-	host:'http://127.0.0.1:10079',
-	homeUrl:'/p/0/socks5%253A%252F%252F192.168.101.1%253A1080/https://www.cilixiong.com/',
-	// url: '/fyclass/index_(fypage-1).html',
+	//host:'https://www.cilixiong.com',
+	//homeUrl:'/',
 	//url: '/fyclassfyfilter-(fypage-1).html',
+	host:'http://127.0.0.1:10079',
+	homeUrl:'/p/0/socks5%253A%252F%252F192.168.101.1%253A1080/https://www.cilixiong.com',
 	url:'/p/0/socks5%253A%252F%252F192.168.101.1%253A1080/https://www.cilixiong.com/fyclassfyfilter-(fypage-1).html',
 	filter_url:'-{{fl.class or "0"}}-{{fl.area or "0"}}',
 	filter:{
@@ -19,7 +20,7 @@ var rule = {
 	},
 	timeout:5000,
 	class_name:'电影&剧集&豆瓣电影Top250&IMDB Top250&高分悬疑片&高分喜剧片&高分传记片&高分爱情片&高分犯罪片&高分恐怖片&高分冒险片&高分武侠片&高分奇幻片&高分历史片&高分战争片&高分歌舞片&高分灾难片&高分情色片&高分西部片&高分音乐片&高分科幻片&高分动作片&高分动画片&高分纪录片&冷门佳片',
-	class_url:'1&2&/top250/&/s/imdbtop250/&/s/suspense/&/s/comedy/&/s/biopic/&/s/romance/&/s/crime/&/s/horror/&/s/adventure/&/s/martial/&/s/fantasy/&/s/history/&/s/war/&/s/musical/&/s/disaster/&/s/erotic/&/s/west/&/s/music/&/s/sci-fi/&s/action/&/s/animation/&/s/documentary/&/s/unpopular/',
+	class_url:'1&2&/top250/&/s/imdbtop250/&/s/suspense/&/s/comedy/&/s/biopic/&/s/romance/&/s/crime/&/s/horror/&/s/adventure/&/s/martial/&/s/fantasy/&/s/history/&/s/war/&/s/musical/&/s/disaster/&/s/erotic/&/s/west/&/s/music/&/s/sci-fi/&/s/action/&/s/animation/&/s/documentary/&/s/unpopular/',
 	play_parse:false,
 	lazy:'',
 	limit:6,
@@ -32,8 +33,7 @@ var rule = {
 			d.push({
 				title: pdfh(it, 'h2&&Text'),
 				desc: pdfh(it, '.me-auto&&Text') + '分 / ' + pdfh(it, '.small&&Text'),
-				pic_url: pd(it, '.card-img&&style'),
-				url: pd(it, 'a&&href')
+				pic_url: pd(it, '.card-img&&style')
 			});
 		})
 		setResult(d);
@@ -43,7 +43,7 @@ var rule = {
 		var d = [];
 		if (MY_CATE !== '1' && MY_CATE !== '2') {
 			let turl = (MY_PAGE === 1)? 'index' : 'index_'+ MY_PAGE;
-			input = HOST + MY_CATE + turl + '.html';
+			input = rule.homeUrl + MY_CATE + turl + '.html';
 		}
 		var html = request(input);
 		var list = pdfa(html, 'body&&.col');
@@ -51,8 +51,7 @@ var rule = {
 			d.push({
 				title: pdfh(it, 'h2&&Text'),
 				desc: pdfh(it, '.me-auto&&Text') + '分 / ' + pdfh(it, '.small&&Text'),
-				pic_url: pdfh(it, '.card-img&&style'),
-				url: ''
+				pic_url: pdfh(it, '.card-img&&style')
 			});
 		})
 		setResult(d);
diff --git a/JN/EXT/JS/dygang.js b/JN/EXT/JS/dygang.js
index a7db00c4..32bda9b1 100644
--- a/JN/EXT/JS/dygang.js
+++ b/JN/EXT/JS/dygang.js
@@ -39,44 +39,91 @@ var rule = {
 		tabs:`js:
 pdfh=jsp.pdfh;pdfa=jsp.pdfa;pd=jsp.pd;
 TABS=[]
-var d = pdfa(html, '#dede_content table tbody tr');
-var index=1;
+let d = pdfa(html, '#dede_content table tbody tr a');
+let tabsa = [];
+let tabsq = [];
+let tabsm = false;
+let tabse = false;
 d.forEach(function(it) {
 	let burl = pdfh(it, 'a&&href');
-	log("burl >>>>>>" + burl);
-	if (burl.startsWith("magnet")){
-		let result = 'magnet' + index;
-		index = index + 1;
-		TABS.push(result);
+	if (burl.startsWith("https://www.aliyundrive.com/s/")){
+		tabsa.push("阿里云盤");
+	}else if (burl.startsWith("https://pan.quark.cn/s/")){
+		tabsq.push("夸克云盤");
+	}else if (burl.startsWith("magnet")){
+		tabsm = true;
+	}else if (burl.startsWith("ed2k")){
+		tabse = true;
 	}
 });
-log('TABS >>>>>>>>>>>>>>>>>>' + TABS);
+if (tabsm === true){
+	TABS.push("磁力");
+}
+if (tabse === true){
+	TABS.push("電驢");
+}
+let tmpIndex;
+tmpIndex=1;
+tabsa.forEach(function(it){
+	TABS.push(it + tmpIndex);
+	tmpIndex = tmpIndex + 1;
+});
+tmpIndex=1;
+tabsq.forEach(function(it){
+	TABS.push(it + tmpIndex);
+	tmpIndex = tmpIndex + 1;
+});
+log('dygang TABS >>>>>>>>>>>>>>>>>>' + TABS);
 `,
 		lists:`js:
 log(TABS);
 pdfh=jsp.pdfh;pdfa=jsp.pdfa;pd=jsp.pd;
 LISTS = [];
-var d = pdfa(html, '#dede_content table tbody tr');
-TABS.forEach(function(tab) {
-	log('tab >>>>>>>>' + tab);
-	if (/^magnet/.test(tab)) {
-		let targetindex = parseInt(tab.substring(6));
-		let index = 1;
-		d.forEach(function(it){
-			let burl = pdfh(it, 'a&&href');
-			if (burl.startsWith("magnet")){
-				if (index === targetindex){
-					let title = pdfh(it, 'a&&Text');
-					log('title >>>>>>>>>>>>>>>>>>>>>>>>>>' + title);
-					log('burl >>>>>>>>>>>>>>>>>>>>>>>>>>' + burl);
-					let loopresult = title + '$' + burl;
-					LISTS.push([loopresult]);
-				}
-				index = index + 1;
-			}
-		});
+let d = pdfa(html, '#dede_content table tbody tr a');
+let lista = [];
+let listq = [];
+let listm = [];
+let liste = [];
+d.forEach(function(it){
+	let burl = pdfh(it, 'a&&href');
+	let title = pdfh(it, 'a&&Text');
+	log('dygang title >>>>>>>>>>>>>>>>>>>>>>>>>>' + title);
+	log('dygang burl >>>>>>>>>>>>>>>>>>>>>>>>>>' + burl);
+	let loopresult = title + '$' + burl;
+	if (burl.startsWith("https://www.aliyundrive.com/s/")){
+		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);
+		}
+		loopresult = title + '$' + burl;
+		lista.push(loopresult);
+	}else if (burl.startsWith("https://pan.quark.cn/s/")){
+		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);
+		}
+		loopresult = title + '$' + burl;
+		listq.push(loopresult);
+	}else if (burl.startsWith("magnet")){
+		listm.push(loopresult);
+	}else if (burl.startsWith("ed2k")){
+		liste.push(loopresult);
 	}
 });
+if (listm.length>0){
+	LISTS.push(listm);
+}
+if (liste.length>0){
+	LISTS.push(liste);
+}
+lista.forEach(function(it){
+	LISTS.push([it]);
+});
+listq.forEach(function(it){
+	LISTS.push([it]);
+});
 `,
 
 	},
diff --git a/JN/EXT/JS/jiyingw.js b/JN/EXT/JS/jiyingw.js
index 621b8a0c..5aae748b 100644
--- a/JN/EXT/JS/jiyingw.js
+++ b/JN/EXT/JS/jiyingw.js
@@ -1,5 +1,8 @@
 var rule = {
 	title:'极影网[磁]',
+	//host:'https://www.jiyingw.net',
+	//homeUrl:'/',
+	//url: '/fyclass/page/fypage?',
 	host:'http://127.0.0.1:10079',
 	homeUrl:'/p/0/socks5%253A%252F%252F192.168.101.1%253A1080/https://www.jiyingw.net',
 	url: '/p/0/socks5%253A%252F%252F192.168.101.1%253A1080/https://www.jiyingw.net/fyclass/page/fypage?',
@@ -38,78 +41,133 @@ var rule = {
 		tabs:`js:
 pdfh=jsp.pdfh;pdfa=jsp.pdfa;pd=jsp.pd;
 TABS=[]
-var d = pdfa(html, '.movie-introduce p');
-var index=0;
+let tabsa = [];
+let tabsq = [];
+let tabsm = false;
+let tabse = false;
+let d = pdfa(html, '.movie-introduce p a');
 d.forEach(function(it) {
-	let burl = pdfh(it, 'a[href^="magnet"]&&href');
-	if (burl.startsWith("magnet")){
-		log("jiyingw burl >>>>>>" + burl);
-		index = index + 1;
-		let result = 'magnet' + index;
-		TABS.push(result);
+	let burl = pdfh(it, 'a&&href');
+	if (burl.startsWith("https://www.aliyundrive.com/s/")){
+		tabsa.push("阿里云盤");
+	}else if (burl.startsWith("https://pan.quark.cn/s/")){
+		tabsq.push("夸克云盤");
+	}else if (burl.startsWith("magnet")){
+		tabsm = true;
+	}else if (burl.startsWith("ed2k")){
+		tabse = true;
 	}
 });
-if (index === 0){
-	d = pdfa(html, 'div#down p.down-list3');
-	index=0;
-	d.forEach(function(it) {
-		let burl = pdfh(it, 'a[href^="magnet"]&&href');
-		if (burl.startsWith("magnet")){
-			log("jiyingw burl >>>>>>" + burl);
-			index = index + 1;
-			let result = 'magnet' + index;
-			TABS.push(result);
-		}
-	});
+d = pdfa(html, 'div#down p.down-list3 a');
+d.forEach(function(it) {
+	let burl = pdfh(it, 'a&&href');
+	if (burl.startsWith("https://www.aliyundrive.com/s/")){
+		tabsa.push("阿里云盤");
+	}else if (burl.startsWith("https://pan.quark.cn/s/")){
+		tabsq.push("夸克云盤");
+	}else if (burl.startsWith("magnet")){
+		tabsm = true;
+	}else if (burl.startsWith("ed2k")){
+		tabse = true;
+	}
+});
+if (tabsm === true){
+	TABS.push("磁力");
 }
-
+if (tabse === true){
+	TABS.push("電驢");
+}
+let tmpIndex;
+tmpIndex=1;
+tabsa.forEach(function(it){
+	TABS.push(it + tmpIndex);
+	tmpIndex = tmpIndex + 1;
+});
+tmpIndex=1;
+tabsq.forEach(function(it){
+	TABS.push(it + tmpIndex);
+	tmpIndex = tmpIndex + 1;
+});
 log('jiyingw TABS >>>>>>>>>>>>>>>>>>' + TABS);
 `,
 		lists:`js:
 log(TABS);
 pdfh=jsp.pdfh;pdfa=jsp.pdfa;pd=jsp.pd;
 LISTS = [];
-var d = pdfa(html, '.movie-introduce p');
-var secondinit=false;
-TABS.forEach(function(tab) {
-	log('jiyingw tab >>>>>>>>' + tab);
-	if (/^magnet/.test(tab)) {
-		let targetindex = parseInt(tab.substring(6));
-		let index = 0;
-		d.forEach(function(it){
-			let burl = pdfh(it, 'a[href^="magnet"]&&href');
-			if (burl.startsWith("magnet")){
-				index = index + 1;
-				if (index === targetindex){
-					let title = pdfh(it, 'a[href^="magnet"]&&Text');
-					log('jiyingw title >>>>>>>>>>>>>>>>>>>>>>>>>>' + title);
-					log('jiyingw burl >>>>>>>>>>>>>>>>>>>>>>>>>>' + burl);
-					let loopresult = title + '$' + burl;
-					LISTS.push([loopresult]);
-				}
-			}
-		});
-		if (index === 0){
-			if (secondinit === false){
-				d = pdfa(html, 'div#down p.down-list3');
-				secondinit = true;
-			}
-			d.forEach(function(it){
-				let burl = pdfh(it, 'a[href^="magnet"]&&href');
-				if (burl.startsWith("magnet")){
-					index = index + 1;
-					if (index === targetindex){
-						let title = pdfh(it, 'a[href^="magnet"]&&Text');
-						log('jiyingw title >>>>>>>>>>>>>>>>>>>>>>>>>>' + title);
-						log('jiyingw burl >>>>>>>>>>>>>>>>>>>>>>>>>>' + burl);
-						let loopresult = title + '$' + burl;
-						LISTS.push([loopresult]);
-					}
-				}
-			});
+let lista = [];
+let listq = [];
+let listm = [];
+let liste = [];
+let d = pdfa(html, '.movie-introduce p');
+d.forEach(function(it){
+	let burl = pdfh(it, 'a&&href');
+	let title = pdfh(it, 'a&&Text');
+	log('dygang title >>>>>>>>>>>>>>>>>>>>>>>>>>' + title);
+	log('dygang burl >>>>>>>>>>>>>>>>>>>>>>>>>>' + burl);
+	let loopresult = title + '$' + burl;
+	if (burl.startsWith("https://www.aliyundrive.com/s/")){
+		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);
 		}
+		loopresult = title + '$' + burl;
+		lista.push(loopresult);
+	}else if (burl.startsWith("https://pan.quark.cn/s/")){
+		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);
+		}
+		loopresult = title + '$' + burl;
+		listq.push(loopresult);
+	}else if (burl.startsWith("magnet")){
+		listm.push(loopresult);
+	}else if (burl.startsWith("ed2k")){
+		liste.push(loopresult);
 	}
 });
+d = pdfa(html, 'div#down p.down-list3 a');
+d.forEach(function(it){
+	let burl = pdfh(it, 'a&&href');
+	let title = pdfh(it, 'a&&Text');
+	log('dygang title >>>>>>>>>>>>>>>>>>>>>>>>>>' + title);
+	log('dygang burl >>>>>>>>>>>>>>>>>>>>>>>>>>' + burl);
+	let loopresult = title + '$' + burl;
+	if (burl.startsWith("https://www.aliyundrive.com/s/")){
+		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);
+		}
+		loopresult = title + '$' + burl;
+		lista.push(loopresult);
+	}else if (burl.startsWith("https://pan.quark.cn/s/")){
+		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);
+		}
+		loopresult = title + '$' + burl;
+		listq.push(loopresult);
+	}else if (burl.startsWith("magnet")){
+		listm.push(loopresult);
+	}else if (burl.startsWith("ed2k")){
+		liste.push(loopresult);
+	}
+});
+if (listm.length>0){
+	LISTS.push(listm);
+}
+if (liste.length>0){
+	LISTS.push(liste);
+}
+lista.forEach(function(it){
+	LISTS.push([it]);
+});
+listq.forEach(function(it){
+	LISTS.push([it]);
+});
 `,
 
 	},
diff --git a/JN/EXT/JS/mp4us.js b/JN/EXT/JS/mp4us.js
index 80a1b992..0369ee2c 100644
--- a/JN/EXT/JS/mp4us.js
+++ b/JN/EXT/JS/mp4us.js
@@ -37,73 +37,90 @@ var rule = {
 		tabs:`js:
 pdfh=jsp.pdfh;pdfa=jsp.pdfa;pd=jsp.pd;
 TABS=[]
-var d = pdfa(html, 'ul.down-list&&li');
-let magnetIndex=1;
-let ed2kIndex=1;
+let d = pdfa(html, 'ul.down-list&&li a');
+let tabsa = [];
+let tabsq = [];
+let tabsm = false;
+let tabse = false;
 d.forEach(function(it) {
 	let burl = pdfh(it, 'a&&href');
-	log("burl >>>>>>" + burl);
-	if (burl.startsWith("magnet")){
-		let result = 'magnet' + magnetIndex;
-		magnetIndex = magnetIndex + 1;
-		TABS.push(result);
+	if (burl.startsWith("https://www.aliyundrive.com/s/")){
+		tabsa.push("阿里云盤");
+	}else if (burl.startsWith("https://pan.quark.cn/s/")){
+		tabsq.push("夸克云盤");
+	}else if (burl.startsWith("magnet")){
+		tabsm = true;
+	}else if (burl.startsWith("ed2k")){
+		tabse = true;
 	}
 });
-d.forEach(function(it) {
-	let burl = pdfh(it, 'a&&href');
-	log("burl >>>>>>" + burl);
-	if (burl.startsWith("ed2k")){
-		let result = 'ed2k' + ed2kIndex;
-		ed2kIndex = ed2kIndex + 1;
-		TABS.push(result);
-	}
+if (tabsm === true){
+	TABS.push("磁力");
+}
+if (tabse === true){
+	TABS.push("電驢");
+}
+let tmpIndex;
+tmpIndex=1;
+tabsa.forEach(function(it){
+	TABS.push(it + tmpIndex);
+	tmpIndex = tmpIndex + 1;
 });
-log('TABS >>>>>>>>>>>>>>>>>>' + TABS);
+tmpIndex=1;
+tabsq.forEach(function(it){
+	TABS.push(it + tmpIndex);
+	tmpIndex = tmpIndex + 1;
+});
+log('mp4us TABS >>>>>>>>>>>>>>>>>>' + TABS);
 `,
 		lists:`js:
 log(TABS);
 pdfh=jsp.pdfh;pdfa=jsp.pdfa;pd=jsp.pd;
 LISTS = [];
-var d = pdfa(html, 'ul.down-list&&li');
-TABS.forEach(function(tab) {
-	log('tab >>>>>>>>' + tab);
-	if (/^magnet/.test(tab)) {
-		let targetindex = parseInt(tab.substring(6));
-		let index = 1;
-		d.forEach(function(it){
-			let burl = pdfh(it, 'a&&href');
-			if (burl.startsWith("magnet")){
-				if (index === targetindex){
-					let title = pdfh(it, 'a&&Text');
-					log('title >>>>>>>>>>>>>>>>>>>>>>>>>>' + title);
-					log('burl >>>>>>>>>>>>>>>>>>>>>>>>>>' + burl);
-					let loopresult = title + '$' + burl;
-					LISTS.push([loopresult]);
-				}
-				index = index + 1;
-			}
-		});
+let d = pdfa(html, 'ul.down-list&&li a');
+let lista = [];
+let listq = [];
+let listm = [];
+let liste = [];
+d.forEach(function(it){
+	let burl = pdfh(it, 'a&&href');
+	let title = pdfh(it, 'a&&Text');
+	log('dygang title >>>>>>>>>>>>>>>>>>>>>>>>>>' + title);
+	log('dygang burl >>>>>>>>>>>>>>>>>>>>>>>>>>' + burl);
+	let loopresult = title + '$' + burl;
+	if (burl.startsWith("https://www.aliyundrive.com/s/")){
+		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);
+		}
+		loopresult = title + '$' + burl;
+		lista.push(loopresult);
+	}else if (burl.startsWith("https://pan.quark.cn/s/")){
+		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);
+		}
+		loopresult = title + '$' + burl;
+		listq.push(loopresult);
+	}else if (burl.startsWith("magnet")){
+		listm.push(loopresult);
+	}else if (burl.startsWith("ed2k")){
+		liste.push(loopresult);
 	}
 });
-TABS.forEach(function(tab) {
-	log('tab >>>>>>>>' + tab);
-	if (/^ed2k/.test(tab)) {
-		let targetindex = parseInt(tab.substring(4));
-		let index = 1;
-		d.forEach(function(it){
-			let burl = pdfh(it, 'a&&href');
-			if (burl.startsWith("ed2k")){
-				if (index === targetindex){
-					let title = pdfh(it, 'a&&Text');
-					log('title >>>>>>>>>>>>>>>>>>>>>>>>>>' + title);
-					log('burl >>>>>>>>>>>>>>>>>>>>>>>>>>' + burl);
-					let loopresult = title + '$' + burl;
-					LISTS.push([loopresult]);
-				}
-				index = index + 1;
-			}
-		});
-	}
+if (listm.length>0){
+	LISTS.push(listm.reverse());
+}
+if (liste.length>0){
+	LISTS.push(liste.reverse());
+}
+lista.forEach(function(it){
+	LISTS.push([it]);
+});
+listq.forEach(function(it){
+	LISTS.push([it]);
 });
 `,
 
diff --git a/JN/EXT/JS/xb6v.js b/JN/EXT/JS/xb6v.js
new file mode 100644
index 00000000..031901b6
--- /dev/null
+++ b/JN/EXT/JS/xb6v.js
@@ -0,0 +1,223 @@
+var rule = {
+	title:'新版6V[磁]',
+	host:'http://www.xb6v.com',
+	homeUrl:'/',
+	url: '/fyclass/index_fypage.html?',
+	filter_url:'{{fl.class}}',
+	filter:{
+	},
+	searchUrl: '/e/search/index.php#tempid=1&tbname=article&mid=1&dopost=search&submit=&keyborad=**;post',
+	searchable:2,
+	quickSearch:0,
+	filterable:0,
+	headers:{
+		'User-Agent': 'PC_UA',
+		'Referer': 'http://www.xb6v.com/'
+	},
+	timeout:5000,
+	class_name:'最新50部&喜剧片&动作片&爱情片&科幻片&恐怖片&剧情片&战争片&纪录片&动画片&电视剧&综艺',
+	class_url:'qian50m.html&xijupian&dongzuopian&aiqingpian&kehuanpian&kongbupian&juqingpian&zhanzhengpian&jilupian&donghuapian&dianshiju&ZongYi',
+	play_parse:true,
+	play_json:[{
+		re:'*',
+		json:{
+			parse:0,
+			jx:0
+		}
+	}],
+	lazy:'',
+	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: pdfh(it, 'div.thumbnail img&&src'),
+				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: pdfh(it, 'div.thumbnail img&&src'),
+					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);
+	`,
+	二级:{
+		title:"div.article_container h1&&Text",
+		img:"div#post_content img&&src",
+		desc:"div#post_content&&Text",
+		content:"div#post_content&&Text",
+		tabs:`js:
+pdfh=jsp.pdfh;pdfa=jsp.pdfa;pd=jsp.pd;
+TABS=[]
+let d = pdfa(html, 'div#post_content table tbody tr a');
+let tabsa = [];
+let tabsq = [];
+let tabsm = false;
+let tabse = false;
+d.forEach(function(it) {
+	let burl = pdfh(it, 'a&&href');
+	if (burl.startsWith("https://www.aliyundrive.com/s/")){
+		tabsa.push("阿里云盤");
+	}else if (burl.startsWith("https://pan.quark.cn/s/")){
+		tabsq.push("夸克云盤");
+	}else if (burl.startsWith("magnet")){
+		tabsm = true;
+	}else if (burl.startsWith("ed2k")){
+		tabse = true;
+	}
+});
+if (tabsm === true){
+	TABS.push("磁力");
+}
+if (tabse === true){
+	TABS.push("電驢");
+}
+let tmpIndex;
+tmpIndex=1;
+tabsa.forEach(function(it){
+	TABS.push(it + tmpIndex);
+	tmpIndex = tmpIndex + 1;
+});
+tmpIndex=1;
+tabsq.forEach(function(it){
+	TABS.push(it + tmpIndex);
+	tmpIndex = tmpIndex + 1;
+});
+log('xb6v TABS >>>>>>>>>>>>>>>>>>' + TABS);
+`,
+		lists:`js:
+log(TABS);
+pdfh=jsp.pdfh;pdfa=jsp.pdfa;pd=jsp.pd;
+LISTS = [];
+let d = pdfa(html, 'div#post_content table tbody tr a');
+let lista = [];
+let listq = [];
+let listm = [];
+let liste = [];
+d.forEach(function(it){
+	let burl = pdfh(it, 'a&&href');
+	let title = pdfh(it, 'a&&Text');
+	log('xb6v title >>>>>>>>>>>>>>>>>>>>>>>>>>' + title);
+	log('xb6v burl >>>>>>>>>>>>>>>>>>>>>>>>>>' + burl);
+	let loopresult = title + '$' + burl;
+	if (burl.startsWith("https://www.aliyundrive.com/s/")){
+		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);
+		}
+		loopresult = title + '$' + burl;
+		lista.push(loopresult);
+	}else if (burl.startsWith("https://pan.quark.cn/s/")){
+		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);
+		}
+		loopresult = title + '$' + burl;
+		listq.push(loopresult);
+	}else if (burl.startsWith("magnet")){
+		listm.push(loopresult);
+	}else if (burl.startsWith("ed2k")){
+		liste.push(loopresult);
+	}
+});
+if (listm.length>0){
+	LISTS.push(listm);
+}
+if (liste.length>0){
+	LISTS.push(liste);
+}
+lista.forEach(function(it){
+	LISTS.push([it]);
+});
+listq.forEach(function(it){
+	LISTS.push([it]);
+});
+`,
+
+	},
+	搜索:`js:
+pdfh=jsp.pdfh;pdfa=jsp.pdfa;pd=jsp.pd;
+
+//let new_host=HOST;
+//let new_html=request(new_host, {withHeaders:true});
+//let json=JSON.parse(new_html);
+//let setCk=Object.keys(json).find(it=>it.toLowerCase()==="set-cookie");
+//let cookie=setCk?json[setCk].split(";")[0]:"";
+//log("xb6v cookie>>>>>>>>>>>>>>>>>>>>>>"+cookie);
+//rule_fetch_params.headers.Cookie=cookie;
+//setItem(RULE_CK,cookie);
+
+let params = 'show=title&tempid=1&tbname=article&mid=1&dopost=search&submit=&keyboard=' + encodeURIComponent(KEY);
+let _fetch_params = JSON.parse(JSON.stringify(rule_fetch_params));
+let postData = {
+    method: "POST",
+    body: params
+};
+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);
+let d=[];
+let dlist = pdfa(search_html, 'div.mainleft&&ul#post_container&&li');
+dlist.forEach(function(it){
+	let title = pdfh(it, 'div.thumbnail img&&alt');
+	if (searchObj.quick === true){
+		if (title.includes(KEY)){
+			title = KEY;
+		}
+	}
+	let img = pd(it, 'div.thumbnail img&&src', HOST);
+	let content = pdfh(it, 'div.article div.entry_post&&Text');
+	let desc = pdfh(it, 'div.info&&span.info_date&&Text');
+	let url = pd(it, 'div.thumbnail&&a&&href', HOST);
+	d.push({
+		title:title,
+		img:img,
+		content:content,
+		desc:desc,
+		url:url
+		});
+});
+setResult(d);
+`,
+}