diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt index d1d54c0db8..ba8605b7ce 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt @@ -180,7 +180,7 @@ object BattleNet { } internal fun installs(registry: List>, agent: List>?): List> { - if (agent.isNullOrEmpty()) return registry + if (agent == null) return registry val tracked = agent.map { it.first.lowercase() }.toSet() return registry.filter { it.first.lowercase() in tracked } + agent } @@ -250,8 +250,8 @@ object BattleNet { return out.toString() } - internal fun productDbEntries(bytes: ByteArray): List> { - val installs = runCatching { fields(bytes, 0, bytes.size) }.getOrDefault(emptyList()).filter { it.first == 1 } + internal fun productDbEntries(bytes: ByteArray): List>? { + val installs = runCatching { fields(bytes, 0, bytes.size) }.getOrNull()?.filter { it.first == 1 }?.takeIf { it.isNotEmpty() } ?: return null return installs.mapNotNull { (_, start, end) -> runCatching { val install = fields(bytes, start, end) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt index 735471cc83..0fe38c49db 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt @@ -73,6 +73,7 @@ object BattleNetInstall { val out = ArrayList(StoreInstallRoot.externalBindSpecs(context)) val root = LinuxRuntime.rootDir(context) GameStorage.effective(context)?.let { library -> + if (!File(library.path).isDirectory) throw IllegalStateException(context.getString(R.string.game_sync_err_game_storage)) val content = SecondaryLibrary.contentPath(File(library.path)).path for (guest in SecondaryLibrary.CARD_GUESTS) { File(root, guest.removePrefix("/")).mkdirs() diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt index 6a4e84cb7e..df68c86d09 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt @@ -212,15 +212,25 @@ class BattleNetTest { ) assertEquals(listOf("agent" to "C:/ProgramData/Battle.net/Agent", "hs_beta" to "C:/Program Files (x86)/Hearthstone", "wow_classic_anniversary" to "Z:/root/Games/World of Warcraft"), BattleNet.productDbEntries(db)) - assertEquals(emptyList>(), BattleNet.productDbEntries(db.copyOf(db.size - 3))) - assertEquals(emptyList>(), BattleNet.productDbEntries(byteArrayOf(0x0a, 0x7f, 0x01))) + assertNull(BattleNet.productDbEntries(db.copyOf(db.size - 3))) + assertNull(BattleNet.productDbEntries(byteArrayOf(0x0a, 0x7f, 0x01))) + assertNull(BattleNet.productDbEntries(ByteArray(0))) + assertEquals(emptyList>(), BattleNet.productDbEntries(message(field(1, message(field(1, "s1"), field(3, message(field(1, "Z:/Games/StarCraft"))), field(4, message(field(1, message(varintField(1, 0)))))))))) + } + + @Test fun theAgentDoesNotStartWithoutTheGameStorageCard() { + val card = Files.createTempDirectory("card").toFile() + com.droiddeck.launcher.session.SessionPrefs.setGameStorage(context, card.path, "SD Card") + assertTrue(com.droiddeck.launcher.stores.battlenet.BattleNetInstall.binds(context).any { it.endsWith(":/mnt/droiddeck-sd") }) + card.deleteRecursively() + assertThrows(IllegalStateException::class.java) { com.droiddeck.launcher.stores.battlenet.BattleNetInstall.binds(context) } } @Test fun aGameTheAgentNoLongerTracksIsNotInstalled() { val registry = listOf("wow" to "Z:\\mnt\\droiddeck-sd\\Games\\Battle.net\\World of Warcraft", "hs_beta" to "C:\\Hearthstone") assertEquals(listOf("hs_beta" to "C:\\Hearthstone", "HS_BETA" to "C:/Hearthstone"), BattleNet.installs(registry, listOf("HS_BETA" to "C:/Hearthstone"))) assertEquals(registry, BattleNet.installs(registry, null)) - assertEquals(registry, BattleNet.installs(registry, emptyList())) + assertEquals(emptyList>(), BattleNet.installs(registry, emptyList())) } @Test fun theGamesAreTheTitlesInstalledInTheirFolders() {