diff --git a/controllers/cms.py b/controllers/cms.py index 60eacd4db8e6e799d6350dbe833fed2a38c8e9e3..8de2d676b83aca72173fe8333155823cd352b04a 100644 --- a/controllers/cms.py +++ b/controllers/cms.py @@ -112,7 +112,7 @@ class CMS: # print(headers) self.headers = headers self.host = host - self.homeUrl = urljoin(host,homeUrl) if host and homeUrl else homeUrl + self.homeUrl = urljoin(host,homeUrl) if host and homeUrl else homeUrl or host if url.find('[') >-1 and url.find(']') > -1: u1 = url.split('[')[0] u2 = url.split('[')[1].split(']')[0] @@ -369,8 +369,8 @@ class CMS: # print(self.url) print(self.headers) has_cache = False + # print(self.homeUrl) if self.homeUrl.startswith('http'): - # print(self.homeUrl) # print(self.class_parse) try: if self.class_parse: @@ -638,10 +638,11 @@ class CMS: if p == '*': vod = self.blank_vod() vod['vod_play_from'] = '道长在线' - vod['vod_remarks'] = self.play_url+detailUrl + vod['vod_remarks'] = detailUrl vod['vod_actor'] = '没有二级,只有一级链接直接嗅探播放' vod['vod_content'] = detailUrl - vod['vod_play_url'] = '嗅探播放$'+detailUrl + vod['vod_play_url'] = '嗅探播放$'+self.play_url+detailUrl + print(vod) return vod if not isinstance(p,dict) and not isinstance(p,str) and not str(p).startswith('js:'): diff --git "a/js/\345\220\270\347\223\234.js" "b/js/\345\220\270\347\223\234.js" new file mode 100644 index 0000000000000000000000000000000000000000..acdabfd4da3fdee39516c108cbb23425f28dc0cb --- /dev/null +++ "b/js/\345\220\270\347\223\234.js" @@ -0,0 +1,19 @@ +var rule = { + title:'吸瓜', + host:'https://xgsp.tv', + // homeUrl:'', + url:'/list/?fyclass-fypage.html', + headers:{ + 'User-Agent':'MOBILE_UA' + }, + timeout:5000, + class_parse:'.wap-roll&&li;a&&Text;a&&href;(\\d+).html', + cate_exclude:'独家', + limit:5, + play_parse:true, + lazy:'js:let html=request(input);let a=html.match(/var now="(.*?)"/)[1];input=a', + 推荐:'ul.row.row-space7.row-m-space7.tx-column-5.tx-column-m-2;li;a&&title;img&&src;.ico-right&&Text;a&&href', + double:true, + 一级:'.tx-column-m-2.mb20&&li;h2&&Text;img&&src;.ico-right&&Text;a&&href', + 二级:'*', +} \ No newline at end of file diff --git a/models/rules.db b/models/rules.db index 8baf4fc801d9781903212783b1c35f751ce8ca68..55128d684d0163210f7a53c36e8b78434920dd5d 100644 Binary files a/models/rules.db and b/models/rules.db differ diff --git a/readme.md b/readme.md index faaead480f83fa609ae3082cc31b9dd53adf5d93..2b4cf5439a4ff81893118df5326e4c057d850a23 100644 --- a/readme.md +++ b/readme.md @@ -46,6 +46,8 @@ [dockerfile教程](https://blog.csdn.net/qq_46158060/article/details/125718218) [获取本地设备信息](https://blog.csdn.net/cui_yonghua/article/details/125508991) [获取本地设备信息](https://m.jb51.net/article/140716.htm) +###### 2022/09/09 +- [X] 1.增加西瓜源,修复一级不支持lazy的bug ###### 2022/09/08 - [X] 1.升级到3.2.9,支持自动合并自定义用户配置(内置t4测试源) - [X] 2.升级到3.3.0,增加奇珍异兽源