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 e59c8b723b..5de835f6e1 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -41,10 +41,20 @@ object AddedGames { return SessionPrefs.gameFolderBinds(context).map { (host, guest) -> Root(File(host), guest) } } - private val SKIP = Regex( - "(?i)^(unins.*|setup.*|.*redist.*|vcredist.*|dxsetup.*|dxwebsetup.*|.*crash.*|.*report.*|dotnet.*|directx.*|.*prereq.*" + - "|.*installer.*|.*uninstall.*|.*updater?.*|.*config(ur.*)?|.*settings.*|.*editor.*|.*server.*|.*benchmark.*|.*helper.*|.*eac.*|.*easyanticheat.*|.*battleye.*)\\.exe$", + private val SKIP_PREFIX = Regex("(?i)^(unins|setup|vc_?redist|dxsetup|dxwebsetup|dotnet|directx|easyanticheat|battleye).*") + private val SKIP_PART = Regex("(?i)redist|prereq|installer|uninstall|crashreport|crashhandler|crashpad|crashsender|launchhelper") + private val SKIP_WORDS = setOf( + "eac", "report", "reporter", "editor", "server", "benchmark", "helper", + "update", "updater", "config", "configure", "configurator", "configuration", "settings", ) + private val WORD = Regex("[A-Z]?[a-z]+|[A-Z]+(?![a-z])|[0-9]+") + + internal fun skipExe(name: String): Boolean { + if (!name.endsWith(".exe", ignoreCase = true)) return false + val base = name.dropLast(4) + if (SKIP_PREFIX.matches(base) || SKIP_PART.containsMatchIn(base)) return true + return WORD.findAll(base).any { it.value.lowercase() in SKIP_WORDS } + } const val GUEST_DIR = "/root/Games" @@ -75,7 +85,7 @@ object AddedGames { val key = "${folder.path}|${folder.lastModified()}" val now = System.currentTimeMillis() ranked[key]?.takeIf { now - it.first < RANK_FRESH_MS }?.let { return it.second } - val guessed = GameExePicker.rank(folder) { !SKIP.matches(it.name) } + val guessed = GameExePicker.rank(folder) { !skipExe(it.name) } val declared = declaredExes(folder) val preferred = declared.map { it.path }.toSet() val result = if (declared.isEmpty()) guessed else GameExePicker.Ranking( @@ -128,7 +138,7 @@ object AddedGames { val root = runCatching { folder.canonicalPath + File.separator }.getOrNull() ?: return emptyList() return names.asSequence() .map { File(folder, it.trim().replace('\\', '/').trimStart('/')) } - .filter { it.name.endsWith(".exe", ignoreCase = true) && !SKIP.matches(it.name) && it.isFile } + .filter { it.name.endsWith(".exe", ignoreCase = true) && !skipExe(it.name) && it.isFile } .filter { runCatching { it.canonicalPath.startsWith(root) }.getOrDefault(false) } .distinctBy { it.path } .toList() diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesSkipExeTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesSkipExeTest.kt new file mode 100644 index 0000000000..720b0a6b58 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesSkipExeTest.kt @@ -0,0 +1,19 @@ +package com.droiddeck.launcher.frontend + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class AddedGamesSkipExeTest { + @Test fun gameTitlesContainingShortSkipWordsAreKept() { + listOf("BeachBuggyRacing.exe", "Reach.exe", "Breach.exe", "Crashday.exe", "CrashBandicoot.exe", + "Observer.exe", "Observer-Win64-Shipping.exe", "Game.exe").forEach { assertFalse(it, AddedGames.skipExe(it)) } + } + + @Test fun installersToolsAndServersAreSkipped() { + listOf("unins000.exe", "setup.exe", "vc_redist.x64.exe", "DXSETUP.exe", "CrashReportClient.exe", + "UnityCrashHandler64.exe", "gamelaunchhelper.exe", "EACLauncher.exe", "DedicatedServer.exe", + "UE4Editor.exe", "valheim_server.exe", "GameConfig.exe", "GameConfigure.exe", "Settings.exe", "Updater.exe", + "EasyAntiCheat_Setup.exe").forEach { assertTrue(it, AddedGames.skipExe(it)) } + } +}