升级了版本

controllers/cms.py

@@ -436,7 +436,8 @@ class CMS:
                     # print(self.headers)
                     if self.class_parse and not has_cache:
                         p = self.class_parse.split(';')
-                        # print(p)
+                        # print(p[0])
+                        # print(html)
                         jsp = jsoup(self.url)
                         pdfh = jsp.pdfh
                         pdfa = jsp.pdfa

js/007影视.js

+muban.首图2.二级.tabs = '.nav-tabs.dpplay&&li';
+var rule = Object.assign(muban.首图2,{
+    title:'007影视',
+    host:'https://www.007ts.me',
+    url:'/channel/fyclass-fypage.html',
+    searchUrl:'/search/**----------fypage---.html',
+    searchable:1,
+    quickSearch:0,
+    搜索:'ul.stui-vodlist&&li;a&&title;.lazyload&&data-original;.pic-text&&Text;a&&href;.text-muted:eq(-1)&&Text',
+});
\ No newline at end of file

js/version.txt

-3.6.5
\ No newline at end of file
+3.6.6
\ No newline at end of file

js/人人影视.js

+muban.首图2.二级.tabs = '.stui-pannel__head h3';
+var rule = Object.assign(muban.首图2,{
+    title:'人人影视',
+    host:'https://www.rttks.com',
+    url:'/rrtop/fyclass/page/fypage.html',
+    searchUrl:'/rrso**/page/fypage.html',
+    class_parse:'.stui-header__menu li;a&&Text;a&&href;.*/(.*?).html',
+    // cate_exclude:'解说',
+    searchable:1,
+    quickSearch:0,
+    play_parse:true,
+    lazy:'',
+    搜索:'ul.stui-vodlist__media&&li;a&&title;.lazyload&&data-original;.pic-text&&Text;a&&href;.text-muted:eq(-1)&&Text',
+});
\ No newline at end of file

js/奇优影院.js

+muban.首图2.二级.title = '.stui-content__detail&&h1&&Text;.stui-content__detail&&p:eq(0)&&Text';
+muban.首图2.二级.tabs = '.stui-pannel__head a';
+muban.首图2.二级.lists = '.stui-content__playlist:eq(#id) li';
+muban.首图2.二级.desc = '.stui-content__detail&&p:eq(1)&&Text;.stui-content__detail&&p:eq(2)&&Text;.stui-content__detail&&p:eq(3)&&Text';
+muban.首图2.二级.content = '.stui-pannel_bd:eq(1)&&Text';
+var rule = Object.assign(muban.首图2,{
+    title:'奇优影院',
+    host:'http://1e6e.com',
+    url:'/list/fyclass_fypage.html',
+    searchUrl:'/search.php;**',
+    搜索:'js:let url=input.split(";")[0];let d=[];let body={searchword:input.split(";")[1]};fetch_params.body=body;let html=post(url,fetch_params);let pdfa=jsp.pdfa;let pdfh=jsp.pdfh;let pd=jsp.pd;let lists=pdfa(html,"ul.stui-vodlist__media&&li");lists.forEach(function(it){d.push({title:pdfh(it,".title&&Text"),url:pd(it,"a&&href"),desc:pdfh(html,".pic-text&&Text"),pic_url:pd(html,".lazyload&&data-original")})});setResult(d);',
+    searchable:1,
+    quickSearch:0,
+//搜索:'li.stui-vodlist__item;a&&title;a&&data-original;.pic-text&&Text;a&&href'
+});
\ No newline at end of file

js/牛马TV.js

+muban.首图2.二级.tabs = '.stui-pannel__head h3';
+muban.首图2.二级.content = '.stui-content__desc&&Text';
+var rule = Object.assign(muban.首图2,{
+    title:'牛马TV',
+    host:'https://www.niumatv.com',
+    url:'/type/fyclass-fypage.html',
+    searchUrl:'/vodsearch**/page/fypage.html',
+    class_parse:'.stui-header__menu&&li;a&&Text;a&&href;.*/(.*?).html',
+    searchable:1,
+    quickSearch:0,
+    搜索:'ul.stui-vodlist&&li;a&&title;.lazyload&&data-original;.pic-text&&Text;a&&href;.text-muted:eq(-1)&&Text',
+});
\ No newline at end of file

py/奇优搜索.js

+js:
+// log(input);
+let url=input.split(";")[0];
+let d = [];
+let body={searchword:input.split(";")[1]};
+fetch_params.body=body;
+let html = post(url,fetch_params);
+// print(html);\
+let pdfa = jsp.pdfa;
+let pdfh = jsp.pdfh;
+let pd = jsp.pd;
+let lists = pdfa(html,'ul.stui-vodlist__media&&li');
+lists.forEach(function (it){
+   d.push({
+       title:pdfh(it,'.title&&Text'),
+       url:pd(it,'a&&href'),
+       desc:pdfh(html,'.pic-text&&Text'),
+       pic_url:pd(html,'.lazyload&&data-original'),
+   });
+});
+setResult(d);
\ No newline at end of file

readme.md

@@ -53,6 +53,8 @@
 - [X] 4.修复局域网ip可能会获取成网关地址问题
 - [X] 5.设置中心增加自定义进程管理地址(可用于goorm等设备绑定快捷方式)
 - [X] 6.直播文件目录迁移
