From 07fa5cb83d15a0230dff92458323606e22c41c87 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sat, 13 Apr 2024 16:58:49 +0530
Subject: [PATCH] Inline 2

---
 web/apps/photos/src/services/export/index.ts | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/web/apps/photos/src/services/export/index.ts b/web/apps/photos/src/services/export/index.ts
index 02753d2992..f5e06bc93d 100644
--- a/web/apps/photos/src/services/export/index.ts
+++ b/web/apps/photos/src/services/export/index.ts
@@ -745,10 +745,7 @@ class ExportService {
                                 image: imageExportName,
                                 video: videoExportName,
                             } = parseLivePhotoExportName(fileExportName);
-                            const imageExportPath = getFileExportPath(
-                                collectionExportPath,
-                                imageExportName,
-                            );
+                            const imageExportPath = `${collectionExportPath}/${imageExportName}`;
                             log.info(
                                 `moving image file ${imageExportPath} to trash folder`,
                             );
@@ -777,10 +774,7 @@ class ExportService {
                                 );
                             }
 
-                            const videoExportPath = getFileExportPath(
-                                collectionExportPath,
-                                videoExportName,
-                            );
+                            const videoExportPath = `${collectionExportPath}/${videoExportName}`;
                             log.info(
                                 `moving video file ${videoExportPath} to trash folder`,
                             );
@@ -807,10 +801,7 @@ class ExportService {
                                 );
                             }
                         } else {
-                            const fileExportPath = getFileExportPath(
-                                collectionExportPath,
-                                fileExportName,
-                            );
+                            const fileExportPath = `${collectionExportPath}/${fileExportName}`;
                             const trashedFilePath =
                                 await getTrashedFileExportPath(
                                     exportDir,
@@ -1071,7 +1062,7 @@ class ExportService {
                         file,
                     );
                     await ensureElectron().saveStreamToDisk(
-                        getFileExportPath(collectionExportPath, fileExportName),
+                        `${collectionExportPath}/${fileExportName}`,
                         updatedFileStream,
                     );
                 } catch (e) {