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 aa1c6eef4c..94b5bba6ee 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -161,6 +161,25 @@ object AddedGames { "appxmanifest.xml" to Regex("]*?\\bExecutable\\s*=\\s*\"([^\"]+)\"", RegexOption.IGNORE_CASE), ) + private val GAME_PARTS = setOf( + "bin", "bin32", "bin64", "binaries", "x64", "x86", "win64", "win32", "windows", + "launcher", "game", "engine", "system", "data", "app", + ) + + internal fun groupGames(folder: File): List? { + val files = folder.listFiles() ?: return null + if (files.any { it.isFile && it.name.endsWith(".exe", ignoreCase = true) && !skipExe(it.name) }) return null + if (declaredExes(folder).isNotEmpty()) return null + val dirs = files.filter { it.isDirectory && !it.name.startsWith(".") }.sortedBy { it.name.lowercase() } + if (dirs.size < 2 || dirs.any { it.name.lowercase() in GAME_PARTS }) return null + return dirs.takeIf { all -> all.all { rank(it).exes.isNotEmpty() } } + } + + private fun expand(folder: File, entries: Set): List = + if (folder.path in entries) listOf(folder) else groupGames(folder) ?: listOf(folder) + + private fun entryFolders(context: Context): Set = AddedExes.list(context).map { it.folder }.toSet() + /** The card's Steam libraries: the arm64 client's steamapps and the x86-64 client's own folder beside it. */ internal fun isSteamLibraryFolder(name: String): Boolean = name.equals("steamapps", ignoreCase = true) || name == com.droiddeck.launcher.session.GameStorage.X64_CARD_DIR @@ -173,6 +192,7 @@ object AddedGames { GameStorage.effective(context)?.let { File(it.path, "steamapps/common") }, ) val removed = SessionPrefs.removedAddedGames(context).toSet() + val entries = entryFolders(context) for (dir in folders.distinctBy { it.absolutePath }) { if (!dir.isDirectory) { Log.w(TAG, "$dir is not a folder; skipped"); continue } val steamInstalls = steamInstallDirs(dir) @@ -180,7 +200,7 @@ object AddedGames { if (folder.name.lowercase() in steamInstalls || isSteamLibraryFolder(folder.name)) continue if (folder.path in removed) continue if (folder.name == "Games" && StoreInstallRoot.roots(context).any { it.absolutePath == folder.absolutePath }) continue - scanGame(context, folder, out) + for (game in expand(folder, entries)) if (game.path !in removed) scanGame(context, game, out) } } for (entry in AddedExes.list(context)) { @@ -232,8 +252,9 @@ object AddedGames { val entries = AddedExes.list(context) fun owns(f: File) = holds(f) && sameGame(f, currentExe(context, entries, f), exe) entries.map { File(it.folder) }.filter(::owns).maxByOrNull { canonical(it).length }?.let { return it } - SessionPrefs.removedAddedGames(context).map { File(it) }.filter(::owns).maxByOrNull { canonical(it).length }?.let { return it } + SessionPrefs.removedAddedGames(context).map { File(it) }.filter { owns(it) && groupGames(it) == null }.maxByOrNull { canonical(it).length }?.let { return it } StoreInstallRoot.gameFolders(context).firstOrNull(::holds)?.let { return it } + val removed = SessionPrefs.removedAddedGames(context) val dirs = listOfNotNull( GameStorage.effective(context)?.let { File(it.path, "steamapps/common") }, GameStorage.effective(context)?.let { File(it.path) }, @@ -242,7 +263,10 @@ object AddedGames { val base = canonical(dir) if (!inside(path, base)) continue val first = path.removePrefix("$base/").substringBefore('/') - File(dir, first).takeIf { it.isDirectory && !isSteamLibraryFolder(first) }?.let { return it } + val top = File(dir, first).takeIf { it.isDirectory && !isSteamLibraryFolder(first) && it.path !in removed } ?: continue + val group = groupGames(top) ?: return top + if (top.path in entries.map { it.folder }) return null + return group.firstOrNull(::holds) } return null } @@ -295,10 +319,11 @@ object AddedGames { if (guestPath(app, dir) == null) bindFolder(app, dir) val removed = SessionPrefs.removedAddedGames(app).toSet() val listed = listedFolders(app, removed) + val entries = entryFolders(app) var already = 0 val fresh = ArrayList() val added = ArrayList() - for (sub in dir.listFiles { f -> f.isDirectory && (showHidden || !f.name.startsWith(".")) }?.sortedBy { it.name.lowercase() }.orEmpty()) { + for (sub in dir.listFiles { f -> f.isDirectory && (showHidden || !f.name.startsWith(".")) }?.sortedBy { it.name.lowercase() }.orEmpty().flatMap { expand(it, entries) }) { val path = canonical(sub) if (listed.any { it == path || inside(path, it) || inside(it, path) }) { already++; continue } onChecking(sub.name) @@ -332,6 +357,7 @@ object AddedGames { private fun listedFolders(context: Context, removed: Set): List { val out = ArrayList() + val entries = entryFolders(context) GamesFolderMigration.run(context) val dirs = listOfNotNull( GameStorage.effective(context)?.let { File(it.path) }, @@ -341,7 +367,7 @@ object AddedGames { for (folder in dir.listFiles { f -> f.isDirectory }.orEmpty()) { if (folder.path in removed || isSteamLibraryFolder(folder.name)) continue if (folder.name == "Games" && StoreInstallRoot.roots(context).any { it.absolutePath == folder.absolutePath }) continue - out.add(canonical(folder)) + expand(folder, entries).filter { it.path !in removed }.forEach { out.add(canonical(it)) } } } AddedExes.list(context).filter { it.folder !in removed }.forEach { out.add(canonical(File(it.folder))) } diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedExesTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedExesTest.kt index 00b9988bde..39591f21aa 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/AddedExesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedExesTest.kt @@ -112,6 +112,135 @@ class AddedExesTest { assertEquals(listOf(pick.path), AddedGames.scan(app).map { it.exe.path }) } + private fun result(r: AddedGames.AddResult): AddedGames.Game = when (r) { + is AddedGames.AddResult.Added -> r.game + is AddedGames.AddResult.Existing -> r.game + is AddedGames.AddResult.Switched -> r.game + else -> throw AssertionError("not added: $r") + } + + private fun visualNovels(): File { + val storage = tmp.newFolder("PC Games") + SessionPrefs.setAddedGamesDirs(app, emptyList()) + SessionPrefs.setGameStorage(app, storage.path, "SD card") + exe(File(storage, "VNs/Albatross/Albatross Log.exe")) + exe(File(storage, "VNs/Rance 01/Rance01.exe")) + exe(File(storage, "VNs/Angel Beats/SiglusEngine.exe")) + exe(File(storage, "VNs/Sayonara/SiglusEngine.exe")) + return storage + } + + @Test fun aGroupFolderOnGameStorageListsEachGameInsideIt() { + val storage = visualNovels() + val vns = File(storage, "VNs") + assertEquals(listOf("Albatross", "Angel Beats", "Rance 01", "Sayonara").map { File(vns, it).path }, + AddedGames.scan(app).map { it.folder.path }) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + + @Test fun anExePickedInAGroupFolderOnGameStorageIsItsOwnGame() { + val storage = visualNovels() + val vns = File(storage, "VNs") + SessionPrefs.setAddedGameExe(app, vns.path, File(vns, "Albatross/Albatross Log.exe").path) + for (pick in listOf("Rance 01/Rance01.exe", "Sayonara/SiglusEngine.exe", "Angel Beats/SiglusEngine.exe")) { + val game = result(AddedGames.addExe(app, File(vns, pick))) + assertEquals(File(vns, pick).parentFile!!.path, game.folder.path) + } + assertEquals(4, AddedGames.scan(app).size) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + + @Test fun aRemovedGroupFolderOnGameStorageStaysRemoved() { + val storage = visualNovels() + val group = File(storage, "VNs") + val pick = File(group, "Rance 01/Rance01.exe") + AddedGames.remove(app, group) + val game = result(AddedGames.addExe(app, pick)) + assertEquals(pick.parentFile!!.path, game.folder.path) + assertTrue(group.path in SessionPrefs.removedAddedGames(app)) + assertEquals(listOf(pick.parentFile!!.path), AddedGames.scan(app).map { it.folder.path }) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + + @Test fun aSiblingExeOfAnAddedGameOnGameStorageSwitchesThatGame() { + val storage = tmp.newFolder("PC Games") + SessionPrefs.setAddedGamesDirs(app, emptyList()) + SessionPrefs.setGameStorage(app, storage.path, "SD card") + val held = exe(File(storage, "Game/bin/Game.exe")) + val pick = exe(File(storage, "Game/launcher/Launcher.exe")) + val game = File(storage, "Game") + AddedExes.put(app, AddedExes.Entry(game.path, held.path)) + val result = AddedGames.addExe(app, pick) + assertTrue(result is AddedGames.AddResult.Switched) + assertEquals(game.path, (result as AddedGames.AddResult.Switched).game.folder.path) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + + @Test fun aHiddenFolderInAGroupIsAddedAsItsOwnGame() { + val storage = visualNovels() + val vns = File(storage, "VNs") + val pick = exe(File(vns, ".Gamma/Gamma.exe")) + val game = result(AddedGames.addExe(app, pick)) + assertEquals(pick.parentFile!!.path, game.folder.path) + assertTrue(AddedGames.scan(app).any { it.folder.path == pick.parentFile!!.path }) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + + @Test fun aFolderThatDeclaresItsExeInASubfolderStaysOneGame() { + val storage = tmp.newFolder("PC Games") + SessionPrefs.setAddedGamesDirs(app, emptyList()) + SessionPrefs.setGameStorage(app, storage.path, "SD card") + exe(File(storage, "Halo/Content/Halo.exe")) + exe(File(storage, "Halo/Tools/ModKit.exe")) + File(storage, "Halo/MicrosoftGame.config").writeText("") + assertEquals(listOf(File(storage, "Halo").path), AddedGames.scan(app).map { it.folder.path }) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + + @Test fun aGroupFolderTheUserAddedAsOneGameStaysOneGame() { + val storage = visualNovels() + val vns = File(storage, "VNs") + AddedExes.put(app, AddedExes.Entry(vns.path, File(vns, "Albatross/Albatross Log.exe").path)) + assertEquals(listOf(vns.path), AddedGames.scan(app).map { it.folder.path }) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + + @Test fun aGameWithBuildFoldersOnGameStorageStaysOneGame() { + val storage = tmp.newFolder("PC Games") + SessionPrefs.setAddedGamesDirs(app, emptyList()) + SessionPrefs.setGameStorage(app, storage.path, "SD card") + exe(File(storage, "Oddworld/x64/Oddworld.exe")) + exe(File(storage, "Oddworld/x86/Oddworld.exe")) + exe(File(storage, "Episodes/Episode1/Episode1.exe")) + File(storage, "Episodes/Movies").mkdirs() + assertEquals(listOf("Episodes", "Oddworld").map { File(storage, it).path }, AddedGames.scan(app).map { it.folder.path }) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + + @Test fun aSiblingExeOfAGameOnGameStorageSwitchesThatGame() { + val storage = tmp.newFolder("PC Games") + SessionPrefs.setAddedGamesDirs(app, emptyList()) + SessionPrefs.setGameStorage(app, storage.path, "SD card") + exe(File(storage, "Game/bin/Game.exe")) + val pick = exe(File(storage, "Game/launcher/Launcher.exe")) + val result = AddedGames.addExe(app, pick) + assertTrue(result is AddedGames.AddResult.Switched) + assertEquals(File(storage, "Game").path, (result as AddedGames.AddResult.Switched).game.folder.path) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + + @Test fun aDeeperExeOfAGameOnGameStorageStillSwitchesThatGame() { + val storage = tmp.newFolder("PC Games") + SessionPrefs.setAddedGamesDirs(app, emptyList()) + SessionPrefs.setGameStorage(app, storage.path, "SD card") + exe(File(storage, "Example/Example.exe")) + val deep = exe(File(storage, "Example/bin/Example64.exe")) + val result = AddedGames.addExe(app, deep) + assertTrue(result is AddedGames.AddResult.Switched) + assertEquals(File(storage, "Example").path, (result as AddedGames.AddResult.Switched).game.folder.path) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + @Test fun anotherBuildOfTheSameExeInASiblingFolderSwitchesTheGame() { noGamesFolders() val held = onStorage("Games2/Oddworld/x64/Oddworld.exe")