From b35f7fcfc6a0a7e0cbd07b9ad6463dc45eb8c9bb Mon Sep 17 00:00:00 2001
From: Vili Manninen <vili.manninen@riskidev.fi>
Date: Thu, 12 Dec 2024 23:50:02 +0200
Subject: [PATCH 1/7] Move mod version downloading logic and state management
 to Vuex state

---
 src/components/views/DownloadModModal.vue | 99 +++++++++++++++--------
 src/pages/DownloadMonitor.vue             |  5 +-
 src/pages/Manager.vue                     |  2 +-
 src/store/index.ts                        |  2 +
 src/store/modules/DownloadModule.ts       | 44 ++++++++++
 5 files changed, 114 insertions(+), 38 deletions(-)
 create mode 100644 src/store/modules/DownloadModule.ts

diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index eb998f9b1..373fdc5e4 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -1,14 +1,14 @@
 <template>
     <div>
-        <div id='downloadProgressModal' :class="['modal', {'is-active':downloadingMod}]" v-if="downloadObject !== null">
+        <div id='downloadProgressModal' :class="['modal', {'is-active':downloadingMod}]" v-if="$store.state.download.downloadObject !== null">
             <div class="modal-background" @click="downloadingMod = false;"></div>
             <div class='modal-content'>
                 <div class='notification is-info'>
-                    <h3 class='title'>Downloading {{downloadObject.modName}}</h3>
-                    <p>{{Math.floor(downloadObject.progress)}}% complete</p>
+                    <h3 class='title'>Downloading {{$store.state.download.downloadObject.modName}}</h3>
+                    <p>{{Math.floor($store.state.download.downloadObject.progress)}}% complete</p>
                     <Progress
                         :max='100'
-                        :value='downloadObject.progress'
+                        :value='$store.state.download.downloadObject.progress'
                         :className="['is-dark']"
                     />
                 </div>
@@ -43,6 +43,7 @@
 
 import { mixins } from "vue-class-component";
 import { Component } from 'vue-property-decorator';
+import { Store } from "vuex";
 import ThunderstoreMod from '../../model/ThunderstoreMod';
 import ManifestV2 from '../../model/ManifestV2';
 import ThunderstoreVersion from '../../model/ThunderstoreVersion';
@@ -68,8 +69,6 @@ interface DownloadProgress {
     failed: boolean;
 }
 
