加了模板

controllers/cms.py

@@ -638,19 +638,28 @@ class CMS:
                     # print(title)
                     obj['title'] = title
                 if p.get('desc'):
-                    p1 = p['desc'].split(';')
-                    desc = '\n'.join([pdfh(html,i).replace('\n',' ') for i in p1])
-                    obj['desc'] = desc
+                    try:
+                        p1 = p['desc'].split(';')
+                        desc = '\n'.join([pdfh(html,i).replace('\n',' ') for i in p1])
+                        obj['desc'] = desc
+                    except:
+                        pass
 
                 if p.get('content'):
                     p1 = p['content'].split(';')
-                    content = '\n'.join([pdfh(html,i).replace('\n',' ') for i in p1])
-                    obj['content'] = content
+                    try:
+                        content = '\n'.join([pdfh(html,i).replace('\n',' ') for i in p1])
+                        obj['content'] = content
+                    except:
+                        pass
 
                 if p.get('img'):
-                    p1 = p['img'].split(';')
-                    img = '\n'.join([pdfh(html,i).replace('\n',' ') for i in p1])
-                    obj['img'] = img
+                    p1 = p['img']
+                    try:
+                        img = pd(html,p1)
+                        obj['img'] = img
+                    except Exception as e:
+                        logger.info(f'二级图片定位失败,但不影响使用{e}')
 
                 vod = {
                     "vod_id": detailUrl,
@@ -792,8 +801,14 @@ class CMS:
                 # print(item)
                 try:
                     title = pdfh(item, p[1])
-                    img = pd(item, p[2])
-                    desc = pdfh(item, p[3])
+                    try:
+                        img = pd(item, p[2])
+                    except:
+                        img = ''
+                    try:
+                        desc = pdfh(item, p[3])
+                    except:
+                        desc = ''
                     # link = '$'.join([pd(item, p4) for p4 in p[4].split('+')])
                     links = [pd(item, p4) if not self.detailUrl else pdfh(item, p4) for p4 in p[4].split('+')]
                     link = '$'.join(links)

js/AnFuns.js

+muban.海螺3.二级.desc = '.hl-text-conch&&Text';
+var rule = Object.assign(muban.海螺3,{
+    title:'AnFuns动漫',
+    host:'https://www.anfuns.cc',
+    cate_exclude: '最新|排行',
+    url:'/type/fyclass-fypage.html',
+    searchUrl:'/search/page/fypage/wd/**.html',
+});
\ No newline at end of file

js/l0l.js

+muban.海螺2.二级.content = '.play-m-box&&Text';
+muban.海螺2.二级.desc = '.play-news&&Text';
+muban.海螺2.二级.img = '';
+var rule = Object.assign(muban.海螺2,{
+    title:'l0l',
+    host:'https://www.l0l.tv',
+    class_parse:'.index-tag&&li;a&&.title&&Text;a&&href;.*/(.*?).html',
+    searchUrl:'/index.php/vod/search/page/fypage/wd/**.html',
+    搜索:'.searchlilst&&li;a&&title;.lazy&&data-original;.list-remarks&&Text;a&&href',
+});
\ No newline at end of file

js/version.txt

-3.2.7
\ No newline at end of file
+3.2.8
\ No newline at end of file

js/小猫咪.js

+muban.海螺3.二级.content = '.hl-infos-content&&Text';
+var rule = Object.assign(muban.海螺3,{
+    title:'小猫咪',
+    host:'https://xmaomi.net',
+});
\ No newline at end of file

js/模板.js

@@ -95,7 +95,49 @@ vfed:{
     一级:'.fed-list-info&&li;a.fed-list-title&&Text;a&&data-original;.fed-list-remarks&&Text;a&&href',
     二级:{"title":"h1.fed-part-eone&&Text;.fed-deta-content&&.fed-part-rows&&li&&Text","img":".fed-list-info&&a&&data-original","desc":".fed-deta-content&&.fed-part-rows&&li:eq(1)&&Text;.fed-deta-content&&.fed-part-rows&&li:eq(2)&&Text;.fed-deta-content&&.fed-part-rows&&li:eq(3)&&Text","content":".fed-part-esan&&Text","tabs":".fed-drop-boxs&&.fed-part-rows&&li","lists":".fed-play-item:eq(#id)&&ul:eq(1)&&li"},
     搜索:'.fed-deta-info;h1&&Text;.lazyload&&data-original;.fed-list-remarks&&Text;a&&href;.fed-deta-content&&Text',
-}
+},
+海螺3:{
+    title:'',
+    host:'',
+    searchUrl:'/v_search/**----------fypage---.html',
+    url:'/vod_____show/fyclass--------fypage---.html',
+    headers:{
+        'User-Agent':'MOBILE_UA'
+    },
+    timeout:5000,
+    class_parse:'body&&.hl-nav li:gt(0);a&&Text;a&&href;.*/(.*?).html',
+    limit:40,
+    play_parse:true,
+    lazy:'',
+    推荐:'.hl-vod-list;li;a&&title;a&&data-original;.remarks&&Text;a&&href',
+    double:true,
+    一级:'.hl-vod-list&&.hl-list-item;a&&title;a&&data-original;.remarks&&Text;a&&href',
+    二级:{"title":".hl-infos-title&&Text;.hl-text-conch&&Text","img":".hl-lazy&&data-original","desc":".hl-infos-content&&.hl-text-conch&&Text","content":".hl-content-text&&Text","tabs":".hl-tabs&&a","lists":".hl-plays-list:eq(#id)&&li"},
+    搜索:'.hl-list-item;a&&title;a&&data-original;.remarks&&Text;a&&href',
+    searchable:1,
+    quickSearch:1,
+},
+海螺2:{
+    title:'',
+    host:'',
+    searchUrl:'/index.php/vod/search/page/fypage/wd/**/',
+    url:'/index.php/vod/show/id/fyclass/page/fypage/',
+    headers:{
+        'User-Agent':'MOBILE_UA'
+    },
+    timeout:5000,
+    class_parse:'#nav-bar li;a&&Text;a&&href;id/(.*?)/',
+    limit:40,
+    play_parse:true,
+    lazy:'',
+    推荐:'.list-a.size;li;a&&title;.lazy&&data-original;.bt&&Text;a&&href',
+    double:true,
+    一级:'.list-a&&li;a&&title;.lazy&&data-original;.list-remarks&&Text;a&&href',
+    二级:{"title":"h2&&Text;.deployment&&Text","img":".lazy&&data-original","desc":".deployment&&Text","content":".ec-show&&Text","tabs":"#tag&&a","lists":".play_list_box:eq(#id)&&li"},
+    搜索:'.search-list;a&&title;.lazy&&data-original;.deployment&&Text;a&&href',
+    searchable:1,
+    quickSearch:1,
+},
 
 
 };
