Merge pull request #15 from TaBayramNTT/develop

v0.13.3
TaBayram · Oct 31, 2023 · 95de0b3 · 95de0b3
2 parents a26423a + 411303d
commit 95de0b3
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 61 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## [0.13.3] - 31/10/2023
+
+### Fixed
+
+- Downloading remote folder would also download non-web directories.
+
 ## [0.13.2] - 30/10/2023
 
 ### Fixed

diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
   },
   "homepage": "https://github.com/TaBayramNTT/vscode-miisync",
   "icon": "resources/icon.png",
-  "version": "0.13.2",
+  "version": "0.13.3",
   "license": "MIT",
   "engines": {
     "vscode": "^1.83.1"

diff --git a/resources/icon_black.svg b/resources/icon_black.svg
diff --git a/src/miiservice/abstract/filters.ts b/src/miiservice/abstract/filters.ts
@@ -1,5 +1,5 @@
 import { MII, RowsetsFatal } from "./responsetypes";
 
 export function IsFatalResponse(response): response is MII<null, null, RowsetsFatal> {
-    return response && 'FatalError' in response.Rowsets;
+    return response?.Rowsets && 'FatalError' in response.Rowsets;
 }
diff --git a/src/transfer/action.ts b/src/transfer/action.ts
@@ -40,18 +40,19 @@ export async function StartAction(type: ActionType, { name, resource, system }:
             logger.infoplus(system.name, name, GetStateMessage("Started", resource));
         const { aborted, error, message } = await actionPromise();
         if (error) {
-            statusBar.updateBar("Error", Icon.error, { duration: 2 });
+            statusBar.updateBar("Error", Icon.error, { duration: 3 });
             logger.errorPlus(system.name, name, message || "");
         }
         else if (aborted) {
-            statusBar.updateBar("Cancelled", Icon.close, { duration: 2 });
+            statusBar.updateBar("Cancelled", Icon.close, { duration: 3 });
             logger.infoplus(system.name, name, GetStateMessage("Cancelled", resource));
         }
         else {
             statusBar.updateBar(texts.end, Icon.success, { duration: 2 });
             logger.infoplus(system.name, name, GetStateMessage("Completed", resource));
         }
     } catch (error: any) {
+        statusBar.updateBar("Error", Icon.error, { duration: 3 });
         logger.toastError(error);
     }
 }

