From aa1c5bc78047242056ec5cd24a6923a49f02aadc Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Thu, 1 Oct 2026 20:47:10 -0400 Subject: [PATCH] fix: keep Steam-installed second-library games out of non-Steam shortcuts --- .../droiddeck/launcher/frontend/AddedGames.kt | 24 +++++++++++++++++- .../launcher/frontend/AddedGamesTest.kt | 25 +++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt index 3a15104022..949602649a 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -96,11 +96,33 @@ object AddedGames { ) for (dir in folders.distinctBy { it.absolutePath }) { if (!dir.isDirectory) { Log.w(TAG, "$dir is not a folder; skipped"); continue } - for (folder in dir.listFiles { f -> f.isDirectory }?.sortedBy { it.name.lowercase() } ?: emptyList()) scanGame(context, folder, out) + val steamInstalls = steamInstallDirs(dir) + for (folder in dir.listFiles { f -> f.isDirectory }?.sortedBy { it.name.lowercase() } ?: emptyList()) { + if (folder.name.lowercase() in steamInstalls) continue + scanGame(context, folder, out) + } } return out.distinctBy { it.folder.canonicalPath } } + /** + * The folders under a library's steamapps/common that a manifest beside it already claims. + * Steam lists those itself, so a shortcut would only add a non-Steam copy of the game. Steam + * may lowercase installdir on Android's case-insensitive storage, so names compare lowercased. + */ + internal fun steamInstallDirs(dir: File): Set { + val steamapps = dir.parentFile?.takeIf { dir.name == "common" && it.name == "steamapps" } ?: return emptySet() + return steamapps.listFiles { f -> f.isFile && f.name.startsWith("appmanifest_") && f.name.endsWith(".acf") } + .orEmpty() + .mapNotNull { manifest -> + runCatching { INSTALL_DIR.find(manifest.readText())?.groupValues?.get(1)?.trim()?.lowercase() }.getOrNull() + } + .filter { it.isNotEmpty() } + .toSet() + } + + private val INSTALL_DIR = Regex("\"installdir\"\\s*\"([^\"]*)\"", RegexOption.IGNORE_CASE) + private fun scanGame(context: Context, folder: File, out: MutableList) { run { val candidates = candidates(folder) diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesTest.kt new file mode 100644 index 0000000000..244f66373f --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesTest.kt @@ -0,0 +1,25 @@ +package com.droiddeck.launcher.frontend + +import java.io.File +import org.junit.Assert.* +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder + +class AddedGamesTest { + @get:Rule val tmp = TemporaryFolder() + + @Test fun steamInstallsInALibraryAreNotScannedAsAddedGames() { + val library = tmp.newFolder("card") + val common = File(library, "steamapps/common").apply { mkdirs() } + File(library, "steamapps/appmanifest_2852190.acf").writeText( + "\"AppState\"\n{\n\t\"appid\"\t\t\"2852190\"\n\t\"installdir\"\t\t\"MONSTER_HUNTER_STORIES_3_TWISTED_REFLECTION\"\n}\n", + ) + File(library, "steamapps/appmanifest_17410.acf").writeText( + "\"AppState\"\n{\n\t\"appid\"\t\t\"17410\"\n\t\"installdir\"\t\t\"Mirrors Edge\"\n}\n", + ) + assertEquals(setOf("monster_hunter_stories_3_twisted_reflection", "mirrors edge"), AddedGames.steamInstallDirs(common)) + // Loose game folders at the library root are never Steam's. + assertEquals(emptySet(), AddedGames.steamInstallDirs(library)) + } +}