Skip to content

Commit

Permalink
update FM
Browse files Browse the repository at this point in the history
  • Loading branch information
@qist
qist committed Feb 21, 2024
1 parent 7207ca8 commit 6587dbe
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion dianshi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@

{"key":"drpy_js_69美剧","name":"影视 | 69美剧[js]","type":3,"api":"./lib/drpy2.min.js","ext":"./js/69美剧.js"},
{"key":"drpy_js_兄弟影视","name":"影视 | 兄弟影视[js]","type":3,"api":"./lib/drpy2.min.js","ext":"./js/兄弟影视.js"},
{"key":"drpy_js_4k剧院","name":"影视 | 4k剧院[js]","type":3,"api":"./lib/drpy2.min.js","ext":"./js/4k剧院.js"},
{"key":"drpy_js_4k剧院","name":"影视 | 4k剧院[js]","type":3,"api":"./lib/drpy.min.js","ext":"./js/4k剧院.js"},
{"key":"drpy_js_爱迪影视","name":"影视 | 爱迪影视[js]","type":3,"api":"./lib/drpy2.min.js","ext":"./js/爱迪影视.js"},
{"key":"drpy_js_539影视","name":"影视 | 539影视[js]","type":3,"api":"./lib/drpy2.min.js","ext":"./js/539影视.js"},
{"key":"drpy_js_333影视","name":"影视 | 333影视[js]","type":3,"api":"./lib/drpy2.min.js","ext":"./js/333影视.js"},
Expand Down
2 changes: 1 addition & 1 deletion jsm.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@

{"key":"drpy_js_69美剧","name":"影视 | 69美剧[js]","type":3,"api":"./lib/drpy2.min.js","ext":"./js/69美剧.js"},
{"key":"drpy_js_兄弟影视","name":"影视 | 兄弟影视[js]","type":3,"api":"./lib/drpy2.min.js","ext":"./js/兄弟影视.js"},
{"key":"drpy_js_4k剧院","name":"影视 | 4k剧院[js]","type":3,"api":"./lib/drpy2.min.js","ext":"./js/4k剧院.js"},
{"key":"drpy_js_4k剧院","name":"影视 | 4k剧院[js]","type":3,"api":"./lib/drpy.min.js","ext":"./js/4k剧院.js"},
{"key":"drpy_js_爱迪影视","name":"影视 | 爱迪影视[js]","type":3,"api":"./lib/drpy2.min.js","ext":"./js/爱迪影视.js"},
{"key":"drpy_js_539影视","name":"影视 | 539影视[js]","type":3,"api":"./lib/drpy2.min.js","ext":"./js/539影视.js"},
{"key":"drpy_js_333影视","name":"影视 | 333影视[js]","type":3,"api":"./lib/drpy2.min.js","ext":"./js/333影视.js"},
Expand Down
2 changes: 1 addition & 1 deletion lib/alist.min.js
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions lib/drpy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function pre(){
}

