video: Only zip unprocessed chunks, otherwise download files separately

This makes the download process instantaneous, which is specially important on longer videos.
bluerobotics · Jul 11, 2024 · c1d14be · c1d14be
1 parent c122c05
commit c1d14be
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/src/components/VideoLibraryModal.vue b/src/components/VideoLibraryModal.vue
@@ -793,7 +793,7 @@ const downloadVideoAndTelemetryFiles = async (): Promise<void> => {
   if (tempProcessedVideos.length > 0) {
     const dataLogFilesAdded = addLogDataToFileList(tempProcessedVideos)
 
-    await videoStore.downloadFilesFromVideoDB(dataLogFilesAdded, fillProgressData)
+    await videoStore.downloadFilesFromVideoDB(dataLogFilesAdded)
   }
   if (tempUnprocessedVideos.length > 0) {
     await videoStore.downloadTempVideo(tempUnprocessedVideos, fillProgressData)

diff --git a/src/stores/video.ts b/src/stores/video.ts
@@ -371,7 +371,8 @@ export const useVideoStore = defineStore('video', () => {
   const downloadFiles = async (
     db: StorageDB,
     keys: string[],
-    zipFilenamePrefix: string,
+    shouldZip = false,
+    zipFilenamePrefix = 'Cockpit-Files',
     progressCallback?: DownloadProgressCallback
   ): Promise<void> => {
     const maybeFiles = await Promise.all(
@@ -388,32 +389,25 @@ export const useVideoStore = defineStore('video', () => {
       return
     }
 
-    if (files.length === 1) {
-      saveAs(files[0].blob, files[0].filename)
-    } else {
+    if (shouldZip) {
       await createZipAndDownload(files, `${zipFilenamePrefix}.zip`, progressCallback)
+    } else {
+      files.forEach(({ blob, filename }) => saveAs(blob, filename))
     }
   }
 
-  const downloadFilesFromVideoDB = async (
-    fileNames: string[],
-    progressCallback?: DownloadProgressCallback
-  ): Promise<void> => {
+  const downloadFilesFromVideoDB = async (fileNames: string[]): Promise<void> => {
     console.debug(`Downloading files from the video recovery database: ${fileNames.join(', ')}`)
-    await downloadFiles(
-      videoStoringDB,
-      fileNames,
-      fileNames.length > 1 ? 'Cockpit-Video-Recordings' : 'Cockpit-Video-Recording',
-      progressCallback
-    )
+    await downloadFiles(videoStoringDB, fileNames)
   }
 
   const downloadTempVideo = async (hashes: string[], progressCallback?: DownloadProgressCallback): Promise<void> => {
     console.debug(`Downloading ${hashes.length} video chunks from the temporary database.`)
 
     for (const hash of hashes) {
       const fileNames = (await tempVideoChunksDB.keys()).filter((filename) => filename.includes(hash))
-      await downloadFiles(tempVideoChunksDB, fileNames, `Cockpit-Unprocessed-Video-Chunks-${hash}`, progressCallback)
+      const zipFilenamePrefix = `Cockpit-Unprocessed-Video-Chunks-${hash}`
+      await downloadFiles(tempVideoChunksDB, fileNames, true, zipFilenamePrefix, progressCallback)
     }
   }