Addressed more PR comments:

- Nits / comment changes

- Restore old functionality to setIconPath

- Changed Profiles.vue onMounted to be sequential rather than lambda style promises.

Author: ebkr

src/pages/Profiles.vue

@@ -132,20 +132,20 @@ async function backToGameSelection() {
 
 onMounted( async () => {
     const settings = await store.getters.settings;
+    await settings.load();
 
-    settings.load()
-        .then(() => store.dispatch('profile/loadLastSelectedProfile'))
-        .then((profileName: string) => {
-            // If the view was entered via game selection, the mod list was updated
-            // and the cache cleared. The profile is already set in the Vuex store
-            // but we want to trigger the cache prewarming. Always doing this for
-            // empty profiles is deemed a fair tradeoff. On the other hand there's
-            // no point to trigger this when returning from the manager view and the
-            // mods are already cached.
-            if (store.state.tsMods.cache.size === 0) {
-                setSelectedProfile(profileName, false);
-            }
-        })
-        .then(updateProfileList);
+    const lastSelectedProfileName = await store.dispatch('profile/loadLastSelectedProfile');
+
+    // If the view was entered via game selection, the mod list was updated
+    // and the cache cleared. The profile is already set in the Vuex store
+    // but we want to trigger the cache prewarming. Always doing this for
+    // empty profiles is deemed a fair tradeoff. On the other hand there's
+    // no point to trigger this when returning from the manager view and the
+    // mods are already cached.
+    if (store.state.tsMods.cache.size === 0) {
+        await setSelectedProfile(lastSelectedProfileName, false);
+    }
+
+    await updateProfileList();
 })
 </script>

src/pages/Splash.vue

@@ -121,8 +121,6 @@
 import { ExternalLink, Hero, Progress } from '../components/all';
 import Game from '../model/game/Game';
 import FsProvider from '../providers/generic/file/FsProvider';
-import GameDirectoryResolverProvider from '../providers/ror2/game/GameDirectoryResolverProvider';
-import LinuxGameDirectoryResolver from '../r2mm/manager/linux/GameDirectoryResolver';
 import PathResolver from '../r2mm/manager/PathResolver';
 import { computed, onMounted, ref } from 'vue';
 import { State } from '../store';

src/providers/generic/zip/AdmZipProvider.ts

@@ -13,8 +13,7 @@ export default class AdmZipProvider extends ZipProvider {
         return window.zip.readFile(zip, file);
     }
 
-    // Type is Promise<ZipEntryInterface[]>
-    async getEntries(zip: string): Promise<any> {
+    async getEntries(zip: string): Promise<ZipEntryInterface[]> {
         return window.zip.getEntries(zip) as ZipEntryInterface[];
     }
 

src/r2mm/mods/ProfileModList.ts

@@ -288,25 +288,16 @@ export default class ProfileModList {
             path.join(PathResolver.MOD_ROOT, "cache", mod.getName(), mod.getVersionNumber().toString(), "icon.png"),
         ]
 
-        return new Promise(async (resolve, reject) => {
+        for (const iconPath of paths) {
             try {
-                for (const iconPath of paths) {
-                    const exists = await FsProvider.instance.exists(iconPath);
-                    if (exists) {
-                        const content = await FsProvider.instance.base64FromZip(iconPath);
-                        mod.setIcon(`data:image/png;base64,${content}`);
-                        resolve(true);
-                        break;
-                    }
-                }
-                resolve(false);
+                const content = await FsProvider.instance.base64FromZip(iconPath);
+                mod.setIcon(`data:image/png;base64,${content}`);
+                return;
             } catch (e) {
-                reject(e);
-            }
-        }).then(resolved => {
-            if (!resolved) {
-                mod.setIcon("/unknown.png");
+                continue;
             }
-        });
+        }
+
+        mod.setIcon("/unknown.png");
     }
 }

src/store/modules/DownloadModule.ts

@@ -274,7 +274,6 @@ export const DownloadModule = {
             }
         },
         addDownload(state: State, download: DownloadProgress) {
-            // @ts-ignore
             state.allDownloads = [...state.allDownloads, download];
         },
         setDone(state: State, downloadId: number) {

src/store/modules/TsModsModule.ts

@@ -184,10 +184,6 @@ export const TsModsModule = {
 
                 if (localState.get(cacheKey) === undefined) {
                     const tsMod = state.mods.find((m) => m.getFullName() === mod.getName());
-
-                    // Updating Vuex state directly instead of mutations is a bad
-                    // practice but everything seems to work here since we only
-                    // mutate the map instead of replacing it altogether.
                     if (tsMod === undefined) {
                         localState.set(cacheKey, {tsMod: undefined, isLatest: true});
                     } else {