appwrite-utils-cli 0.9.990 → 0.9.991

package/dist/main.js

@@ -171,19 +171,30 @@ async function main() {
             options.wipeDocumentStorage ||
             options.wipeUsers ||
             options.wipeCollections) {
-            if (options.wipeDatabase && options.databases) {
-                for (const db of options.databases) {
-                    await controller.wipeDatabase(db, options.wipeDocumentStorage);
+            if (parsedArgv.wipe === "all") {
+                if (options.databases) {
+                    for (const db of options.databases) {
+                        await controller.wipeDatabase(db, true); // true to wipe associated buckets
+                    }
                 }
+                await controller.wipeUsers();
             }
-            if (options.wipeDocumentStorage && parsedArgv.bucketIds) {
-                for (const bucketId of parsedArgv.bucketIds.split(",")) {
-                    await controller.wipeDocumentStorage(bucketId);
+            else if (parsedArgv.wipe === "docs") {
+                if (options.databases) {
+                    for (const db of options.databases) {
+                        await controller.wipeBucketFromDatabase(db);
+                    }
+                }
+                if (parsedArgv.bucketIds) {
+                    for (const bucketId of parsedArgv.bucketIds.split(",")) {
+                        await controller.wipeDocumentStorage(bucketId);
+                    }
                 }
             }
-            if (options.wipeUsers) {
+            else if (parsedArgv.wipe === "users") {
                 await controller.wipeUsers();
             }
+            // Handle specific collection wipes
             if (options.wipeCollections && options.databases) {
                 for (const db of options.databases) {
                     const dbCollections = await fetchAllCollections(db.$id, controller.database);

package/dist/migrations/transfer.js

@@ -65,7 +65,13 @@ export const transferStorageLocalToLocal = async (storage, fromBucketId, toBucke
                 continue;
             }
             const fileToCreate = InputFile.fromBuffer(new Uint8Array(fileData), file.name);
-            await tryAwaitWithRetry(async () => await storage.createFile(toBucketId, file.$id, fileToCreate, file.$permissions));
+            try {
+                await tryAwaitWithRetry(async () => await storage.createFile(toBucketId, file.$id, fileToCreate, file.$permissions));
+            }
+            catch (error) {
+                // File already exists, so we can skip it
+                continue;
+            }
             numberOfFiles++;
         }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "appwrite-utils-cli",
   "description": "Appwrite Utility Functions to help with database management, data conversion, data import, migrations, and much more. Meant to be used as a CLI tool, I do not recommend installing this in frontend environments.",
-  "version": "0.9.990",
+  "version": "0.9.991",
   "main": "src/main.ts",
   "type": "module",
   "repository": {

package/src/main.ts

@@ -181,7 +181,8 @@ async function main() {
       collections: parsedArgv.collectionIds?.split(","),
       doBackup: parsedArgv.backup,
       wipeDatabase: parsedArgv.wipe === "all" || parsedArgv.wipe === "docs",
-      wipeDocumentStorage: parsedArgv.wipe === "all" || parsedArgv.wipe === "storage",
+      wipeDocumentStorage:
+        parsedArgv.wipe === "all" || parsedArgv.wipe === "storage",
       wipeUsers: parsedArgv.wipe === "all" || parsedArgv.wipe === "users",
       generateSchemas: parsedArgv.generate,
       importData: parsedArgv.import,
@@ -218,19 +219,29 @@ async function main() {
       options.wipeUsers ||
       options.wipeCollections
     ) {
-      if (options.wipeDatabase && options.databases) {
-        for (const db of options.databases) {
-          await controller.wipeDatabase(db, options.wipeDocumentStorage);
+      if (parsedArgv.wipe === "all") {
+        if (options.databases) {
+          for (const db of options.databases) {
+            await controller.wipeDatabase(db, true); // true to wipe associated buckets
+          }
         }
-      }
-      if (options.wipeDocumentStorage && parsedArgv.bucketIds) {
-        for (const bucketId of parsedArgv.bucketIds.split(",")) {
-          await controller.wipeDocumentStorage(bucketId);
+        await controller.wipeUsers();
+      } else if (parsedArgv.wipe === "docs") {
+        if (options.databases) {
+          for (const db of options.databases) {
+            await controller.wipeBucketFromDatabase(db);
+          }
         }
-      }
-      if (options.wipeUsers) {
+        if (parsedArgv.bucketIds) {
+          for (const bucketId of parsedArgv.bucketIds.split(",")) {
+            await controller.wipeDocumentStorage(bucketId);
+          }
+        }
+      } else if (parsedArgv.wipe === "users") {
         await controller.wipeUsers();
       }
+
+      // Handle specific collection wipes
       if (options.wipeCollections && options.databases) {
         for (const db of options.databases) {
           const dbCollections = await fetchAllCollections(

package/src/migrations/transfer.ts

@@ -109,15 +109,20 @@ export const transferStorageLocalToLocal = async (
         new Uint8Array(fileData),
         file.name
       );
-      await tryAwaitWithRetry(
-        async () =>
+      try {
+        await tryAwaitWithRetry(
+          async () =>
           await storage.createFile(
             toBucketId,
             file.$id,
             fileToCreate,
             file.$permissions
           )
-      );
+        );
+      } catch (error: any) {
+        // File already exists, so we can skip it
+        continue;
+      }
       numberOfFiles++;
     }
   }