From 5b2f7a9a6d9fd5cc966719c11e9c20e9dc6f34fa Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 7 Nov 2026 19:32:13 -0500 Subject: [PATCH] fix(storage): a Second library on a raw /mnt/media_rw path is used again (#2245) fix(storage): check a raw /mnt/media_rw library against its storage volume A Second library picked as /mnt/media_rw//... was always treated as unplugged, because Android only reports a volume's state for its /storage path. Sessions then ran with internal storage only and the library's games were missing. Map the path to its /storage form before the lookup, reusing UsbLink.storagePath, and drop the copy in SteamLibraries. --- .../com/droiddeck/launcher/session/GameStorage.kt | 6 ++++-- .../droiddeck/launcher/session/SteamLibraries.kt | 8 +++----- .../droiddeck/launcher/session/GameStorageTest.kt | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 7 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 729533d5a2..26fe486c80 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt @@ -57,8 +57,10 @@ object GameStorage { return pref.isNotEmpty() && pref != SessionPrefs.GAME_STORAGE_OFF && !attached(File(pref)) } - internal fun attached(path: File): Boolean = - attached(path, runCatching { Environment.getExternalStorageState(path) }.getOrNull()) + internal fun attached( + path: File, + stateOf: (File) -> String? = { runCatching { Environment.getExternalStorageState(it) }.getOrNull() }, + ): Boolean = attached(path, stateOf(File(UsbLink.storagePath(path.path)))) internal fun attached( path: File, 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 6f89079677..0846763599 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt @@ -96,7 +96,7 @@ object SteamLibraries { if (picked.none { overlaps(canonical(it.first), canonical(hit.first)) }) picked += hit } return picked.map { (dir, games) -> - val shown = File(storagePath(dir.path)) + val shown = File(UsbLink.storagePath(dir.path)) Found(dir.path, shown.path, defaultLabel(context, shown), games) } } @@ -155,7 +155,7 @@ object SteamLibraries { } fun defaultLabel(context: Context, picked: File): String { - val folder = File(storagePath(picked.path)) + val folder = File(UsbLink.storagePath(picked.path)) val volume = try { context.getSystemService(StorageManager::class.java)?.getStorageVolume(folder)?.getDescription(context) } catch (e: Exception) { @@ -171,9 +171,7 @@ object SteamLibraries { internal fun overlaps(a: String, b: String): Boolean = a == b || a.startsWith("$b/") || b.startsWith("$a/") - private fun storagePath(path: String): String = if (path.startsWith("/mnt/media_rw/")) "/storage/" + path.removePrefix("/mnt/media_rw/") else path - - private fun canonical(file: File): String = storagePath(runCatching { file.canonicalPath }.getOrDefault(file.absolutePath)) + private 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/GameStorageTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GameStorageTest.kt index 88eb0e0ae2..d6913ed5d3 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/GameStorageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/GameStorageTest.kt @@ -81,6 +81,20 @@ class GameStorageTest { assertFalse(GameStorage.attached(volume, Environment.MEDIA_UNKNOWN, externalStoragePath = true)) } + @Test fun aRawVolumePathIsCheckedAsItsStorageVolume() { + val asked = mutableListOf() + val mounted = { file: File -> asked += file.path; if (file.path.startsWith("/storage/B2BD-BCFC")) Environment.MEDIA_MOUNTED else Environment.MEDIA_UNKNOWN } + assertTrue(GameStorage.attached(File("/mnt/media_rw/B2BD-BCFC/STEAM GAMES"), mounted)) + assertEquals("/storage/B2BD-BCFC/STEAM GAMES", asked.single()) + assertTrue(GameStorage.attached(File("/storage/B2BD-BCFC/STEAM GAMES"), mounted)) + } + + @Test fun aRawVolumePathOnARemovedCardIsNotAttached() { + assertFalse(GameStorage.attached(File("/mnt/media_rw/B2BD-BCFC/STEAM GAMES")) { Environment.MEDIA_REMOVED }) + assertFalse(GameStorage.attached(File("/mnt/media_rw/B2BD-BCFC/STEAM GAMES")) { Environment.MEDIA_UNKNOWN }) + assertFalse(GameStorage.attached(File("/mnt/media_rw/B2BD-BCFC/STEAM GAMES")) { null }) + } + @Test fun onlyASavedDriveThatIsMissingCountsAsDisconnected() { SessionPrefs.setGameStorage(app, "", "") assertFalse(GameStorage.disconnected(app))