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 eb5bb4e0d9..729533d5a2 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt @@ -48,7 +48,33 @@ object GameStorage { return when { pref == SessionPrefs.GAME_STORAGE_OFF -> null pref.isEmpty() -> options(context).firstOrNull()?.let { Option(it.name, it.path) } - else -> Option(SessionPrefs.gameStorageLabel(context), pref) + else -> Option(SessionPrefs.gameStorageLabel(context), pref).takeIf { attached(File(pref)) } + } + } + + fun disconnected(context: Context): Boolean { + val pref = SessionPrefs.gameStorage(context) + 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, + state: String?, + externalStoragePath: Boolean = isExternalStoragePath(path), + ): Boolean = when { + state == Environment.MEDIA_MOUNTED || state == Environment.MEDIA_MOUNTED_READ_ONLY -> true + externalStoragePath -> false + state == Environment.MEDIA_UNKNOWN || state == null -> path.isDirectory || path.parentFile?.isDirectory == true + else -> false + } + + private fun isExternalStoragePath(path: File): Boolean { + val absolute = path.absoluteFile.toPath().normalize() + return listOf(File("/storage"), File("/mnt/media_rw")).any { + absolute.startsWith(it.absoluteFile.toPath().normalize()) } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt index 2ba84041f8..b3c3fc0795 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt @@ -97,20 +97,25 @@ object StoreInstallRoot { fun installRoot(context: Context): File = internalRoot(context) - fun externalTarget(context: Context): Target? = - if (SessionPrefs.defaultStorageFolder(context).isNotBlank()) customTarget(context) - else detectedExternalTarget(context) + fun externalTarget(context: Context): Target? = when { + SessionPrefs.defaultStorageFolder(context).isNotBlank() -> customTarget(context) + GameStorage.disconnected(context) -> null + else -> detectedExternalTarget(context) + } internal fun externalTarget(targets: List, internalRoot: File): Target? = targets.firstOrNull { it.folder && it.root.absolutePath != internalRoot.absolutePath } ?: targets.firstOrNull { it.removable && it.root.absolutePath != internalRoot.absolutePath } fun defaultTarget(context: Context): Target? = when (SessionPrefs.defaultStorage(context)) { - SessionPrefs.DEFAULT_STORAGE_INTERNAL -> Target(internalRoot(context), context.getString(com.droiddeck.launcher.R.string.games_internal), removable = false) - SessionPrefs.DEFAULT_STORAGE_EXTERNAL -> externalTarget(context) + SessionPrefs.DEFAULT_STORAGE_INTERNAL -> internalTarget(context) + SessionPrefs.DEFAULT_STORAGE_EXTERNAL -> externalTarget(context) ?: internalTarget(context) else -> null } + private fun internalTarget(context: Context) = + Target(internalRoot(context), context.getString(com.droiddeck.launcher.R.string.games_internal), removable = false) + fun libraryRoot(context: Context): File? = GameStorage.effective(context)?.let { File(it.path, ON_VOLUME) } fun roots(context: Context): List { 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 f731c4f1c3..88eb0e0ae2 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/GameStorageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/GameStorageTest.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.session +import android.os.Environment import com.droiddeck.launcher.frontend.AddedGames import java.io.File import org.junit.Assert.* @@ -48,4 +49,46 @@ class GameStorageTest { SessionPrefs.setAddedGamesDirs(app, odd.map { it.path }) assertTrue(GameStorage.gamesFolderLibraries(app).isEmpty()) } + + @Test fun anUnpluggedDriveFallsBackToInternalWithoutForgettingIt() { + val gone = "/storage/0000-0000/Android/data/com.droiddeck.launcher/files/steam" + SessionPrefs.setGameStorage(app, gone, "USB drive") + assertNull(GameStorage.effective(app)) + assertNull(GameStorage.x64CardLibrary(app)) + assertEquals(gone, SessionPrefs.gameStorage(app)) + } + + @Test fun aPluggedInDriveStaysTheLibrary() { + val files = tmp.newFolder("files") + val steam = File(files, "steam") + SessionPrefs.setGameStorage(app, steam.path, "USB drive") + assertEquals(steam.path, GameStorage.effective(app)?.path) + steam.mkdirs() + assertEquals(steam.path, GameStorage.effective(app)?.path) + assertEquals("USB drive", GameStorage.effective(app)?.label) + } + + @Test fun missingSubfolderIsAttachedWhenItsVolumeIsMounted() { + val path = File(tmp.newFolder("mounted-volume"), "missing/steam") + assertTrue(GameStorage.attached(path, Environment.MEDIA_MOUNTED, externalStoragePath = true)) + } + + @Test fun removedVolumeIsNotAttachedEvenWhenItsParentExists() { + val parent = tmp.newFolder("storage") + val volume = File(parent, "0000-0000") + assertTrue(parent.isDirectory) + assertFalse(GameStorage.attached(volume, Environment.MEDIA_REMOVED, externalStoragePath = true)) + assertFalse(GameStorage.attached(volume, Environment.MEDIA_UNKNOWN, externalStoragePath = true)) + } + + @Test fun onlyASavedDriveThatIsMissingCountsAsDisconnected() { + SessionPrefs.setGameStorage(app, "", "") + assertFalse(GameStorage.disconnected(app)) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + assertFalse(GameStorage.disconnected(app)) + SessionPrefs.setGameStorage(app, "/storage/0000-0000/Android/data/com.droiddeck.launcher/files/steam", "USB drive") + assertTrue(GameStorage.disconnected(app)) + SessionPrefs.setGameStorage(app, tmp.newFolder("plugged").path, "USB drive") + assertFalse(GameStorage.disconnected(app)) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt index c368ca082b..f5ce0d2a97 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt @@ -53,10 +53,10 @@ class StoreInstallRootTest { assertEquals(SessionPrefs.DEFAULT_STORAGE_ASK, SessionPrefs.defaultStorage(app)) } - @Test fun defaultExternalStorageFallsBackToTheInstallDialogWhenNoCardIsPresent() { + @Test fun defaultExternalStorageFallsBackToInternalWhenNoCardIsPresent() { SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_EXTERNAL) - assertNull(StoreInstallRoot.defaultTarget(app)) + assertEquals(StoreInstallRoot.internalRoot(app).absolutePath, StoreInstallRoot.defaultTarget(app)?.root?.absolutePath) } @Test fun aChosenFolderIsUsedForDefaultExternalStorage() { @@ -74,7 +74,7 @@ class StoreInstallRootTest { assertFalse(File(root, ".droiddeck-write-probe").exists()) } - @Test fun aDisconnectedChosenFolderDoesNotFallBackToAnotherTarget() { + @Test fun aDisconnectedChosenFolderFallsBackToInternalUntilItIsBack() { val card = File(app.filesDir, "card/steam").apply { mkdirs() } SessionPrefs.setGameStorage(app, card.path, "Card") val folder = File(app.filesDir, "usb/SSD").apply { mkdirs() } @@ -83,8 +83,11 @@ class StoreInstallRootTest { assertNotNull(StoreInstallRoot.defaultTarget(app)) assertTrue(folder.delete()) - assertNull(StoreInstallRoot.defaultTarget(app)) + assertEquals(StoreInstallRoot.internalRoot(app).absolutePath, StoreInstallRoot.defaultTarget(app)?.root?.absolutePath) assertEquals(File(card, "Games").absolutePath, StoreInstallRoot.detectedExternalTarget(app)?.root?.absolutePath) + + assertTrue(folder.mkdirs()) + assertEquals(File(folder, "Games").absolutePath, StoreInstallRoot.defaultTarget(app)?.root?.absolutePath) } @Test fun filesOnAChosenFolderAreMappedIntoTheGuest() { @@ -303,4 +306,20 @@ class StoreInstallRootTest { assertEquals("itch", StoreInstallRoot.storeDir(File("/games"), Store.ITCH).name) assertEquals("Game Jolt", StoreInstallRoot.storeDir(File("/games"), Store.GAMEJOLT).name) } + + @Test fun anUnpluggedLibraryDriveSendsInstallsToInternalUntilItIsBack() { + val files = File(app.filesDir, "usb-drive/files") + val library = File(files, "steam") + SessionPrefs.setGameStorage(app, library.path, "USB drive") + SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_EXTERNAL) + val internal = StoreInstallRoot.internalRoot(app).absolutePath + + assertEquals(internal, StoreInstallRoot.defaultTarget(app)?.root?.absolutePath) + assertEquals(listOf(internal), StoreInstallRoot.targets(app).map { it.root.absolutePath }) + assertNull(StoreInstallRoot.libraryRoot(app)) + + library.mkdirs() + assertEquals(File(library, "Games").absolutePath, StoreInstallRoot.defaultTarget(app)?.root?.absolutePath) + assertEquals(File(library, "Games").absolutePath, StoreInstallRoot.libraryRoot(app)?.absolutePath) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt index 60df152e05..1b92f1f1a0 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt @@ -457,7 +457,7 @@ class EpicClientTest { assertEquals("/root/Games/Stores/Epic", EpicClient.prepareInstallDir(context)) } - @Test fun aDisconnectedDefaultFolderKeepsTheLauncherInstallDir() { + @Test fun aDisconnectedDefaultFolderMovesTheLauncherInstallDirToInternal() { val context = org.robolectric.RuntimeEnvironment.getApplication() val previousStorage = com.droiddeck.launcher.session.SessionPrefs.defaultStorage(context) val previousFolder = com.droiddeck.launcher.session.SessionPrefs.defaultStorageFolder(context) @@ -470,8 +470,8 @@ class EpicClientTest { com.droiddeck.launcher.session.SessionPrefs.setDefaultStorageFolder( context, File(context.filesDir, "missing-${System.nanoTime()}").path, "SSD") try { - assertEquals(current, EpicClient.prepareInstallDir(context)) - assertEquals(current, org.json.JSONObject(settings.readText()).getString("defaultInstallDir")) + assertEquals("/root/Games/Stores/Epic", EpicClient.prepareInstallDir(context)) + assertEquals("/root/Games/Stores/Epic", org.json.JSONObject(settings.readText()).getString("defaultInstallDir")) } finally { com.droiddeck.launcher.session.SessionPrefs.setDefaultStorage(context, previousStorage) if (previousFolder.isBlank()) com.droiddeck.launcher.session.SessionPrefs.clearDefaultStorageFolder(context)