Move downloadCompletedCallback to DownloadMixin to make it easier to

split DownloadModModal component
ebkr · Dec 17, 2024 · 569946e · 569946e
1 parent b910f51
commit 569946e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/src/components/mixins/DownloadMixin.vue b/src/components/mixins/DownloadMixin.vue
@@ -2,9 +2,12 @@
 import Vue from 'vue';
 import Component from 'vue-class-component';
 
-import ThunderstoreMod from "../../model/ThunderstoreMod";
+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";
 
 
 @Component
@@ -29,5 +32,13 @@ export default class DownloadMixin extends Vue {
     get profile(): Profile {
         return this.$store.getters['profile/activeProfile'];
     }
+
+    async downloadCompletedCallback(downloadedMods: ThunderstoreCombo[]): Promise<void> {
+        try {
+            await installModsAndResolveConflicts(downloadedMods, this.profile, this.$store);
+        } catch (e) {
+            this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
+        }
+    }
 }
 </script>
diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
@@ -57,7 +57,6 @@ import Profile from '../../model/Profile';
 import { Progress } from '../all';
 import ConflictManagementProvider from '../../providers/generic/installing/ConflictManagementProvider';
 import ModalCard from '../ModalCard.vue';
-import {installModsAndResolveConflicts, installModsToProfile} from '../../utils/ProfileUtils';
 import DownloadMixin from "../mixins/DownloadMixin.vue";
 import DownloadModVersionSelectModal from "../../components/views/DownloadModVersionSelectModal.vue";
 
@@ -214,7 +213,10 @@ interface DownloadProgress {
                         downloadVersion: [currentAssignId, obj]
                     });
                 }
-            }, this.downloadCompletedCallback);
+            }, (downloadedMods) => {
+                this.downloadCompletedCallback(downloadedMods);
+                this.downloadingMod = false;
+            });
         }
 
         downloadHandler(tsMod: ThunderstoreMod, tsVersion: ThunderstoreVersion) {
@@ -268,18 +270,13 @@ interface DownloadProgress {
                             downloadVersion: [currentAssignId, obj]
                         });
                     }
-                }, this.downloadCompletedCallback);
+                }, (downloadedMods) => {
+                    this.downloadCompletedCallback(downloadedMods);
+                    this.downloadingMod = false;
+                });
             }, 1);
         }
 
-        async downloadCompletedCallback(downloadedMods: ThunderstoreCombo[]) {
-            try {
-                await installModsAndResolveConflicts(downloadedMods, this.profile, this.$store);
-            } catch (e) {
-                this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
-            }
-            this.downloadingMod = false;
-        }
 
         static async installModAfterDownload(profile: Profile, mod: ThunderstoreMod, version: ThunderstoreVersion): Promise<R2Error | void> {
             return new Promise(async (resolve, reject) => {