Move download progress callbacks to DownloadMixin

ebkr · Jan 23, 2025 · 631023c · 631023c
1 parent 911baa4
commit 631023c
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 32 deletions.
diff --git a/src/components/mixins/DownloadMixin.vue b/src/components/mixins/DownloadMixin.vue
@@ -2,12 +2,14 @@
 import Vue from 'vue';
 import Component from 'vue-class-component';
 
+import StatusEnum from "../../model/enums/StatusEnum";
 import R2Error from "../../model/errors/R2Error";
 import Game from "../../model/game/Game";
 import Profile from "../../model/Profile";
 import ThunderstoreCombo from "../../model/ThunderstoreCombo";
 import ThunderstoreMod from "../../model/ThunderstoreMod";
 import { installModsAndResolveConflicts } from "../../utils/ProfileUtils";
+import { Store } from "vuex";
 
 
 @Component
@@ -50,6 +52,35 @@ export default class DownloadMixin extends Vue {
         }
     }
 
+    downloadProgressCallback(assignId: number, progress: number, modName: string, status: number, err: R2Error | null) {
+        try {
+            if (status === StatusEnum.FAILURE) {
+                this.setIsModProgressModalOpen(false);
+                this.$store.commit('download/updateDownload', {assignId, failed: true});
+                if (err !== null) {
+                    DownloadMixin.addSolutionsToError(err);
+                    throw err;
+                }
+            } else if (status === StatusEnum.PENDING) {
+                this.$store.commit('download/updateDownload', {assignId, progress, modName});
+            }
+        } catch (e) {
+            this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
+        }
+    };
+
+    static downloadProgressCallback(store: Store<any>, assignId: number, progress: number, modName: string, status: number, err: R2Error | null) {
+        if (status === StatusEnum.FAILURE) {
+            store.commit('download/updateDownload', {assignId, failed: true});
+            if (err !== null) {
+                DownloadMixin.addSolutionsToError(err);
+                throw err;
+            }
+        } else if (status === StatusEnum.PENDING) {
+            store.commit('download/updateDownload', {assignId, progress, modName});
+        }
+    }
+
     static addSolutionsToError(err: R2Error): void {
         // Sanity check typing.
         if (!(err instanceof R2Error)) {

diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
@@ -31,7 +31,6 @@ import ModalCard from '../ModalCard.vue';
 import DownloadModVersionSelectModal from "../../components/views/DownloadModVersionSelectModal.vue";
 import UpdateAllInstalledModsModal from "../../components/views/UpdateAllInstalledModsModal.vue";
 import DownloadMixin from "../mixins/DownloadMixin.vue";
-import StatusEnum from '../../model/enums/StatusEnum';
 import R2Error from '../../model/errors/R2Error';
 import ManifestV2 from '../../model/ManifestV2';
 import Profile from '../../model/Profile';
@@ -75,7 +74,7 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                             ignoreCache,
                             (progress: number, modName: string, status: number, err: R2Error | null) => {
                                 try {
-                                    DownloadModModal.downloadProgressCallback(store, assignId, progress, modName, status, err);
+                                    DownloadMixin.downloadProgressCallback(store, assignId, progress, modName, status, err);
                                 } catch (e) {
                                     reject(e);
                                 }
@@ -107,18 +106,6 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
             });
         }
 
-        static downloadProgressCallback(store: Store<any>, assignId: number, progress: number, modName: string, status: number, err: R2Error | null) {
-            if (status === StatusEnum.FAILURE) {
-                store.commit('download/updateDownload', {assignId, failed: true});
-                if (err !== null) {
-                    DownloadMixin.addSolutionsToError(err);
-                    throw err;
-                }
-            } else if (status === StatusEnum.PENDING) {
-                store.commit('download/updateDownload', {assignId, progress, modName});
-            }
-        }
-
         async downloadHandler(tsMod: ThunderstoreMod, tsVersion: ThunderstoreVersion) {
             this.closeModal();
 
@@ -151,26 +138,8 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                 await this.downloadCompletedCallback(downloadedMods);
                 this.setIsModProgressModalOpen(false);
             }, 1);
-
         }
 
-        downloadProgressCallback(assignId: number, progress: number, modName: string, status: number, err: R2Error | null) {
-            try {
-                if (status === StatusEnum.FAILURE) {
-                    this.setIsModProgressModalOpen(false);
-                    this.$store.commit('download/updateDownload', {assignId, failed: true});
-                    if (err !== null) {
-                        DownloadMixin.addSolutionsToError(err);
-                        throw err;
-                    }
-                } else if (status === StatusEnum.PENDING) {
-                    this.$store.commit('download/updateDownload', {assignId, progress, modName});
-                }
-            } catch (e) {
-                this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
-            }
-        };
-
         static async installModAfterDownload(profile: Profile, mod: ThunderstoreMod, version: ThunderstoreVersion): Promise<R2Error | void> {
             return new Promise(async (resolve, reject) => {
                 const manifestMod: ManifestV2 = new ManifestV2().fromThunderstoreMod(mod, version);