\ No newline at end of file

js/追剧喵.js

+// muban.海螺2.二级.content = '.hl-infos-content&&Text';
+var rule = Object.assign(muban.海螺2,{
+    title:'追剧喵',
+    host:'https://zjmiao.com',
+});
\ No newline at end of file

readme.md

@@ -52,6 +52,7 @@
 - [X] 3.js源增加cate_exlude参数
 - [X] 4.增加腾云驾雾源(二级暂未完善,后面再说)
 - [X] 5.完善腾云驾雾源,修复直播下载乱码,修复网站强制证书验证
+- [X] 6.升级到3.2.8,增加两套模板和多个对应源
 ###### 2022/09/06
 - [X] 1.增加了后台管理界面在线检测升级系统功能
 - [X] 2.增加了后台管理界面修改直播源地址和同步直播源

utils/htmlParser.py

@@ -43,7 +43,11 @@ class jsoup:
             else:
                 ret = ret.attr(option)
                 if add_url and option in ['url','src','href','data-original','data-src']:
-                    ret = urljoin(self.MY_URL,ret)
+                    if 'http' in ret:
+                        ret = ret[ret.find('http'):]
+                    else:
+                        ret = urljoin(self.MY_URL,ret)
+                    # print(ret)
         else:
             # ret = doc(parse+':first')
             ret = doc(parse) # 由于是生成器,直接转str就能拿到第一条数据,不需要next