+- [X] 7.增加py_gitcafe.py和其他几个js首图2模板源
+- [X] 8.版本号更新至3.6.6
 ###### 2022/09/14
 - [X] 1.升级至3.6.2,增加了一些解析
 - [X] 2.升级至3.6.5,修复菜狗部分源解析失败问题(url参数有+号被自动变空格导致的)

txt/py/py_gitcafe.py

@@ -4,6 +4,7 @@ import sys
 sys.path.append('..') 
 from base.spider import Spider
 import requests
+import json
 
 class Spider(Spider):
 	def getDependence(self):
@@ -20,41 +21,26 @@ class Spider(Spider):
 		pass
 	def homeContent(self,filter):
 		result = {}
-		cateManual = {
-			"hyds": "华语电视",
-			"rhds": "日韩电视",
-			"omds": "欧美电视",
-			"qtds": "其他电视",
-			"hydy": "华语电影",
-			"rhdy": "日韩电影",
-			"omdy": "欧美电影",
-			"qtdy": "其他电影",
-			"hydm": "华语动漫",
-			"rhdm": "日韩动漫",
-			"omdm": "欧美动漫",
-			"jlp": "纪录片",
-			"zyp": "综艺片",
-			"jypx": "教育培训",
-			"qtsp": "其他视频",
-			"hyyy": "华语音乐",
-			"rhyy": "日韩音乐",
-			"omyy": "欧美音乐",
-			"qtyy": "其他音乐",
-			"kfrj": "娱乐软件",
-			"xtrj": "系统软件",
-			"wlrj": "网络软件",
-			"bgrj": "办公软件",
-			"qtrj": "其他软件",
-			"mh": "漫画",
-			"xs": "小说",
-			"cbs": "出版书",
-			"zspx": "知识培训",
-			"qtwd": "其他文档",
-			"bz": "壁纸",
-			"rw": "人物",
-			"fj": "风景",
-			"qttp": "其他图片",
-			"qt": "其他"
+		cateManual = {			
+			"华语电视" :"hyds",
+			"日韩电视" :"rhds",
+			"欧美电视" :"omds",
+			"其他电视" :"qtds",
+			"华语电影" :"hydy",
+			"日韩电影" :"rhdy",
+			"欧美电影" :"omdy",
+			"其他电影" :"qtdy",
+			"华语动漫" :"hydm",
+			"日韩动漫" :"rhdm",
+			"欧美动漫" :"omdm",
+			"纪录片" :"jlp",
+			"综艺片" :"zyp",
+			"教育培训" :"jypx",
+			"其他视频" :"qtsp",
+			"华语音乐" :"hyyy",
+			"日韩音乐" :"rhyy",
+			"欧美音乐" :"omyy",
+			"其他音乐" :"qtyy"
 		}
 		classes = []
 		for k in cateManual:
@@ -63,6 +49,8 @@ class Spider(Spider):
 				'type_id':cateManual[k]
 			})
 		result['class'] = classes
+		if filter:
+			result['filter'] = self.config['filter']
 		return result
 	def homeVideoContent(self):
 		result = {}
@@ -84,13 +72,16 @@ class Spider(Spider):
 		result['list']=videos
 		return result
 	def categoryContent(self,tid,pg,filter,extend):
+		result = {}
 		url = self.baseUrl+'/tool/alipaper/'
 		form = {
 			"action": "viewcat",
 			"cat": tid,
 			"num":pg
 		}
-		vodList = requests.post(url,headers=self.header,data=form).json()
+		
+		rsp = requests.post(url,headers=self.header,data=form)
+		vodList = json.loads(self.cleanText(rsp.text))
 		videos = []
 		for vod in vodList:
 			videos.append({
@@ -99,14 +90,17 @@ class Spider(Spider):
 				"vod_pic": "https://txc.gtimg.com/data/375895/2022/0214/d6b96cc3799b6417d30e4715d2973f64.png",
 				"vod_remarks": vod['cat']
 			})
-		return videos
-	header = {
-		"User-Agent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.54 Safari/537.36"
-	}
+		result['list'] = videos
+		result['page'] = pg
+		result['pagecount'] = 9999
+		result['limit'] = 90
+		result['total'] = 999999
+		return result
 	category = ['hydm','hyds','hydy','omdm','omds','omdy','rhdm','rhds','rhdy','qtds','qtdy','qtsp','jlp','zyp']
 	def detailContent(self,array):
-		return self.ali.detailContent(newArray)
+		return self.ali.detailContent(array)
 	def searchContent(self,key,quick):
+		result = {}
 		url = self.baseUrl+'/tool/alipaper/'
 		form = {
 			"action": "search",
@@ -121,9 +115,13 @@ class Spider(Spider):
 				"vod_pic": "https://txc.gtimg.com/data/375895/2022/0214/d6b96cc3799b6417d30e4715d2973f64.png",
 				"vod_remarks": vod['cat']
 			})
-		return videos
+		result = {
+			'list':videos
+		}
+		return result
 	def playerContent(self,flag,id,vipFlags):
 		return self.ali.playerContent(flag,id,vipFlags)
+
 	homeData = {}
 	baseUrl = 'https://gitcafe.net'
 	config = {