Merge pull request #1646 from ebkr/mod-list-update-prevent-info

Display information about mod list updating being prevented

Author: anttimaki

src/components/ModListUpdateBanner.vue

@@ -37,13 +37,18 @@ export default class ModListUpdateBanner extends Vue {
                 {{ $store.state.tsMods.thunderstoreModListUpdateStatus }}
             </span>
             <span v-else-if="updateError">
-                Error updating the mod list.
+                Error refreshing the mod list.
                 <a @click="openErrorModal">View error details</a>.
                 <br />
-                The manager will keep trying to update the mod list in the background.
+                The manager will keep trying to refresh the mod list in the background.
+            </span>
+            <span v-else-if="$store.getters['download/activeDownloadCount'] > 0">
+                An error occurred when refreshing the mod list from Thunderstore.<br />
+                However, the mod list can't be refreshed while the are mod downloads in progress.<br />
+                Please wait for the downloads to finish before continuing.
             </span>
             <span v-else>
-                An error occurred when updating the mod list from Thunderstore.
+                An error occurred when refreshing the mod list from Thunderstore.
                 Would you like to
                 <a @click="updateModList">try again now</a>?
             </span>

src/components/profiles-modals/ImportProfileModal.vue

@@ -321,26 +321,35 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
                 </p>
 
                 <p class="margin-top">
-                    Updating the mod list from Thunderstore might solve this issue.
-
-                    <span v-if="$store.state.tsMods.modsLastUpdated">
-                        The mod list was last updated on {{ valueToReadableDate($store.state.tsMods.modsLastUpdated) }}.
-                    </span>
-
-                    <br />
-
-                    <span v-if="$store.state.tsMods.isThunderstoreModListUpdateInProgress">
-                        {{ $store.state.tsMods.thunderstoreModListUpdateStatus }}
-                    </span>
-                    <span v-else-if="$store.state.tsMods.thunderstoreModListUpdateError">
-                        Error updating the mod list:
-                        {{ $store.state.tsMods.thunderstoreModListUpdateError.message }}.
-                        <a @click="$store.dispatch('tsMods/syncPackageList')">Retry</a>?
-                    </span>
-                    <span v-else>
-                        Would you like to
-                        <a @click="$store.dispatch('tsMods/syncPackageList')">update now</a>?
-                    </span>
+                    Refreshing the mod list from Thunderstore might solve this issue.
+
+                    <div v-if="$store.getters['download/activeDownloadCount'] > 0">
+                        <span>
+                            However, the mod list can't be refreshed while the are mod downloads in progress.
+                            Please wait for the downloads to finish before continuing.
+                        </span>
+                    </div>
+
+                    <div v-else>
+                        <span v-if="$store.state.tsMods.modsLastUpdated">
+                            The mod list was last refreshed on {{ valueToReadableDate($store.state.tsMods.modsLastUpdated) }}.
+                        </span>
+
+                        <br />
+
+                        <span v-if="$store.state.tsMods.isThunderstoreModListUpdateInProgress">
+                            {{ $store.state.tsMods.thunderstoreModListUpdateStatus }}
+                        </span>
+                        <span v-else-if="$store.state.tsMods.thunderstoreModListUpdateError">
+                            Error refreshing the mod list:
+                            {{ $store.state.tsMods.thunderstoreModListUpdateError.message }}.
+                            <a @click="$store.dispatch('tsMods/syncPackageList')">Retry</a>?
+                        </span>
+                        <span v-else>
+                            Would you like to
+                            <a @click="$store.dispatch('tsMods/syncPackageList')">refresh now</a>?
+                        </span>
+                    </div>
                 </p>
             </div>
         </template>

src/components/settings-components/SettingsView.vue

@@ -315,10 +315,13 @@ import CdnProvider from '../../providers/generic/connection/CdnProvider';
                 'Check for any new mod releases.',
                 async () => {
                         if (this.$store.state.tsMods.isThunderstoreModListUpdateInProgress) {
-                            return this.$store.state.tsMods.thunderstoreModListUpdateStatus || "Updating...";
+                            return this.$store.state.tsMods.thunderstoreModListUpdateStatus || "Refreshing...";
                         }
                         if (this.$store.state.tsMods.thunderstoreModListUpdateError) {
-                            return `Error updating the mod list: ${this.$store.state.tsMods.thunderstoreModListUpdateError.message}`;
+                            return `Error refreshing the mod list: ${this.$store.state.tsMods.thunderstoreModListUpdateError.message}`;
+                        }
+                        if (this.$store.getters['download/activeDownloadCount'] > 0) {
+                            return "Refreshing the mod list is disabled while there are active downloads.";
                         }
                         if (this.$store.state.tsMods.modsLastUpdated !== undefined) {
                             return "Cache date: " + moment(this.$store.state.tsMods.modsLastUpdated).format("MMMM Do YYYY, h:mm:ss a");

src/store/modules/DownloadModule.ts

@@ -52,17 +52,33 @@ export const DownloadModule = {
     },
 
     getters: <GetterTree<State, RootState>>{
-        activeDownloadCount(state) {
-            const active = state.allDownloads.filter(
+        activeDownloadCount(_state, getters) {
+            return getters.activeDownloads.length;
+        },
+        activeDownloads(state) {
+            return state.allDownloads.filter(
                 dl =>
                     !dl.failed &&
                     !(dl.downloadProgress >= 100 && dl.installProgress >= 100)
             );
-            return active.length;
+        },
+        conciseDownloadStatus(_state, getters) {
+            if (getters.activeDownloadCount === 1 && getters.newestActiveDownload) {
+                if (getters.newestActiveDownload.downloadProgress < 100) {
+                    return `Downloading mods (${getters.newestActiveDownload.downloadProgress}%)`;
+                } else {
+                    return `Installing mods (${getters.newestActiveDownload.installProgress}%)`;
+                }
+            } else if (getters.activeDownloadCount > 1) {
+                return `Downloading and installing ${getters.activeDownloadCount} mods...`;
+            }
         },
         currentDownload(state) {
             return state.allDownloads[state.allDownloads.length-1] || null;
         },
+        newestActiveDownload(_state, getters) {
+            return getters.activeDownloads[getters.activeDownloads.length-1] || null;
+        },
         newestFirst(state) {
             return Array.from(state.allDownloads).reverse();
         },

src/store/modules/TsModsModule.ts

@@ -200,8 +200,8 @@ export const TsModsModule = {
          * Full update process of the mod list, to be used after
          * passing the splash screen.
          */
-        async syncPackageList({commit, dispatch, state}): Promise<void> {
-            if (state.isThunderstoreModListUpdateInProgress) {
+        async syncPackageList({commit, dispatch, state, rootGetters}): Promise<void> {
+            if (state.isThunderstoreModListUpdateInProgress || rootGetters['download/activeDownloadCount'] > 0) {
                 return;
             }