Merge pull request #1710 from ebkr/move-downloadandinstallspecific

Move downloadAndInstallSpecific away from the UI component

Author: anttimaki

src/components/views/DownloadModModal.vue

@@ -47,14 +47,12 @@
 
 import { mixins } from "vue-class-component";
 import { Component } from 'vue-property-decorator';
-import { Store } from "vuex";
 
 import { Progress } from '../all';
 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 { ImmutableProfile } from '../../model/Profile';
 import R2Error from '../../model/errors/R2Error';
 import ThunderstoreMod from '../../model/ThunderstoreMod';
 import ThunderstoreVersion from '../../model/ThunderstoreVersion';
@@ -71,32 +69,6 @@ import ThunderstoreDownloaderProvider from '../../providers/ror2/downloading/Thu
     })
     export default class DownloadModModal extends mixins(DownloadMixin) {
 
-        public static async downloadAndInstallSpecific(
-            profile: ImmutableProfile,
-            combo: ThunderstoreCombo,
-            store: Store<any>
-        ): Promise<void> {
-            const assignId = await store.dispatch(
-                'download/addDownload',
-                [`${combo.getMod().getName()} (${combo.getVersion().getVersionNumber().toString()})`]
-            );
-
-            try {
-                const downloadedMods = await ThunderstoreDownloaderProvider.instance.download(
-                    profile,
-                    combo,
-                    store.state.download.ignoreCache,
-                    (downloadProgress: number, modName: string, status: number, err: R2Error | null) => {
-                        store.dispatch('download/downloadProgressCallback', { assignId, downloadProgress, modName, status, err });
-                    }
-                );
-                await store.dispatch('download/installMod', {downloadedMods, assignId, profile});
-            } catch (e) {
-                store.commit('download/updateDownload', { assignId, failed: true });
-                throw e;
-            }
-        }
-
         async downloadHandler(tsMod: ThunderstoreMod, tsVersion: ThunderstoreVersion) {
             this.closeModal();
 

src/pages/Manager.vue

@@ -639,7 +639,7 @@ import ModalCard from '../components/ModalCard.vue';
                 }
 
 				try {
-                	await DownloadModModal.downloadAndInstallSpecific(this.profile.asImmutableProfile(), combo, this.$store);
+                	await this.$store.dispatch('download/downloadAndInstallSpecific', {profile: this.profile.asImmutableProfile(), combo});
 				    const modList = await ProfileModList.getModList(this.profile.asImmutableProfile());
                     if (modList instanceof R2Error) {
                         throw modList;

src/store/modules/DownloadModule.ts

@@ -126,6 +126,28 @@ export const DownloadModule = {
             });
         },
 
+        async downloadAndInstallSpecific({state, commit, dispatch}, params: {
+            combo: ThunderstoreCombo,
+            profile: ImmutableProfile
+        }) {
+            const assignId = await dispatch('addDownload', [`${params.combo.getMod().getName()} (${params.combo.getVersion().getVersionNumber().toString()})`]);
+
+            try {
+                const downloadedMods = await ThunderstoreDownloaderProvider.instance.download(
+                    params.profile,
+                    params.combo,
+                    state.ignoreCache,
+                    (downloadProgress: number, modName: string, status: number, err: R2Error | null) => {
+                        dispatch('downloadProgressCallback', { assignId, downloadProgress, modName, status, err });
+                    }
+                );
+                await dispatch('installMods', {downloadedMods, assignId, profile: params.profile});
+            } catch (e) {
+                commit('updateDownload', { assignId, failed: true });
+                throw e;
+            }
+        },
+
         async downloadProgressCallback({commit}, params: {
             assignId: number,
             downloadProgress: number,