Merge pull request Kirimson#70 from Kirimson/better_info_response

fix:better info responses

Author: Kirimson

src/components/VaunchGuiResponse.vue

@@ -38,10 +38,6 @@ const dismiss = () => {
   font-size: 1rem;
 }
 
-#error-title {
-  width: 100%;
-}
-
 #response-inner {
   position: relative;
   padding: 1rem;
@@ -52,18 +48,11 @@ const dismiss = () => {
   <div class="response-window-container" ref="responseWindow">
     <div class="vaunch-window" id="response-window">
       <span
-        v-if="response.type == 'error'"
-        id="error-title"
-        class="folder-title">
-        <i class="fa-solid fa-circle-exclamation"></i>
-        <span id="man-title-text">Error</span>
-      </span>
-      <span
-        v-if="response.type == 'info'"
-        id="error-title"
         class="folder-title">
-        <i class="fa-solid fa-circle-information"></i>
-        <span id="man-title-text">Info</span>
+        <i v-if="response.type == 'error'" class="fa-solid fa-circle-exclamation"></i>
+        <span v-if="response.type == 'error'" id="man-title-text">Error</span>
+        <i v-if="response.type == 'info'" class="fa-solid fa-circle-info"></i>
+        <span v-if="response.type == 'info'" id="man-title-text">Info</span>
       </span>
       <div id="response-inner">
         {{ response.message }}

src/models/commands/fs/VaunchMv.ts

@@ -97,7 +97,7 @@ export class VaunchMv extends VaunchCommand {
         if (newFolder.getFile(newFileName)) {
           return this.makeResponse(
             ResponseType.Info,
-            `A file with the name ${newFileName} already exists in destination folder. ${source} was not moved.`
+            `A file with the name ${newFileName} already exists in the destination folder. ${source} was not moved.`
           );
         }
 

src/models/commands/fs/VaunchRmdir.ts

@@ -57,31 +57,44 @@ export class VaunchRmdir extends VaunchCommand {
       args.shift();
     }
     const failedToDelete: string[] = [];
+    const notEmpty:string[] = [];
     args.forEach((toDelete) => {
       // Strip slashes from folder names, if running from autocompleted value
       toDelete = toDelete.replace("/", "");
       if (folders.getFolderByName(toDelete)) {
+        // If force is set, delete no matter what. Otherwise, check the directory is empty first.
         if (force) {
           folders.remove(toDelete);
         } else if (folders.getFolderByName(toDelete).files.size == 0) {
           folders.remove(toDelete);
+        } else {
+          notEmpty.push(toDelete);
         }
       } else failedToDelete.push(toDelete);
     });
 
-    if (failedToDelete.length == 0) {
-      return this.makeResponse(
-        ResponseType.Success,
-        `Deleted folder: ${args.join(", ")}`
-      );
-    } else {
+    console.log(notEmpty);
+    if (failedToDelete.length != 0) {
       const plural = failedToDelete.length > 1 ? true : false;
       return this.makeResponse(
         ResponseType.Error,
         `The folder${plural ? "s" : ""}: ${failedToDelete.join(", ")} do${
           plural ? "" : "es"
         } not exist and ${plural ? "were" : "was"} not deleted`
       );
+    } else if (notEmpty.length != 0) {
+      const plural = notEmpty.length > 1 ? true : false;
+      return this.makeResponse(
+        ResponseType.Info,
+        `The folder${plural ? "s" : ""}: ${notEmpty.join(", ")} ${
+          plural ? "are" : "is"
+        } not empty and ${plural ? "were" : "was"} not deleted`
+      );
+    } else {
+      return this.makeResponse(
+        ResponseType.Success,
+        `Deleted folder: ${args.join(", ")}`
+      );
     }
   }
 }