From 679e9476c3744450e923d5697a59d4592c3aeca5 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sun, 25 Oct 2026 15:21:27 -0400 Subject: [PATCH] Add Battle.net logs to Share logs (#1573) --- .../droiddeck/launcher/core/LogRedactor.kt | 2 +- .../launcher/session/SessionLogShare.kt | 26 ++++++++++++++++- .../launcher/core/LogRedactorTest.kt | 1 + .../session/SessionLogShareZipTest.kt | 28 +++++++++++++++++++ 4 files changed, 55 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt b/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt index 491101dba2..20073c4ca3 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt @@ -76,7 +76,7 @@ object LogRedactor { private const val ACCOUNT_VALUE = "(\"[^\"<\\r\\n]+\"|'[^'<\\r\\n]+'|[^\\s\"'<>&;,}]+)" private val ACCOUNT_KV = Regex( - "(?i)(? addEntry(z, folder.name + "/steam/" + f.name, f); advance(f) } stores.forEach { f -> addEntry(z, "$STORES_DIR/" + f.name, f); advance(f) } tools.forEach { f -> addEntry(z, SessionPaths.TOOLS_DIR + "/" + f.name, f); advance(f) } + battleNet.forEach { (name, f) -> addEntry(z, "$BATTLENET_DIR/$name", f); advance(f) } } return zip } @@ -88,6 +91,27 @@ object SessionLogShare { private fun shareDir(context: Context): File = File(context.cacheDir, "share") + private const val BATTLENET_DIR = "battlenet" + + private fun battleNetLogs(context: Context): List> { + val drive = File(BattleNet.prefix(context), "pfx/drive_c") + val data = File(drive, "ProgramData/Battle.net") + fun logsUnder(dir: File, prefix: String) = dir.listFiles { f -> f.isDirectory && f.name.startsWith(prefix) }.orEmpty().map { File(it, "Logs") } + return newest("droiddeck", listOf(File(LinuxRuntime.rootDir(context), "root/.cache/droiddeck/battlenet")), 2, setOf("battlenet.log", "spawned.log")) + + newest("client", listOf(File(drive, "users/steamuser/AppData/Local/Battle.net/Logs")), 6) + + newest("agent", listOf(File(data, "Agent/Logs")) + logsUnder(File(data, "Agent"), "Agent."), 10, byDir = true) + + newest("setup", logsUnder(File(data, "Setup"), ""), 3, byDir = true) + } + + private fun newest(folder: String, dirs: List, count: Int, names: Set? = null, byDir: Boolean = false): List> { + val since = System.currentTimeMillis() - RECENT_DAYS * 86_400_000L + return dirs.flatMap { dir -> + dir.listFiles { f -> f.isFile && f.name.endsWith(".log") && (names == null || f.name in names) && f.lastModified() >= since && f.length() <= STEAM_LOG_MAX_BYTES }.orEmpty().toList() + }.sortedByDescending { it.lastModified() }.take(count).map { f -> + (if (byDir) "$folder/${f.parentFile?.parentFile?.name}/${f.name}" else "$folder/${f.name}") to f + } + } + private fun recent(dir: File): List { val since = System.currentTimeMillis() - RECENT_DAYS * 86_400_000L return dir.listFiles { f -> f.isFile && f.lastModified() >= since }?.sortedBy { it.name }.orEmpty() diff --git a/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt b/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt index a67093e935..38849c41a8 100644 --- a/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt @@ -195,6 +195,7 @@ class LogRedactorTest { "auth: login=maskeduser42&remember=1", "accountName: maskeduser42", "{\"username\": \"masked user 42\"}", + "[Clubs] {Main} Club membership subscription created: |accountId=maskeduser42", ) for (line in lines) { val out = LogRedactor.redactForShare(line) diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareZipTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareZipTest.kt index 95893adde6..012d2a916d 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareZipTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareZipTest.kt @@ -50,6 +50,34 @@ class SessionLogShareZipTest { assertFalse(zip.exists()) } + @Test fun battleNetAndBlizzardLogsComeAlongScrubbedAndNewestFirst() { + val session = File(LinuxRuntime.logDir(app), "2026-10-25-05-battle-net").apply { mkdirs() } + File(session, "session.log").writeText("droiddeck-battlenet: open (from the menu)\n") + val root = LinuxRuntime.rootDir(app) + File(root, "root/.cache/droiddeck/battlenet").apply { mkdirs() }.apply { + resolve("battlenet.log").writeText("launching WoW\n") + resolve("other.log").writeText("other\n") + } + val drive = File(com.droiddeck.launcher.runtime.BattleNet.prefix(app), "pfx/drive_c") + val client = File(drive, "users/steamuser/AppData/Local/Battle.net/Logs").apply { mkdirs() } + val now = System.currentTimeMillis() + for (i in 1..8) client.resolve("battle.net-$i.log").apply { writeText("client $i accountId=1:0:5ca1ab1e\n"); setLastModified(now - i * 60_000L) } + client.resolve("battle.net-old.log").apply { writeText("old\n"); setLastModified(now - 30L * 86_400_000L) } + File(drive, "ProgramData/Battle.net/Agent/Agent.9824/Logs").apply { mkdirs() }.resolve("Agent-1.log").writeText("agent someone@example.com\n") + File(drive, "ProgramData/Battle.net/Agent/Agent.9900/Logs").apply { mkdirs() }.resolve("Agent-1.log").writeText("agent 9900\n") + File(drive, "ProgramData/Battle.net/Setup/bna_2/Logs").apply { mkdirs() }.resolve("battle.net-setup-1.log").writeText("setup\n") + + val zip = SessionLogShare.zipFolder(app, session)!! + val text = ZipFile(zip).use { z -> z.entries().toList().associate { e -> e.name to z.getInputStream(e).bufferedReader().readText() } } + assertTrue(text.keys.containsAll(listOf("battlenet/droiddeck/battlenet.log", "battlenet/agent/Agent.9824/Agent-1.log", "battlenet/agent/Agent.9900/Agent-1.log", "battlenet/setup/bna_2/battle.net-setup-1.log"))) + assertFalse(text.containsKey("battlenet/droiddeck/other.log")) + assertEquals((1..6).map { "battlenet/client/battle.net-$it.log" }.toSet(), text.keys.filter { it.startsWith("battlenet/client/") }.toSet()) + val all = text.values.joinToString("\n") + assertFalse(all.contains("5ca1ab1e")) + assertFalse(all.contains("someone@example.com")) + SessionLogShare.clear(app) + } + @Test fun theSharePassChangesNothingInACleanLine() { val line = "dxvk: Device 0x5 (Adreno 750) https://github.com/doitsujin/dxvk/releases code 403" assertEquals(line, com.droiddeck.launcher.core.LogRedactor.redactForShare(line))