-let assignId = 0;
-
     @Component({
         components: {
             DownloadModVersionSelectModal,
@@ -79,11 +78,8 @@ let assignId = 0;
     })
     export default class DownloadModModal extends mixins(DownloadMixin) {
 
-        downloadObject: DownloadProgress | null = null;
         downloadingMod: boolean = false;
 
-        static allVersions: [number, DownloadProgress][] = [];
-
         get ignoreCache(): boolean {
             const settings = this.$store.getters['settings'];
             return settings.getContext().global.ignoreCache;
@@ -92,12 +88,16 @@ let assignId = 0;
         public static async downloadSpecific(
             profile: Profile,
             combo: ThunderstoreCombo,
-            ignoreCache: boolean
+            ignoreCache: boolean,
+            store: Store<any>
         ): Promise<void> {
             return new Promise((resolve, reject) => {
                 const tsMod = combo.getMod();
                 const tsVersion = combo.getVersion();
-                const currentAssignId = assignId++;
+
+                store.commit('download/increaseAssignId');
+                const currentAssignId = store.state.download.assignId;
+
                 const progressObject = {
                     progress: 0,
                     initialMods: [`${tsMod.getName()} (${tsVersion.getVersionNumber().toString()})`],
@@ -105,15 +105,19 @@ let assignId = 0;
                     assignId: currentAssignId,
                     failed: false,
                 };
-                DownloadModModal.allVersions.push([currentAssignId, progressObject]);
+
+                store.commit('download/pushDownloadObjectToAllVersions', progressObject);
                 setTimeout(() => {
                     ThunderstoreDownloaderProvider.instance.download(profile.asImmutableProfile(), tsMod, tsVersion, ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
-                        const assignIndex = DownloadModModal.allVersions.findIndex(([number, val]) => number === currentAssignId);
+                        const assignIndex = store.state.download.allVersions.findIndex(([number, val]: [number, DownloadProgress]) => number === currentAssignId);
                         if (status === StatusEnum.FAILURE) {
                             if (err !== null) {
-                                const existing = DownloadModModal.allVersions[assignIndex]
+                                const existing = store.state.download.allVersions[assignIndex]
                                 existing[1].failed = true;
-                                DownloadModModal.allVersions[assignIndex] = [currentAssignId, existing[1]];
+                                store.commit('download/updateDownloadObject', {
+                                    assignId: assignIndex,
+                                    downloadObject: [currentAssignId, existing[1]]
+                                });
                                 DownloadModModal.addSolutionsToError(err);
                                 return reject(err);
                             }
@@ -125,7 +129,10 @@ let assignId = 0;
                                 assignId: currentAssignId,
                                 failed: false,
                             }
-                            DownloadModModal.allVersions[assignIndex] = [currentAssignId, obj];
+                            store.commit('download/updateDownloadObject', {
+                                assignId: assignIndex,
+                                downloadObject: [currentAssignId, obj]
+                            });
                         }
                     }, async (downloadedMods: ThunderstoreCombo[]) => {
                         ProfileModList.requestLock(async () => {
@@ -155,7 +162,10 @@ let assignId = 0;
         async downloadLatest() {
             this.closeModal();
             const modsWithUpdates: ThunderstoreCombo[] = await this.$store.dispatch('profile/getCombosWithUpdates');
-            const currentAssignId = assignId++;
+
+            this.$store.commit('download/increaseAssignId');
+            const currentAssignId = this.$store.state.download.assignId;
+
             const progressObject = {
                 progress: 0,
                 initialMods: modsWithUpdates.map(value => `${value.getMod().getName()} (${value.getVersion().toString()})`),
@@ -163,17 +173,23 @@ let assignId = 0;
                 assignId: currentAssignId,
                 failed: false,
             };
-            this.downloadObject = progressObject;
-            DownloadModModal.allVersions.push([currentAssignId, this.downloadObject]);
+            this.$store.commit('download/setDownloadObject', progressObject);
+            this.$store.commit('download/pushDownloadObjectToAllVersions', {
+                assignId: currentAssignId,
+                downloadObject: progressObject
+            });
             this.downloadingMod = true;
             ThunderstoreDownloaderProvider.instance.downloadLatestOfAll(modsWithUpdates, this.ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
-                const assignIndex = DownloadModModal.allVersions.findIndex(([number, val]) => number === currentAssignId);
+                const assignIndex = this.$store.state.download.allVersions.findIndex(([number, val]: [number, DownloadProgress]) => number === currentAssignId);
                 if (status === StatusEnum.FAILURE) {
                     if (err !== null) {
                         this.downloadingMod = false;
-                        const existing = DownloadModModal.allVersions[assignIndex]
+                        const existing = this.$store.state.download.allVersions[assignIndex];
                         existing[1].failed = true;
-                        this.$set(DownloadModModal.allVersions, assignIndex, [currentAssignId, existing[1]]);
+                        this.$store.commit('download/updateDownloadObject', {
+                            assignId: assignIndex,
+                            downloadObject: [currentAssignId, existing[1]]
+                        });
                         DownloadModModal.addSolutionsToError(err);
                         this.$store.commit('error/handleError', err);
                         return;
@@ -186,17 +202,23 @@ let assignId = 0;
                         assignId: currentAssignId,
                         failed: false,
                     }
-                    if (this.downloadObject!.assignId === currentAssignId) {
-                        this.downloadObject = Object.assign({}, obj);
+                    if (this.$store.state.download.downloadObject!.assignId === currentAssignId) {
+                        this.$store.commit('download/setDownloadObject', obj);
                     }
-                    this.$set(DownloadModModal.allVersions, assignIndex, [currentAssignId, obj]);
+                    this.$store.commit('download/updateDownloadObject', {
+                        assignId: assignIndex,
+                        downloadObject: [currentAssignId, obj]
+                    });
                 }
             }, this.downloadCompletedCallback);
         }
 
         downloadHandler(tsMod: ThunderstoreMod, tsVersion: ThunderstoreVersion) {
             this.closeModal();
-            const currentAssignId = assignId++;
+
+            this.$store.commit('download/increaseAssignId');
+            const currentAssignId = this.$store.state.download.assignId;
+
             const progressObject = {
                 progress: 0,
                 initialMods: [`${tsMod.getName()} (${tsVersion.getVersionNumber().toString()})`],
@@ -204,18 +226,24 @@ let assignId = 0;
                 assignId: currentAssignId,
                 failed: false,
             };
-            this.downloadObject = progressObject;
-            DownloadModModal.allVersions.push([currentAssignId, this.downloadObject]);
+            this.$store.commit('download/setDownloadObject', progressObject);
+            this.$store.commit('download/pushDownloadObjectToAllVersions', {
+                assignId: currentAssignId,
+                downloadObject: this.$store.state.download.downloadObject
+            });
             this.downloadingMod = true;
             setTimeout(() => {
                 ThunderstoreDownloaderProvider.instance.download(this.profile.asImmutableProfile(), tsMod, tsVersion, this.ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
-                    const assignIndex = DownloadModModal.allVersions.findIndex(([number, val]) => number === currentAssignId);
+                    const assignIndex = this.$store.state.download.allVersions.findIndex(([number, val]: [number, DownloadProgress]) => number === currentAssignId);
                     if (status === StatusEnum.FAILURE) {
                         if (err !== null) {
                             this.downloadingMod = false;
-                            const existing = DownloadModModal.allVersions[assignIndex]
+                            const existing = this.$store.state.download.allVersions[assignIndex];
                             existing[1].failed = true;
-                            this.$set(DownloadModModal.allVersions, assignIndex, [currentAssignId, existing[1]]);
+                            this.$store.commit('download/updateDownloadObject', {
+                                assignId: assignIndex,
+                                downloadObject: [currentAssignId, existing[1]]
+                            });
                             DownloadModModal.addSolutionsToError(err);
                             this.$store.commit('error/handleError', err);
                             return;
@@ -228,10 +256,13 @@ let assignId = 0;
                             assignId: currentAssignId,
                             failed: false,
                         }
-                        if (this.downloadObject!.assignId === currentAssignId) {
-                            this.downloadObject = Object.assign({}, obj);
+                        if (this.$store.state.download.downloadObject!.assignId === currentAssignId) {
+                            this.$store.commit('download/setDownloadObject', obj);
                         }
-                        this.$set(DownloadModModal.allVersions, assignIndex, [currentAssignId, obj]);
+                        this.$store.commit('download/updateDownloadObject', {
+                            assignId: assignIndex,
+                            downloadObject: [currentAssignId, obj]
+                        });
                     }
                 }, this.downloadCompletedCallback);
             }, 1);
diff --git a/src/pages/DownloadMonitor.vue b/src/pages/DownloadMonitor.vue
index 2503e4161..9752b17fd 100644
--- a/src/pages/DownloadMonitor.vue
+++ b/src/pages/DownloadMonitor.vue
@@ -44,7 +44,6 @@
 
 import { Component, Vue } from 'vue-property-decorator';
 import { Hero } from '../components/all';
-import DownloadModModal from '../components/views/DownloadModModal.vue';
 import Progress from '../components/Progress.vue';
 import Timeout = NodeJS.Timeout;
 
@@ -59,9 +58,9 @@ export default class DownloadMonitor extends Vue {
     private activeDownloads: [number, any][] = [];
 
     created() {
-        this.activeDownloads = [...DownloadModModal.allVersions].reverse();
+        this.activeDownloads = [...this.$store.state.download.allVersions].reverse();
         this.refreshInterval = setInterval(() => {
-            this.activeDownloads = [...DownloadModModal.allVersions].reverse();
+            this.activeDownloads = [...this.$store.state.download.allVersions].reverse();
         }, 100);
     }
 
diff --git a/src/pages/Manager.vue b/src/pages/Manager.vue
index 49f92263a..b3638808e 100644
--- a/src/pages/Manager.vue
+++ b/src/pages/Manager.vue
@@ -635,7 +635,7 @@ import ModalCard from '../components/ModalCard.vue';
                     });
                     return;
                 }
-                DownloadModModal.downloadSpecific(this.profile, combo, ignoreCache)
+                DownloadModModal.downloadSpecific(this.profile, combo, ignoreCache, this.$store)
                     .then(async value => {
                         const modList = await ProfileModList.getModList(this.profile.asImmutableProfile());
                         if (!(modList instanceof R2Error)) {
diff --git a/src/store/index.ts b/src/store/index.ts
index adb94f05e..2bc5f2962 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -2,6 +2,7 @@ import Vue from 'vue';
 import Vuex, { ActionContext } from 'vuex';
 
 import ErrorModule from './modules/ErrorModule';
+import { DownloadModule } from './modules/DownloadModule';
 import ModalsModule from './modules/ModalsModule';
 import ModFilterModule from './modules/ModFilterModule';
 import ProfileModule from './modules/ProfileModule';
@@ -123,6 +124,7 @@ export const store = {
     },
     modules: {
         error: ErrorModule,
+        download: DownloadModule,
         modals: ModalsModule,
         modFilters: ModFilterModule,
         profile: ProfileModule,
diff --git a/src/store/modules/DownloadModule.ts b/src/store/modules/DownloadModule.ts
new file mode 100644
index 000000000..276912add
--- /dev/null
+++ b/src/store/modules/DownloadModule.ts
@@ -0,0 +1,44 @@
+import Vue from "vue";
+
+export interface DownloadProgress {
+    assignId: number;
+    initialMods: string[];
+    modName: string;
+    progress: number;
+    failed: boolean;
+}
+
+
+interface State {
+    allVersions: [number, DownloadProgress][],
+    assignId: number,
+    downloadObject: DownloadProgress | null,
+}
+
+/**
+ * State for mod downloads.
+ */
+export const DownloadModule = {
+    namespaced: true,
+
+    state: (): State => ({
+        allVersions: [],
+        assignId: 0,
+        downloadObject: null, // TODO: Check if the last element of allVersions can be used instead of this
+    }),
+
+    mutations: {
+        setDownloadObject(state: State, downloadObject: DownloadProgress) {
+            state.downloadObject = Object.assign({}, downloadObject);
+        },
+        pushDownloadObjectToAllVersions(state: State, params: { assignId: number, downloadObject: DownloadProgress }) {
+            state.allVersions.push([params.assignId, params.downloadObject]);
+        },
+        updateDownloadObject(state: State, params: { assignId: number, downloadObject: DownloadProgress }) {
+            Vue.set(state.allVersions, params.assignId, params.downloadObject);
+        },
+        increaseAssignId(state: State) {
+            state.assignId++;
+        }
+    },
+}

From c8175d2888370e0ee954c491327a69fef9c7ba24 Mon Sep 17 00:00:00 2001
From: Vili Manninen <vili.manninen@riskidev.fi>
Date: Fri, 13 Dec 2024 14:11:48 +0200
Subject: [PATCH 2/7] Minor fixes, mostly object type stuff

---
 src/components/views/DownloadModModal.vue | 18 +++++++++++-------
 src/store/modules/DownloadModule.ts       | 12 ++++++------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index 373fdc5e4..e2d2d4b99 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -106,7 +106,11 @@ interface DownloadProgress {
                     failed: false,
                 };
 
-                store.commit('download/pushDownloadObjectToAllVersions', progressObject);
+                store.commit('download/pushDownloadObjectToAllVersions', {
+                    assignId: currentAssignId,
+                    downloadObject: progressObject
+                });
+
                 setTimeout(() => {
                     ThunderstoreDownloaderProvider.instance.download(profile.asImmutableProfile(), tsMod, tsVersion, ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
                         const assignIndex = store.state.download.allVersions.findIndex(([number, val]: [number, DownloadProgress]) => number === currentAssignId);
@@ -116,7 +120,7 @@ interface DownloadProgress {
                                 existing[1].failed = true;
                                 store.commit('download/updateDownloadObject', {
                                     assignId: assignIndex,
-                                    downloadObject: [currentAssignId, existing[1]]
+                                    downloadVersion: [currentAssignId, existing[1]]
                                 });
                                 DownloadModModal.addSolutionsToError(err);
                                 return reject(err);
@@ -131,7 +135,7 @@ interface DownloadProgress {
                             }
                             store.commit('download/updateDownloadObject', {
                                 assignId: assignIndex,
-                                downloadObject: [currentAssignId, obj]
+                                downloadVersion: [currentAssignId, obj]
                             });
                         }
                     }, async (downloadedMods: ThunderstoreCombo[]) => {
@@ -188,7 +192,7 @@ interface DownloadProgress {
                         existing[1].failed = true;
                         this.$store.commit('download/updateDownloadObject', {
                             assignId: assignIndex,
-                            downloadObject: [currentAssignId, existing[1]]
+                            downloadVersion: [currentAssignId, existing[1]]
                         });
                         DownloadModModal.addSolutionsToError(err);
                         this.$store.commit('error/handleError', err);
@@ -207,7 +211,7 @@ interface DownloadProgress {
                     }
                     this.$store.commit('download/updateDownloadObject', {
                         assignId: assignIndex,
-                        downloadObject: [currentAssignId, obj]
+                        downloadVersion: [currentAssignId, obj]
                     });
                 }
             }, this.downloadCompletedCallback);
@@ -242,7 +246,7 @@ interface DownloadProgress {
                             existing[1].failed = true;
                             this.$store.commit('download/updateDownloadObject', {
                                 assignId: assignIndex,
-                                downloadObject: [currentAssignId, existing[1]]
+                                downloadVersion: [currentAssignId, existing[1]]
                             });
                             DownloadModModal.addSolutionsToError(err);
                             this.$store.commit('error/handleError', err);
@@ -261,7 +265,7 @@ interface DownloadProgress {
                         }
                         this.$store.commit('download/updateDownloadObject', {
                             assignId: assignIndex,
-                            downloadObject: [currentAssignId, obj]
+                            downloadVersion: [currentAssignId, obj]
                         });
                     }
                 }, this.downloadCompletedCallback);
diff --git a/src/store/modules/DownloadModule.ts b/src/store/modules/DownloadModule.ts
index 276912add..21d4c5c9f 100644
--- a/src/store/modules/DownloadModule.ts
+++ b/src/store/modules/DownloadModule.ts
@@ -1,5 +1,3 @@
-import Vue from "vue";
-
 export interface DownloadProgress {
     assignId: number;
     initialMods: string[];
@@ -29,13 +27,15 @@ export const DownloadModule = {
 
     mutations: {
         setDownloadObject(state: State, downloadObject: DownloadProgress) {
-            state.downloadObject = Object.assign({}, downloadObject);
+            state.downloadObject = {...downloadObject};
         },
         pushDownloadObjectToAllVersions(state: State, params: { assignId: number, downloadObject: DownloadProgress }) {
-            state.allVersions.push([params.assignId, params.downloadObject]);
+            state.allVersions = [...state.allVersions, [params.assignId, params.downloadObject]];
         },
-        updateDownloadObject(state: State, params: { assignId: number, downloadObject: DownloadProgress }) {
-            Vue.set(state.allVersions, params.assignId, params.downloadObject);
+        updateDownloadObject(state: State, params: { assignId: number, downloadVersion: [number, DownloadProgress]}) {
+            const newVersions = [...state.allVersions];
+            newVersions[params.assignId] = params.downloadVersion;
+            state.allVersions = newVersions;
         },
         increaseAssignId(state: State) {
             state.assignId++;

From 9503e7282231a147d05f3fc2d300a3212413319c Mon Sep 17 00:00:00 2001
From: Vili Manninen <vili.manninen@riskidev.fi>
Date: Fri, 13 Dec 2024 14:16:31 +0200
Subject: [PATCH 3/7] Add a getter activeDownloadCount

---
 src/store/modules/DownloadModule.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/store/modules/DownloadModule.ts b/src/store/modules/DownloadModule.ts
index 21d4c5c9f..2d9a4742b 100644
--- a/src/store/modules/DownloadModule.ts
+++ b/src/store/modules/DownloadModule.ts
@@ -1,3 +1,6 @@
+import { GetterTree } from "vuex";
+import { State as RootState } from "../../store";
+
 export interface DownloadProgress {
     assignId: number;
     initialMods: string[];
@@ -25,6 +28,15 @@ export const DownloadModule = {
         downloadObject: null, // TODO: Check if the last element of allVersions can be used instead of this
     }),
 
+    getters: <GetterTree<State, RootState>>{
+        activeDownloadCount(state) {
+            const active = state.allVersions.filter(
+                dl => !dl[1].failed && dl[1].progress < 100
+            );
+            return active.length;
+        },
+    },
+
     mutations: {
         setDownloadObject(state: State, downloadObject: DownloadProgress) {
             state.downloadObject = {...downloadObject};

From 17556bcf5c950267382cf7a685e30df9f9496079 Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Tue, 17 Dec 2024 14:28:35 +0200
Subject: [PATCH 4/7] Move downloadCompletedCallback functions main business
 logic to ProfileUtils

---
 src/components/views/DownloadModModal.vue | 25 +++++++----------------
 src/utils/ProfileUtils.ts                 | 18 ++++++++++++++++
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index e2d2d4b99..6b12f0ead 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -57,7 +57,7 @@ import Profile from '../../model/Profile';
 import { Progress } from '../all';
 import ConflictManagementProvider from '../../providers/generic/installing/ConflictManagementProvider';
 import ModalCard from '../ModalCard.vue';
-import { installModsToProfile } from '../../utils/ProfileUtils';
+import { installModsAndResolveConflicts } from '../../utils/ProfileUtils';
 import DownloadMixin from "../mixins/DownloadMixin.vue";
 import DownloadModVersionSelectModal from "../../components/views/DownloadModVersionSelectModal.vue";
 
@@ -273,23 +273,12 @@ interface DownloadProgress {
         }
 
         async downloadCompletedCallback(downloadedMods: ThunderstoreCombo[]) {
-            ProfileModList.requestLock(async () => {
-                const profile = this.profile.asImmutableProfile();
-
-                try {
-                    const modList = await installModsToProfile(downloadedMods, profile);
-                    await this.$store.dispatch('profile/updateModList', modList);
-
-                    const err = await ConflictManagementProvider.instance.resolveConflicts(modList, this.profile.asImmutableProfile());
-                    if (err instanceof R2Error) {
-                        throw err;
-                    }
-                } catch (e) {
-                    this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
-                } finally {
-                    this.downloadingMod = false;
-                }
-            });
+            try {
+                await installModsAndResolveConflicts(downloadedMods, this.profile.asImmutableProfile(), 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> {
diff --git a/src/utils/ProfileUtils.ts b/src/utils/ProfileUtils.ts
index 7700227c1..d02f7f1ac 100644
--- a/src/utils/ProfileUtils.ts
+++ b/src/utils/ProfileUtils.ts
@@ -16,6 +16,8 @@ import ZipProvider from "../providers/generic/zip/ZipProvider";
 import ProfileInstallerProvider from "../providers/ror2/installing/ProfileInstallerProvider";
 import * as PackageDb from '../r2mm/manager/PackageDexieStore';
 import ProfileModList from "../r2mm/mods/ProfileModList";
+import ConflictManagementProvider from "../providers/generic/installing/ConflictManagementProvider";
+import {Store} from "vuex";
 
 export async function exportModsToCombos(exportMods: ExportMod[], game: Game): Promise<ThunderstoreCombo[]> {
     const dependencyStrings = exportMods.map((m) => m.getDependencyString());
@@ -56,6 +58,22 @@ async function extractConfigsToImportedProfile(
     }
 }
 
+export async function installModsAndResolveConflicts(
+    downloadedMods: ThunderstoreCombo[],
+    profile: ImmutableProfile,
+    store: Store<any>
+): Promise<void> {
+    await ProfileModList.requestLock(async () => {
+        try {
+            const modList: ManifestV2[] = await installModsToProfile(downloadedMods, profile);
+            await store.dispatch('profile/updateModList', modList);
+            throwForR2Error(await ConflictManagementProvider.instance.resolveConflicts(modList, profile));
+        } catch (e: any) {
+            throw e;
+        }
+    });
+}
+
 /**
  * Install mods to target profile and sync the changes to mods.yml file
  * This is more performant than calling ProfileModList.addMod() on a

From 54224fdabe86f0b8f25160de8c9ffa96e89d2229 Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Tue, 17 Dec 2024 14:38:01 +0200
Subject: [PATCH 5/7] Move downloadCompletedCallback to DownloadMixin to make
 it easier to split DownloadModModal component

---
 src/components/mixins/DownloadMixin.vue   | 13 ++++++++++++-
 src/components/views/DownloadModModal.vue | 20 ++++++++------------
 src/utils/ProfileUtils.ts                 |  2 +-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/components/mixins/DownloadMixin.vue b/src/components/mixins/DownloadMixin.vue
index 65a020929..04b7b187d 100644
--- 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.asImmutableProfile(), 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
index 6b12f0ead..b1bf5a2c0 100644
--- 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 } 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,19 +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.asImmutableProfile(), 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) => {
                 const manifestMod: ManifestV2 = new ManifestV2().fromThunderstoreMod(mod, version);
diff --git a/src/utils/ProfileUtils.ts b/src/utils/ProfileUtils.ts
index d02f7f1ac..72e4eb77e 100644
--- a/src/utils/ProfileUtils.ts
+++ b/src/utils/ProfileUtils.ts
@@ -12,11 +12,11 @@ import Profile, { ImmutableProfile } from "../model/Profile";
 import ThunderstoreCombo from "../model/ThunderstoreCombo";
 import VersionNumber from "../model/VersionNumber";
 import FsProvider from "../providers/generic/file/FsProvider";
+import ConflictManagementProvider from "../providers/generic/installing/ConflictManagementProvider";
 import ZipProvider from "../providers/generic/zip/ZipProvider";
 import ProfileInstallerProvider from "../providers/ror2/installing/ProfileInstallerProvider";
 import * as PackageDb from '../r2mm/manager/PackageDexieStore';
 import ProfileModList from "../r2mm/mods/ProfileModList";
-import ConflictManagementProvider from "../providers/generic/installing/ConflictManagementProvider";
 import {Store} from "vuex";
 
 export async function exportModsToCombos(exportMods: ExportMod[], game: Game): Promise<ThunderstoreCombo[]> {

From bd954c4563b29dfec5457fce63f72bbdca8695f1 Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Wed, 18 Dec 2024 14:35:33 +0200
Subject: [PATCH 6/7] Optimize imports

---
 src/components/views/DownloadModModal.vue | 21 +++++++++++----------
 src/utils/ProfileUtils.ts                 |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index b1bf5a2c0..414b17de7 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -44,21 +44,22 @@
 import { mixins } from "vue-class-component";
 import { Component } from 'vue-property-decorator';
 import { Store } from "vuex";
-import ThunderstoreMod from '../../model/ThunderstoreMod';
+
+import { Progress } from '../all';
+import ModalCard from '../ModalCard.vue';
+import DownloadModVersionSelectModal from "../../components/views/DownloadModVersionSelectModal.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';
+import ThunderstoreMod from '../../model/ThunderstoreMod';
 import ThunderstoreVersion from '../../model/ThunderstoreVersion';
-import ThunderstoreDownloaderProvider from '../../providers/ror2/downloading/ThunderstoreDownloaderProvider';
-import R2Error from '../../model/errors/R2Error';
-import StatusEnum from '../../model/enums/StatusEnum';
 import ThunderstoreCombo from '../../model/ThunderstoreCombo';
+import ConflictManagementProvider from '../../providers/generic/installing/ConflictManagementProvider';
 import ProfileInstallerProvider from '../../providers/ror2/installing/ProfileInstallerProvider';
+import ThunderstoreDownloaderProvider from '../../providers/ror2/downloading/ThunderstoreDownloaderProvider';
 import ProfileModList from '../../r2mm/mods/ProfileModList';
-import Profile from '../../model/Profile';
-import { Progress } from '../all';
-import ConflictManagementProvider from '../../providers/generic/installing/ConflictManagementProvider';
-import ModalCard from '../ModalCard.vue';
-import DownloadMixin from "../mixins/DownloadMixin.vue";
-import DownloadModVersionSelectModal from "../../components/views/DownloadModVersionSelectModal.vue";
 
 interface DownloadProgress {
     assignId: number;
diff --git a/src/utils/ProfileUtils.ts b/src/utils/ProfileUtils.ts
index 72e4eb77e..7e09c8404 100644
--- a/src/utils/ProfileUtils.ts
+++ b/src/utils/ProfileUtils.ts
@@ -1,6 +1,7 @@
 import path from "path";
 
 import * as yaml from "yaml";
+import { Store } from "vuex";
 
 import FileUtils from "./FileUtils";
 import R2Error from "../model/errors/R2Error";
@@ -17,7 +18,6 @@ import ZipProvider from "../providers/generic/zip/ZipProvider";
 import ProfileInstallerProvider from "../providers/ror2/installing/ProfileInstallerProvider";
 import * as PackageDb from '../r2mm/manager/PackageDexieStore';
 import ProfileModList from "../r2mm/mods/ProfileModList";
-import {Store} from "vuex";
 
 export async function exportModsToCombos(exportMods: ExportMod[], game: Game): Promise<ThunderstoreCombo[]> {
     const dependencyStrings = exportMods.map((m) => m.getDependencyString());

From 61c3b3fa34edfc8d11368c8323a75f087d47fcc7 Mon Sep 17 00:00:00 2001
From: Vili Manninen <vili.manninen@riskidev.fi>
Date: Thu, 19 Dec 2024 14:02:53 +0200
Subject: [PATCH 7/7] Remove unnecessary try/catch wrapping

---
 src/utils/ProfileUtils.ts | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/utils/ProfileUtils.ts b/src/utils/ProfileUtils.ts
index 7e09c8404..b538f1b81 100644
--- a/src/utils/ProfileUtils.ts
+++ b/src/utils/ProfileUtils.ts
@@ -64,13 +64,9 @@ export async function installModsAndResolveConflicts(
     store: Store<any>
 ): Promise<void> {
     await ProfileModList.requestLock(async () => {
-        try {
-            const modList: ManifestV2[] = await installModsToProfile(downloadedMods, profile);
-            await store.dispatch('profile/updateModList', modList);
-            throwForR2Error(await ConflictManagementProvider.instance.resolveConflicts(modList, profile));
-        } catch (e: any) {
-            throw e;
-        }
+        const modList: ManifestV2[] = await installModsToProfile(downloadedMods, profile);
+        await store.dispatch('profile/updateModList', modList);
+        throwForR2Error(await ConflictManagementProvider.instance.resolveConflicts(modList, profile));
     });
 }