Added tracking for online vs local sourced mods

Author: ebkr

src/model/ManifestV2.ts

@@ -31,6 +31,8 @@ export default class ManifestV2 {
     private enabled: boolean = true;
     private icon: string = '';
 
+    private onlineSource: boolean = false;
+
     // Intended to be used to import a mod with only minimal fields specified.
     // Should support manifest V1. Defaults to an "Unknown" author field if not found.
     public makeSafeFromPartial(data: any): R2Error | ManifestV2 {
@@ -87,6 +89,7 @@ export default class ManifestV2 {
         this.setGameVersion(jsManifestObject.gameVersion);
         this.icon = path.join(PathResolver.MOD_ROOT, 'cache', this.getName(), this.versionNumber.toString(), 'icon.png');
         this.setInstalledAtTime(jsManifestObject.installedAtTime || 0);
+        this.setOnlineSource(jsManifestObject.onlineSource || false);
         if (!jsManifestObject.enabled) {
             this.disable();
         }
@@ -245,4 +248,12 @@ export default class ManifestV2 {
     public getDependencyString(): string {
         return `${this.getName()}-${this.getVersionNumber().toString()}`;
     }
+
+    public isOnlineSource(): boolean {
+        return this.onlineSource;
+    }
+
+    public setOnlineSource(isOnlineSource: boolean) {
+        this.onlineSource = isOnlineSource;
+    }
 }

src/r2mm/downloading/BetterThunderstoreDownloader.ts

@@ -1,4 +1,3 @@
-import StatusEnum from '../../model/enums/StatusEnum';
 import axios, { AxiosResponse } from 'axios';
 import ThunderstoreCombo from '../../model/ThunderstoreCombo';
 import ZipExtract from '../installing/ZipExtract';
@@ -61,6 +60,7 @@ export default class BetterThunderstoreDownloader extends ThunderstoreDownloader
             try {
                 const response = await this._downloadCombo(comboInProgress, singleModProgressCallback);
                 await this._saveDownloadResponse(response, comboInProgress, singleModProgressCallback);
+                await DownloadUtils.markAsDownloadedFromOnline(comboInProgress);
             } catch(e) {
                 throw R2Error.fromThrownValue(e, `Failed to download mod ${comboInProgress.getVersion().getFullName()}`);
             }

src/r2mm/mods/CacheUtil.ts

@@ -7,6 +7,7 @@ import ManifestV2 from '../../model/ManifestV2';
 import VersionNumber from '../../model/VersionNumber';
 import FsProvider from '../../providers/generic/file/FsProvider';
 import path from '../../providers/node/path/path';
+import * as DownloadUtils from '../../utils/DownloadUtils';
 
 export default class CacheUtil {
 
@@ -42,8 +43,15 @@ export default class CacheUtil {
             const cacheDirectory = path.join(PathResolver.MOD_ROOT, "cache");
             await FileUtils.ensureDirectory(cacheDirectory);
             for (const folder of (await fs.readdir(cacheDirectory))) {
+                if (folder === '_state') {
+                    continue;
+                }
                 if ((await fs.stat(path.join(cacheDirectory, folder))).isDirectory()) {
                     if (this.hasNoVersions(folder, activeModSet)) {
+                        // Remove all online state files for this mod before deleting the folder
+                        for (const versionFolder of (await fs.readdir(path.join(cacheDirectory, folder)))) {
+                            await DownloadUtils.removeOnlineStateFile(folder, versionFolder);
+                        }
                         await FileUtils.emptyDirectory(path.join(cacheDirectory, folder))
                         await fs.rmdir(path.join(cacheDirectory, folder));
                     } else {
@@ -52,6 +60,8 @@ export default class CacheUtil {
                             const matchingVersion = versions.find(value => value.toString() === versionFolder);
                             if (matchingVersion === undefined) {
                                 try {
+                                    // Remove online state file for this version
+                                    await DownloadUtils.removeOnlineStateFile(folder, versionFolder);
                                     await FileUtils.emptyDirectory(path.join(cacheDirectory, folder, versionFolder));
                                     await fs.rmdir(path.join(cacheDirectory, folder, versionFolder));
                                 } catch (e) {

src/utils/DownloadUtils.ts

@@ -85,3 +85,66 @@ export function generateProgressPercentage(currentProgress: number, targetProgre
 export function statusIsDownloadOrExtract(status: DownloadStatusEnum): boolean {
     return status === DownloadStatusEnum.DOWNLOADING || status === DownloadStatusEnum.EXTRACTING || status === DownloadStatusEnum.EXTRACTED;
 }
+
+/**
+ * Get the path to the online state directory in the cache.
+ * This directory contains empty files named after dependency strings
+ * to track which mods were downloaded from online sources.
+ */
+export function getOnlineStateDir(): string {
+    return path.join(PathResolver.MOD_ROOT, 'cache', '_state', 'online');
+}
+
+/**
+ * Get the path to the online state file for a given dependency string.
+ * @param dependencyString The dependency string (e.g., "AuthorName-ModName-1.0.0")
+ */
+export function getOnlineStatePath(dependencyString: string): string {
+    return path.join(getOnlineStateDir(), dependencyString);
+}
+
+/**
+ * Check if a mod was previously downloaded from online (state file exists).
+ * @param combo The combo to check.
+ * @returns True if the mod was downloaded from online, false otherwise.
+ */
+export async function wasDownloadedFromOnline(combo: ThunderstoreCombo): Promise<boolean> {
+    const statePath = getOnlineStatePath(combo.getDependencyString());
+    return FsProvider.instance.exists(statePath);
+}
+
+/**
+ * Mark a mod as downloaded from online by creating a state file.
+ * Errors are silently ignored to avoid failing downloads due to state tracking issues.
+ * @param combo The combo to mark.
+ */
+export async function markAsDownloadedFromOnline(combo: ThunderstoreCombo): Promise<void> {
+    try {
+        const fs = FsProvider.instance;
+        const stateDir = getOnlineStateDir();
+        if (!await fs.exists(stateDir)) {
+            await fs.mkdirs(stateDir);
+        }
+        const statePath = getOnlineStatePath(combo.getDependencyString());
+        await fs.writeFile(statePath, '');
+    } catch (e) {
+        console.warn(`Failed to mark mod as downloaded from online: ${combo.getDependencyString()}`, e);
+    }
+}
+
+/**
+ * Remove the online state file for a given mod version.
+ * @param modName The full mod name (e.g., "AuthorName-ModName")
+ * @param version The version string (e.g., "1.0.0")
+ */
+export async function removeOnlineStateFile(modName: string, version: string): Promise<void> {
+    const fs = FsProvider.instance;
+    const stateFile = path.join(getOnlineStateDir(), `${modName}-${version}`);
+    try {
+        if (await fs.exists(stateFile)) {
+            await fs.unlink(stateFile);
+        }
+    } catch (e) {
+        // Ignore errors when removing state files
+    }
+}

src/utils/ProfileUtils.ts

@@ -14,6 +14,7 @@ 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 { wasDownloadedFromOnline } from './DownloadUtils';
 
 export async function exportModsToCombos(
     exportMods: ExportMod[],
@@ -85,6 +86,11 @@ export async function installModsToProfile(
 
             const manifestMod = new ManifestV2().fromThunderstoreCombo(comboMod);
 
+            // Mark as downloaded from online if the state file exists in cache
+            if (await wasDownloadedFromOnline(comboMod)) {
+                manifestMod.setOnlineSource(true);
+            }
+
             if (installedVersions.includes(manifestMod.getDependencyString())) {
                 continue;
             }