diff --git a/SrcJyAlist.js b/SrcJyAlist.js index 76ee9cdd..3024f0d1 100644 --- a/SrcJyAlist.js +++ b/SrcJyAlist.js @@ -9,16 +9,16 @@ try{ let datalist = alistData.drives || []; let alistconfig = alistData.config || {}; let fileFilter = alistconfig['fileFilter']==0?0:1; -let audiovisual = 'mp4|avi|mkv|rmvb|flv|mov|ts|mp3|m4a|wma|flac';//影音文件 -let contain = new RegExp(alistconfig.contain||audiovisual,"i");//设置可显示的影音文件后缀 +let audiovisual = alistconfig.contain||'mp4|avi|mkv|rmvb|flv|mov|ts|mp3|m4a|wma|flac';//影音文件 +let contain = new RegExp(audiovisual,"i");//设置可显示的影音文件后缀 let music = new RegExp("mp3|m4a|wma|flac","i");//进入音乐播放器 let image = new RegExp("jpg|png|gif|bmp|ico|svg","i");//进入图片查看 -function getlist(data,isdir,filter,filecontain) { - filecontain = contain || filecontain; +function getlist(data,isdir,filter,audiovisual) { + let contain = new RegExp(audiovisual,"i");//设置可显示的影音文件后缀 let list = data.filter(item => { let suffix = item.name.substring(item.name.lastIndexOf('.')+1);//后缀名 - return isdir ? item.is_dir : filter? (/mp4|avi|mkv|rmvb|flv|mov|ts|mp3|m4a|wma|flac/.test(suffix) || /srt|vtt|ass/.test(suffix)) : !item.is_dir; + return isdir ? item.is_dir : filter? (contain.test(suffix) || /srt|vtt|ass/.test(suffix)) : !item.is_dir; }) log(list); try{ @@ -472,7 +472,7 @@ function alistHome() { } } -function alistList(alistapi,dirname){ +function alistList(alistapi,dirname,audiovisual){ setPageTitle(dirname); let d = []; let listid = base64Encode(MY_PARAMS.path); @@ -495,7 +495,7 @@ function alistList(alistapi,dirname){ if(json.code==200){ let dirlist = getlist(json.data.content||[],1); addItemBefore(listid, arrayAdd(dirlist,1,alistapi)); - let filelist = getlist(json.data.content||[],0,alistapi.nofilter?0:fileFilter); + let filelist = getlist(json.data.content||[],0,alistapi.nofilter?0:fileFilter,audiovisual); addItemBefore(listid, arrayAdd(filelist,0,alistapi,json.data.provider)); if(dirlist.length==0&&filelist.length==0){ addItemBefore(listid, { @@ -539,7 +539,7 @@ function arrayAdd(list,isdir,alistapi,provider){ img: item.thumb || config.依赖.match(/http(s)?:\/\/.*\//)[0] + "img/文件夹.svg",//#noRecordHistory##noHistory# url: $("hiker://empty##" + encodeURI(alistapi.server + path)).rule((alistapi,dirname) => { require(config.依赖.match(/http(s)?:\/\/.*\//)[0] + 'SrcJyAlist.js'); - alistList(alistapi,dirname); + alistList(alistapi,dirname,audiovisual); },alistapi,item.name), col_type: 'avatar', extra: {