[web] Refactoring of downloader - Part x/x (#4155)

ente-io · Nov 23, 2024 · 07ba083 · 07ba083
2 parents 3c47e86 + 01cc72a
commit 07ba083
Show file tree

Hide file tree

Showing 10 changed files with 162 additions and 158 deletions.
diff --git a/web/apps/photos/src/components/FixCreationTime.tsx b/web/apps/photos/src/components/FixCreationTime.tsx
@@ -324,8 +324,7 @@ const updateEnteFileDate = async (
             timestamp: customDate!.timestamp,
         };
     } else if (enteFile.metadata.fileType == FileType.image) {
-        const stream = await downloadManager.getFile(enteFile);
-        const blob = await new Response(stream).blob();
+        const blob = await downloadManager.fileBlob(enteFile);
         const file = new File([blob], enteFile.metadata.title);
         const { DateTimeOriginal, DateTimeDigitized, MetadataDate, DateTime } =
             await extractExifDates(file);

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -362,7 +362,9 @@ const PhotoFrame = ({
                 }
                 log.info(`[${item.id}] doesn't have thumbnail`);
                 thumbFetching[item.id] = true;
-                const url = await DownloadManager.getThumbnailForPreview(item);
+                // URL will always be defined (unless an error is thrown) since
+                // we are not passing the `cachedOnly` option.
+                const url = await DownloadManager.renderableThumbnailURL(item)!;
                 updateThumb(instance, index, item, url, false);
             } catch (e) {
                 log.error("getSlideData failed get msrc url failed", e);

diff --git a/web/apps/photos/src/components/PhotoList/index.tsx b/web/apps/photos/src/components/PhotoList/index.tsx
@@ -631,10 +631,6 @@ export function PhotoList({
 
     /**
      * Checks and merge multiple dates into a single row.
-     *
-     * @param items
-     * @param columns
-     * @returns
      */
     const mergeTimeStampList = (
         items: TimeStampListItem[],

diff --git a/web/apps/photos/src/components/pages/gallery/PreviewCard.tsx b/web/apps/photos/src/components/pages/gallery/PreviewCard.tsx
@@ -274,7 +274,7 @@ export default function PreviewCard(props: IProps) {
                     return;
                 }
                 const url: string =
-                    await DownloadManager.getThumbnailForPreview(
+                    await DownloadManager.renderableThumbnailURL(
                         file,
                         props.showPlaceholder,
                     );

diff --git a/web/apps/photos/src/services/export/index.ts b/web/apps/photos/src/services/export/index.ts
@@ -928,7 +928,7 @@ class ExportService {
         const electron = ensureElectron();
         try {
             const fileUID = getExportRecordFileUID(file);
-            const originalFileStream = await downloadManager.getFile(file);
+            const originalFileStream = await downloadManager.fileStream(file);
             if (file.metadata.fileType === FileType.livePhoto) {
                 await this.exportLivePhoto(
                     exportDir,

diff --git a/web/apps/photos/src/services/export/migration.ts b/web/apps/photos/src/services/export/migration.ts
@@ -309,8 +309,7 @@ async function getFileExportNamesFromExportedFiles(
             For Live Photos we need to download the file to get the image and video name
         */
         if (file.metadata.fileType === FileType.livePhoto) {
-            const fileStream = await downloadManager.getFile(file);
-            const fileBlob = await new Response(fileStream).blob();
+            const fileBlob = await downloadManager.fileBlob(file);
             const { imageFileName, videoFileName } = await decodeLivePhoto(
                 file.metadata.title,
                 fileBlob,

diff --git a/web/apps/photos/src/utils/file/index.ts b/web/apps/photos/src/utils/file/index.ts
@@ -56,9 +56,7 @@ export enum FILE_OPS_TYPE {
 
 export async function downloadFile(file: EnteFile) {
     try {
-        let fileBlob = await new Response(
-            await DownloadManager.getFile(file),
-        ).blob();
+        let fileBlob = await DownloadManager.fileBlob(file);
         if (file.metadata.fileType === FileType.livePhoto) {
             const { imageFileName, imageData, videoFileName, videoData } =
                 await decodeLivePhoto(file.metadata.title, fileBlob);
@@ -392,7 +390,7 @@ async function downloadFileDesktop(
 ) {
     const fs = electron.fs;
 
-    const stream = await DownloadManager.getFile(file);
+    const stream = await DownloadManager.fileStream(file);
 
     if (file.metadata.fileType === FileType.livePhoto) {
         const fileBlob = await new Response(stream).blob();

diff --git a/web/packages/new/photos/components/Tiles.tsx b/web/packages/new/photos/components/Tiles.tsx
@@ -72,7 +72,7 @@ export const ItemCard: React.FC<React.PropsWithChildren<ItemCardProps>> = ({
             );
         } else {
             void downloadManager
-                .getThumbnailForPreview(coverFile, isScrolling)
+                .renderableThumbnailURL(coverFile, isScrolling)
                 .then((url) => !didCancel && setCoverImageURL(url));
         }