diff --git a/src/transfer/limited/deletecomplex.ts b/src/transfer/limited/deletecomplex.ts
@@ -19,19 +19,24 @@ export async function DeleteComplexLimited(folder: SimpleFolder, userConfig: Use
     let aborted = false;
 
     const promises: Promise<any>[] = [];
-    limitManager.startProgress();
-    limitManager.createWindow('Deleting', () => aborted = true)
+    try {
+        limitManager.startProgress();
+        limitManager.createWindow('Deleting', () => aborted = true)
 
-    await deleteRecursive(folder);
-    do {
-        await Promise.all(promises);
-    }
-    while (limitManager.OngoingCount != 0);
+        await deleteRecursive(folder);
+        do {
+            await Promise.all(promises);
+        }
+        while (limitManager.OngoingCount != 0);
 
-    limitManager.endProgress();
-    return {
-        aborted
-    };
+        limitManager.endProgress();
+        return {
+            aborted
+        };
+    } catch (error: any) {
+        limitManager.endProgress();
+        throw Error(error);
+    }
 
     async function deleteRecursive(folder: SimpleFolder) {
         if (aborted) return;

diff --git a/src/transfer/limited/downloadcomplex.ts b/src/transfer/limited/downloadcomplex.ts
@@ -32,36 +32,42 @@ export async function DownloadComplexLimited(folder: ComplexFolder, getPath: (it
         return { aborted: true, };
     }
 
-    limitManager.startProgress();
-    limitManager.createWindow('Preparing Download', () => aborted = true)
     let fileCount = 0;
     let promises: Promise<any>[] = [];
+    try {
+        limitManager.startProgress();
+        limitManager.createWindow('Preparing Download', () => aborted = true)
+
+        await getChildren(folder);
+        do {
+            await Promise.all(promises);
+        }
+        while (limitManager.OngoingCount != 0);
 
-    await getChildren(folder);
-    do {
-        await Promise.all(promises);
-    }
-    while (limitManager.OngoingCount != 0);
 
+        if (aborted) {
+            limitManager.endProgress();
+            return { aborted };
+        }
+        limitManager.createWindow('Downloading', () => aborted = true)
+        limitManager.MaxQueue = 0;
+        limitManager.Finished = 0;
+        promises = [];
+
+        await downloadFiles(folder);
+        do {
+            await Promise.all(promises);
+        }
+        while (limitManager.OngoingCount != 0);
 
-    if (aborted) {
         limitManager.endProgress();
+
         return { aborted };
+    } catch (error: any) {
+        limitManager.endProgress();
+        throw Error(error);
     }
-    limitManager.createWindow('Downloading', () => aborted = true)
-    limitManager.MaxQueue = 0;
-    limitManager.Finished = 0;
-    promises = [];
-
-    await downloadFiles(folder);
-    do {
-        await Promise.all(promises);
-    }
-    while (limitManager.OngoingCount != 0);
-
-    limitManager.endProgress();
 
-    return { aborted };
 
     async function getChildren(mainFolder: ComplexFolder) {
         if (aborted) return;
@@ -81,7 +87,8 @@ export async function DownloadComplexLimited(folder: ComplexFolder, getPath: (it
                     const files = await listFilesService.call({ host: system.host, port: system.port }, mainFolder.folder.Path);
                     if (aborted) return;
                     if (!files || IsFatalResponse(files)) return;
-                    mainFolder.files = files?.Rowsets?.Rowset?.Row?.map((cFile) => { return { file: cFile, path: null } }) || [];
+                    mainFolder.files = files?.Rowsets?.Rowset?.Row?.
+                        map((cFile) => { return { file: cFile, path: null } }) || [];
 
                 })
                 promises.push(filePromise);
@@ -92,7 +99,9 @@ export async function DownloadComplexLimited(folder: ComplexFolder, getPath: (it
                     const folders = await listFoldersService.call({ host: system.host, port: system.port }, mainFolder.folder.Path);
                     if (aborted) return;
                     if (!folders || IsFatalResponse(folders)) return;
-                    mainFolder.folders = folders?.Rowsets?.Rowset?.Row?.map((cFolder) => { return { folder: cFolder, path: null, files: [], folders: [] } }) || [];
+                    mainFolder.folders = folders?.Rowsets?.Rowset?.Row?.
+                        filter((cFolder) => cFolder.IsWebDir).
+                        map((cFolder) => { return { folder: cFolder, path: null, files: [], folders: [] } }) || [];
 
                     for (const folder of mainFolder.folders) {
                         promises.push(limitManager.newRemote(() => getChildren(folder)));

diff --git a/src/transfer/limited/limited.ts b/src/transfer/limited/limited.ts
@@ -4,6 +4,7 @@ import pLimit = require("p-limit");
 
 export interface LimitedReturn<T> {
     aborted: boolean,
+    error?: Error,
     data?: T
 }
 

diff --git a/src/transfer/limited/uploadcomplex.ts b/src/transfer/limited/uploadcomplex.ts
@@ -22,10 +22,24 @@ export async function UploadComplexLimited(folder: SimpleFolder, userConfig: Use
     let aborted = false;
 
     const promises: Promise<any>[] = [];
-    limitManager.startProgress();
-    limitManager.createWindow('Uploading', () => aborted = true)
+    try {
+        limitManager.startProgress();
+        limitManager.createWindow('Uploading', () => aborted = true)
+
+        await fillEmptyFolders(folder);
+        await uploadRecursive(folder);
+        do {
+            await Promise.all(promises);
+        }
+        while (limitManager.OngoingCount != 0);
+
+        limitManager.endProgress();
+        return { aborted };
+    } catch (error: any) {
+        limitManager.endProgress();
+        throw Error(error);
+    }
 
-    await fillEmptyFolders(folder);
     async function fillEmptyFolders(mainFolder: SimpleFolder) {
         const promises: Promise<any>[] = [];
         for (const folder of mainFolder.folders) {
@@ -44,18 +58,6 @@ export async function UploadComplexLimited(folder: SimpleFolder, userConfig: Use
         return 1;
     }
 
-    await uploadRecursive(folder);
-    do {
-        await Promise.all(promises);
-    }
-    while (limitManager.OngoingCount != 0);
-
-    limitManager.endProgress();
-
-    return {
-        aborted
-    };
-
     async function uploadRecursive(folder: SimpleFolder) {
         if (aborted) return;
         if (!await ValidatePath(folder.path, userConfig)) return;