更新 'SrcJyAliDisk.js'

SrcJyAliDisk.js

@@ -20,7 +20,7 @@ let ordersKeys = Object.keys(orders);
 let orderskey = orders[getItem('aliyun_order', '聚影排序')];
 let style = getItem('aliyun_style', 'avatar');
 
-function aliShareUrl(input,jyerji) {
+function aliShareUrl(input,jkdata) {
     let li = input.split('\n');
     let share_id;
     let folder_id;
@@ -36,7 +36,7 @@ function aliShareUrl(input,jyerji) {
             folder_id = it.indexOf('/folder/') > -1 ? it.split('/folder/')[1] : "root";
         }
     })
-    if(jyerji && share_id){
+    if(jkdata && share_id){
         let html = request("https://api.aliyundrive.com/adrive/v3/share_link/get_share_by_anonymous",{
             headers: {
                 referer: "https://www.aliyundrive.com/"
@@ -51,10 +51,20 @@ function aliShareUrl(input,jyerji) {
         if(files.length==0){
             return "toast://分享链接已失效";
         }else{
-            return "toast://"+files.length;
+            let data = JuErjiAliShare(share_id, folder_id, share_pwd);
+            if(data.errorStr){
+                return "toast://" + data.errorStr;
+            }else{
+                deleteItemByCls('Juloadlist');
+                let menus = data.menus
+                let d = menus.concat(data.lists);
+                addItemBefore(jkdata.updateItemid, d);// 生成切源分组
+                updateItem(jkdata.updateItemid, {
+                    title: ""
+                })
+                return "toast://已切换源：" + jkdata.name;
+            }
         }
-
-        return JuErjiAliShare(share_id, folder_id, share_pwd);
     }else{
         if (share_id) {
             aliShare(share_id, folder_id, share_pwd);
@@ -1220,11 +1230,11 @@ function JuErjiSousuo(name) {
                         if (/www\.aliyundrive\.com|www\.alipan\.com/.test(surl)) {
                             let extra = {
                                 url: surl,
-                                data: {name: obj.name, type: "yundisk", group: "云盘", url: obj.name}
+                                data: {name: obj.name, type: "yundisk", group: "云盘", url: obj.name, updateItemid: "云盘_" +name + "_loading"}
                             }
-                            arr.url = $("#noLoading#").lazyRule((extra) => {
+                            arr.url = $().lazyRule((extra) => {
                                 require(config.依赖.match(/http(s)?:\/\/.*\//)[0] + 'SrcJyAliDisk.js');
-                                return aliShareUrl(extra.url, 1);
+                                return aliShareUrl(extra.url, extra.data);
                             }, extra),
                             searchlist.push(arr);
                         }
@@ -1283,6 +1293,8 @@ function JuErjiSousuo(name) {
 
 function JuErjiAliShare(share_id, folder_id, share_pwd) {
     let d = [];
+    let menus = [];
+    let errorStr;
     try {
         if (!userinfo.refresh_token) {
             d = d.concat(myDiskMenu(0));
@@ -1292,7 +1304,7 @@ function JuErjiAliShare(share_id, folder_id, share_pwd) {
             let sharetoken = get_sharetoken.share_token;
             let getbyshare = {};
 
-            d.push({
+            menus.push({
                 title: "刷新",
                 url: $().lazyRule(() => {
                     return 'hiker://empty';
@@ -1413,26 +1425,15 @@ function JuErjiAliShare(share_id, folder_id, share_pwd) {
             })
 
             if (errorCode[get_sharetoken.code]) {
-                d.push({
-                    title: errorCode[get_sharetoken.code],
-                    url: 'hiker://empty',
-                    col_type: "text_center_1"
-                })
-                setResult(d);
+                errorStr = errorCode[get_sharetoken.code];
             } else {
                 let postdata = { "share_id": share_id, "parent_file_id": folder_id || "root", "limit": 200, "image_thumbnail_process": "image/resize,w_256/format,jpeg", "image_url_process": "image/resize,w_1920/format,jpeg/interlace,1", "video_thumbnail_process": "video/snapshot,t_1000,f_jpg,ar_auto,w_256", "order_by": orderskey.split('#')[0], "order_direction": orderskey.split('#')[1] };
                 headers['x-share-token'] = sharetoken;
                 getbyshare = JSON.parse(request('https://api.aliyundrive.com/adrive/v2/file/list_by_share', { headers: headers, body: postdata, method: 'POST' }));
                 
                 if (errorCode[getbyshare.code]) {
-                    d.push({
-                        title: errorCode[getbyshare.code],
-                        url: 'hiker://empty',
-                        col_type: "text_center_1"
-                    })
-                    setResult(d);
-                }
-            }
+                    errorStr = errorCode[getbyshare.code];
+                }else{
                     let sharelist = getbyshare.items || [];
                     sharelist = sharelist.filter(item => {
                         return item.type == "file" || (item.type == "folder" && !folderFilter.test(item.name));
@@ -1547,19 +1548,17 @@ function JuErjiAliShare(share_id, folder_id, share_pwd) {
                             }
                         })
                     } else {
-                toast('列表为空');
+                        errorStr = '列表为空';
+                    }
+                }
             }
         }
     } catch (e) {
-        log('获取共享文件列表失败>' + e.message);
-        d.push({
-            title: '该分享已失效或异常',
-            url: 'hiker://empty',
-            col_type: "text_center_1"
-        })
-        toast('该分享已失效或异常，可刷新确认下');
+        errorStr = e.message;
     }
     return {
-        "lists": d
+        errorStr: errorStr,
+        menus: menus,
+        lists: d
     };
 }