Merge pull request #1485 from ebkr/memory-optimization-pt4-DownloadModModal

Don't depend on ThunderstoreMod containing all ThunderstoreVersions in components

Author: anttimaki

src/components/views/DownloadModModal.vue

@@ -106,6 +106,7 @@ import Game from '../../model/game/Game';
 import ConflictManagementProvider from '../../providers/generic/installing/ConflictManagementProvider';
 import { MOD_LOADER_VARIANTS } from '../../r2mm/installing/profile_installers/ModLoaderVariantRecord';
 import ModalCard from '../ModalCard.vue';
+import * as PackageDb from '../../r2mm/manager/PackageDexieStore';
 
 interface DownloadProgress {
     assignId: number;
@@ -222,26 +223,26 @@ let assignId = 0;
         async getModVersions() {
             this.currentVersion = null;
             if (this.thunderstoreMod !== null) {
-                this.selectedVersion = this.thunderstoreMod.getVersions()[0].getVersionNumber().toString();
-                this.versionNumbers = this.thunderstoreMod.getVersions()
-                    .map(value => value.getVersionNumber().toString());
+                this.selectedVersion = this.thunderstoreMod.getLatestVersion().getVersionNumber().toString();
+                this.recommendedVersion = null;
+
+                this.versionNumbers = await PackageDb.getPackageVersionNumbers(
+                    this.activeGame.internalFolderName,
+                    this.thunderstoreMod.getFullName()
+                );
 
                 const foundRecommendedVersion = MOD_LOADER_VARIANTS[this.activeGame.internalFolderName]
                     .find(value => value.packageName === this.thunderstoreMod!.getFullName());
 
-                if (foundRecommendedVersion === undefined || foundRecommendedVersion.recommendedVersion === undefined) {
-                    this.recommendedVersion = null;
-                    this.selectedVersion = this.thunderstoreMod.getVersions()[0].getVersionNumber().toString();
-                } else {
+                if (foundRecommendedVersion && foundRecommendedVersion.recommendedVersion) {
                     this.recommendedVersion = foundRecommendedVersion.recommendedVersion.toString();
 
-                    // Bind to recommended version or fall back to latest
-                    const thunderstoreRecommendedVersion = this.thunderstoreMod.getVersions()
-                        .find(value => value.getVersionNumber().isEqualTo(foundRecommendedVersion.recommendedVersion!));
-                    if (thunderstoreRecommendedVersion !== undefined) {
-                        this.selectedVersion = thunderstoreRecommendedVersion.getVersionNumber().toString();
-                    } else {
-                        this.selectedVersion = this.thunderstoreMod.getVersions()[0].getVersionNumber().toString()
+                    // Auto-select recommended version if it's found.
+                    const recommendedVersion = this.versionNumbers.find(
+                        (ver) => ver === foundRecommendedVersion.recommendedVersion!.toString()
+                    );
+                    if (recommendedVersion) {
+                        this.selectedVersion = recommendedVersion;
                     }
                 }
 
@@ -259,18 +260,26 @@ let assignId = 0;
             this.$store.commit("closeDownloadModModal");
         }
 
-        downloadThunderstoreMod() {
+        async downloadThunderstoreMod() {
             const refSelectedThunderstoreMod: ThunderstoreMod | null = this.thunderstoreMod;
             const refSelectedVersion: string | null = this.selectedVersion;
             if (refSelectedThunderstoreMod === null || refSelectedVersion === null) {
                 // Shouldn't happen, but shouldn't throw an error.
                 return;
             }
-            const version = refSelectedThunderstoreMod.getVersions()
-                .find((modVersion: ThunderstoreVersion) => modVersion.getVersionNumber().toString() === refSelectedVersion);
-            if (version === undefined) {
+
+            let version: ThunderstoreVersion;
+
+            try {
+                version = await PackageDb.getVersionAsThunderstoreVersion(
+                    this.activeGame.internalFolderName,
+                    refSelectedThunderstoreMod.getFullName(),
+                    refSelectedVersion
+                );
+            } catch {
                 return;
             }
+
             this.downloadHandler(refSelectedThunderstoreMod, version);
         }
 

src/components/views/OnlineModList.vue

@@ -4,7 +4,7 @@
             v-for='(key, index) in pagedModList' :key="`online-${key.getFullName()}-${index}-${settings.getContext().global.expandedCards}`"
             :image="getImageUrl(key)"
             :id="index"
-            :description="key.getVersions()[0].getDescription()">
+            :description="key.getLatestVersion().getDescription()">
             <template v-slot:title>
                 <span v-if="key.isPinned()">
                     <span class="tag is-info margin-right margin-right--half-width"
@@ -126,7 +126,7 @@ export default class OnlineModList extends Vue {
 
     getImageUrl(tsMod: ThunderstoreMod): string {
         return CdnProvider.replaceCdnHost(
-            tsMod.getVersions()[0].getIcon()
+            tsMod.getLatestVersion().getIcon()
         );
     }
 

src/components/views/OnlineModView.vue

@@ -147,7 +147,7 @@ export default class OnlineModView extends Vue {
         const searchKeys = SearchUtils.makeKeys(this.thunderstoreSearchFilter);
         if (searchKeys.length > 0) {
             searchableList = this.sortedThunderstoreModList.filter((x: ThunderstoreMod) => {
-                return SearchUtils.isSearched(searchKeys, x.getFullName(), x.getVersions()[0].getDescription())
+                return SearchUtils.isSearched(searchKeys, x.getFullName(), x.getLatestVersion().getDescription())
             });
         }
         if (!allowNsfw) {

src/r2mm/manager/PackageDexieStore.ts

@@ -127,6 +127,11 @@ export async function getPackagesByNames(community: string, packageNames: string
     return packages.map(ThunderstoreMod.parseFromThunderstoreData);
 }
 
+export async function getPackageVersionNumbers(community: string, packageName: string) {
+    const pkg = await getPackageFromDatabase(community, packageName);
+    return pkg.versions.map((v) => v.version_number);
+}
+
 /**
  * @param game Game (community) which package listings should be used in the lookup.
  * @param dependencies Lookup targets as Thunderstore dependency strings.
@@ -167,6 +172,11 @@ export async function getLastPackageListUpdateTime(community: string) {
     return hash ? hash.date_updated : undefined;
 }
 
+export async function getVersionAsThunderstoreVersion(community: string, packageName: string, versionNumber: string) {
+    const version = await getPackgeVersionFromDatabase(community, packageName, versionNumber);
+    return ThunderstoreVersion.parseFromThunderstoreData(version);
+}
+
 export async function isLatestPackageListIndex(community: string, hash: string) {
     return Boolean(
         await db.indexHashes.where({community, hash}).count()
@@ -176,3 +186,24 @@ export async function isLatestPackageListIndex(community: string, hash: string)
 export async function setLatestPackageListIndex(community: string, hash: string) {
     await db.indexHashes.put({community, hash, date_updated: new Date()});
 }
+
+async function getPackageFromDatabase(community: string, packageName: string) {
+    const pkg = await db.packages.where({community, full_name: packageName}).first();
+
+    if (!pkg) {
+        throw new Error(`Couldn't find package "${packageName}" in ${community} packages`);
+    }
+
+    return pkg;
+}
+
+async function getPackgeVersionFromDatabase(community: string, packageName: string, versionNumber: string) {
+    const pkg = await getPackageFromDatabase(community, packageName);
+    const ver = pkg.versions.find((v) => v.version_number === versionNumber);
+
+    if (!ver) {
+        throw new Error(`Couldn't find version "${versionNumber}" of package "${packageName}" in ${community} packages`);
+    }
+
+    return ver;
+}