From 3230ccdc73c64629f947c01d0356d0e4922b68e6 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 20:55:52 -0500 Subject: [PATCH] fix(steam): offer a Games folder as a Steam library when it is not already one (#2432) * fix(steam): offer a Games folder as a Steam library when it is not already one * test(steam): cover discovery with chosen storage * fix(steam): compare Games folders and Steam libraries by the same storage path The Games-folder overlap check used the raw canonical path, so a library saved under the raw card mount and the same folder under /storage were treated as different. Reuse the library canonicalisation. --- .../droiddeck/launcher/session/GameStorage.kt | 8 ++---- .../launcher/session/SteamLibraries.kt | 10 +++++-- .../launcher/session/SteamLibrariesTest.kt | 28 +++++++++++++++++++ 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt b/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt index 5bf25103b0..e9ecb7443c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt @@ -90,11 +90,11 @@ object GameStorage { fun gamesFolderLibraries(context: Context): List { if (SessionPrefs.gameStorage(context).isNotEmpty()) return emptyList() - val card = effective(context)?.let { canonical(File(it.path)) } - val added = SteamLibraries.list(context).map { canonical(it.host) } + val card = effective(context)?.let { SteamLibraries.canonical(File(it.path)) } + val added = SteamLibraries.list(context).map { SteamLibraries.canonical(it.host) } val sm = context.getSystemService(StorageManager::class.java) return AddedGames.roots(context).mapNotNull { root -> - val host = canonical(root.host) + val host = SteamLibraries.canonical(root.host) if (!hasInstalledGames(root.host)) return@mapNotNull null if ('"' in root.guest || '\\' in root.guest || !root.host.isDirectory || !root.host.canWrite()) return@mapNotNull null if (card != null && (host == card || host.startsWith("$card/") || card.startsWith("$host/"))) return@mapNotNull null @@ -109,8 +109,6 @@ object GameStorage { internal fun hasInstalledGames(root: File): Boolean = File(root, "steamapps").listFiles { f -> f.isFile && f.name.startsWith("appmanifest_") && f.name.endsWith(".acf") }?.isNotEmpty() == true - private fun canonical(file: File): String = runCatching { file.canonicalPath }.getOrDefault(file.absolutePath) - fun labelFor(context: Context, path: String): String = options(context).firstOrNull { it.path == path }?.name ?: File(path).name.ifEmpty { context.getString(R.string.gstore_folder) } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt index 0846763599..8b219470c8 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt @@ -82,13 +82,14 @@ object SteamLibraries { /** Reads storage; call off the main thread. */ fun found(context: Context): List { val entries = list(context) - val taken = taken(context, entries) + AddedGames.roots(context).map { canonical(it.host) } + val taken = taken(context, entries) + GameStorage.gamesFolderLibraries(context).map { canonical(it.host) } + val gamesFolders = AddedGames.roots(context).map { canonical(it.host) } val hits = ArrayList>() for (root in StorageRoots.list(context)) { if (!root.readable) continue for (dir in candidates(rawView(root.dir), SCAN_DEPTH)) { val games = gameCount(dir) - if (games > 0 && File(dir, "steamapps").canWrite() && taken.none { overlaps(it, canonical(dir)) }) hits += dir to games + if (games > 0 && File(dir, "steamapps").canWrite() && offered(taken, gamesFolders, canonical(dir))) hits += dir to games } } val picked = ArrayList>() @@ -101,6 +102,9 @@ object SteamLibraries { } } + internal fun offered(taken: List, gamesFolders: List, dir: String): Boolean = + taken.none { overlaps(it, dir) } && gamesFolders.none { it != dir && overlaps(it, dir) } + /** The FUSE view under /storage hides files other apps wrote unless DroidDeck has all files access; the raw card mount does not. */ private fun rawView(dir: File): File { if (!dir.path.startsWith("/storage/") || dir.path.startsWith("/storage/emulated")) return dir @@ -171,7 +175,7 @@ object SteamLibraries { internal fun overlaps(a: String, b: String): Boolean = a == b || a.startsWith("$b/") || b.startsWith("$a/") - private fun canonical(file: File): String = UsbLink.storagePath(runCatching { file.canonicalPath }.getOrDefault(file.absolutePath)) + internal fun canonical(file: File): String = UsbLink.storagePath(runCatching { file.canonicalPath }.getOrDefault(file.absolutePath)) private const val SCAN_DEPTH = 2 private const val SCAN_LIMIT = 4000 diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt index 5a3fdb26c8..5317e5ca33 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt @@ -65,6 +65,26 @@ class SteamLibrariesTest { assertTrue(SteamLibraries.add(app, nested.path) is SteamLibraries.AddResult.Refused) } + @Test fun aGamesFolderIsOfferedWholeUnlessItIsAlreadyALibrary() { + val games = "/storage/card/GameNative" + assertTrue(SteamLibraries.offered(emptyList(), listOf(games), games)) + assertFalse(SteamLibraries.offered(emptyList(), listOf(games), "$games/Steam")) + assertFalse(SteamLibraries.offered(emptyList(), listOf(games), "/storage/card")) + assertFalse(SteamLibraries.offered(listOf(games), listOf(games), games)) + assertTrue(SteamLibraries.offered(listOf("/storage/card/Other"), listOf(games), "/storage/card/New")) + } + + @Test fun aGamesFolderRemainsDiscoverableBesideChosenGameStorage() { + val card = tmp.newFolder("card") + val games = File(card, "GameNative").path + val selected = File(card, "Selected").apply { mkdirs() } + SessionPrefs.setGameStorage(app, selected.path, "Selected") + val effective = GameStorage.effective(app)!! + assertTrue(SteamLibraries.offered(listOf(effective.path), listOf(games), games)) + SessionPrefs.setGameStorage(app, card.path, "Card") + assertFalse(SteamLibraries.offered(listOf(GameStorage.effective(app)!!.path), listOf(games), games)) + } + private fun library(dir: File): File = dir.apply { File(this, "steamapps").mkdirs(); File(this, "steamapps/appmanifest_220.acf").writeText("x") } @Test fun pickingTheFolderAboveALibraryAddsTheLibraryInside() { @@ -124,6 +144,14 @@ class SteamLibrariesTest { assertEquals("${lib.guest}/steamapps/common/Game", AddedGames.guestPath(app, scanned.folder)) } + @Test fun rawAndStorageMountViewsOverlapButDistinctFoldersDoNot() { + val raw = SteamLibraries.canonical(File("/mnt/media_rw/ABCD-1234/Games")) + val storage = SteamLibraries.canonical(File("/storage/ABCD-1234/Games")) + assertEquals(storage, raw) + assertTrue(SteamLibraries.overlaps(raw, SteamLibraries.canonical(File("/storage/ABCD-1234/Games/Steam")))) + assertFalse(SteamLibraries.overlaps(raw, SteamLibraries.canonical(File("/storage/ABCD-1234/Other")))) + } + @Test fun unreadableOrInvalidEntriesAreDropped() { assertTrue(SteamLibraries.parse("{oops").isEmpty()) assertEquals(listOf("2"), SteamLibraries.parse("""[{"id":"../x","path":"/a"},{"id":"2","path":"/b","label":""}]""").map { it.id })