diff --git a/base/config.py b/base/config.py index 6d1cd163a510ef46f77b529211e45b9d4df3aad1..8bfe7900d064a1cc269dd50ed8b765464cdeb121 100644 --- a/base/config.py +++ b/base/config.py @@ -27,7 +27,8 @@ HTTP_PORT = '5705' PLAY_DISABLE = False # 全局禁用播放解析 LAZYPARSE_MODE = 1 # 播放解析模式(0 本地 1 局域网 2远程 仅在全局禁用为False的时候生效) WALL_PAPER_ENABLE = True # 启用自定义壁纸 -WALL_PAPER = "https://picsum.photos/1280/720/?blur=10" # 自定义壁纸,可注释 +# WALL_PAPER = "https://picsum.photos/1280/720/?blur=10" # 自定义壁纸,可注释 +WALL_PAPER = "https://tuapi.eees.cc/api.php?category=fengjing&type=302" # 自定义壁纸,可注释 SUP_PORT = 9001 # supervisord 服务端口 RETRY_CNT = 3 # 验证码重试次数 # OCR_API = 'http://192.168.3.224:9000/api/ocr_img' # 验证码识别接口,传参数data diff --git a/base/rules.db b/base/rules.db index 53cd7d8bc1f26dd82a324c6b9b11ef531012d281..d48f689e443e9eac352bb598f239cfc904c0cafa 100644 Binary files a/base/rules.db and b/base/rules.db differ diff --git a/js/version.txt b/js/version.txt index 5593094542df68fb73dd93e7f514dacc0fd225c7..71380f2427ede9999e769f1698032b511868cbeb 100644 --- a/js/version.txt +++ b/js/version.txt @@ -1 +1 @@ -3.9.9beta2 \ No newline at end of file +3.9.10 \ No newline at end of file diff --git a/readme.md b/readme.md index cb5857222aba7bb916f042cd4bf7a6bdb2f05e27..4643cd6173121abe32a0b0d8b1cd38e6aa12048b 100644 --- a/readme.md +++ b/readme.md @@ -47,6 +47,10 @@ [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/10/18 +- [ ] 没有二级只有一级的情况下想办法把标题和图片带进去二级。(这个想法实现难度太大了,直接放弃,不要瞎搞了) +- [X] 3.9.10 (修复js模式1搜索不到结果,修复js模式0二级选集和线路异常,优化drpy聚搜) +- [X] 源增加属性 模板,可用作模板继承 ###### 2022/10/17 - [X] 3.9.8beta2 全局关闭https对应的ssl证书验证 - [X] 3.9.9 增加新特性,简写快看源,修复小品网推荐显示 @@ -346,6 +350,8 @@ var rule = { // 类似海阔一级 列表;标题;图片;描述;链接;详情 其中最后一个参数选填 一级:'.col-sm-6;h3&&Text;img&&data-src;.date&&Text;a&&href', // 二级可以是*,表示规则无二级,直接拿一级的链接进行嗅探 + // 二级 title: 片名;类型 + // 二级 desc: 主要信息;年代;地区;演员;导演 // 或者 {title:'',img:'',desc:'',content:'',tabs:'',lists:''} 同海阔dr二级 二级:'*', // 搜索可以是*,集成一级，或者跟一级一样的写法 列表;标题;图片;描述;链接;详情 @@ -360,7 +366,15 @@ host:'https://yanetflix.com', url:'/index.php/vod/show/id/fyclass/page/fypage.html', class_parse:'.navbar-items li:gt(1):lt(6);a&&Text;a&&href;.*/(.*?).html', }); - +``` +模板继承写法(新) +```javascript +var rule = { +title:'cokemv', +模板:'mxpro', +host:'https://cokemv.me', +class_parse:'.navbar-items li:gt(1):lt(7);a&&Text;a&&href;/(\\d+).html', +} +``` js:内置变量 -input,html,VODS,VOD,TABS,LISTS -``` \ No newline at end of file +input,html,VODS,VOD,TABS,LISTS \ No newline at end of file diff --git a/templates/config.txt b/templates/config.txt index 3e98a82800e97155da8accd0f6739bff5198124b..495b7c55a72e589ea84d8111142a5ab904d59e84 100644 --- a/templates/config.txt +++ b/templates/config.txt @@ -128,131 +128,221 @@ "recommend": [{"name": "豆瓣推荐","request": {"method": "GET","header": [{"key": "Referer","value": "https://movie.douban.com/"}],"url": {"raw": "https://movie.douban.com/j/new_search_subjects?sort=U&range=0,10&tags=&playable=1&start=0&year_range=2022,2022"}},"response": {"result": "$.data","data": [{"key": "name","value": "title"},{"key": "note","value": "rate"},{"key": "pic","value": "cover"}]},"expires" : "86400"}], "rating": [{"name": "rating","request": {"method": "GET","url": {"raw": "https://api.wmdb.tv/api/v1/movie/search?q={name}&limit=1"}},"response": {"result": "this","data": [{"key": "rating","value": "doubanRating"}]}}], "ijk": [{ -"group": "软解码", -"options": [{ - "category": 4, - "name": "opensles", - "value": "0" -}, { - "category": 4, - "name": "overlay-format", - "value": "842225234" -}, { - "category": 4, - "name": "framedrop", - "value": "1" -}, { - "category": 4, - "name": "soundtouch", - "value": "1" -}, { - "category": 4, - "name": "start-on-prepared", - "value": "1" -}, { - "category": 1, - "name": "http-detect-range-support", - "value": "0" -}, { - "category": 1, - "name": "fflags", - "value": "fastseek" -}, { - "category": 2, - "name": "skip_loop_filter", - "value": "48" -}, { - "category": 4, - "name": "reconnect", - "value": "1" -}, { - "category": 4, - "name": "enable-accurate-seek", - "value": "0" -}, { - "category": 4, - "name": "mediacodec", - "value": "0" -}, { - "category": 4, - "name": "mediacodec-auto-rotate", - "value": "0" -}, { - "category": 4, - "name": "mediacodec-handle-resolution-change", - "value": "0" -}, { - "category": 4, - "name": "mediacodec-hevc", - "value": "0" -}, { - "category": 1, - "name": "dns_cache_timeout", - "value": "600000000" -}] -}, { -"group": "硬解码", -"options": [{ - "category": 4, - "name": "opensles", - "value": "0" -}, { - "category": 4, - "name": "overlay-format", - "value": "842225234" -}, { - "category": 4, - "name": "framedrop", - "value": "1" -}, { - "category": 4, - "name": "soundtouch", - "value": "1" -}, { - "category": 4, - "name": "start-on-prepared", - "value": "1" -}, { - "category": 1, - "name": "http-detect-range-support", - "value": "0" -}, { - "category": 1, - "name": "fflags", - "value": "fastseek" -}, { - "category": 2, - "name": "skip_loop_filter", - "value": "48" -}, { - "category": 4, - "name": "reconnect", - "value": "1" -}, { - "category": 4, - "name": "enable-accurate-seek", - "value": "0" -}, { - "category": 4, - "name": "mediacodec", - "value": "1" -}, { - "category": 4, - "name": "mediacodec-auto-rotate", - "value": "1" -}, { - "category": 4, - "name": "mediacodec-handle-resolution-change", - "value": "1" -}, { - "category": 4, - "name": "mediacodec-hevc", - "value": "1" -}, { - "category": 1, - "name": "dns_cache_timeout", - "value": "600000000" -}] -}], -"ads": ["mimg.0c1q0l.cn", "www.googletagmanager.com", "www.google-analytics.com", "mc.usihnbcq.cn", "mg.g1mm3d.cn", "mscs.svaeuzh.cn", "cnzz.hhttm.top", "tp.vinuxhome.com", "cnzz.mmstat.com", "www.baihuillq.com", "s23.cnzz.com", "z3.cnzz.com", "c.cnzz.com", "stj.v1vo.top", "z12.cnzz.com", "img.mosflower.cn", "tips.gamevvip.com", "ehwe.yhdtns.com", "xdn.cqqc3.com", "www.jixunkyy.cn", "sp.chemacid.cn", "hm.baidu.com", "s9.cnzz.com", "z6.cnzz.com", "um.cavuc.com", "mav.mavuz.com", "wofwk.aoidf3.com", "z5.cnzz.com", "xc.hubeijieshikj.cn", "tj.tianwenhu.com", "xg.gars57.cn", "k.jinxiuzhilv.com", "cdn.bootcss.com", "ppl.xunzhuo123.com", "xomk.jiangjunmh.top", "img.xunzhuo123.com", "z1.cnzz.com", "s13.cnzz.com", "xg.huataisangao.cn", "z7.cnzz.com", "xg.huataisangao.cn", "z2.cnzz.com", "s96.cnzz.com", "q11.cnzz.com", "thy.dacedsfa.cn", "xg.whsbpw.cn", "s19.cnzz.com", "z8.cnzz.com", "s4.cnzz.com", "f5w.as12df.top", "ae01.alicdn.com", "www.92424.cn", "k.wudejia.com", "vivovip.mmszxc.top", "qiu.xixiqiu.com", "cdnjs.hnfenxun.com", "cms.qdwght.com"] + "group": "软解码", + "options": [{ + "category": 4, + "name": "opensles", + "value": "0" + }, + { + "category": 4, + "name": "overlay-format", + "value": "842225234" + }, + { + "category": 4, + "name": "framedrop", + "value": "1" + }, + { + "category": 4, + "name": "soundtouch", + "value": "1" + }, + { + "category": 4, + "name": "start-on-prepared", + "value": "1" + }, + { + "category": 1, + "name": "http-detect-range-support", + "value": "0" + }, + { + "category": 1, + "name": "fflags", + "value": "fastseek" + }, + { + "category": 2, + "name": "skip_loop_filter", + "value": "48" + }, + { + "category": 4, + "name": "reconnect", + "value": "1" + }, + { + "category": 4, + "name": "max-buffer-size", + "value": "5242880" + }, + { + "category": 4, + "name": "enable-accurate-seek", + "value": "0" + }, + { + "category": 4, + "name": "mediacodec", + "value": "0" + }, + { + "category": 4, + "name": "mediacodec-auto-rotate", + "value": "0" + }, + { + "category": 4, + "name": "mediacodec-handle-resolution-change", + "value": "0" + }, + { + "category": 4, + "name": "mediacodec-hevc", + "value": "0" + } + ] + }, + { + "group": "硬解码", + "options": [{ + "category": 4, + "name": "opensles", + "value": "0" + }, + { + "category": 4, + "name": "overlay-format", + "value": "842225234" + }, + { + "category": 4, + "name": "framedrop", + "value": "1" + }, + { + "category": 4, + "name": "soundtouch", + "value": "1" + }, + { + "category": 4, + "name": "start-on-prepared", + "value": "1" + }, + { + "category": 1, + "name": "http-detect-range-support", + "value": "0" + }, + { + "category": 1, + "name": "fflags", + "value": "fastseek" + }, + { + "category": 2, + "name": "skip_loop_filter", + "value": "48" + }, + { + "category": 4, + "name": "reconnect", + "value": "1" + }, + { + "category": 4, + "name": "max-buffer-size", + "value": "5242880" + }, + { + "category": 4, + "name": "enable-accurate-seek", + "value": "0" + }, + { + "category": 4, + "name": "mediacodec", + "value": "1" + }, + { + "category": 4, + "name": "mediacodec-auto-rotate", + "value": "1" + }, + { + "category": 4, + "name": "mediacodec-handle-resolution-change", + "value": "1" + }, + { + "category": 4, + "name": "mediacodec-hevc", + "value": "1" + } + ] + } +], +"ads": [ + "mimg.0c1q0l.cn", + "www.googletagmanager.com", + "www.google-analytics.com", + "mc.usihnbcq.cn", + "mg.g1mm3d.cn", + "mscs.svaeuzh.cn", + "cnzz.hhttm.top", + "tp.vinuxhome.com", + "cnzz.mmstat.com", + "www.baihuillq.com", + "s23.cnzz.com", + "z3.cnzz.com", + "c.cnzz.com", + "stj.v1vo.top", + "z12.cnzz.com", + "img.mosflower.cn", + "tips.gamevvip.com", + "ehwe.yhdtns.com", + "xdn.cqqc3.com", + "www.jixunkyy.cn", + "sp.chemacid.cn", + "hm.baidu.com", + "s9.cnzz.com", + "z6.cnzz.com", + "um.cavuc.com", + "mav.mavuz.com", + "wofwk.aoidf3.com", + "z5.cnzz.com", + "xc.hubeijieshikj.cn", + "tj.tianwenhu.com", + "xg.gars57.cn", + "k.jinxiuzhilv.com", + "cdn.bootcss.com", + "ppl.xunzhuo123.com", + "xomk.jiangjunmh.top", + "img.xunzhuo123.com", + "z1.cnzz.com", + "s13.cnzz.com", + "xg.huataisangao.cn", + "z7.cnzz.com", + "xg.huataisangao.cn", + "z2.cnzz.com", + "s96.cnzz.com", + "q11.cnzz.com", + "thy.dacedsfa.cn", + "xg.whsbpw.cn", + "s19.cnzz.com", + "z8.cnzz.com", + "s4.cnzz.com", + "f5w.as12df.top", + "ae01.alicdn.com", + "www.92424.cn", + "k.wudejia.com", + "vivovip.mmszxc.top", + "qiu.xixiqiu.com", + "cdnjs.hnfenxun.com", + "cms.qdwght.com" +] } \ No newline at end of file diff --git a/templates/config.txt.old b/templates/config.txt.old new file mode 100644 index 0000000000000000000000000000000000000000..3e98a82800e97155da8accd0f6739bff5198124b --- /dev/null +++ b/templates/config.txt.old @@ -0,0 +1,258 @@ +{ +{% if config.WALL_PAPER_ENABLE %}"wallpaper":"{{ host }}/pics",{% endif %} +"dr_count": {{rules.list|length}}, +"mode": {{ mode }}, +"spider": "{{ host }}/liveslib", +{% if alists|length > 0 %}"drives": {{alists_str}},{% endif %} +"homepage":"https://gitcode.net/qq_32394351/dr_py", +"sites": [{% for rule in rules.list %}{% if js_mode != 1 %} +{ + "key":"dr_{{ rule.name }}", + "name":"{{ rule.name }}(道长)", + "type":1, + "api":"{{ host }}/vod?rule={{ rule.name }}", + "searchable": {{ rule.searchable }}, + "quickSearch": {{ rule.quickSearch }}, + "filterable": {{ rule.filterable }} +}{% else %} +{ + "key":"dr_{{ rule.name }}", + "name":"{{ rule.name }}(drpy)", + "type":3, + "api":{% if ISTVB %}"{{ host }}/libs/drpy.ym.js"{% else %}"{{ host }}/libs/drpy.min.js"{% endif %}, + #"api":"{{ host }}/libs/drpy.js", + "searchable": {{ rule.searchable }}, + "quickSearch": {{ rule.quickSearch }}, + "filterable": {{ rule.filterable }}, + "ext":"{{ host }}/admin/view/{{ rule.name }}.js" +}{% endif %}{% if loop.last==False %},{% endif %}{% endfor %} +{% if js_mode == 1 %},{ + "key":"js_drpy", + "name":"drpy(道长)", + "type":1, + "api":"{{ host }}/vod?rule=drpy", + "searchable": 1, + "quickSearch": 1, + "filterable": 1 +}{% endif %} +{% if pys %} +,{% for py in pys %}{ + "key":"{{ py.name }}", + "name":"{{ py.name }}(Pyramid)", + "type": 3, + "api":"{{ py.name }}", + "searchable": {{ py.searchable }}, + "quickSearch": {{ py.quickSearch }}, + "filterable": {{ py.filterable }}, + "ext": "{{ host }}/txt/py/{{ py.name }}.py" +}{% if loop.last==False %},{% endif %}{% endfor %} +{% endif %} +], + "parses": [{ + "name": "🌐Ⓤ", + "type": 0, + "url": "", + "header": { + "User-Agent": "Mozilla/5.0" + } + },{ + "name": "🌀Ⓙ", + "type": 1, + "url": "", + "header": { + "User-Agent": "Mozilla/5.0" + } + }, + { + "name": "轮询", + "type": 2, + "url": "Sequence", + "header": { + "User-Agent": "Mozilla/5.0" + } + }, + { + "name": "并发", + "type": 2, + "url": "Parallel", + "header": { + "User-Agent": "Mozilla/5.0" + } + }, + {% for jx in jxs %} +{ + "name": "{{ jx.name }}", + "url": "{{ jx.url }}", + "type": {{ jx.type }}, + "ext": { + "flag": ["qiyi","imgo","爱奇艺", "奇艺", "qq", "腾讯", "youku", "优酷", "pptv", "PPTV", "letv", "乐视","leshi", "bilibili", "哔哩哔哩", "哔哩", "mgtv", "芒果","sohu", "xigua","fun","风行"], + "header": { + "User-Agent": "{{ jx.ua }}" + } + } +}{% if loop.last==False %},{% endif %}{% endfor %} + ], +"flags": ["imgo","youku", "qq", "iqiyi", "qiyi","fun", "letv","leshi","sohu", "tudou","xigua","cntv","1905", "pptv", "mgtv", "wasu", "bilibili", "renrenmi"], +"hotSearch": [{ + "name": "mobilesearch", + "request": { + "method": "GET", + "header": [ + { + "key": "Referer", + "value": "{{ host }}" + } + ], + "url": { + "raw": "{{ host }}/hotsugg?t={time}" + } + }, + "response": { + "result": "$.data", + "data": [ + { + "key": "keyword", + "value": "title" + } + ] + } +}], +"lives":[{"group":"redirect","channels":[{"name":"直播","urls":["proxy://do=live&type=txt&ext={{live_url}}"]}]}], +"sniffer": { + "userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36 Edg/105.0.1343.27", + "isVideoFormat": "http((?!http).){26,}\\.(m3u8|mp4|flv|avi|mkv|wmv|mpg|mpeg|mov|ts|3gp|rm|rmvb|asf|m4a|mp3|wma)", + "custom": [ + {"url":"/Cloud/Down/AliCloud/", "mimeType":"text/html", "encoding":"utf-8", "header":{"Referer": "https://zxzj.vip/"}} + ] +}, +"recommend": [{"name": "豆瓣推荐","request": {"method": "GET","header": [{"key": "Referer","value": "https://movie.douban.com/"}],"url": {"raw": "https://movie.douban.com/j/new_search_subjects?sort=U&range=0,10&tags=&playable=1&start=0&year_range=2022,2022"}},"response": {"result": "$.data","data": [{"key": "name","value": "title"},{"key": "note","value": "rate"},{"key": "pic","value": "cover"}]},"expires" : "86400"}], +"rating": [{"name": "rating","request": {"method": "GET","url": {"raw": "https://api.wmdb.tv/api/v1/movie/search?q={name}&limit=1"}},"response": {"result": "this","data": [{"key": "rating","value": "doubanRating"}]}}], +"ijk": [{ +"group": "软解码", +"options": [{ + "category": 4, + "name": "opensles", + "value": "0" +}, { + "category": 4, + "name": "overlay-format", + "value": "842225234" +}, { + "category": 4, + "name": "framedrop", + "value": "1" +}, { + "category": 4, + "name": "soundtouch", + "value": "1" +}, { + "category": 4, + "name": "start-on-prepared", + "value": "1" +}, { + "category": 1, + "name": "http-detect-range-support", + "value": "0" +}, { + "category": 1, + "name": "fflags", + "value": "fastseek" +}, { + "category": 2, + "name": "skip_loop_filter", + "value": "48" +}, { + "category": 4, + "name": "reconnect", + "value": "1" +}, { + "category": 4, + "name": "enable-accurate-seek", + "value": "0" +}, { + "category": 4, + "name": "mediacodec", + "value": "0" +}, { + "category": 4, + "name": "mediacodec-auto-rotate", + "value": "0" +}, { + "category": 4, + "name": "mediacodec-handle-resolution-change", + "value": "0" +}, { + "category": 4, + "name": "mediacodec-hevc", + "value": "0" +}, { + "category": 1, + "name": "dns_cache_timeout", + "value": "600000000" +}] +}, { +"group": "硬解码", +"options": [{ + "category": 4, + "name": "opensles", + "value": "0" +}, { + "category": 4, + "name": "overlay-format", + "value": "842225234" +}, { + "category": 4, + "name": "framedrop", + "value": "1" +}, { + "category": 4, + "name": "soundtouch", + "value": "1" +}, { + "category": 4, + "name": "start-on-prepared", + "value": "1" +}, { + "category": 1, + "name": "http-detect-range-support", + "value": "0" +}, { + "category": 1, + "name": "fflags", + "value": "fastseek" +}, { + "category": 2, + "name": "skip_loop_filter", + "value": "48" +}, { + "category": 4, + "name": "reconnect", + "value": "1" +}, { + "category": 4, + "name": "enable-accurate-seek", + "value": "0" +}, { + "category": 4, + "name": "mediacodec", + "value": "1" +}, { + "category": 4, + "name": "mediacodec-auto-rotate", + "value": "1" +}, { + "category": 4, + "name": "mediacodec-handle-resolution-change", + "value": "1" +}, { + "category": 4, + "name": "mediacodec-hevc", + "value": "1" +}, { + "category": 1, + "name": "dns_cache_timeout", + "value": "600000000" +}] +}], +"ads": ["mimg.0c1q0l.cn", "www.googletagmanager.com", "www.google-analytics.com", "mc.usihnbcq.cn", "mg.g1mm3d.cn", "mscs.svaeuzh.cn", "cnzz.hhttm.top", "tp.vinuxhome.com", "cnzz.mmstat.com", "www.baihuillq.com", "s23.cnzz.com", "z3.cnzz.com", "c.cnzz.com", "stj.v1vo.top", "z12.cnzz.com", "img.mosflower.cn", "tips.gamevvip.com", "ehwe.yhdtns.com", "xdn.cqqc3.com", "www.jixunkyy.cn", "sp.chemacid.cn", "hm.baidu.com", "s9.cnzz.com", "z6.cnzz.com", "um.cavuc.com", "mav.mavuz.com", "wofwk.aoidf3.com", "z5.cnzz.com", "xc.hubeijieshikj.cn", "tj.tianwenhu.com", "xg.gars57.cn", "k.jinxiuzhilv.com", "cdn.bootcss.com", "ppl.xunzhuo123.com", "xomk.jiangjunmh.top", "img.xunzhuo123.com", "z1.cnzz.com", "s13.cnzz.com", "xg.huataisangao.cn", "z7.cnzz.com", "xg.huataisangao.cn", "z2.cnzz.com", "s96.cnzz.com", "q11.cnzz.com", "thy.dacedsfa.cn", "xg.whsbpw.cn", "s19.cnzz.com", "z8.cnzz.com", "s4.cnzz.com", "f5w.as12df.top", "ae01.alicdn.com", "www.92424.cn", "k.wudejia.com", "vivovip.mmszxc.top", "qiu.xixiqiu.com", "cdnjs.hnfenxun.com", "cms.qdwght.com"] +} \ No newline at end of file