let rule = {};
const VERSION = 'drpy1 3.9.48beta16 20231011';
const VERSION = 'drpy1 3.9.49beta2 20231122';
/** 已知问题记录
* 1.影魔的jinjia2引擎不支持 {{fl}}对象直接渲染 (有能力解决的话尽量解决下，支持对象直接渲染字符串转义,如果加了|safe就不转义)[影魔牛逼，最新的文件发现这问题已经解决了]
* Array.prototype.append = Array.prototype.push; 这种js执行后有毛病,for in 循环列表会把属性给打印出来 (这个大毛病需要重点排除一下)
Expand Down Expand Up @@ -1634,9 +1634,9 @@ function searchParse(searchObj) {
p = p.trim();
let pp = rule.一级.split(';');
let url = searchObj.searchUrl.replaceAll('**', searchObj.wd);
if(searchObj.pg === 1 && url.includes('[')&&url.includes(']')){
if(searchObj.pg === 1 && url.includes('[')&&url.includes(']')&&!url.includes('#')){
url = url.split('[')[1].split(']')[0];
}else if(searchObj.pg > 1 && url.includes('[')&&url.includes(']')){
}else if(searchObj.pg > 1 && url.includes('[')&&url.includes(']')&&!url.includes('#')){
url = url.split('[')[0];
}
if(/fypage/.test(url)){
Expand Down Expand Up @@ -2351,7 +2351,7 @@ function isVideoParse(isVideoObj){
rule.url = rule.host && rule.url ? urljoin(rule.host,rule.url) : rule.url;
}

if(rule.searchUrl.includes('[')&&rule.searchUrl.includes(']')){
if(rule.searchUrl.includes('[')&&rule.searchUrl.includes(']')&&!rule.searchUrl.includes('#')){
let u1 = rule.searchUrl.split('[')[0]
let u2 = rule.searchUrl.split('[')[1].split(']')[0]
rule.searchUrl = rule.host && rule.searchUrl?urljoin(rule.host,u1)+'['+urljoin(rule.host,u2)+']':rule.searchUrl;
Expand Down
8 changes: 4 additions & 4 deletions lib/drpy2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function pre(){

let rule = {};
let vercode = typeof(pdfl) ==='function'?'drpy2.1':'drpy2';
const VERSION = vercode+' 3.9.48beta16 20231011';
const VERSION = vercode+' 3.9.49beta2 20231122';
/** 已知问题记录
* 1.影魔的jinjia2引擎不支持 {{fl}}对象直接渲染 (有能力解决的话尽量解决下，支持对象直接渲染字符串转义,如果加了|safe就不转义)[影魔牛逼，最新的文件发现这问题已经解决了]
* Array.prototype.append = Array.prototype.push; 这种js执行后有毛病,for in 循环列表会把属性给打印出来 (这个大毛病需要重点排除一下)
Expand Down Expand Up @@ -1559,9 +1559,9 @@ function searchParse(searchObj) {
p = p.trim();
let pp = rule.一级.split(';');
let url = searchObj.searchUrl.replaceAll('**', searchObj.wd);
if(searchObj.pg === 1 && url.includes('[')&&url.includes(']')){
if(searchObj.pg === 1 && url.includes('[')&&url.includes(']')&&!url.includes('#')){
url = url.split('[')[1].split(']')[0];
}else if(searchObj.pg > 1 && url.includes('[')&&url.includes(']')){
}else if(searchObj.pg > 1 && url.includes('[')&&url.includes(']')&&!url.includes('#')){
url = url.split('[')[0];
}

Expand Down Expand Up @@ -2242,7 +2242,7 @@ function init(ext) {
}else{
rule.url = rule.host && rule.url ? urljoin(rule.host,rule.url) : rule.url;
}
if(rule.searchUrl.includes('[')&&rule.searchUrl.includes(']')){
if(rule.searchUrl.includes('[')&&rule.searchUrl.includes(']')&&!rule.searchUrl.includes('#')){
let u1 = rule.searchUrl.split('[')[0]
let u2 = rule.searchUrl.split('[')[1].split(']')[0]
rule.searchUrl = rule.host && rule.searchUrl?urljoin(rule.host,u1)+'['+urljoin(rule.host,u2)+']':rule.searchUrl;
Expand Down
2 changes: 1 addition & 1 deletion lib/live2cms.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const VERSION = 'live2cms 20230619';
const UA = 'Mozilla/5.0'; //默认请求ua
const __ext = {data_dict:{}};
const tips = `\n道长直播转点播js-当前版本${VERSION}`;
const def_pic = 'https://avatars.githubusercontent.com/u/58679624?s=400&u=246b55fcda2b4850b444aebd6b8f8d6a12883f8c&v=4';
const def_pic = 'https://avatars.githubusercontent.com/u/97389433?s=120&v=4';

/**
* 存在数据库配置表里, key字段对应值value,没有就新增,有就更新,调用此方法会清除key对应的内存缓存
Expand Down

0 comments on commit 6587dbe

Please sign in to comment.