fix download bug

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 ### Fixed
 - [Issue 512](https://github.com/aza547/wow-recorder/issues/512) - Fix a bug where the manager would repeatedly retry configuration if the user got the password wrong.
+- Fixed an issue where you could not download a video if the cloud upload setting was disabled.
 
 ## [5.7.2] - 2024-08-04
 ### Fixed

src/main/Manager.ts

@@ -503,7 +503,6 @@ export default class Manager {
 
     const {
       cloudStorage,
-      cloudUpload,
       cloudAccountName,
       cloudAccountPassword,
       cloudGuildName,
@@ -530,12 +529,7 @@ export default class Manager {
 
       this.cloudClient.pollInit();
       this.cloudClient.pollForUpdates(10);
-
-      if (cloudUpload) {
-        // The video process queue only needs the cloud client for uploads, so
-        // we only need to set this if we're configured to upload.
-        this.videoProcessQueue.setCloudClient(this.cloudClient);
-      }
+      this.videoProcessQueue.setCloudClient(this.cloudClient);
     }
 
     this.refreshCloudStatus();

src/main/VideoProcessQueue.ts

@@ -1,7 +1,7 @@
 import { BrowserWindow } from 'electron';
 import path from 'path';
 import assert from 'assert';
-import { allowUploadCategory } from '../utils/configUtils';
+import { shouldUpload } from '../utils/configUtils';
 import DiskSizeMonitor from '../storage/DiskSizeMonitor';
 import ConfigService from './ConfigService';
 import {
@@ -157,7 +157,6 @@ export default class VideoProcessQueue {
    */
   public unsetCloudClient() {
     this.cloudClient = undefined;
-    this.cfg.get<string>('storagePath');
   }
 
   /**
@@ -221,16 +220,12 @@ export default class VideoProcessQueue {
         await tryUnlink(data.source);
       }
 
-      if (this.cloudClient !== undefined) {
-        const allowUpload = allowUploadCategory(this.cfg, data.metadata);
+      if (this.cloudClient && shouldUpload(this.cfg, data.metadata)) {
+        const item: UploadQueueItem = {
+          path: videoPath,
+        };
 
-        if (allowUpload) {
-          const item: UploadQueueItem = {
-            path: videoPath,
-          };
-
-          this.queueUpload(item);
-        }
+        this.queueUpload(item);
       }
     } catch (error) {
       console.error(
@@ -290,7 +285,7 @@ export default class VideoProcessQueue {
       };
 
       if (cloudMetadata.level) {
-        // The string "level" isn't a valid column name, in new videos we
+        // The string "level" isn't a valid SQL column name, in new videos we
         // use the keystoneLevel entry in the metadata, but if we're uploading
         // an old video correct it here at the point of upload.
         cloudMetadata.keystoneLevel = cloudMetadata.level;
@@ -475,7 +470,7 @@ export default class VideoProcessQueue {
   private async uploadQueueEmpty() {
     console.info('[VideoProcessQueue] Upload processing queue empty');
 
-    if (this.cloudClient === undefined) {
+    if (!this.cloudClient) {
       return;
     }
 

src/utils/configUtils.ts

@@ -36,9 +36,16 @@ const allowRecordCategory = (cfg: ConfigService, category: VideoCategory) => {
   return true;
 };
 
-const allowUploadCategory = (cfg: ConfigService, metadata: Metadata) => {
+const shouldUpload = (cfg: ConfigService, metadata: Metadata) => {
   const { category } = metadata;
 
+  const upload = cfg.get<boolean>('cloudUpload');
+
+  if (!upload) {
+    console.info('[configUtils] Cloud upload is disabled');
+    return false;
+  }
+
   if (category === VideoCategory.Clips) {
     console.info('[configUtils] Clips are always uploaded');
     return true;
@@ -195,7 +202,7 @@ const getOverlayConfig = (cfg: ConfigService): ObsOverlayConfig => {
 // eslint-disable-next-line import/prefer-default-export
 export {
   allowRecordCategory,
-  allowUploadCategory,
+  shouldUpload,
   getObsBaseConfig,
   getObsVideoConfig,
   getObsAudioConfig,