From 787e908ba894b2a482c74c0415b53ffe42e955ea Mon Sep 17 00:00:00 2001
From: patttterson <49377371+patttterson@users.noreply.github.com>
Date: Sun, 3 May 2026 20:07:47 -0700
Subject: [PATCH 1/2] feat: group installed games

---
 .../composables/GameSelectionComposable.ts    | 17 +++-
 .../game-selection/GameSelectionList.vue      | 32 ++++++-
 src/r2mm/manager/SteamLibraryScanner.ts       | 86 +++++++++++++++++++
 3 files changed, 133 insertions(+), 2 deletions(-)
 create mode 100644 src/r2mm/manager/SteamLibraryScanner.ts

diff --git a/src/components/composables/GameSelectionComposable.ts b/src/components/composables/GameSelectionComposable.ts
index c84fac4c5..af758d9e3 100644
--- a/src/components/composables/GameSelectionComposable.ts
+++ b/src/components/composables/GameSelectionComposable.ts
@@ -10,12 +10,14 @@ import ProviderUtils from '../../providers/generic/ProviderUtils';
 import R2Error from '../../model/errors/R2Error';
 import { getStore } from '../../providers/generic/store/StoreProvider';
 import { State } from '../../store';
+import { getInstalledSteamAppIds } from '../../r2mm/manager/SteamLibraryScanner';
 
 export function useGameSelectionComposable() {
     const store = getStore<State>();
     const router = useRouter();
 
     const favourites = ref<string[]>([]);
+    const installedAppIds = ref<Set<string>>(new Set());
     const selectedGame = ref<Game | null>(null);
     const selectedPlatform = ref<Platform | null>(null);
     const filterText = ref<string>('');
@@ -66,10 +68,21 @@ export function useGameSelectionComposable() {
             .filter((value: Game) => favourites.value.includes(value.settingsIdentifier));
     });
 
