From 2c1ded036e27c528b66cf30b8360a92f3c79309a Mon Sep 17 00:00:00 2001
From: src48597962 <48597962@qq.com>
Date: Wed, 8 Mar 2023 20:24:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'SrcJyAlist.js'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SrcJyAlist.js | 62 +++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/SrcJyAlist.js b/SrcJyAlist.js
index fc83d45b..d769391e 100644
--- a/SrcJyAlist.js
+++ b/SrcJyAlist.js
@@ -449,7 +449,9 @@ function alistUrl(alistapi,path,sign,subtitle,provider) {
   }
 }
 
-function alistSearch(alistapi,key) {
+function alistSearch(alistapi,input) {
+  let dirlist = [];
+  let filelist = [];
   try{
     let headers = {'content-type':'application/json;charset=UTF-8'};
     if(alistapi.token){
@@ -457,51 +459,49 @@ function alistSearch(alistapi,key) {
     }
     let json = JSON.parse(fetch(alistapi.server + "/api/fs/search", {headers:headers,body:{"per_page":100,"page":1,"parent":"/","keywords":key},method:'POST',timeout:10000}));
     if(json.code==200){
-      let dirlist = getlist(json.data.content,1);
-      addItemBefore('listloading', arrayAdd(dirlist,1,alistapi));
-      let filelist = getlist(json.data.content,0,alistapi.nofilter?0:fileFilter);
-      filelist = filelist.filter(f => {
-        return !dirlist.some(d => d.parent+"/"+d.name==f.parent);
-      })
-      addItemBefore('listloading', arrayAdd(filelist,0,alistapi,json.data.provider));
-      if(dirlist.length==0&&filelist.length==0){
-        addItemBefore('listloading', {
-          title: alistapi.name+" 未搜索到 “"+key+"”",
-          url: "hiker://empty",
-          col_type: "text_center_1",
-          extra: {
-              cls: "loadlist"
-          }
-        });
-      }
+      dirlist = getlist(json.data.content,1);
+      filelist = getlist(json.data.content,0,alistapi.nofilter?0:fileFilter);
     }else if(json.code==500){
       toast(alistapi.name+' 搜索出错了，此网盘不支持搜索');
     }else if(json.code==401){
-      toast('登录令牌token失效，需要重新获取');
+      toast(alistapi.name+' 登录令牌token失效，需要重新获取');
     }
   }catch(e){
-    log(alistapi.name+' 内置搜索出错了>'+e.message);
+    log(alistapi.name+' 内置搜索出错,偿试小雅搜索>'+e.message);
     try{
       let html = fetch(alistapi.server+'/search?box='+key+'&url=&type=video');
       let list = pdfa(html,'body&&div&&a');
-      let dirlist = [];
       list.forEach(item => {
         let txt = pdfh(item,"a&&href");
-        dirlist.push(
-          {
-                "parent": txt.substring(0,txt.lastIndexOf("/")),
-                "name": txt.substring(txt.lastIndexOf('/')+1),
-                "is_dir": true,
-                "size": 0,
-                "type": 1
-            }
-        )
+        let isfile = txt.substring(txt.lastIndexOf('.')+1);
+        log(txt+'>'+isfile);
+        dirlist.push({
+            "parent": txt.substring(0,txt.lastIndexOf("/")),
+            "name": txt.substring(txt.lastIndexOf('/')+1),
+            "is_dir": true
+        })
       })
-      addItemBefore('listloading', arrayAdd(dirlist,1,alistapi));
     }catch(e){
       log(alistapi.name+' 偿试小雅搜索失败');
     }
   }
+
+      addItemBefore('listloading', arrayAdd(dirlist,1,alistapi));
+      filelist = filelist.filter(f => {
+        return !dirlist.some(d => d.parent+"/"+d.name==f.parent);
+      })
+      addItemBefore('listloading', arrayAdd(filelist,0,alistapi,json.data.provider));
+      if(dirlist.length==0&&filelist.length==0){
+        addItemBefore('listloading', {
+          title: alistapi.name+" 未搜索到 “"+input+"”",
+          url: "hiker://empty",
+          col_type: "text_center_1",
+          extra: {
+              cls: "loadlist"
+          }
+        });
+      }
+  
   return 1;
 }