From 63c38427708e97bddcd6899946d1ecd11ac86dcb Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 7 May 2024 19:32:43 +0530
Subject: [PATCH] Write export record after operation completion

---
 web/apps/photos/src/services/export/index.ts | 47 +++++++++-----------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/web/apps/photos/src/services/export/index.ts b/web/apps/photos/src/services/export/index.ts
index de84e2859..786932ff8 100644
--- a/web/apps/photos/src/services/export/index.ts
+++ b/web/apps/photos/src/services/export/index.ts
@@ -734,38 +734,31 @@ class ExportService {
                     const collectionExportName =
                         collectionIDExportNameMap.get(collectionID);
 
-                    await this.removeFileExportedRecord(exportDir, fileUID);
-                    try {
-                        if (isLivePhotoExportName(fileExportName)) {
-                            const { image, video } =
-                                parseLivePhotoExportName(fileExportName);
+                    if (isLivePhotoExportName(fileExportName)) {
+                        const { image, video } =
+                            parseLivePhotoExportName(fileExportName);
 
-                            await moveToTrash(
-                                exportDir,
-                                collectionExportName,
-                                image,
-                            );
-
-                            await moveToTrash(
-                                exportDir,
-                                collectionExportName,
-                                video,
-                            );
-                        } else {
-                            await moveToTrash(
-                                exportDir,
-                                collectionExportName,
-                                fileExportName,
-                            );
-                        }
-                    } catch (e) {
-                        await this.addFileExportedRecord(
+                        await moveToTrash(
                             exportDir,
-                            fileUID,
+                            collectionExportName,
+                            image,
+                        );
+
+                        await moveToTrash(
+                            exportDir,
+                            collectionExportName,
+                            video,
+                        );
+                    } else {
+                        await moveToTrash(
+                            exportDir,
+                            collectionExportName,
                             fileExportName,
                         );
-                        throw e;
                     }
+
+                    await this.removeFileExportedRecord(exportDir, fileUID);
+
                     log.info(`Moved file id ${fileUID} to Trash`);
                 } catch (e) {
                     log.error("trashing failed for a file", e);