+    const installedGameList = computed(() => {
+        return filteredGameList.value
+            .filter((value: Game) => !hiddenGameList.value.includes(value))
+            .filter((value: Game) => value.storePlatformMetadata.some(
+                p => [Platform.STEAM, Platform.STEAM_DIRECT].includes(p.storePlatform)
+                    && p.storeIdentifier != null
+                    && installedAppIds.value.has(String(p.storeIdentifier))
+            ));
+    });
+
     const nonFavouriteGameList = computed(() => {
         return filteredGameList.value
             .filter((value: Game) => !hiddenGameList.value.includes(value))
-            .filter((value: Game) => !favourites.value.includes(value.settingsIdentifier));
+            .filter((value: Game) => !favourites.value.includes(value.settingsIdentifier))
+            .filter((value: Game) => !installedGameList.value.includes(value));
     });
 
     function isFavourited(game: Game): boolean {
@@ -145,6 +158,7 @@ export function useGameSelectionComposable() {
         settings.value = await ManagerSettings.getSingleton(GameManager.defaultGame);
         const globalSettings = settings.value.getContext().global;
         favourites.value = globalSettings.favouriteGames || [];
+        installedAppIds.value = await getInstalledSteamAppIds();
 
         const lastGame = GameManager.findByFolderName(globalSettings.lastSelectedGame);
         if (lastGame) markAsSelectedGame(lastGame);
@@ -190,6 +204,7 @@ export function useGameSelectionComposable() {
         isSettingDefaultPlatform,
         hiddenGameList,
         favouriteGameList,
+        installedGameList,
         nonFavouriteGameList,
         isFavourited,
         isGameSelected,
diff --git a/src/components/game-selection/GameSelectionList.vue b/src/components/game-selection/GameSelectionList.vue
index c50da063a..8093fe088 100644
--- a/src/components/game-selection/GameSelectionList.vue
+++ b/src/components/game-selection/GameSelectionList.vue
@@ -13,6 +13,15 @@
                         @click="markAsSelectedGame(game)"
                         @toggle-favourite="toggleFavourite(game)"
                     />
+                    <GameSelectionListItem
+                        v-for="game of installedGameList"
+                        :key="game.settingsIdentifier"
+                        :game="game"
+                        :is-selected="isGameSelected(game)"
+                        :is-favourited="isFavourited(game)"
+                        @click="markAsSelectedGame(game)"
+                        @toggle-favourite="toggleFavourite(game)"
+                    />
                     <GameSelectionListItem
                         v-for="game of nonFavouriteGameList"
                         :key="game.settingsIdentifier"
@@ -57,8 +66,27 @@
                         </template>
 
 
-                        <template v-if="nonFavouriteGameList.length > 0">
+                        <template v-if="installedGameList.length > 0">
                             <hr v-if="favouriteGameList.length > 0"/>
+                            <GameSelectionSection title="Installed Games" :count="installedGameList.length" :default-open="true">
+                                <div class="game-cards-container">
+                                    <GameSelectionCard
+                                        v-for="game of installedGameList"
+                                        :key="game.settingsIdentifier"
+                                        :game="game"
+                                        :is-selected="isGameSelected(game)"
+                                        :is-favourited="isFavourited(game)"
+                                        :active-tab="activeTab"
+                                        @select="emit('select-game', $event)"
+                                        @set-default="emit('set-default-game', $event)"
+                                        @toggle-favourite="toggleFavourite($event)"
+                                    />
+                                </div>
+                            </GameSelectionSection>
+                        </template>
+
+                        <template v-if="nonFavouriteGameList.length > 0">
+                            <hr v-if="favouriteGameList.length > 0 || installedGameList.length > 0"/>
                             <GameSelectionSection
                                 :title="`${capitalize(activeTab)}s`"
                                 :count="nonFavouriteGameList.length"
@@ -155,6 +183,7 @@ const emit = defineEmits<{
 
 const mergedGameList = computed(() => {
     const favourites = favouriteGameList.value;
+    const installed = installedGameList.value;
     const others = nonFavouriteGameList.value;
     return [...favourites, ...others];
 });
@@ -174,6 +203,7 @@ const newGames = computed(() => {
 const {
     hiddenGameList,
     favouriteGameList,
+    installedGameList,
     nonFavouriteGameList,
     activeTab,
     viewMode,
diff --git a/src/r2mm/manager/SteamLibraryScanner.ts b/src/r2mm/manager/SteamLibraryScanner.ts
new file mode 100644
index 000000000..829d1755c
--- /dev/null
+++ b/src/r2mm/manager/SteamLibraryScanner.ts
@@ -0,0 +1,86 @@
+import * as vdf from '@node-steam/vdf';
+import R2Error from '../../model/errors/R2Error';
+import FsProvider from '../../providers/generic/file/FsProvider';
+import PlatformInterceptorProvider from '../../providers/generic/game/platform_interceptor/PlatformInterceptorProvider';
+import { Platform } from '../../model/schema/ThunderstoreSchema';
+import path from '../../providers/node/path/path';
+
+export async function getInstalledSteamAppIds(): Promise<Set<string>> {
+    try {
+        const resolver = PlatformInterceptorProvider.instance.getDirectoryResolverForPlatform(Platform.STEAM);
+        if (resolver === undefined) return new Set();
+        const steamPath = await resolver.getSteamDirectory();
+        if (steamPath instanceof R2Error) return new Set();
+
+        const fs = FsProvider.instance;
+        const steamappsSubPaths = ['steamapps', path.join('steam', 'steamapps'), path.join('root', 'steamapps')];
+
+        let rootSteamapps: string | undefined;
+        for (const sub of steamappsSubPaths) {
+            const candidate = path.join(steamPath, sub);
+            if (await fs.exists(candidate)) {
+                rootSteamapps = candidate;
+                break;
+            }
+        }
+
+        if (rootSteamapps === undefined) return new Set();
+
+        const locations: string[] = [rootSteamapps];
+
+        try {
+            const files = await fs.readdir(rootSteamapps);
+            for (const file of files) {
+                if (file.toLowerCase() !== 'libraryfolders.vdf') continue;
+                const raw = (await fs.readFile(path.join(rootSteamapps, file))).toString();
+                const parsed: any = vdf.parse(raw);
+                const folders = parsed.libraryfolders ?? parsed.LibraryFolders;
+                if (!folders) continue;
+                for (const key of Object.keys(folders)) {
+                    if (isNaN(Number(key))) continue;
+                    const entry = folders[key];
+                    const folderPath = typeof entry === 'string' ? entry : entry?.path;
+                    if (typeof folderPath === 'string') {
+                        locations.push(path.join(folderPath, 'steamapps'));
+                    }
+                }
+            }
+        } catch {
+//⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣤⣀⣀⠀⠀⣀⡠⠴⠒⠚⠉⠉⠓⠒⠦⣄⣶⠒⣷⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+//⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠘⡷⢬⣉⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠠⡌⠻⣧⢻⣧⣤⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+//⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣖⠗⡋⢹⠀⠀⢰⡄⠀⠀⢸⣷⡀⠀⣠⠽⣆⢼⣇⢻⣸⡄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+//⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡜⣡⣶⢋⡏⠙⢢⣏⣇⠀⠀⠈⣇⡵⡏⠀⠀⢹⡏⢾⣿⠃⢿⡆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+//⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣾⢿⢻⣏⣿⡇⡄⣾⠀⠹⡄⠄⠀⡇⠀⠹⣤⠈⠹⣿⣾⢸⠀⢘⣷⣄⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+//⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣴⣯⣿⣽⣿⣷⢸⡗⠦⣄⡹⣼⣄⣿⣴⠛⠹⡄⡇⣿⣿⠾⠚⢹⢿⢽⣽⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀
+//⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣸⣿⣞⣾⣿⢿⣯⢻⢻⡴⠞⠁⠈⠻⣿⣌⡉⠓⣿⣰⡿⠀⠀⠀⠸⡜⡾⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀
+//⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡴⣡⠊⢸⣹⠁⠈⠙⣾⡄⠁⠀⢰⠛⠉⠉⠉⢳⣀⣿⣿⠃⠀⠀⣀⣀⣧⣿⡞⣷⡀⠀⠀⠀⠀⠀⠀⠀⠀
+//⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⠋⡴⠁⠀⠸⢿⣤⣤⣤⣹⣿⣷⣶⣾⣷⣶⣶⣺⣋⣽⣿⣷⠶⠟⠛⠋⢧⠀⠀⠸⡜⣷⠀⠀⠀⠀⠀⠀⠀⠀
+//⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡜⠁⡰⠁⠀⠀⢠⡿⠀⠀⠀⠉⠉⠉⠙⢻⡟⣹⣿⠃⣿⠋⠁⠀⠀⠀⠀⠀⠸⡄⠀⠀⢣⠹⣧⠀⠀⠀⠀⠀⠀⠀
+//⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⠏⡀⢠⠇⠀⠀⢠⡿⠁⠀⠀⠀⠀⣤⣶⡴⠚⢻⠡⣸⠀⢹⣆⠀⠀⠀⠀⠀⠀⠀⡇⠀⠀⠸⡄⢻⣇⠀⠀⠀⠀⠀⠀
+//⠀⠀⠀⠀⠀⠀⠀⠀⢀⡏⣼⠁⢸⠀⠀⠀⣾⠃⠀⠀⠀⠀⠀⢻⣿⣧⣀⣬⠋⠁⠀⣠⣿⣶⣆⠀⠀⠀⠀⠀⡇⠀⠀⠀⡇⠈⣿⡀⠀⠀⠀⠀⠀
+//⠀⠀⠀⠀⠀⠀⠀⠀⣸⣸⣿⠀⡇⠀⢰⣸⡟⠀⠀⠀⣀⣠⠴⠚⣟⣻⣧⣯⣗⣤⣾⣿⣿⡿⠋⠀⠀⠀⠀⣸⣤⠀⠀⠀⡇⡆⢻⠃⠀⠀⠀⠀⠀
+//⠀⠀⠀⠀⠀⠀⠀⠀⣿⡿⢸⡀⣇⠀⣸⣿⡁⠀⣾⣻⡁⣀⣤⣶⠟⠋⠉⠛⢿⣋⣻⡏⠉⠀⠀⠀⠀⠀⢰⣿⡇⠀⠀⠀⣷⡇⣸⡄⠀⠀⠀⠀⠀
+//⠀⠀⠀⠀⠀⠀⠀⠀⠿⠇⠀⢧⢸⠀⣿⡿⠇⠀⠈⠛⠛⠋⠉⠀⠀⠀⠀⠀⡟⠀⣿⠇⠀⠀⠀⠀⠀⢠⣿⣿⡇⠀⠀⣰⡿⣧⣿⠃⠀⠀⠀⠀⠀
+//⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢿⣄⣹⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢰⡇⠀⣿⠀⠀⠀⠀⠀⠀⣸⡿⢸⠁⢠⣾⠋⢰⣿⡏⠀⠀⠀⠀⠀⠀
+//⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠛⠛⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣼⣶⣶⡿⠀⠀⠀⠀⠀⠀⠉⠁⢸⣶⡟⠁⠀⠾⠟⠀⠀⠀⠀⠀⠀⠀
+//⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+        }
+
+        const appIds = new Set<string>();
+        const manifestPattern = /^appmanifest_(\d+)\.acf$/i;
+
+        for (const location of locations) {
+            if (!(await fs.exists(location))) continue;
+            const files = await fs.readdir(location);
+            for (const file of files) {
+                const match = file.match(manifestPattern);
+                if (match) appIds.add(match[1]);
+            }
+        }
+
+        return appIds;
+    } catch (e) {
+        console.warn('SteamLibraryScanner: failed to scan Steam library', e);
+        return new Set();
+    }
+}

From 0a94dbedfeb4b4e9017e2822bc07fb606461ea00 Mon Sep 17 00:00:00 2001
From: patttterson <49377371+patttterson@users.noreply.github.com>
Date: Sun, 3 May 2026 20:07:47 -0700
Subject: [PATCH 2/2] fix: stop sorting favorites with installed games

---
 .../composables/GameSelectionComposable.ts        | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/components/composables/GameSelectionComposable.ts b/src/components/composables/GameSelectionComposable.ts
index af758d9e3..8b5337175 100644
--- a/src/components/composables/GameSelectionComposable.ts
+++ b/src/components/composables/GameSelectionComposable.ts
@@ -28,18 +28,9 @@ export function useGameSelectionComposable() {
     const isSettingDefaultPlatform = ref<boolean>(false);
 
     const gameList = computed<Game[]>(() => {
-        return GameManager.gameList.sort((a, b) => {
-            if (favourites.value.includes(a.settingsIdentifier)) {
-                if (favourites.value.includes(b.settingsIdentifier)) {
-                    return a.displayName.toLowerCase().localeCompare(b.displayName.toLowerCase());
-                } else {
-                    return -1;
-                }
-            } else if (favourites.value.includes(b.settingsIdentifier)) {
-                return 1;
-            }
-            return a.displayName.toLowerCase().localeCompare(b.displayName.toLowerCase());
-        });
+        return GameManager.gameList.sort((a, b) =>
+            a.displayName.toLowerCase().localeCompare(b.displayName.toLowerCase())
+        );
     });
 
     const matchesSearch = (game: Game): boolean => {