From 9d99232f9909de53ae1ecc557e67d70144c155e3 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 14:32:29 -0500 Subject: [PATCH 01/57] feat(agent): the agent's commits and pull requests carry no Claude credit by default (#2482) feat(agent): Claude Code commits and pull requests carry no co-author or Claude Code credit by default --- .../droiddeck/launcher/agent/AgentHarness.kt | 24 +++++++++++++++++++ .../com/droiddeck/launcher/agent/AgentHost.kt | 4 +++- .../droiddeck/launcher/agent/AgentSetup.kt | 1 + .../droiddeck/launcher/agent/AgentHostTest.kt | 21 ++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt index de45d4b51a..722c6e4029 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt @@ -27,6 +27,8 @@ interface AgentHarness { fun turn(message: String, conversation: String?, options: Options): List /** One line of the CLI's output, or null when it carries nothing to show. */ fun parse(line: String): AgentEvent? + /** Sets the CLI's own defaults in the userland before it runs; [rootfs] is the userland's root. */ + fun prepare(rootfs: File) {} data class Model(val id: String, val label: String) @@ -59,6 +61,28 @@ object ClaudeCode : AgentHarness { override val signIn = listOf(binary, "auth", "login", "--claudeai") override val plans = true + /** + * Commits and pull requests the agent makes carry no Claude Code credit or co-author line by + * default. Only keys the user has not set are written, so their own choice stays. + */ + override fun prepare(rootfs: File) { + val file = File(rootfs, "root/.claude/settings.json") + val settings = if (file.exists()) runCatching { JSONObject(file.readText()) }.getOrNull() ?: return else JSONObject() + var changed = false + if (!settings.has("includeCoAuthoredBy")) { + settings.put("includeCoAuthoredBy", false) + changed = true + } + if (!settings.has("attribution")) { + settings.put("attribution", JSONObject().put("commit", "").put("pr", "")) + changed = true + } + if (changed) runCatching { + file.parentFile?.mkdirs() + file.writeText(settings.toString(2) + "\n") + } + } + override fun models(rootfs: File) = listOf( AgentHarness.Model("opus", "Opus"), AgentHarness.Model("sonnet", "Sonnet"), AgentHarness.Model("haiku", "Haiku"), ) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt index bbb99b744d..b1e939b088 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt @@ -55,7 +55,8 @@ object AgentHost { "process of its own and shows the user its progress and time left; dd-lab-build follows that build's log until it is done. " + "Run it with run_in_background and keep checking its output, so the user can talk to you meanwhile. " + "The restart ends this process, and this conversation continues on the new build. " + - "Files the user attaches are listed at the end of their message, under /root/.cache/droiddeck/attachments." + "Files the user attaches are listed at the end of their message, under /root/.cache/droiddeck/attachments. " + + "Commits and pull requests you make are the user's own: add no co-author line, AI credit or generated-by note." val entries = mutableStateListOf() val queue = mutableStateListOf() @@ -250,6 +251,7 @@ object AgentHost { val command = current.turn(prompt, conversation, AgentHarness.Options(model, plan && current.plans, BRIEF)) val workdir = workspace(app) Thread({ + runCatching { current.prepare(LinuxRuntime.rootDir(app)) } val child = try { guest(app, command, workdir).start() } catch (e: Exception) { diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt index 47efab507d..b9971ced15 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt @@ -93,6 +93,7 @@ object AgentSetup { Thread({ val result = runCatching { installHelpers(app) + runCatching { harness.prepare(LinuxRuntime.rootDir(app)) } val child = AgentHost.guest(app, command).start() child.outputStream.close() child.inputStream.bufferedReader().forEachLine { line -> diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt index 23a176c201..13e88edac4 100644 --- a/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt @@ -131,6 +131,27 @@ class AgentHostTest { assertEquals("ls", shellCommand("ls")) } + @Test fun claudeCodeDefaultsToNoAttributionAndKeepsTheUsersChoice() { + val root = Files.createTempDirectory("rootfs").toFile() + val settings = File(root, "root/.claude/settings.json") + ClaudeCode.prepare(root) + val written = org.json.JSONObject(settings.readText()) + assertEquals(false, written.getBoolean("includeCoAuthoredBy")) + assertEquals("", written.getJSONObject("attribution").getString("commit")) + assertEquals("", written.getJSONObject("attribution").getString("pr")) + + settings.writeText("""{"includeCoAuthoredBy":true,"model":"opus"}""") + ClaudeCode.prepare(root) + val kept = org.json.JSONObject(settings.readText()) + assertEquals(true, kept.getBoolean("includeCoAuthoredBy")) + assertEquals("opus", kept.getString("model")) + assertTrue(kept.has("attribution")) + + settings.writeText("not json") + ClaudeCode.prepare(root) + assertEquals("not json", settings.readText()) + } + @Test fun aTurnWithoutAnEndWasInterrupted() { assertTrue(AgentHost.interrupted(listOf(Entry.Asked("hi"), Entry.Used("1", "Bash", "dd-lab-build")))) assertEquals(false, AgentHost.interrupted(listOf(Entry.Asked("hi"), Entry.Finished(null)))) From 263e96469f754ae2b0386bf63b618768b2834a79 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 16:00:11 -0500 Subject: [PATCH 02/57] fix(agent): setup repairs a half-installed userland before installing the CLI (#2490) --- .../com/droiddeck/launcher/agent/AgentSetup.kt | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt index b9971ced15..bc4ac2c9e9 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt @@ -79,7 +79,8 @@ object AgentSetup { Step.CONNECTION -> return Step.INSTALL -> { listOf("sh", "-c", "set -e; export DEBIAN_FRONTEND=noninteractive; " + - "apt-get update; apt-get install -y --no-install-recommends git gh adb curl ca-certificates python3; ${harness.install}") + "dpkg --configure -a; apt-get update; apt-get -f install -y; " + + "apt-get install -y --no-install-recommends git gh adb curl ca-certificates python3; ${harness.install}") } Step.SIGN_IN -> harness.signIn Step.GITHUB -> listOf("dd-gh-login") @@ -96,11 +97,14 @@ object AgentSetup { runCatching { harness.prepare(LinuxRuntime.rootDir(app)) } val child = AgentHost.guest(app, command).start() child.outputStream.close() - child.inputStream.bufferedReader().forEachLine { line -> - val text = line.trim() - if (text.isNotEmpty() && !noise(text)) main.post { detail[step] = text.take(160) } + logFile(app, step).apply { parentFile?.mkdirs() }.bufferedWriter().use { log -> + child.inputStream.bufferedReader().forEachLine { line -> + log.appendLine(line) + val text = line.trim() + if (text.isNotEmpty() && !noise(text)) main.post { detail[step] = text.take(160) } + } + child.waitFor().also { log.appendLine("exit $it") } } - child.waitFor() } main.post { AgentHostService.setupEnded(app) @@ -116,6 +120,9 @@ object AgentSetup { }, "agent-setup-${step.name.lowercase()}").start() } + /** The whole output of a step's last run; the card shows only its last line. */ + fun logFile(app: Context, step: Step) = File(app.filesDir, "agent/setup-${step.name.lowercase()}.log") + fun buildToolsInstalled(app: Context) = AgentHost.guestFileExists(app, "/root/aapt2/aapt2") && AgentHost.guestFileExists(app, "$CHECKOUT/.git") /** dd-lab-build compiled this install's commit, so a Lab build compiles only what changed. */ From 7d5aae724ce25290e58bd27cb6fd0d5487dc48a0 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 11 Nov 2026 16:29:53 -0500 Subject: [PATCH 03/57] fix(ci): fetch the Venus component without spending the API quota (#2483) --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 555d8b673c..57a2075145 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -617,12 +617,11 @@ jobs: - name: Check out MaliBridge run: git submodule update --init external/MaliBridge - name: Fetch the Mali (Venus) component (tools/venus/release.env) - env: - GH_TOKEN: ${{ github.token }} run: | set -euo pipefail . tools/venus/release.env - gh release download "${VENUS_TAG}" -R "${VENUS_REPO}" -p venus.tzst -O venus.tzst + curl -fsSL --retry 5 --retry-all-errors --retry-delay 10 -o venus.tzst \ + "https://github.com/${VENUS_REPO}/releases/download/${VENUS_TAG}/venus.tzst" echo "${VENUS_SHA256} venus.tzst" | sha256sum -c - tar --use-compress-program=unzstd -xf venus.tzst -C app/src/main test -f app/src/main/jniLibs/arm64-v8a/libvirgl_test_server.so From 1d247d212bf6e1cd8cb4520b7b7f4ffc1e620510 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 17:39:48 -0500 Subject: [PATCH 04/57] fix(decky): run Decky's unprivileged role as root in the guest (#2481) --- tools/linuxfs/overlay/usr/local/bin/droiddeck-session | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index df301aadaf..37fb2c00ad 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -1396,6 +1396,8 @@ case $mode in decky_stop() { [ -z "$decky_child" ] || kill "$decky_child" 2>/dev/null; [ -z "$decky_child" ] || wait "$decky_child" 2>/dev/null; exit 0; } trap decky_stop TERM INT HUP decky_exits=0 + # The guest has no "deck" user, which Decky otherwise requires at startup. + export UNPRIVILEGED_USER=root while :; do if [ "$decky_arch" = x86_64 ]; then /usr/local/bin/droiddeck-fex run --mode on -- "$decky_loader" >>"$HOME/homebrew/services/PluginLoader.log" 2>&1 & else "$decky_loader" >>"$HOME/homebrew/services/PluginLoader.log" 2>&1 & From 3b6d13a8d7830e77bd0cf10373220e341a5df79d Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 11 Nov 2026 19:10:49 -0500 Subject: [PATCH 05/57] fix: games on an SD card install faster and Battle.net can read the card's volume (#2379) A Battle.net library on another volume is reached through its own drive letter, so the Agent's volume query succeeds. The proot fast path keeps folder handles for FUSE-backed libraries. Supersedes #2377. --- .../droiddeck/launcher/runtime/BattleNet.kt | 19 +- .../launcher/runtime/BattleNetTest.kt | 23 ++ .../overlay/usr/local/bin/droiddeck-battlenet | 184 +++++++++++- tools/proot/fastpath/fastpath.c | 264 ++++++++++++++++-- tools/tests/test_battlenet.py | 186 +++++++++++- tools/tests/test_fastpath_fuse_dirs.py | 243 ++++++++++++++++ 6 files changed, 883 insertions(+), 36 deletions(-) create mode 100644 tools/tests/test_fastpath_fuse_dirs.py 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 a98e3d0cfa..e1dd1fff21 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt @@ -232,11 +232,24 @@ object BattleNet { } internal fun hostFolder(context: Context, path: String): File? { - val drive = Regex("""^([CcZz]):[\\/](.*)$""").matchEntire(path.trim()) ?: return null + val drive = Regex("""^([A-Za-z]):[\\/](.*)$""").matchEntire(path.trim()) ?: return null val relative = drive.groupValues[2].replace('\\', '/').trim('/') if (relative.isEmpty() || relative.split('/').any { it == ".." }) return null - return if (drive.groupValues[1].equals("c", ignoreCase = true)) File(prefix(context), "pfx/drive_c/$relative") - else com.droiddeck.launcher.frontend.AddedGames.hostPath(context, "/$relative") + val letter = drive.groupValues[1].lowercase() + if (letter == "c") return File(prefix(context), "pfx/drive_c/$relative") + val link = File(prefix(context), "pfx/dosdevices/$letter:").toPath() + val mapped = runCatching { java.nio.file.Files.readSymbolicLink(link).toString() }.getOrNull() + val target = when { + mapped == null -> if (letter == "z") "/" else return null + mapped.startsWith("/") -> mapped + else -> { + val rootfs = LinuxRuntime.rootDir(context).toPath().toAbsolutePath().normalize() + val resolved = link.toAbsolutePath().parent.resolve(mapped).normalize() + if (!resolved.startsWith(rootfs)) return null + "/" + rootfs.relativize(resolved).joinToString("/") + } + }.trimEnd('/') + return com.droiddeck.launcher.frontend.AddedGames.hostPath(context, "$target/$relative") } private val KEY = Regex("""^\[(.+)\](?:\s+\d+)?\s*$""") 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 1af73baef4..c9a3fcb9e4 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt @@ -259,6 +259,29 @@ class BattleNetTest { BattleNet.hostFolder(context, "Z:/root/Games/Stores/Battle.net/Hearthstone/")) } + @Test fun aMappedWineDriveResolvesThroughItsLink() { + val devices = File(BattleNet.prefix(context), "pfx/dosdevices").apply { mkdirs() } + java.nio.file.Files.createSymbolicLink(File(devices, "d:").toPath(), java.nio.file.Paths.get("/root/Games/Card")) + java.nio.file.Files.createSymbolicLink(File(devices, "e:").toPath(), java.nio.file.Paths.get("../drive_c")) + assertEquals(File(LinuxRuntime.rootDir(context), "root/Games/Card/Battle.net/Hearthstone"), + BattleNet.hostFolder(context, "D:\\Battle.net\\Hearthstone")) + assertEquals(File(BattleNet.prefix(context), "pfx/drive_c/Games/X"), BattleNet.hostFolder(context, "E:\\Games\\X")) + assertNull(BattleNet.hostFolder(context, "F:\\Games\\X")) + assertNull(BattleNet.hostFolder(context, "D:\\..\\etc")) + } + + @Test fun aDriveLinkTheNativeUserlandMadeRelativeStillResolvesInTheGuest() { + val root = LinuxRuntime.rootDir(context) + val devices = File(BattleNet.prefix(context), "pfx/dosdevices").apply { mkdirs() } + java.nio.file.Files.createSymbolicLink(File(devices, "d:").toPath(), java.nio.file.Paths.get("/root/Games/Card")) + java.nio.file.Files.createSymbolicLink(File(devices, "g:").toPath(), java.nio.file.Paths.get("../../../../../../../../../../..")) + NativeGuest.relinkAbsoluteSymlinks(context, root) + assertFalse(java.nio.file.Files.readSymbolicLink(File(devices, "d:").toPath()).isAbsolute) + assertEquals(File(root, "root/Games/Card/Battle.net/Hearthstone"), + BattleNet.hostFolder(context, "D:\\Battle.net\\Hearthstone")) + assertNull(BattleNet.hostFolder(context, "G:\\etc\\passwd")) + } + @Test fun wowForeverIsListedBesideRetailInTheSharedWorldOfWarcraftFolder() { val pfx = File(BattleNet.prefix(context), "pfx").apply { mkdirs() } diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet index 1ea487e873..3473e7dead 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet @@ -41,6 +41,9 @@ FEX_WAIT = 120 START_GRACE = 90 POLL = 2 STOP_WAIT = 5 +DRIVES = "defghijklmnopqruvwxy" +PRODUCT_DB = ("ProgramData", "Battle.net", "Agent", "product.db") +INSTALL_FOLDER = (1, 3, 1) CLOSE_GRACE = 15 HANDOFF_WAIT = 120 GAME_SETTLE = 20 @@ -123,7 +126,7 @@ function install() { save(".form", form); if (form.indexOf('"' + lang + '"') < 0) lang = "enUS"; var locale = lang.toLowerCase(); - call("POST", "/install/" + uid, '{"account_country":"' + country + '","finalized":true,"game_dir":"' + dir + '","geo_ip_country":"' + + call("POST", "/install/" + uid, '{"account_country":"' + country + '","finalized":true,"game_dir":"' + dir.replace(/\\/g, "\\\\").replace(/"/g, '\\"') + '","geo_ip_country":"' + region + '","language":["' + locale + '"],"selected_asset_locale":"' + locale + '","selected_locale":"' + locale + '","shortcut":"none","tome_torrent":""}'); watch("/install/" + uid); @@ -226,8 +229,72 @@ def installed(root): return os.path.isfile(launcher(root)) -def install_path(library): - return "Z:" + library.rstrip("/") +def dosdevices(root): + return os.path.join(prefix(root), "pfx", "dosdevices") + + +def volume_root(path): + device = os.stat(path).st_dev + while path != "/": + parent = os.path.dirname(path) + if os.stat(parent).st_dev != device: + break + path = parent + return path + + +def inside(path, folder): + return path == folder or path.startswith(folder.rstrip("/") + "/") + + +def mapped_drive(root, path, volume): + folder = dosdevices(root) + try: + names = sorted(os.listdir(folder)) + except OSError: + return None + for name in names: + link = os.path.join(folder, name) + if len(name) == 2 and name[0].lower() in DRIVES and name[1] == ":" and os.path.islink(link): + target = os.path.realpath(link) + if inside(target, volume) and inside(path, target): + return name[0].lower(), target + return None + + +def map_drive(root, volume): + folder = dosdevices(root) + for letter in DRIVES: + link = os.path.join(folder, letter + ":") + if not os.path.lexists(link): + try: + os.makedirs(folder, exist_ok=True) + os.symlink(volume, link) + except OSError as error: + say("%s not mapped to a Wine drive: %s" % (volume, error)) + return None + say("Wine drive %s: is %s" % (letter.upper(), volume)) + return letter, volume + say("%s not mapped to a Wine drive: every letter is taken" % volume) + return None + + +def install_path(root, library): + library = library.rstrip("/") or "/" + try: + path = os.path.realpath(library) + volume = volume_root(path) + except OSError: + return "Z:" + library + if volume == "/": + return "Z:" + library + drive = mapped_drive(root, path, volume) + if drive is None and not wine_processes(os.path.join(prefix(root), "pfx")): + drive = map_drive(root, volume) + if drive is None: + return "Z:" + library + letter, target = drive + return letter.upper() + ":\\" + path[len(target):].strip("/").replace("/", "\\") def write_config(root, library=None): @@ -254,8 +321,8 @@ def write_config(root, library=None): client["HardwareAcceleration"] = "false" changes.append("acceleration") if library and isinstance(client.setdefault("Install", {}), dict) \ - and str(client["Install"].get("DefaultInstallPath", "")).rstrip("/\\") != install_path(library): - client["Install"]["DefaultInstallPath"] = install_path(library) + and str(client["Install"].get("DefaultInstallPath", "")).rstrip("/\\") != install_path(root, library).rstrip("\\"): + client["Install"]["DefaultInstallPath"] = install_path(root, library) changes.append("library") games = config.setdefault("Games", {}) for uid in CLIENT_32_BIT if isinstance(games, dict) else (): @@ -417,13 +484,106 @@ def wallpaper(root): def windows_path(root, path): - found = re.match(r"(?i)^([cz]):[\\/](.*)$", path.strip()) + found = re.match(r"(?i)^([a-z]):[\\/](.*)$", path.strip()) if not found: return None parts = [part for part in re.split(r"[\\/]+", found.group(2)) if part] - if not parts or ".." in parts: + if ".." in parts: return None - return os.path.join(drive_c(root) if found.group(1).lower() == "c" else "/", *parts) + letter = found.group(1).lower() + link = os.path.join(dosdevices(root), letter + ":") + if letter == "c": + target = drive_c(root) + elif os.path.islink(link): + target = os.path.realpath(link) + elif letter == "z": + target = "/" + else: + return None + return os.path.join(target, *parts) + + +def varint(data, at): + value = shift = 0 + while at < len(data) and shift < 64: + byte = data[at] + at += 1 + value |= (byte & 0x7F) << shift + if not byte & 0x80: + return value, at + shift += 7 + raise ValueError("varint") + + +def encode_varint(value): + out = bytearray() + while value > 0x7F: + out.append(value & 0x7F | 0x80) + value >>= 7 + out.append(value) + return bytes(out) + + +def rewrite_field(data, path, change): + out, at = bytearray(), 0 + while at < len(data): + start = at + tag, at = varint(data, at) + kind = tag & 7 + if kind == 0: + at = varint(data, at)[1] + elif kind == 1: + at += 8 + elif kind == 5: + at += 4 + elif kind == 2: + size, body = varint(data, at) + at = body + size + else: + raise ValueError("wire type") + if at > len(data): + raise ValueError("length") + if kind == 2 and tag >> 3 == path[0]: + value = data[body:at] + value = change(value) if len(path) == 1 else rewrite_field(value, path[1:], change) + out += encode_varint(tag) + encode_varint(len(value)) + value + else: + out += data[start:at] + return bytes(out) + + +def drive_folder(root, value): + try: + text = value.decode("utf-8") + except UnicodeDecodeError: + return value + if not re.match(r"(?i)^z:[\\/]", text): + return value + folder = windows_path(root, text) + if not folder or not os.path.isdir(folder): + return value + moved = install_path(root, folder) + return value if moved.startswith("Z:") else moved.replace("\\", "/").encode("utf-8") + + +def move_installs(root): + path = os.path.join(drive_c(root), *PRODUCT_DB) + try: + with open(path, "rb") as f: + data = f.read() + moved = rewrite_field(data, INSTALL_FOLDER, lambda value: drive_folder(root, value)) + if moved == data or wine_processes(os.path.join(prefix(root), "pfx")): + return False + with open(path, "rb") as f: + if f.read() != data: + return False + except (OSError, ValueError): + return False + with open(path + ".tmp", "wb") as f: + f.write(moved) + shutil.copymode(path, path + ".tmp") + os.replace(path + ".tmp", path) + return True def wow_folders(root): @@ -533,6 +693,11 @@ def configure(root, library=None): except OSError as error: say("Battle.net's config not written: %s" % error) return + try: + if move_installs(root): + say("Battle.net's installed games on a mapped volume now use its Wine drive") + except OSError as error: + say("Battle.net's installed games not moved to their Wine drive: %s" % error) try: wallpaper(root) except OSError as error: @@ -1227,7 +1392,6 @@ def agent_job(root, action, uid, product="", folder="", locale="enUS", country=" say("%s not made: %s" % (folder, error)) emit("ERROR", "folder") return 2 - windows = "Z:" + folder told = None while True: processes = wine_processes(pfx) @@ -1244,6 +1408,8 @@ def agent_job(root, action, uid, product="", folder="", locale="enUS", country=" time.sleep(POLL if poll is None else poll) with lock: stop_leftovers(pfx) + if action == "install": + windows = install_path(root, folder) emit("STATE", "starting") base = os.path.join(CACHE, "agent-%s" % uid) for suffix in (".json", ".game", ".form", ".error"): diff --git a/tools/proot/fastpath/fastpath.c b/tools/proot/fastpath/fastpath.c index 8d645eddd2..7a1e2c79a4 100644 --- a/tools/proot/fastpath/fastpath.c +++ b/tools/proot/fastpath/fastpath.c @@ -41,7 +41,7 @@ typedef long (*stub_fn)(long nr, long a, long b, long c, long d, long e, long f) static stub_fn fp_sys; static int fp_on; -struct bind { char *host; size_t hlen; char *guest; size_t glen; int canon; int dropped; }; +struct bind { char *host; size_t hlen; char *guest; size_t glen; int canon; int dropped; int fuse; }; static struct bind binds[MAX_BINDS]; static int nbinds; static char root[PATH_MAX]; @@ -133,7 +133,8 @@ static long tracer; static pthread_mutex_t cache_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t bind_lock; static pthread_mutex_t long_lock; -static void after_fork(void) { pthread_mutex_init(&cache_lock, NULL); pthread_mutex_init(&bind_lock, NULL); pthread_mutex_init(&long_lock, NULL); } +static pthread_mutex_t dir_lock = PTHREAD_MUTEX_INITIALIZER; +static void after_fork(void) { pthread_mutex_init(&cache_lock, NULL); pthread_mutex_init(&bind_lock, NULL); pthread_mutex_init(&long_lock, NULL); pthread_mutex_init(&dir_lock, NULL); } static int traced_by_match(const char *key) { static char buf[32768]; @@ -414,6 +415,212 @@ static int host_bind(const char *h) { return -1; } +static unsigned hash_of(const char *s); +static long long now_ns(void); +#define DIRS 64 +#define DIR_FD_FLOOR 1000 +struct dirslot { unsigned hash, epoch; int fd, refs; dev_t dev; ino_t ino; long tag; long long stamp; char path[PATH_MAX]; char seen[PATH_MAX]; }; +static struct dirslot dirs[DIRS]; +static unsigned dir_epoch; +struct near { long fd; int slot, own; const char *name; }; + +static int fuse_bind(const char *h) { + int i = host_bind(h); + if (i < 0) return -1; + int f = __atomic_load_n(&binds[i].fuse, __ATOMIC_ACQUIRE); + if (!f) { + struct statfs fs; + f = sc(SYS_statfs, (long)binds[i].host, (long)&fs, 0, 0, 0) == 0 && fs.f_type == 0x65735546 ? 1 : 2; + __atomic_store_n(&binds[i].fuse, f, __ATOMIC_RELEASE); + } + return f == 1 ? i : -1; +} + +static long fd_path(long fd, char *out) { + char link[40]; + snprintf(link, sizeof link, "/proc/self/fd/%ld", fd); + long n = sc(SYS_readlinkat, AT_FDCWD, (long)link, (long)out, PATH_MAX - 1, 0); + if (n <= 0 || n >= PATH_MAX - 1) return -1; + out[n] = 0; + return 0; +} + +static int fd_id(long fd, dev_t *dev, ino_t *ino) { + struct stat st; + if (sc(SYS_newfstatat, fd, (long)"", (long)&st, AT_EMPTY_PATH, 0) != 0) return -1; + *dev = st.st_dev; + *ino = st.st_ino; + return 0; +} + +static long dir_tag(void) { + static uint64_t state; + uint64_t z = __atomic_add_fetch(&state, 0x9e3779b97f4a7c15ULL, __ATOMIC_RELAXED), seed = 0; + const void *random = (const void *)getauxval(AT_RANDOM); + if (random) memcpy(&seed, random, sizeof seed); + z += seed; + z = (z ^ (z >> 30)) * 0xbf58476d1ce4e5b9ULL; + z = (z ^ (z >> 27)) * 0x94d049bb133111ebULL; + return (long)((z ^ (z >> 31)) & 0xffffffffffULL) + 1; +} + +static int dir_owned(const struct dirslot *e) { + dev_t dev; + ino_t ino; + return e->fd > 0 && sc(SYS_lseek, e->fd, 0, SEEK_CUR, 0, 0) == e->tag + && fd_id(e->fd, &dev, &ino) == 0 && dev == e->dev && ino == e->ino; +} + +static int dir_fresh(struct dirslot *e, const char *dir) { + long long t = now_ns(); + if (t - __atomic_load_n(&e->stamp, __ATOMIC_RELAXED) < ttl_ns) return 1; + struct stat st; + if (sc(SYS_newfstatat, AT_FDCWD, (long)dir, (long)&st, 0, 0) != 0 || st.st_dev != e->dev || st.st_ino != e->ino) { + __atomic_add_fetch(&dir_epoch, 1, __ATOMIC_RELEASE); + return 0; + } + __atomic_store_n(&e->stamp, t, __ATOMIC_RELAXED); + return 1; +} + +static void dirs_drop(const char *host) { + size_t len = strlen(host); + if (pthread_mutex_trylock(&dir_lock) != 0) { + __atomic_add_fetch(&dir_epoch, 1, __ATOMIC_RELEASE); + return; + } + for (int i = 0; i < DIRS; i++) + if (dirs[i].path[0] && under(dirs[i].path, host, len)) dirs[i].path[0] = 0; + pthread_mutex_unlock(&dir_lock); +} + +static void near_put(struct near *n) { + if (n->own) sc(SYS_close, n->fd, 0, 0, 0, 0); + else if (n->slot >= 0) __atomic_sub_fetch(&dirs[n->slot].refs, 1, __ATOMIC_RELEASE); + n->fd = AT_FDCWD; + n->slot = -1; + n->own = 0; +} + +static int dir_cached(const char *dir, struct near *n) { + unsigned h = hash_of(dir); + struct dirslot *e = &dirs[h % DIRS]; + if (pthread_mutex_trylock(&dir_lock) != 0) return 0; + int hit = e->fd >= 0 && e->hash == h && e->path[0] && strcmp(e->path, dir) == 0 + && e->epoch == __atomic_load_n(&dir_epoch, __ATOMIC_ACQUIRE); + if (hit) __atomic_add_fetch(&e->refs, 1, __ATOMIC_ACQUIRE); + pthread_mutex_unlock(&dir_lock); + if (!hit) return 0; + char now[PATH_MAX]; + if (fd_path(e->fd, now) == 0 && strcmp(now, e->seen) == 0 && dir_fresh(e, dir)) { + n->fd = e->fd; + n->slot = (int)(e - dirs); + n->own = 0; + return 1; + } + __atomic_sub_fetch(&e->refs, 1, __ATOMIC_RELEASE); + if (pthread_mutex_trylock(&dir_lock) == 0) { + if (e->hash == h && strcmp(e->path, dir) == 0) e->path[0] = 0; + pthread_mutex_unlock(&dir_lock); + } + return 0; +} + +static int dir_keep(const char *dir, long fd, struct near *n) { + long high = sc(SYS_fcntl, fd, F_DUPFD_CLOEXEC, DIR_FD_FLOOR, 0, 0); + sc(SYS_close, fd, 0, 0, 0, 0); + if (high < 0) return -1; + n->fd = high; + n->slot = -1; + n->own = 1; + char seen[PATH_MAX]; + dev_t dev; + ino_t ino; + long tag = dir_tag(); + struct stat st; + if (fd_id(high, &dev, &ino) < 0 || strlen(dir) >= PATH_MAX + || sc(SYS_newfstatat, AT_FDCWD, (long)dir, (long)&st, 0, 0) != 0 || st.st_dev != dev || st.st_ino != ino) { + near_put(n); + return -1; + } + if (fd_path(high, seen) < 0 || sc(SYS_lseek, high, tag, SEEK_SET, 0, 0) != tag) return 0; + unsigned h = hash_of(dir); + struct dirslot *e = &dirs[h % DIRS]; + if (pthread_mutex_trylock(&dir_lock) != 0) return 0; + if (__atomic_load_n(&e->refs, __ATOMIC_ACQUIRE) == 0) { + if (dir_owned(e)) sc(SYS_close, e->fd, 0, 0, 0, 0); + e->hash = h; + e->epoch = __atomic_load_n(&dir_epoch, __ATOMIC_ACQUIRE); + e->tag = tag; + e->stamp = now_ns(); + e->fd = (int)high; + e->dev = dev; + e->ino = ino; + e->refs = 1; + strcpy(e->path, dir); + strcpy(e->seen, seen); + n->slot = (int)(e - dirs); + n->own = 0; + } + pthread_mutex_unlock(&dir_lock); + return 0; +} + +static int dir_get(char *dir, size_t floor, struct near *n) { + size_t len = strlen(dir), at = len; + while (!dir_cached(dir, n)) { + if (at <= floor) { + long fd = sc(SYS_openat, AT_FDCWD, (long)dir, O_RDONLY | O_DIRECTORY | O_CLOEXEC, 0, 0); + if (fd < 0 || dir_keep(dir, fd, n) < 0) return -1; + break; + } + char *slash = strrchr(dir, '/'); + if (!slash || (size_t)(slash - dir) < floor) return -1; + *slash = 0; + at = slash - dir; + } + while (at < len) { + dir[at] = '/'; + const char *name = dir + at + 1; + size_t next = at + 1 + strlen(name); + long fd = sc(SYS_openat, n->fd, (long)name, O_RDONLY | O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC, 0, 0); + near_put(n); + if (fd < 0 || dir_keep(dir, fd, n) < 0) return -1; + at = next; + } + return 0; +} + +static long near_get(const char *host, struct near *n) { + n->fd = AT_FDCWD; + n->slot = -1; + n->own = 0; + n->name = host; + if (ttl_ns <= 0 || host[0] != '/') return n->fd; + int i = fuse_bind(host); + if (i < 0) return n->fd; + const char *slash = strrchr(host, '/'); + size_t plen = slash - host; + if (plen < binds[i].hlen || !slash[1] || plen >= PATH_MAX) return n->fd; + char dir[PATH_MAX]; + memcpy(dir, host, plen); + dir[plen] = 0; + if (dir_get(dir, binds[i].hlen, n) < 0) { + near_put(n); + return n->fd; + } + n->name = slash + 1; + return n->fd; +} + +static long hsc(long nr, const char *host, long a, long b, long c) { + struct near n; + long fd = near_get(host, &n); + long rs = sc(nr, fd, (long)n.name, a, b, c); + near_put(&n); + return rs; +} + static int guest_text(const char *h, char *g) { if (h[0] == '/' && under(h, root, rootlen)) return to_guest(h, g, PATH_MAX); int i = h[0] == '/' ? host_bind(h) : -1; @@ -556,7 +763,7 @@ static long proc_readlink(const struct res *r, char *text, size_t size, int *cha return name[0] == 'e' ? own_exe(text) : own_cwd(text); } char h[PATH_MAX]; - long t = sc(SYS_readlinkat, AT_FDCWD, (long)r->host, (long)h, sizeof h - 1, 0); + long t = hsc(SYS_readlinkat, r->host, (long)h, sizeof h - 1, 0); if (t < 0) return t; if (t >= (long)sizeof h - 1) return FP_SLOW; if (size && (size_t)t > size) t = size; @@ -579,7 +786,7 @@ static long proc_link(struct res *r, char *text, int final) { if (!under(r->host, "/proc", 5)) return FP_SLOW; r->moving = 1; if (!strcmp(r->guest, "/proc/self") || !strcmp(r->guest, "/proc/thread-self")) { - long t = sc(SYS_readlinkat, AT_FDCWD, (long)r->host, (long)text, PATH_MAX - 1, 0); + long t = hsc(SYS_readlinkat, r->host, (long)text, PATH_MAX - 1, 0); if (t <= 0 || t >= PATH_MAX - 1) return FP_SLOW; text[t] = 0; return t; @@ -628,7 +835,7 @@ static long walk(struct res *r, const char *text, int follow, int last) { if (reserved(r->guest)) return FP_SLOW; struct bind *through; if (to_host(r->guest, r->host, &through) < 0) return FP_SLOW; - long s = sc(SYS_newfstatat, AT_FDCWD, (long)r->host, (long)&r->st, AT_SYMLINK_NOFOLLOW, 0); + long s = hsc(SYS_newfstatat, r->host, (long)&r->st, AT_SYMLINK_NOFOLLOW, 0); if (s < 0) { int glue = glue_above_binding(r->guest, glen + n); if (glue < 0) return FP_SLOW; @@ -648,13 +855,13 @@ static long walk(struct res *r, const char *text, int follow, int last) { t = proc_link(r, target, final && last); if (t == FP_SLOW) return FP_SLOW; if (t == 0) { - if (sc(SYS_newfstatat, AT_FDCWD, (long)r->host, (long)&r->st, 0, 0) < 0) return FP_SLOW; + if (hsc(SYS_newfstatat, r->host, (long)&r->st, 0, 0) < 0) return FP_SLOW; r->magic = 1; r->exists = 1; return 0; } } else { - t = sc(SYS_readlinkat, AT_FDCWD, (long)r->host, (long)target, sizeof target - 1, 0); + t = hsc(SYS_readlinkat, r->host, (long)target, sizeof target - 1, 0); if (t <= 0 || t >= (long)sizeof target - 1) return FP_SLOW; target[t] = 0; if (detranslated(target, r->host) == FP_SLOW) return FP_SLOW; @@ -676,7 +883,7 @@ static long walk(struct res *r, const char *text, int follow, int last) { } if (!stated) { if (to_host(r->guest, r->host, NULL) < 0) return FP_SLOW; - long s = sc(SYS_newfstatat, AT_FDCWD, (long)r->host, (long)&r->st, AT_SYMLINK_NOFOLLOW, 0); + long s = hsc(SYS_newfstatat, r->host, (long)&r->st, AT_SYMLINK_NOFOLLOW, 0); if (s < 0 && strcmp(r->guest, "/") != 0 && glue_above_binding(r->guest, strlen(r->guest))) return FP_SLOW; if (s < 0) return s == -ENOENT ? FP_SLOW : s; } @@ -699,7 +906,7 @@ static long bound_literal(const char *literal, struct res *r) { struct bind *bd; if (reserved(literal) || bind_of(literal, &bd) < 0 || !bd || bd->glen != strlen(literal) || bd->glen < 2) return FP_SLOW; if (snprintf(r->host, PATH_MAX, "%s", bd->host) >= PATH_MAX) return FP_SLOW; - if (sc(SYS_newfstatat, AT_FDCWD, (long)r->host, (long)&r->st, AT_SYMLINK_NOFOLLOW, 0) < 0 || S_ISLNK(r->st.st_mode)) return FP_SLOW; + if (hsc(SYS_newfstatat, r->host, (long)&r->st, AT_SYMLINK_NOFOLLOW, 0) < 0 || S_ISLNK(r->st.st_mode)) return FP_SLOW; snprintf(r->guest, PATH_MAX, "%s", literal); r->exists = 1; r->moving = 0; @@ -822,8 +1029,8 @@ static long fp_open(int dirfd, const char *path, int flags, mode_t mode) { long rs = resolve(dirfd, path, follow | MAY_BE_UNSEEN, &r); if (rs < 0) return rs; if (rs == 1 && !(flags & O_CREAT)) return -ENOENT; - if (rs == UNSEEN) return sc(SYS_openat, AT_FDCWD, (long)r.host, flags, (flags & O_CREAT) ? mode : 0, 0); - return sc(SYS_openat, AT_FDCWD, (long)r.host, flags | (follow && !r.magic ? O_NOFOLLOW : 0), (flags & O_CREAT) ? mode : 0, 0); + if (rs == UNSEEN) return hsc(SYS_openat, r.host, flags, (flags & O_CREAT) ? mode : 0, 0); + return hsc(SYS_openat, r.host, flags | (follow && !r.magic ? O_NOFOLLOW : 0), (flags & O_CREAT) ? mode : 0, 0); } static int do_openat(int dirfd, const char *path, int flags, mode_t mode, int (*real)(int, const char *, int, ...)) { @@ -864,7 +1071,7 @@ static long fp_stat(int dirfd, const char *path, int flags, struct stat *st) { long rs = resolve(dirfd, path, (flags & AT_SYMLINK_NOFOLLOW ? 0 : 1) | MAY_BE_UNSEEN, &r); if (rs < 0) return rs; if (rs == 1) return -ENOENT; - if (rs == UNSEEN) return sc(SYS_newfstatat, AT_FDCWD, (long)r.host, (long)st, flags, 0); + if (rs == UNSEEN) return hsc(SYS_newfstatat, r.host, (long)st, flags, 0); *st = r.st; return 0; } @@ -1007,7 +1214,7 @@ static long fp_access(int dirfd, const char *path, int mode, int flags) { ? resolve(dirfd, path, (flags & AT_SYMLINK_NOFOLLOW ? 0 : 1) | MAY_BE_UNSEEN, &r) : FP_SLOW; if (rs == 1) rs = -ENOENT; if (rs == 0 && S_ISLNK(r.st.st_mode)) rs = FP_SLOW; - if (rs == 0 || rs == UNSEEN) rs = sc(SYS_faccessat, AT_FDCWD, (long)r.host, mode, 0, 0); + if (rs == 0 || rs == UNSEEN) rs = hsc(SYS_faccessat, r.host, mode, 0, 0); return rs; } @@ -1030,7 +1237,7 @@ static long link_text(const struct res *r, char *text, size_t size, int *changed *changed = 0; if (in_proc != under(r->host, "/proc", 5)) return FP_SLOW; if (in_proc) return proc_readlink(r, text, size, changed); - long t = sc(SYS_readlinkat, AT_FDCWD, (long)r->host, (long)text, PATH_MAX - 1, 0); + long t = hsc(SYS_readlinkat, r->host, (long)text, PATH_MAX - 1, 0); if (t < 0) return t; if (t >= PATH_MAX - 1) return FP_SLOW; if (size && (size_t)t > size) t = size; @@ -1135,7 +1342,7 @@ char *__getcwd_chk(char *buf, size_t size, size_t room) { static long fp_mkdir(int dirfd, const char *path, mode_t mode) { struct res r; long rs = resolve(dirfd, path, MAY_BE_UNSEEN, &r); - if (rs == 0 || rs == 1 || rs == UNSEEN) rs = sc(SYS_mkdirat, AT_FDCWD, (long)r.host, mode, 0, 0); + if (rs == 0 || rs == 1 || rs == UNSEEN) rs = hsc(SYS_mkdirat, r.host, mode, 0, 0); return rs; } int mkdirat(int dirfd, const char *path, mode_t mode) { @@ -1172,7 +1379,7 @@ static long fp_unlink(int dirfd, const char *path, int flags) { if (rs == 0 && (flags & AT_REMOVEDIR) && strcmp(r.guest, "/") == 0) rs = FP_SLOW; if (rs == 0 || rs == UNSEEN) { int changes_paths = (flags & AT_REMOVEDIR) || rs == UNSEEN || S_ISLNK(r.st.st_mode); - rs = sc(SYS_unlinkat, AT_FDCWD, (long)r.host, flags, 0, 0); + rs = hsc(SYS_unlinkat, r.host, flags, 0, 0); if (rs == 0 && changes_paths) forget(); } return rs; @@ -1196,9 +1403,14 @@ static long fp_rename(int olddirfd, const char *old, int newdirfd, const char *n if (rt < 0) rs = rt; else if (rt == 0 && S_ISDIR(to.st.st_mode)) rs = FP_SLOW; else { - rs = flags ? sc(SYS_renameat2, AT_FDCWD, (long)from.host, AT_FDCWD, (long)to.host, flags) - : sc(SYS_renameat, AT_FDCWD, (long)from.host, AT_FDCWD, (long)to.host, 0); - if (rs == 0) forget(); + struct near a, b; + near_get(from.host, &a); + near_get(to.host, &b); + rs = flags ? sc(SYS_renameat2, a.fd, (long)a.name, b.fd, (long)b.name, flags) + : sc(SYS_renameat, a.fd, (long)a.name, b.fd, (long)b.name, 0); + near_put(&a); + near_put(&b); + if (rs == 0 && (S_ISLNK(from.st.st_mode) || (rt == 0 && S_ISLNK(to.st.st_mode)))) forget(); } } return rs; @@ -1236,7 +1448,10 @@ static long fp_chmod(int dirfd, const char *path, mode_t mode, int flags) { struct res r; long rs = flags ? FP_SLOW : resolve(dirfd, path, 1 | MAY_BE_UNSEEN, &r); if (rs == 1) rs = -ENOENT; - if (rs == 0 || rs == UNSEEN) rs = sc(SYS_fchmodat, AT_FDCWD, (long)r.host, mode, 0, 0); + if (rs == 0 || rs == UNSEEN) { + rs = hsc(SYS_fchmodat, r.host, mode, 0, 0); + if (rs == 0) dirs_drop(r.host); + } return rs; } int fchmodat(int dirfd, const char *path, mode_t mode, int flags) { @@ -1249,7 +1464,10 @@ static long fp_chown(int dirfd, const char *path, uid_t uid, gid_t gid, int flag struct res r; long rs = flags & ~AT_SYMLINK_NOFOLLOW ? FP_SLOW : resolve(dirfd, path, (flags & AT_SYMLINK_NOFOLLOW ? 0 : 1) | MAY_BE_UNSEEN, &r); if (rs == 1) rs = -ENOENT; - if (rs == 0 || rs == UNSEEN) rs = sc(SYS_fchownat, AT_FDCWD, (long)r.host, (long)uid, (long)gid, flags); + if (rs == 0 || rs == UNSEEN) { + rs = hsc(SYS_fchownat, r.host, (long)uid, (long)gid, flags); + if (rs == 0) dirs_drop(r.host); + } return rs; } int fchownat(int dirfd, const char *path, uid_t uid, gid_t gid, int flags) { @@ -1267,7 +1485,7 @@ static long fp_utimens(int dirfd, const char *path, const struct timespec times[ } else { rs = flags & ~AT_SYMLINK_NOFOLLOW ? FP_SLOW : resolve(dirfd, path, (flags & AT_SYMLINK_NOFOLLOW ? 0 : 1) | MAY_BE_UNSEEN, &r); if (rs == 1) rs = -ENOENT; - if (rs == 0 || rs == UNSEEN) rs = sc(SYS_utimensat, AT_FDCWD, (long)r.host, (long)times, flags, 0); + if (rs == 0 || rs == UNSEEN) rs = hsc(SYS_utimensat, r.host, (long)times, flags, 0); } return rs; } @@ -1509,7 +1727,7 @@ static long socket_address(const struct sockaddr *addr, socklen_t len, int follo char *slash = strrchr(r.host, '/'); if (!slash || slash == r.host) return FP_SLOW; *slash = 0; - *dir = sc(SYS_openat, AT_FDCWD, (long)r.host, O_PATH | O_DIRECTORY | O_CLOEXEC, 0, 0); + *dir = hsc(SYS_openat, r.host, O_PATH | O_DIRECTORY | O_CLOEXEC, 0, 0); if (*dir < 0) return FP_SLOW; hlen = snprintf(out->sun_path, room, "/proc/self/fd/%ld/%s", *dir, slash + 1); if (hlen >= room) { sc(SYS_close, *dir, 0, 0, 0, 0); *dir = -1; return FP_SLOW; } diff --git a/tools/tests/test_battlenet.py b/tools/tests/test_battlenet.py index 5f3d72c1b6..ec20e81777 100644 --- a/tools/tests/test_battlenet.py +++ b/tools/tests/test_battlenet.py @@ -198,6 +198,155 @@ class ConfigAndMenuTest(Temp): self.assertEqual(path.stat().st_mtime_ns, mtime) +class DriveTest(Temp): + def setUp(self): + super().setUp() + self.root = str(self.tmp / "Steam") + self.devices = Path(BNET["dosdevices"](self.root)) + self.card = self.tmp / "card" + self.library = self.card / "Games/Battle.net" + self.library.mkdir(parents=True) + self.running = [] + patcher = mock.patch.dict(BNET, {"say": lambda message: None, "wine_processes": lambda pfx, proc="/proc": list(self.running), + "volume_root": lambda path: str(self.card) if BNET["inside"](path, str(self.card)) else "/"}) + patcher.start() + self.addCleanup(patcher.stop) + + def test_a_volume_ends_where_the_device_changes(self): + devices = {"/": 1, "/mnt": 1, "/mnt/card": 7, "/mnt/card/Games": 7, "/mnt/card/Games/Battle.net": 7, "/root": 1, "/root/Games": 1} + with mock.patch.object(os, "stat", lambda path: mock.Mock(st_dev=devices[path])): + volume_root = runpy.run_path(str(BIN / "droiddeck-battlenet"))["volume_root"] + self.assertEqual(volume_root("/mnt/card/Games/Battle.net"), "/mnt/card") + self.assertEqual(volume_root("/mnt/card"), "/mnt/card") + self.assertEqual(volume_root("/root/Games"), "/") + self.assertEqual(volume_root("/"), "/") + + def test_a_library_on_the_root_volume_keeps_its_path_and_gets_no_drive(self): + library = self.tmp / "root/Games/Battle.net" + library.mkdir(parents=True) + self.assertEqual(BNET["install_path"](self.root, str(library) + "/"), "Z:" + str(library)) + self.assertFalse(self.devices.exists()) + + def test_a_library_on_another_volume_gets_a_drive_at_the_volume_root(self): + self.assertEqual(BNET["install_path"](self.root, str(self.library)), "D:\\Games\\Battle.net") + self.assertEqual(os.readlink(self.devices / "d:"), str(self.card)) + self.assertEqual(BNET["install_path"](self.root, str(self.library / "World of Warcraft")), "D:\\Games\\Battle.net\\World of Warcraft") + self.assertEqual(BNET["install_path"](self.root, str(self.card)), "D:\\") + self.assertEqual(sorted(os.listdir(self.devices)), ["d:"]) + + def test_drives_in_use_and_the_ones_proton_owns_are_left_alone(self): + self.devices.mkdir(parents=True) + os.symlink("/somewhere/else", self.devices / "d:") + os.symlink(str(self.card), self.devices / "s:") + self.assertEqual(BNET["install_path"](self.root, str(self.library)), "E:\\Games\\Battle.net") + self.assertEqual(os.readlink(self.devices / "d:"), "/somewhere/else") + for letter in BNET["DRIVES"]: + if not os.path.lexists(self.devices / (letter + ":")): + os.symlink("/somewhere/else", self.devices / (letter + ":")) + os.unlink(self.devices / "e:") + os.symlink("/somewhere/else", self.devices / "e:") + self.assertEqual(BNET["install_path"](self.root, str(self.library)), "Z:" + str(self.library)) + self.assertNotIn("s", BNET["DRIVES"]) + self.assertNotIn("t", BNET["DRIVES"]) + + def test_a_running_prefix_gets_no_new_drive_but_uses_the_ones_it_started_with(self): + self.running = [(5, ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe"])] + self.assertEqual(BNET["install_path"](self.root, str(self.library)), "Z:" + str(self.library)) + self.assertFalse(self.devices.exists()) + self.running = [] + self.assertEqual(BNET["install_path"](self.root, str(self.library)), "D:\\Games\\Battle.net") + self.running = [(5, ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe"])] + self.assertEqual(BNET["install_path"](self.root, str(self.library)), "D:\\Games\\Battle.net") + + def test_a_drive_mapped_inside_the_volume_is_reused(self): + self.devices.mkdir(parents=True) + os.symlink(str(self.card / "Games"), self.devices / "g:") + self.assertEqual(BNET["install_path"](self.root, str(self.library)), "G:\\Battle.net") + self.assertEqual(sorted(os.listdir(self.devices)), ["g:"]) + + def test_the_config_stores_the_drive_path_once(self): + path = self.tmp / ("Steam/steamapps/compatdata/%s/pfx/drive_c/users/steamuser/AppData/Roaming/Battle.net/Battle.net.config" + % BNET["APP_ID"]) + BNET["write_config"](self.root) + self.assertEqual(BNET["write_config"](self.root, str(self.library)), "library") + self.assertEqual(json.loads(path.read_text())["Client"]["Install"]["DefaultInstallPath"], "D:\\Games\\Battle.net") + self.assertIsNone(BNET["write_config"](self.root, str(self.library))) + + def test_registered_paths_resolve_through_their_drive(self): + BNET["install_path"](self.root, str(self.library)) + self.assertEqual(BNET["windows_path"](self.root, "D:/Games/Battle.net/World of Warcraft"), + str(self.library / "World of Warcraft")) + self.assertEqual(BNET["windows_path"](self.root, "Z:\\mnt\\card\\World of Warcraft"), "/mnt/card/World of Warcraft") + self.assertEqual(BNET["windows_path"](self.root, "C:/Program Files (x86)/World of Warcraft"), + os.path.join(BNET["drive_c"](self.root), "Program Files (x86)/World of Warcraft")) + self.assertIsNone(BNET["windows_path"](self.root, "E:/Games/X")) + self.assertIsNone(BNET["windows_path"](self.root, "D:/../etc")) + self.assertEqual(BNET["windows_path"](self.root, "D:\\"), str(self.library.parent.parent)) + + def field(self, number, value): + varint = BNET["encode_varint"] + return varint(number << 3 | 2) + varint(len(value)) + value + + def product(self, uid, folder, filler=b""): + settings = self.field(1, folder.encode()) + self.field(2, b"us") + b"\x18\x02" + filler + return self.field(1, self.field(1, uid.encode()) + self.field(2, uid.encode()) + self.field(3, settings) + + b"\x21" + bytes(8) + b"\x2d" + bytes(4)) + + def database(self, *products): + path = Path(BNET["drive_c"](self.root)) / "ProgramData/Battle.net/Agent/product.db" + path.parent.mkdir(parents=True, exist_ok=True) + path.write_bytes(b"".join(products) + self.field(7, b"tail")) + path.chmod(0o600) + return path + + def test_games_registered_through_the_root_drive_move_to_their_volume_drive(self): + game = self.library / "World of Warcraft" + game.mkdir() + other = self.tmp / "root/Games/Other" + other.mkdir(parents=True) + client = self.product("battle.net", "C:/Program Files (x86)/Battle.net") + local = self.product("other", "Z:" + str(other)) + gone = self.product("gone", "Z:" + str(self.card / "Missing")) + path = self.database(client, self.product("wow", "Z:" + str(game), bytes(200)), local, gone) + self.assertTrue(BNET["move_installs"](self.root)) + self.assertEqual(path.read_bytes(), client + self.product("wow", "D:/Games/Battle.net/World of Warcraft", bytes(200)) + + local + gone + self.field(7, b"tail")) + self.assertEqual(path.stat().st_mode & 0o777, 0o600) + self.assertEqual(os.readlink(self.devices / "d:"), str(self.card)) + self.assertFalse(BNET["move_installs"](self.root)) + + def test_registrations_stay_while_the_prefix_runs_or_the_database_is_unreadable(self): + game = self.library / "World of Warcraft" + game.mkdir() + path = self.database(self.product("wow", "Z:" + str(game))) + before = path.read_bytes() + self.running = [(5, ["C:\\ProgramData\\Battle.net\\Agent\\Agent.exe"])] + self.assertFalse(BNET["move_installs"](self.root)) + self.assertEqual(path.read_bytes(), before) + self.running = [] + for broken in (before[:-3], b"\x0a\xff", b"\x0b\x01"): + path.write_bytes(broken) + self.assertFalse(BNET["move_installs"](self.root)) + self.assertEqual(path.read_bytes(), broken) + os.unlink(path) + self.assertFalse(BNET["move_installs"](self.root)) + + def test_a_database_written_while_it_was_being_read_is_left_as_written(self): + game = self.library / "World of Warcraft" + game.mkdir() + path = self.database(self.product("wow", "Z:" + str(game))) + newer = path.read_bytes() + self.field(7, b"newer") + + def processes(pfx, proc="/proc"): + path.write_bytes(newer) + return [] + + with mock.patch.dict(BNET, {"wine_processes": processes}): + self.assertFalse(BNET["move_installs"](self.root)) + self.assertEqual(path.read_bytes(), newer) + self.assertTrue(BNET["move_installs"](self.root)) + + class GamepadTest(Temp): def registry(self, *entries): rows = ["WINE REGISTRY Version 2"] @@ -772,7 +921,7 @@ class Harness(Temp): "stop": lambda processes, wait=0: self.calls.append(("stop", sorted(pid for pid, _ in processes))), "start": lambda exe, verb=None: self.calls.append(("start", os.path.basename(exe), verb)) or self.Proton(), "spawn": lambda program, verb, args=(): self.calls.append(("spawn", os.path.basename(program), verb, list(args))), - "acquire": lambda folder=None: self.lock, + "acquire": lambda folder=None: self.lock, "volume_root": lambda path: "/", "POLL": 0, "READY_SETTLE": 0, "GAME_GRACE": 0, "CLIENT_WAIT": 0, }) patcher.start() @@ -1170,6 +1319,7 @@ class AgentTest(Temp): script = BNET["AGENT_SCRIPT"] self.assertIn("port = a(0), action = a(1), uid = a(2), product = a(3), dir = a(4)", script) self.assertIn("lang = a(5), country = a(6), region = a(7), out = a(8)", script) + self.assertIn(r'''"game_dir":"' + dir.replace(/\\/g, "\\\\").replace(/"/g, '\\"') + '","geo''', script) self.assertIn('"--internalclienttools"', (BIN / "droiddeck-battlenet").read_text()) def test_the_driver_asks_blizzards_chinese_repository_for_chinese_installs(self): @@ -1230,6 +1380,40 @@ class AgentJobTest(Harness): self.assertEqual([kind for kind, _ in self.lines], ["STATE", "PROGRESS", "DONE"]) self.assertEqual(json.loads(self.lines[-1][1]), {"install_dir": "Z:" + folder, "exe": "WarcraftRumble.exe", "version": "16.1.2.119725"}) + def test_an_install_on_another_volume_is_handed_over_by_its_drive_once_the_prefix_is_stopped(self): + self.install() + card = self.tmp / "card" + folder = str(card / "Games/Battle.net/Warcraft Rumble") + self.files = {".json": json.dumps({"progress": 1.0, "download_complete": True, "state": 1004}), + ".game": json.dumps({"installed": True, "install_dir": "D:/Games/Battle.net/Warcraft Rumble", "local_version": "1", + "binaries": {"game": {"relative_path": "WarcraftRumble.exe"}}})} + self.states = [[(7, self.AGENT)]] + events = [] + real_map = BNET["map_drive"] + + def acquire(folder=None): + events.append("lock") + return self.lock + + def stop(pfx): + events.append(("stop", not self.lock.closed)) + self.states = [[]] + return True + + def map_drive(root, volume): + events.append(("map", not self.lock.closed)) + return real_map(root, volume) + + with mock.patch.dict(BNET, {"volume_root": lambda path: str(card), "stop_leftovers": stop, "map_drive": map_drive, + "acquire": acquire}): + code = BNET["agent_job"](self.root, "install", "gryphon", "gryphon", folder, "enUS", "USA", "US", poll=0) + self.assertEqual(code, 0) + self.assertEqual(events, ["lock", ("stop", True), ("map", True)]) + self.assertTrue(self.lock.closed) + cmd = self.started[0] + self.assertEqual(cmd[cmd.index("--") + 6], "D:\\Games\\Battle.net\\Warcraft Rumble") + self.assertEqual(os.readlink(os.path.join(BNET["dosdevices"](self.root), "d:")), str(card)) + def test_an_agent_error_is_reported_with_its_code(self): self.install() self.files = {".json": json.dumps({"error": 2421, "progress": 0.0})} diff --git a/tools/tests/test_fastpath_fuse_dirs.py b/tools/tests/test_fastpath_fuse_dirs.py new file mode 100644 index 0000000000..d8c52e99da --- /dev/null +++ b/tools/tests/test_fastpath_fuse_dirs.py @@ -0,0 +1,243 @@ +import os +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest + +USERNS = shutil.which("unshare") is not None and subprocess.run(["unshare", "-Urm", "true"], capture_output=True).returncode == 0 + +FASTPATH = Path(__file__).resolve().parents[1] / "proot/fastpath/fastpath.c" + +PROGRAM = r""" +#include "FASTPATH" +#include + +static long host_sys(long nr, long a, long b, long c, long d, long e, long f) { + long r = syscall(nr, a, b, c, d, e, f); + return r < 0 ? -errno : r; +} + +static void show(long r) { + if (r == FP_SLOW) puts("SLOW"); + else if (r < 0) printf("E%ld\n", -r); + else puts("ok"); +} + +static int high_fds(void) { + int n = 0; + for (int fd = DIR_FD_FLOOR; fd < DIR_FD_FLOOR + 4 * DIRS; fd++) + if (fcntl(fd, F_GETFD) >= 0) n++; + return n; +} + +int main(int argc, char **argv) { + static char hosts[MAX_BINDS][PATH_MAX], guests[MAX_BINDS][512]; + static int taken[DIRS]; + int ntaken = 0; + fp_sys = host_sys; + snprintf(root, sizeof root, "%s", argv[1]); + rootlen = strlen(root); + int i = 2; + for (; i + 1 < argc && strcmp(argv[i], "--"); i += 2) { + struct bind *bd = &binds[nbinds]; + bd->host = hosts[nbinds]; + bd->guest = guests[nbinds]; + snprintf(bd->host, PATH_MAX, "%s", argv[i]); + snprintf(bd->guest, sizeof guests[0], "%s", argv[i + 1]); + bd->hlen = strlen(bd->host); + bd->glen = strlen(bd->guest); + nbinds++; + } + pthread_once(&init_once, fp_init); + fp_on = 1; + for (i++; i < argc; i++) { + const char *op = argv[i]; + if (!strcmp(op, "fuse")) { + for (int b = 0; b < nbinds; b++) binds[b].fuse = 1; + } else if (!strcmp(op, "touch")) { + long fd = fp_open(AT_FDCWD, argv[++i], O_CREAT | O_WRONLY | O_CLOEXEC, 0644); + if (fd >= 0) close((int)fd); + show(fd); + } else if (!strcmp(op, "stat")) { + struct stat st; + show(fp_stat(AT_FDCWD, argv[++i], AT_SYMLINK_NOFOLLOW, &st)); + } else if (!strcmp(op, "mkdir")) { + show(fp_mkdir(AT_FDCWD, argv[++i], 0755)); + } else if (!strcmp(op, "mv")) { + show(fp_rename(AT_FDCWD, argv[i + 1], AT_FDCWD, argv[i + 2], 0)); + i += 2; + } else if (!strcmp(op, "rm")) { + show(fp_unlink(AT_FDCWD, argv[++i], 0)); + } else if (!strcmp(op, "host-mv")) { + show(host_sys(SYS_renameat, AT_FDCWD, (long)argv[i + 1], AT_FDCWD, (long)argv[i + 2], 0, 0)); + i += 2; + } else if (!strcmp(op, "host-rmdir")) { + show(host_sys(SYS_unlinkat, AT_FDCWD, (long)argv[++i], AT_REMOVEDIR, 0, 0, 0)); + } else if (!strcmp(op, "host-mkdir")) { + show(host_sys(SYS_mkdirat, AT_FDCWD, (long)argv[++i], 0755, 0, 0, 0)); + } else if (!strcmp(op, "clobber")) { + long null = host_sys(SYS_openat, AT_FDCWD, (long)"/dev/null", O_RDONLY, 0, 0, 0); + for (int fd = DIR_FD_FLOOR; fd < DIR_FD_FLOOR + DIRS; fd++) host_sys(SYS_dup3, null, fd, 0, 0, 0, 0); + host_sys(SYS_close, null, 0, 0, 0, 0, 0); + puts("ok"); + } else if (!strcmp(op, "first-fd")) { + char link[40], out[PATH_MAX]; + snprintf(link, sizeof link, "/proc/self/fd/%d", DIR_FD_FLOOR); + long n = host_sys(SYS_readlinkat, AT_FDCWD, (long)link, (long)out, sizeof out - 1, 0, 0); + out[n > 0 ? n : 0] = 0; + puts(out); + } else if (!strcmp(op, "fds")) { + printf("%d\n", high_fds()); + } else if (!strcmp(op, "ttl")) { + ttl_ns = atoll(argv[++i]) * 1000000LL; + } else if (!strcmp(op, "sleep")) { + usleep(atoi(argv[++i]) * 1000); + } else if (!strcmp(op, "chmod")) { + show(fp_chmod(AT_FDCWD, argv[i + 1], strtol(argv[i + 2], NULL, 8), 0)); + i += 2; + } else if (!strcmp(op, "host-mount")) { + show(mount("tmpfs", argv[++i], "tmpfs", 0, NULL) == 0 ? 0 : -errno); + } else if (!strcmp(op, "take-over")) { + for (int fd = DIR_FD_FLOOR; fd < DIR_FD_FLOOR + DIRS; fd++) { + char link[40], out[PATH_MAX]; + snprintf(link, sizeof link, "/proc/self/fd/%d", fd); + long n = host_sys(SYS_readlinkat, AT_FDCWD, (long)link, (long)out, sizeof out - 1, 0, 0); + if (n <= 0) continue; + out[n] = 0; + long mine = host_sys(SYS_openat, AT_FDCWD, (long)out, O_RDONLY | O_DIRECTORY, 0, 0, 0); + host_sys(SYS_dup3, mine, fd, 0, 0, 0, 0); + host_sys(SYS_close, mine, 0, 0, 0, 0, 0); + taken[ntaken++] = fd; + } + puts("ok"); + } else if (!strcmp(op, "taken")) { + int open_fds = 0; + for (int t = 0; t < ntaken; t++) + if (lseek(taken[t], 0, SEEK_CUR) == 0) open_fds++; + printf("%d/%d\n", open_fds, ntaken); + } + } + return 0; +} +""" + + +class FastPathFuseDirsTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + if shutil.which("gcc") is None: + raise unittest.SkipTest("gcc is not available") + cls.build = tempfile.TemporaryDirectory() + source = Path(cls.build.name) / "fuse_dirs.c" + source.write_text(PROGRAM.replace("FASTPATH", str(FASTPATH))) + cls.program = Path(cls.build.name) / "fuse_dirs" + subprocess.run(["gcc", "-O1", "-Wall", "-Wextra", "-Werror", "-Wno-format-truncation", "-pthread", "-o", str(cls.program), str(source), "-ldl"], check=True) + + @classmethod + def tearDownClass(cls): + cls.build.cleanup() + + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.temp.cleanup) + base = Path(self.temp.name) + self.root = base / "root" + (self.root / "mnt").mkdir(parents=True) + self.card = base / "card" + (self.card / "Games/steamapps/common/Game/Data").mkdir(parents=True) + + def ask(self, *ops, wrap=()): + argv = [*wrap, str(self.program), str(self.root), str(self.card), "/mnt/card", "--", *ops] + return subprocess.run(argv, capture_output=True, text=True, timeout=20, check=True).stdout.split() + + def test_files_deep_in_a_fuse_library_are_created_renamed_and_removed(self): + data = "/mnt/card/Games/steamapps/common/Game/Data" + out = self.ask("fuse", "touch", f"{data}/a.tmp", "mv", f"{data}/a.tmp", f"{data}/a.idx", + "stat", f"{data}/a.idx", "stat", f"{data}/a.tmp", "rm", f"{data}/a.idx", + "stat", f"{data}/a.idx", "fds") + self.assertEqual(["ok", "ok", "ok", "E2", "ok", "E2"], out[:-1]) + self.assertGreater(int(out[-1]), 0) + self.assertEqual([], list((self.card / "Games/steamapps/common/Game/Data").iterdir())) + + def test_a_folder_renamed_behind_the_cache_is_not_reused(self): + game = self.card / "Games/steamapps/common/Game" + (game / "Data/keep").write_text("x") + out = self.ask("fuse", "stat", "/mnt/card/Games/steamapps/common/Game/Data/keep", + "host-mv", str(game), str(game.parent / "Moved"), + "stat", "/mnt/card/Games/steamapps/common/Game/Data/keep", + "stat", "/mnt/card/Games/steamapps/common/Moved/Data/keep") + self.assertEqual(["ok", "ok", "E2", "ok"], out) + + def test_a_folder_deleted_and_made_again_is_looked_up_fresh(self): + data = self.card / "Games/steamapps/common/Game/Data" + out = self.ask("fuse", "touch", "/mnt/card/Games/steamapps/common/Game/Data/old", + "rm", "/mnt/card/Games/steamapps/common/Game/Data/old", + "host-rmdir", str(data), "host-mkdir", str(data), + "touch", "/mnt/card/Games/steamapps/common/Game/Data/new") + self.assertEqual(["ok"] * 5, out) + self.assertEqual(["new"], [p.name for p in data.iterdir()]) + + def test_folders_deleted_and_made_again_many_times_keep_descriptors_bounded(self): + data = self.card / "Games/steamapps/common/Game/Data" + ops = ["fuse"] + for _ in range(200): + ops += ["touch", "/mnt/card/Games/steamapps/common/Game/Data/x", + "rm", "/mnt/card/Games/steamapps/common/Game/Data/x", + "host-rmdir", str(data), "host-mkdir", str(data)] + out = self.ask(*ops, "fds") + self.assertEqual(["ok"] * 800, out[:-1]) + self.assertLessEqual(int(out[-1]), 64) + + def test_descriptors_the_program_takes_over_are_left_alone(self): + data = "/mnt/card/Games/steamapps/common/Game/Data" + out = self.ask("fuse", "touch", f"{data}/a", "clobber", "touch", f"{data}/b", + "stat", f"{data}/a", "first-fd") + self.assertEqual(["ok", "ok", "ok", "ok", "/dev/null"], out) + self.assertEqual({"a", "b"}, {p.name for p in (self.card / "Games/steamapps/common/Game/Data").iterdir()}) + + def test_a_folder_the_program_opened_itself_stays_open_when_the_cache_moves_on(self): + data = self.card / "Games/steamapps/common/Game/Data" + ops = ["fuse", "touch", "/mnt/card/Games/steamapps/common/Game/Data/a", "take-over"] + for n in range(200): + (data / f"d{n}").mkdir() + ops += ["touch", f"/mnt/card/Games/steamapps/common/Game/Data/d{n}/x"] + out = self.ask(*ops, "taken") + self.assertEqual(["ok"] * 202, out[:-1]) + opened, total = map(int, out[-1].split("/")) + self.assertGreater(total, 0) + self.assertEqual(total, opened) + self.assertEqual(200, len(list(data.glob("d*/x")))) + + @unittest.skipIf(os.geteuid() == 0, "root passes folder permissions") + def test_a_parent_folder_closed_by_the_program_stops_cached_access_at_once(self): + game = self.card / "Games/steamapps/common/Game" + (game / "Data/keep").write_text("x") + self.addCleanup(os.chmod, game, 0o755) + out = self.ask("fuse", "stat", "/mnt/card/Games/steamapps/common/Game/Data/keep", + "chmod", "/mnt/card/Games/steamapps/common/Game", "000", + "stat", "/mnt/card/Games/steamapps/common/Game/Data/keep", + "touch", "/mnt/card/Games/steamapps/common/Game/Data/new") + self.assertEqual(["ok", "ok"], out[:2]) + self.assertNotIn("ok", out[2:]) + os.chmod(game, 0o755) + self.assertEqual(["keep"], [p.name for p in (game / "Data").iterdir()]) + + @unittest.skipUnless(USERNS, "mount namespaces are not available") + def test_a_mount_placed_over_a_cached_folder_receives_later_writes(self): + data = self.card / "Games/steamapps/common/Game/Data" + out = self.ask("fuse", "ttl", "1", "touch", "/mnt/card/Games/steamapps/common/Game/Data/under", + "host-mount", str(data), "sleep", "20", + "touch", "/mnt/card/Games/steamapps/common/Game/Data/over", + "stat", "/mnt/card/Games/steamapps/common/Game/Data/under", wrap=("unshare", "-Urm")) + self.assertEqual(["ok", "ok", "ok", "E2"], out) + self.assertEqual(["under"], [p.name for p in data.iterdir()]) + + def test_other_filesystems_keep_absolute_paths_and_open_no_folders(self): + data = "/mnt/card/Games/steamapps/common/Game/Data" + out = self.ask("touch", f"{data}/a", "mv", f"{data}/a", f"{data}/b", "rm", f"{data}/b", "fds") + self.assertEqual(["ok", "ok", "ok", "0"], out) + + +if __name__ == "__main__": + unittest.main() From b3c61cf0bfad2fc87cbe957308caa5ff741f8682 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 11 Nov 2026 20:45:23 -0500 Subject: [PATCH 06/57] fix: permissions set by Windows programs are kept on SD cards (#2504) * fix: keep file permissions set by Windows programs on volumes without extended attributes Wine's server stores a file's security descriptor in an extended attribute. Volumes that cannot hold one dropped every descriptor, so a program that checks and repairs its install folder's permissions repeated the repair on every start. The descriptor is now kept inside the prefix when the volume refuses it, and follows the file when the server renames or deletes it. * fix: a path deleted with remove() drops its kept descriptor too --- tools/linuxfs/preload/descriptor.c | 291 +++++++++++++++++++++++++ tools/linuxfs/preload/dircache.c | 16 +- tools/linuxfs/preload/owner.c | 7 +- tools/tests/test_descriptor_preload.py | 245 +++++++++++++++++++++ tools/tests/test_fastpath_fuse_dirs.py | 28 +++ 5 files changed, 580 insertions(+), 7 deletions(-) create mode 100644 tools/linuxfs/preload/descriptor.c create mode 100644 tools/tests/test_descriptor_preload.py diff --git a/tools/linuxfs/preload/descriptor.c b/tools/linuxfs/preload/descriptor.c new file mode 100644 index 0000000000..681dce999e --- /dev/null +++ b/tools/linuxfs/preload/descriptor.c @@ -0,0 +1,291 @@ +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define DESCRIPTOR "user.wine.sd" +#define STORE "/.droiddeck-descriptors" +#define ENTRY_MAX (PATH_MAX * 2) + +int bl_is_wineserver(void) __attribute__((visibility("hidden"))); + +static int store_seen; + +static int kept(const char *name) { + return name != NULL && strcmp(name, DESCRIPTOR) == 0 && bl_is_wineserver(); +} + +static int store_root(char *out, size_t size) { + const char *prefix = getenv("WINEPREFIX"); + int n; + + if (prefix == NULL || prefix[0] != '/') return -1; + n = snprintf(out, size, "%s" STORE, prefix); + return n > 0 && (size_t)n < size ? n : -1; +} + +static int store_exists(void) { + char root[PATH_MAX]; + + if (store_seen) return 1; + if (store_root(root, sizeof(root)) < 0) return 0; + store_seen = access(root, F_OK) == 0; + return store_seen; +} + +static int entry_for(const char *path, char *out, size_t size, const char *suffix, int create) { + int used = store_root(out, size); + const char *part = path, *end; + + if (used < 0 || path[0] != '/') return -1; + if (create && mkdir(out, 0700) != 0 && errno != EEXIST) return -1; + while (*part == '/') part++; + if (*part == '\0') return -1; + for (;;) { + size_t length; + const char *tail; + + end = strchr(part, '/'); + length = end ? (size_t)(end - part) : strlen(part); + tail = end ? ".d" : suffix; + if (length + strlen(tail) > NAME_MAX || used + length + strlen(tail) + 2 > size) return -1; + out[used++] = '/'; + memcpy(out + used, part, length); + used += (int)length; + strcpy(out + used, tail); + used += (int)strlen(tail); + if (!end) break; + if (create && mkdir(out, 0700) != 0 && errno != EEXIST) return -1; + part = end + 1; + } + if (create) store_seen = 1; + return 0; +} + +static int path_of(int fd, char *out, size_t size) { + char link[40]; + ssize_t n; + + snprintf(link, sizeof(link), "/proc/self/fd/%d", fd); + n = readlink(link, out, size - 1); + if (n <= 0 || out[0] != '/') return -1; + out[n] = '\0'; + return 0; +} + +static int resolved(const char *path, char *out, size_t size) { + int fd, result; + + if (path == NULL) return -1; + fd = open(path, O_PATH | O_NOFOLLOW | O_CLOEXEC); + if (fd < 0) return -1; + result = path_of(fd, out, size); + close(fd); + return result; +} + +static int entry_of(int fd, char *out, size_t size, int create) { + char path[PATH_MAX]; + + if (path_of(fd, path, sizeof(path)) != 0) return -1; + return entry_for(path, out, size, ".sd", create); +} + +static ssize_t stored_read(int fd, void *value, size_t size) { + char entry[ENTRY_MAX]; + struct stat st; + ssize_t got = 0; + int file; + + if (entry_of(fd, entry, sizeof(entry), 0) != 0) return -2; + file = open(entry, O_RDONLY | O_NOFOLLOW | O_CLOEXEC); + if (file < 0) { + if (errno != ENOENT) return -2; + errno = ENODATA; + return -1; + } + if (fstat(file, &st) != 0) { + close(file); + return -2; + } + if (size == 0) { + close(file); + return (ssize_t)st.st_size; + } + if ((size_t)st.st_size > size) { + close(file); + errno = ERANGE; + return -1; + } + while (got < st.st_size) { + ssize_t n = read(file, (char *)value + got, (size_t)(st.st_size - got)); + if (n <= 0) { + close(file); + return -2; + } + got += n; + } + close(file); + return got; +} + +static int stored_write(int fd, const void *value, size_t size) { + char entry[ENTRY_MAX], fresh[ENTRY_MAX + 8]; + size_t put = 0; + int file; + + if (entry_of(fd, entry, sizeof(entry), 1) != 0) return -1; + snprintf(fresh, sizeof(fresh), "%s.new", entry); + file = open(fresh, O_WRONLY | O_CREAT | O_TRUNC | O_NOFOLLOW | O_CLOEXEC, 0600); + if (file < 0) return -1; + while (put < size) { + ssize_t n = write(file, (const char *)value + put, size - put); + if (n <= 0) { + close(file); + unlinkat(AT_FDCWD, fresh, 0); + return -1; + } + put += (size_t)n; + } + if (close(file) != 0 || renameat(AT_FDCWD, fresh, AT_FDCWD, entry) != 0) { + unlinkat(AT_FDCWD, fresh, 0); + return -1; + } + return 0; +} + +ssize_t fgetxattr(int fd, const char *name, void *value, size_t size) { + static ssize_t (*next)(int, const char *, void *, size_t); + ssize_t result; + + if (next == NULL) next = dlsym(RTLD_NEXT, "fgetxattr"); + if (next == NULL) { + errno = ENOSYS; + return -1; + } + result = next(fd, name, value, size); + if (result >= 0 || errno != ENOTSUP || !kept(name)) return result; + result = stored_read(fd, value, size); + if (result == -2) { + errno = ENOTSUP; + return -1; + } + return result; +} + +int fsetxattr(int fd, const char *name, const void *value, size_t size, int flags) { + static int (*next)(int, const char *, const void *, size_t, int); + int saved = errno, result; + + if (next == NULL) next = dlsym(RTLD_NEXT, "fsetxattr"); + if (next == NULL) { + errno = ENOSYS; + return -1; + } + result = next(fd, name, value, size, flags); + if (result == 0 || errno != ENOTSUP || !kept(name)) return result; + if (stored_write(fd, value, size) != 0) { + errno = ENOTSUP; + return -1; + } + errno = saved; + return 0; +} + +int fremovexattr(int fd, const char *name) { + static int (*next)(int, const char *); + char entry[ENTRY_MAX]; + int saved = errno, result; + + if (next == NULL) next = dlsym(RTLD_NEXT, "fremovexattr"); + if (next == NULL) { + errno = ENOSYS; + return -1; + } + result = next(fd, name); + if (result == 0 || errno != ENOTSUP || !kept(name)) return result; + if (entry_of(fd, entry, sizeof(entry), 0) != 0) { + errno = ENOTSUP; + return -1; + } + if (unlinkat(AT_FDCWD, entry, 0) != 0) { + errno = errno == ENOENT ? ENODATA : ENOTSUP; + return -1; + } + errno = saved; + return 0; +} + +static int tracked(const char *path, char *out, size_t size) { + int saved = errno, found; + + found = bl_is_wineserver() && store_exists() && resolved(path, out, size) == 0; + errno = saved; + return found; +} + +static void forget(const char *path, int folder) { + char entry[ENTRY_MAX]; + int saved = errno; + + if (entry_for(path, entry, sizeof(entry), ".sd", 0) == 0) unlinkat(AT_FDCWD, entry, 0); + if (folder && entry_for(path, entry, sizeof(entry), ".d", 0) == 0) unlinkat(AT_FDCWD, entry, AT_REMOVEDIR); + errno = saved; +} + +static void follow(const char *from, const char *to) { + static const char *const kinds[] = {".sd", ".d"}; + char old[ENTRY_MAX], new[ENTRY_MAX]; + int saved = errno; + + for (size_t i = 0; i < 2; i++) { + if (entry_for(from, old, sizeof(old), kinds[i], 0) != 0) continue; + if (access(old, F_OK) != 0) { + if (i == 0 && entry_for(to, new, sizeof(new), kinds[i], 0) == 0) unlinkat(AT_FDCWD, new, 0); + continue; + } + if (entry_for(to, new, sizeof(new), kinds[i], 1) != 0 || renameat(AT_FDCWD, old, AT_FDCWD, new) != 0) { + if (i == 0) unlinkat(AT_FDCWD, old, 0); + } + } + errno = saved; +} + +__attribute__((visibility("hidden"))) +int bl_descriptor_unlink(const char *path, int (*real)(const char *)) { + char target[PATH_MAX]; + int known = tracked(path, target, sizeof(target)), result = real(path); + + if (result == 0 && known) forget(target, 0); + return result; +} + +__attribute__((visibility("hidden"))) +int bl_descriptor_rmdir(const char *path, int (*real)(const char *)) { + char target[PATH_MAX]; + int known = tracked(path, target, sizeof(target)), result = real(path); + + if (result == 0 && known) forget(target, 1); + return result; +} + +__attribute__((visibility("hidden"))) +int bl_descriptor_remove(const char *path, int (*real)(const char *)) { + return bl_descriptor_rmdir(path, real); +} + +__attribute__((visibility("hidden"))) +int bl_descriptor_rename(const char *from, const char *to, int (*real)(const char *, const char *)) { + char old[PATH_MAX], new[PATH_MAX]; + int known = tracked(from, old, sizeof(old)), result = real(from, to); + + if (result == 0 && known && tracked(to, new, sizeof(new))) follow(old, new); + return result; +} diff --git a/tools/linuxfs/preload/dircache.c b/tools/linuxfs/preload/dircache.c index 296faa616b..f6951497f0 100644 --- a/tools/linuxfs/preload/dircache.c +++ b/tools/linuxfs/preload/dircache.c @@ -846,9 +846,17 @@ int bl_dircache_create(int dirfd, const char *path, int flags, mode_t mode, } ONE_PATH(mkdir, ADDED, IN_CREATE, next_mkdir(path, mode), mode_t mode) -ONE_PATH(rmdir, REMOVED, IN_DELETE, next_rmdir(path)) -ONE_PATH(unlink, REMOVED, IN_DELETE, next_unlink(path)) -ONE_PATH(remove, REMOVED, IN_DELETE, next_remove(path)) +int bl_descriptor_unlink(const char *path, int (*real)(const char *)) __attribute__((visibility("hidden"))); +int bl_descriptor_rmdir(const char *path, int (*real)(const char *)) __attribute__((visibility("hidden"))); +int bl_descriptor_remove(const char *path, int (*real)(const char *)) __attribute__((visibility("hidden"))); +int bl_descriptor_rename(const char *from, const char *to, int (*real)(const char *, const char *)) + __attribute__((visibility("hidden"))); + +static int moved(const char *from, const char *to) { return bl_descriptor_rename(from, to, next_rename); } + +ONE_PATH(rmdir, REMOVED, IN_DELETE, bl_descriptor_rmdir(path, next_rmdir)) +ONE_PATH(unlink, REMOVED, IN_DELETE, bl_descriptor_unlink(path, next_unlink)) +ONE_PATH(remove, REMOVED, IN_DELETE, bl_descriptor_remove(path, next_remove)) #define TWO_PATHS(name, gone, event, call) \ int name(const char *from, const char *to) { \ @@ -881,7 +889,7 @@ ONE_PATH(remove, REMOVED, IN_DELETE, next_remove(path)) int bl_link_lock(const char *oldpath, const char *newpath, int result) __attribute__((visibility("hidden"))); static int link_or_lock(const char *from, const char *to) { return bl_link_lock(from, to, next_link(from, to)); } -TWO_PATHS(rename, 1, IN_MOVED_TO, next_rename) +TWO_PATHS(rename, 1, IN_MOVED_TO, moved) TWO_PATHS(link, 0, IN_CREATE, link_or_lock) TWO_PATHS(symlink, 0, IN_CREATE, next_symlink) diff --git a/tools/linuxfs/preload/owner.c b/tools/linuxfs/preload/owner.c index 78ada3bf00..1e493f8a80 100644 --- a/tools/linuxfs/preload/owner.c +++ b/tools/linuxfs/preload/owner.c @@ -12,7 +12,8 @@ #define FAT_MAGIC 0x4d44 #define EXFAT_MAGIC 0x2011bab0 -static int is_wineserver(void) { +__attribute__((visibility("hidden"))) +int bl_is_wineserver(void) { static int cached = -1; char exe[PATH_MAX]; const char *base; @@ -43,7 +44,7 @@ void bl_storage_owner(int fd, struct stat *st) { int saved = errno; uid_t uid; - if (st != NULL && is_wineserver()) { + if (st != NULL && bl_is_wineserver()) { uid = getuid(); if (st->st_uid != uid && has_no_unix_owner(fd)) st->st_uid = uid; } @@ -60,7 +61,7 @@ int fchmod(int fd, mode_t mode) { return -1; } result = next_fchmod(fd, mode); - if (result != 0 && errno == EPERM && is_wineserver()) { + if (result != 0 && errno == EPERM && bl_is_wineserver()) { if (has_no_unix_owner(fd)) { errno = saved; return 0; diff --git a/tools/tests/test_descriptor_preload.py b/tools/tests/test_descriptor_preload.py new file mode 100644 index 0000000000..f83df2e9b2 --- /dev/null +++ b/tools/tests/test_descriptor_preload.py @@ -0,0 +1,245 @@ +import os +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest + +PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" + +FAKE = r""" +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include + +static int answer(int fd) { + char link[32], path[4096]; + snprintf(link, sizeof(link), "/proc/self/fd/%d", fd); + long n = syscall(SYS_readlinkat, AT_FDCWD, link, path, sizeof(path) - 1); + path[n > 0 ? n : 0] = '\0'; + if (strstr(path, "/card/")) return ENOTSUP; + if (strstr(path, "/denied/")) return EACCES; + return ENODATA; +} + +ssize_t fgetxattr(int fd, const char *name, void *value, size_t size) { + (void)name; (void)value; (void)size; + errno = answer(fd); + return -1; +} + +int fsetxattr(int fd, const char *name, const void *value, size_t size, int flags) { + (void)name; (void)value; (void)size; (void)flags; + int error = answer(fd); + if (error == ENODATA) return 0; + errno = error; + return -1; +} + +int fremovexattr(int fd, const char *name) { + (void)name; + errno = answer(fd); + return -1; +} +""" + +PROGRAM = r""" +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include + +static const char *error(void) { + return errno == ENOTSUP ? "unsupported" : errno == ENODATA ? "none" : errno == ERANGE ? "range" : + errno == EACCES ? "denied" : "other"; +} + +int main(int argc, char **argv) { + for (int i = 1; i < argc; i++) { + const char *op = argv[i]; + if (!strcmp(op, "unlink") || !strcmp(op, "rmdir")) { + const char *path = argv[++i]; + printf("%s\n", (op[0] == 'u' ? unlink(path) : rmdir(path)) == 0 ? "ok" : "failed"); + continue; + } + if (!strcmp(op, "remove-path")) { + printf("%s\n", remove(argv[++i]) == 0 ? "ok" : "failed"); + continue; + } + if (!strcmp(op, "rename")) { + const char *from = argv[++i], *to = argv[++i]; + printf("%s\n", rename(from, to) == 0 ? "ok" : "failed"); + continue; + } + int fd = open(argv[++i], O_RDONLY); + char value[64]; + if (!strcmp(op, "set")) { + const char *text = argv[++i]; + errno = 1234; + int result = fsetxattr(fd, "user.wine.sd", text, strlen(text), 0); + printf("%s\n", result == 0 ? errno == 1234 ? "ok" : "errno" : error()); + } else if (!strcmp(op, "get")) { + ssize_t n = fgetxattr(fd, "user.wine.sd", value, sizeof(value)); + if (n < 0) printf("%s\n", error()); + else printf("=%.*s\n", (int)n, value); + } else if (!strcmp(op, "size")) { + ssize_t n = fgetxattr(fd, "user.wine.sd", NULL, 0); + if (n < 0) printf("%s\n", error()); + else printf("%d\n", (int)n); + } else if (!strcmp(op, "short")) { + ssize_t n = fgetxattr(fd, "user.wine.sd", value, 2); + printf("%s\n", n < 0 ? error() : "read"); + } else if (!strcmp(op, "remove")) { + errno = 1234; + int result = fremovexattr(fd, "user.wine.sd"); + printf("%s\n", result == 0 ? errno == 1234 ? "ok" : "errno" : error()); + } else if (!strcmp(op, "other")) { + ssize_t n = fgetxattr(fd, "user.other", value, sizeof(value)); + printf("%s\n", n < 0 ? error() : "read"); + } + close(fd); + } + return 0; +} +""" + + +@unittest.skipUnless(shutil.which("cc"), "needs a C compiler") +class DescriptorPreloadTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + cls.build_dir = tempfile.TemporaryDirectory() + build = Path(cls.build_dir.name) + (build / "fake.c").write_text(FAKE) + (build / "program.c").write_text(PROGRAM) + cls.preload = build / "libblsession.so" + cls.fake = build / "fake.so" + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-o", str(cls.preload), + *map(str, sorted(PRELOAD.glob("*.c"))), "-ldl"], check=True) + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-o", str(cls.fake), str(build / "fake.c")], check=True) + cls.wineserver = build / "wineserver" + subprocess.run(["cc", "-O2", "-o", str(cls.wineserver), str(build / "program.c")], check=True) + cls.other = build / "wine64-preloader" + shutil.copy(cls.wineserver, cls.other) + + @classmethod + def tearDownClass(cls): + cls.build_dir.cleanup() + + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.dir = Path(os.path.realpath(self.temp.name)) + self.prefix = self.dir / "prefix" + self.prefix.mkdir() + self.store = self.prefix / ".droiddeck-descriptors" + for kind in ("card", "disk", "denied"): + (self.dir / kind / "game").mkdir(parents=True) + (self.dir / kind / "game" / "file").write_text("x") + + def tearDown(self): + self.temp.cleanup() + + def path(self, *parts): + return str(self.dir.joinpath(*parts)) + + def run_as(self, program, *args, prefix=True): + env = dict(os.environ, LD_PRELOAD="%s:%s" % (self.preload, self.fake)) + env.pop("WINEPREFIX", None) + if prefix: + env["WINEPREFIX"] = str(self.prefix) + result = subprocess.run([str(program), *args], env=env, capture_output=True, text=True, check=True) + return result.stdout.split() + + def server(self, *args, **kwargs): + return self.run_as(self.wineserver, *args, **kwargs) + + def test_a_descriptor_is_kept_where_the_volume_cannot_store_it(self): + file, folder = self.path("card", "game", "file"), self.path("card", "game") + self.assertEqual(["none", "ok", "ok"], self.server("get", file, "set", file, "one", "set", folder, "two")) + self.assertEqual(["=one", "3", "=two"], self.server("get", file, "size", file, "get", folder)) + + def test_a_descriptor_is_replaced_and_removed(self): + file = self.path("card", "game", "file") + self.assertEqual(["ok", "ok", "=longer"], self.server("set", file, "one", "set", file, "longer", "get", file)) + self.assertEqual(["range", "ok", "none", "none"], self.server("short", file, "remove", file, "get", file, "remove", file)) + + def test_a_volume_that_stores_descriptors_is_left_alone(self): + file = self.path("disk", "game", "file") + self.assertEqual(["ok", "none", "none"], self.server("set", file, "one", "get", file, "remove", file)) + self.assertFalse(self.store.exists()) + + def test_other_failures_keep_their_error(self): + file = self.path("denied", "game", "file") + self.assertEqual(["denied", "denied", "denied"], self.server("set", file, "one", "get", file, "remove", file)) + self.assertFalse(self.store.exists()) + + def test_other_programs_and_other_attributes_are_unchanged(self): + file = self.path("card", "game", "file") + self.assertEqual(["unsupported", "unsupported", "unsupported"], + self.run_as(self.other, "set", file, "one", "get", file, "remove", file)) + self.assertEqual(["ok", "unsupported"], self.server("set", file, "one", "other", file)) + self.assertEqual(["unsupported"], self.run_as(self.other, "get", file)) + + def test_nothing_is_kept_without_a_prefix(self): + file = self.path("card", "game", "file") + self.assertEqual(["unsupported", "unsupported", "unsupported"], + self.server("set", file, "one", "get", file, "remove", file, prefix=False)) + + def test_a_deleted_file_loses_its_descriptor(self): + file, folder = self.path("card", "game", "file"), self.path("card", "game") + self.assertEqual(["ok", "ok", "ok"], self.server("set", file, "one", "set", folder, "two", "unlink", file)) + Path(file).write_text("x") + self.assertEqual(["none", "ok", "ok"], self.server("get", file, "unlink", file, "rmdir", folder)) + Path(folder).mkdir() + self.assertEqual(["none"], self.server("get", folder)) + + def test_a_removed_file_or_folder_loses_its_descriptor(self): + file, folder = self.path("card", "game", "file"), self.path("card", "game") + self.assertEqual(["ok", "ok", "ok", "ok"], + self.server("set", file, "one", "set", folder, "two", "remove-path", file, "remove-path", folder)) + Path(folder).mkdir() + Path(file).write_text("x") + self.assertEqual(["none", "none"], self.server("get", folder, "get", file)) + + def test_a_file_deleted_through_a_link_loses_its_descriptor(self): + file = self.path("card", "game", "file") + os.symlink(self.path("card"), self.path("drive")) + self.assertEqual(["ok", "ok"], self.server("set", file, "one", "unlink", self.path("drive", "game", "file"))) + Path(file).write_text("x") + self.assertEqual(["none"], self.server("get", file)) + + def test_a_descriptor_follows_a_rename(self): + file, moved = self.path("card", "game", "file"), self.path("card", "game", "moved") + self.assertEqual(["ok", "ok", "=one"], self.server("set", file, "one", "rename", file, moved, "get", moved)) + Path(file).write_text("x") + self.assertEqual(["none", "ok", "none"], self.server("get", file, "rename", file, moved, "get", moved)) + + def test_descriptors_follow_a_renamed_folder(self): + file, folder, moved = self.path("card", "game", "file"), self.path("card", "game"), self.path("card", "moved") + self.assertEqual(["ok", "ok", "ok"], self.server("set", file, "one", "set", folder, "two", "rename", folder, moved)) + self.assertEqual(["=two", "=one"], self.server("get", moved, "get", self.path("card", "moved", "file"))) + Path(folder).mkdir() + (Path(folder) / "file").write_text("x") + self.assertEqual(["none", "none"], self.server("get", folder, "get", file)) + + def test_deletes_outside_the_store_cost_nothing_before_it_exists(self): + file = self.path("disk", "game", "file") + self.assertEqual(["ok"], self.server("unlink", file)) + self.assertFalse(self.store.exists()) + + def test_a_name_too_long_to_keep_reports_no_support(self): + long_file = self.path("card", "game", "n" * 254) + Path(long_file).write_text("x") + self.assertEqual(["unsupported", "unsupported"], self.server("set", long_file, "one", "get", long_file)) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_fastpath_fuse_dirs.py b/tools/tests/test_fastpath_fuse_dirs.py index d8c52e99da..4347e0aedf 100644 --- a/tools/tests/test_fastpath_fuse_dirs.py +++ b/tools/tests/test_fastpath_fuse_dirs.py @@ -13,8 +13,18 @@ PROGRAM = r""" #include "FASTPATH" #include +static const char *race_from, *race_to; +static dev_t race_dev; +static ino_t race_ino; + static long host_sys(long nr, long a, long b, long c, long d, long e, long f) { long r = syscall(nr, a, b, c, d, e, f); + struct stat fs; + if (r >= 0 && nr == SYS_fcntl && b == F_DUPFD_CLOEXEC && c == DIR_FD_FLOOR && race_from + && syscall(SYS_fstat, a, &fs) == 0 && fs.st_dev == race_dev && fs.st_ino == race_ino) { + syscall(SYS_renameat, AT_FDCWD, race_from, AT_FDCWD, race_to); + race_from = NULL; + } return r < 0 ? -errno : r; } @@ -72,6 +82,14 @@ int main(int argc, char **argv) { } else if (!strcmp(op, "host-mv")) { show(host_sys(SYS_renameat, AT_FDCWD, (long)argv[i + 1], AT_FDCWD, (long)argv[i + 2], 0, 0)); i += 2; + } else if (!strcmp(op, "race-mv")) { + struct stat rs; + race_from = argv[i + 1]; + race_to = argv[i + 2]; + i += 2; + show(host_sys(SYS_newfstatat, AT_FDCWD, (long)race_from, (long)&rs, 0, 0, 0)); + race_dev = rs.st_dev; + race_ino = rs.st_ino; } else if (!strcmp(op, "host-rmdir")) { show(host_sys(SYS_unlinkat, AT_FDCWD, (long)argv[++i], AT_REMOVEDIR, 0, 0, 0)); } else if (!strcmp(op, "host-mkdir")) { @@ -169,6 +187,16 @@ class FastPathFuseDirsTest(unittest.TestCase): "stat", "/mnt/card/Games/steamapps/common/Moved/Data/keep") self.assertEqual(["ok", "ok", "E2", "ok"], out) + def test_a_folder_renamed_while_it_is_opened_is_not_used_under_its_old_name(self): + game = self.card / "Games/steamapps/common/Game" + (game / "Data/keep").write_text("x") + out = self.ask("fuse", "race-mv", str(game / "Data"), str(game / "Moved"), + "stat", "/mnt/card/Games/steamapps/common/Game/Data/keep", + "touch", "/mnt/card/Games/steamapps/common/Game/Data/new", "fds") + self.assertEqual(["ok", "E2", "E2"], out[:3]) + self.assertEqual(["keep"], [p.name for p in (game / "Moved").iterdir()]) + self.assertLessEqual(int(out[-1]), 64) + def test_a_folder_deleted_and_made_again_is_looked_up_fresh(self): data = self.card / "Games/steamapps/common/Game/Data" out = self.ask("fuse", "touch", "/mnt/card/Games/steamapps/common/Game/Data/old", From ea48036811633afc81fc6ac47f619fcc8870c379 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 11 Nov 2026 20:55:30 -0500 Subject: [PATCH 07/57] fix(game-env): the VRAM cap also applies to D3D9 games (#2372) * fix(game-env): the VRAM cap also applies to D3D9 games DXVK's D3D9 frontend ignores dxgi.maxDeviceMemory, so set d3d9.maxAvailableMemory to the same cap. * fix(vram): leave DXVK's lower per-game D3D9 limits in place above the 4096 MiB default --- docs/development/vram-budget.md | 2 +- tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env | 5 ++++- tools/tests/test_game_environment.py | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/development/vram-budget.md b/docs/development/vram-budget.md index c9e6820efe..50e3becf70 100644 --- a/docs/development/vram-budget.md +++ b/docs/development/vram-budget.md @@ -1,6 +1,6 @@ # Reported video memory budget -The Performance VRAM setting enables `VK_LAYER_DROIDDECK_vram_cap` for games and reports smaller device-local `VK_EXT_memory_budget` budgets. DXVK exposes these through DXGI's `QueryVideoMemoryInfo`, including to D3D12 games using DXVK's DXGI alongside vkd3d-proton. Games that consult this budget can choose smaller working sets. The driver still supplies real heap sizes, usage figures, memory types, and actual allocation results. DXVK also receives its existing `dxgi.maxDeviceMemory` setting, which separately reduces the adapter's advertised dedicated video memory. A lower driver budget remains lower; the layer never increases it. +The Performance VRAM setting enables `VK_LAYER_DROIDDECK_vram_cap` for games and reports smaller device-local `VK_EXT_memory_budget` budgets. DXVK exposes these through DXGI's `QueryVideoMemoryInfo`, including to D3D12 games using DXVK's DXGI alongside vkd3d-proton. Games that consult this budget can choose smaller working sets. The driver still supplies real heap sizes, usage figures, memory types, and actual allocation results. DXVK also receives its existing `dxgi.maxDeviceMemory` setting, which separately reduces the adapter's advertised dedicated video memory, and, for caps below DXVK's 4096 MiB D3D9 default, `d3d9.maxAvailableMemory`, which caps the texture memory DXVK's D3D9 frontend reports, since D3D9 games do not read the DXGI setting. Higher caps leave the D3D9 setting alone so DXVK's lower per-game limits still apply. OpenGL games are not covered. A lower driver budget remains lower; the layer never increases it. This does not make vkd3d-proton automatically enforce the selected budget. In the [upstream allocator inspected during this investigation](https://github.com/HansKristian-Work/vkd3d-proton/blob/865b12ba0cc20796b3709397ce5d6d3b8a205b04/libs/vkd3d/memory.c), `heapBudget` is used for diagnostic reporting, while the [DXVK adapter](https://github.com/doitsujin/dxvk/blob/cf0a0d90f8965147741ad17dcd0b263817572ab3/src/dxgi/dxgi_adapter.cpp) returns the Vulkan budget to applications. Seeing a smaller budget in a VKD3D log verifies reporting, not reduced allocation or eviction. diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 175b8d8d1c..a4d8387353 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -12,6 +12,7 @@ from pathlib import Path GAME_TU_DEBUG = "DROIDDECK_GAME_TU_DEBUG" CHROMIUM_FILES = {"chrome-sandbox", "chrome_100_percent.pak", "v8_context_snapshot.bin"} +D3D9_DEFAULT_MEMORY_MB = 4096 SYNC_KEYS = ("BL_SYNC", "BL_SYNC_FALLBACK", "BL_FSYNC_FIRST", "BL_SYNC_MIN_NOFILE", "PROTON_NO_ESYNC", "PROTON_NO_FSYNC", "PROTON_NO_NTSYNC", "WINEESYNC") SEED_REDISTS = "/usr/local/bin/droiddeck-seed-redists" PACK_KEYS = ("WINESERVER", "BL_SYNC_PACK", "WINEESYNC", "PROTON_NO_ESYNC", "PROTON_NO_FSYNC") @@ -396,7 +397,9 @@ def vram_cap(env): if not re.fullmatch(r"[1-9][0-9]{0,6}", value): return env result = env.copy() - cap = "dxgi.maxDeviceMemory = %d" % int(value) + cap = "dxgi.maxDeviceMemory = {0}".format(int(value)) + if int(value) < D3D9_DEFAULT_MEMORY_MB: + cap += "; d3d9.maxAvailableMemory = {0}".format(int(value)) own = result.get("DXVK_CONFIG", "").strip().strip(";").strip() result["DXVK_CONFIG"] = cap + "; " + own if own else cap result["DROIDDECK_VRAM_CAP"] = "1" diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index d6cb49582e..18ec5135ec 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -993,8 +993,10 @@ class GameEnvironmentTest(unittest.TestCase): def test_the_vram_cap_comes_before_the_games_own_dxvk_settings(self): cap = MODULE["vram_cap"] self.assertEqual(cap({"BL_VRAM_MB": "4096"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 4096") + self.assertEqual(cap({"BL_VRAM_MB": "8192"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 8192") + self.assertEqual(cap({"BL_VRAM_MB": "4095"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 4095; d3d9.maxAvailableMemory = 4095") self.assertEqual(cap({"BL_VRAM_MB": "2048", "DXVK_CONFIG": "dxvk.maxFrameRate = 60;"})["DXVK_CONFIG"], - "dxgi.maxDeviceMemory = 2048; dxvk.maxFrameRate = 60") + "dxgi.maxDeviceMemory = 2048; d3d9.maxAvailableMemory = 2048; dxvk.maxFrameRate = 60") for off in ({}, {"BL_VRAM_MB": "0"}, {"BL_VRAM_MB": "lots"}, {"BL_VRAM_MB": "²"}, {"BL_VRAM_MB": "-1"}): self.assertNotIn("DXVK_CONFIG", cap(off)) self.assertNotIn("DROIDDECK_VRAM_CAP", cap(off)) From 2953739f1e4afea09c8e81c0cf30dc7b47a6bd80 Mon Sep 17 00:00:00 2001 From: KeegantheVeganat0r <58369898+KeegantheVeganat0r@users.noreply.github.com> Date: Thu, 12 Nov 2026 01:55:33 +0000 Subject: [PATCH 08/57] fix(lab): target the active app package and repair build setup (#2494) * fix(lab): handle SDK licenses and cache Gradle planning * fix(lab): target the package owning the agent session * fix(lab): preserve package overrides across build handoff --- docs/lab-builds.md | 5 +++ tools/agent/dd-lab-build | 31 +++++++++++--- tools/agent/setup | 2 +- tools/tests/test_dd_lab_build.py | 69 ++++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+), 7 deletions(-) create mode 100644 tools/tests/test_dd_lab_build.py diff --git a/docs/lab-builds.md b/docs/lab-builds.md index 4f2ddfb5f0..177133e14d 100644 --- a/docs/lab-builds.md +++ b/docs/lab-builds.md @@ -25,6 +25,11 @@ change. Updates lists them under Lab builds: the one in use can be turned off, one built for this install can be used again, and any can be deleted. +The build targets the package owning `DD_AGENT_INBOX` when run from the Agent tab. +For a manual build of another package, set `DROIDDECK_PACKAGE`, for example +`DROIDDECK_PACKAGE=com.tencent.ig dd-lab-build`. This also selects the control provider, +Lab storage, and package to restart. + ## What a Lab build cannot change The manifest, native code (`cpp`, `jniLibs`, Rust), Gradle files, `App`, `AppLanguage`, and `LabOverlay` itself: diff --git a/tools/agent/dd-lab-build b/tools/agent/dd-lab-build index 44b62bd6b8..b29c6bc5a6 100755 --- a/tools/agent/dd-lab-build +++ b/tools/agent/dd-lab-build @@ -5,12 +5,17 @@ # compile what changed. Setup runs it once; it takes the longest. # --explain logs why each task ran and Kotlin's build report, to find out what makes a build slow. set -euo pipefail -pkg=com.droiddeck.launcher +pkg=${DROIDDECK_PACKAGE:-} +if [ -z "$pkg" ] && [[ ${DD_AGENT_INBOX:-} =~ ^/data/(user/[0-9]+|data)/([^/]+)/files/agent$ ]]; then + pkg=${BASH_REMATCH[2]} +fi +pkg=${pkg:-com.droiddeck.launcher} serial=${ADB_SERIAL:-127.0.0.1:5555} mode=build explain=() for arg in "$@"; do case $arg in + --package=*) pkg=${arg#--package=} ;; --no-restart) mode=no-restart ;; --prepare) mode=prepare ;; --explain) explain=(--info -Pkotlin.build.report.output=file) ;; @@ -31,16 +36,18 @@ progress() { # stage [permille task done total eta] fail() { progress failed 0 "$*"; echo "dd-lab-build: $*" >&2; exit 1; } trap 'progress failed 0 stopped; exit 143' INT TERM trap 'progress failed 0 "a command failed on line $LINENO"' ERR +[[ $pkg =~ ^[A-Za-z][A-Za-z0-9_]*(\.[A-Za-z][A-Za-z0-9_]*)+$ ]] || fail "invalid Android package: $pkg" +export DROIDDECK_PACKAGE=$pkg device() { adb -s "$serial" shell "$@" | tr -d '\r'; } # The app's agent loses every process it started when its turn ends, a build included, so it asks # the app to run the build in a process of its own and follows that build here. -agent=/data/user/0/$pkg/files/agent +agent=${DD_AGENT_INBOX:-/data/user/0/$pkg/files/agent} if [ -n "${DD_AGENT:-}" ] && [ -z "${DD_LAB_DETACHED:-}" ] && [ -d "$agent" ]; then trap - ERR log=$cache/dd-lab-build.log rm -f "$progress_file" - python3 -c 'import json,os,sys; print(json.dumps({"cwd": os.getcwd(), "args": sys.argv[1:]}))' "$@" > "$agent/lab-request.part" + python3 -c 'import json,os,sys; print(json.dumps({"cwd": os.getcwd(), "args": [*sys.argv[1:], "--package=" + os.environ["DROIDDECK_PACKAGE"]]}))' "$@" > "$agent/lab-request.part" mv "$agent/lab-request.part" "$agent/lab-request" echo "DroidDeck runs this build itself, so it keeps going if this turn ends. Its log follows." for _ in $(seq 1 30); do [ -f "$progress_file" ] && break; sleep 1; done @@ -102,7 +109,7 @@ export DROIDDECK_SOURCE_COMMIT=$base DROIDDECK_BUILD_LABEL="lab on $installed_la printf 'sdk.dir=%s\n' "$ANDROID_HOME" > local.properties if [ ! -d "$ANDROID_HOME/platforms/android-34" ]; then progress sdk - yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --licenses >/dev/null + (set +o pipefail; yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --licenses >/dev/null) "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" "platforms;android-34" "build-tools;35.0.0" >/dev/null fi @@ -125,7 +132,19 @@ gradle=(./gradlew :app:processReleaseResources :app:mergeDexRelease --max-worker -Pandroid.aapt2FromMavenOverride=$HOME/aapt2/aapt2 -Pkotlin.compiler.execution.strategy=daemon -Pkotlin.daemon.jvmargs=-Xmx${kotlin_heap}m -Dorg.gradle.jvmargs=-Xmx${gradle_heap}m --console=plain) progress planning -mapfile -t plan < <("${gradle[@]}" --dry-run -q 2>/dev/null | awk '/^:/ {print $1}' || true) +plan_file=$cache/dd-lab-build-plan +plan_key=$( + { + printf '%s\n' "$repo" "${gradle[@]}" + git ls-files -z -- '*gradle*' | xargs -0 -r sha256sum + } | sha256sum | cut -d ' ' -f1 +) +if [ "$(head -n 1 "$plan_file" 2>/dev/null)" != "$plan_key" ]; then + plan_output=$("${gradle[@]}" --dry-run) || fail "Gradle planning failed: $plan_output" + { printf '%s\n' "$plan_key"; awk '/^:/ {print $1}' <<<"$plan_output"; } > "$plan_file.part" + mv "$plan_file.part" "$plan_file" +fi +mapfile -t plan < <(tail -n +2 "$plan_file") total=${#plan[@]} # Each task's estimate is how long it took last time; a full compile of the app takes about 15 minutes. @@ -221,6 +240,6 @@ device cmd package compile -m verify -f $pkg >/dev/null progress restarting 1000 "$name" echo "Restarting DroidDeck on the Lab build; it shows a notification when it is back" # The app's own agent ends with the app, so it is told to carry on once the app is back. -if [ -n "${DD_AGENT:-}" ]; then mkdir -p "/data/user/0/$pkg/files/agent" && : > "/data/user/0/$pkg/files/agent/resume"; fi +if [ -n "${DD_AGENT:-}" ]; then mkdir -p "$agent" && : > "$agent/resume"; fi device "nohup sh -c 'sleep 3; monkey -p $pkg -c android.intent.category.LAUNCHER 1' >/dev/null 2>&1 &" for pid in $(device pidof $pkg); do kill "$pid" 2>/dev/null || true; done diff --git a/tools/agent/setup b/tools/agent/setup index 0b1f66f6a0..5c2405d8d6 100755 --- a/tools/agent/setup +++ b/tools/agent/setup @@ -61,7 +61,7 @@ if [ ! -x "$sdk/cmdline-tools/latest/bin/sdkmanager" ]; then mv "$sdk/cmdline-tools/cmdline-tools" "$sdk/cmdline-tools/latest" fi export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-arm64 -yes | "$sdk/cmdline-tools/latest/bin/sdkmanager" --licenses >/dev/null +(set +o pipefail; yes | "$sdk/cmdline-tools/latest/bin/sdkmanager" --licenses >/dev/null) "$sdk/cmdline-tools/latest/bin/sdkmanager" "platforms;android-34" "build-tools;35.0.0" >/dev/null adb connect 127.0.0.1:5555 || true diff --git a/tools/tests/test_dd_lab_build.py b/tools/tests/test_dd_lab_build.py new file mode 100644 index 0000000000..9cf6d2a2c8 --- /dev/null +++ b/tools/tests/test_dd_lab_build.py @@ -0,0 +1,69 @@ +import json +import os +from pathlib import Path +import subprocess +import tempfile +import time +import unittest + + +SCRIPT = Path(__file__).resolve().parents[1] / 'agent/dd-lab-build' + + +class LabBuildPackageTest(unittest.TestCase): + def test_package_override_survives_app_handoff_without_its_environment(self): + with tempfile.TemporaryDirectory() as tmp: + root = Path(tmp) + inbox = root / 'agent' + inbox.mkdir() + cache = root / '.cache' + env = {**os.environ, 'HOME': tmp, 'DD_AGENT': '1', + 'DD_AGENT_INBOX': str(inbox), 'DROIDDECK_PACKAGE': 'com.example.target'} + env.pop('DD_LAB_DETACHED', None) + child = subprocess.Popen(['bash', str(SCRIPT), '--prepare'], env=env, + stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True) + try: + request = inbox / 'lab-request' + deadline = time.monotonic() + 10 + while not request.exists() and child.poll() is None and time.monotonic() < deadline: + time.sleep(0.01) + self.assertTrue(request.exists()) + payload = json.loads(request.read_text()) + self.assertEqual(['--prepare', '--package=com.example.target'], payload['args']) + progress = cache / 'dd-lab-build.json' + progress.write_text('{"stage":"prepared"}') + stdout, stderr = child.communicate(timeout=10) + self.assertEqual(0, child.returncode, stdout + stderr) + finally: + if child.poll() is None: + child.kill() + child.communicate() + + bin_dir = root / 'bin' + bin_dir.mkdir() + (bin_dir / 'adb').write_text('#!/bin/sh\nexit 0\n') + (bin_dir / 'python3').write_text( + '#!/bin/sh\nprintf "%s" "$DROIDDECK_PACKAGE" > "$HOME/selected-package"\nexit 1\n') + for tool in bin_dir.iterdir(): + tool.chmod(0o755) + env.pop('DROIDDECK_PACKAGE') + env['DD_LAB_DETACHED'] = '1' + env['PATH'] = str(bin_dir) + os.pathsep + env['PATH'] + result = subprocess.run(['bash', str(SCRIPT), *payload['args']], env=env, + capture_output=True, text=True, timeout=10, cwd=SCRIPT.parents[2]) + self.assertNotEqual(0, result.returncode) + self.assertIn('could not read DroidDeck', result.stderr) + self.assertEqual('com.example.target', (root / 'selected-package').read_text()) + + def test_invalid_packages_are_rejected_before_handoff(self): + with tempfile.TemporaryDirectory() as tmp: + inbox = Path(tmp) / 'agent' + inbox.mkdir() + for package in ('bad;touch injected', '../other', '', 'com.example/other'): + with self.subTest(package=package): + env = {**os.environ, 'HOME': tmp, 'DD_AGENT': '1', 'DD_AGENT_INBOX': str(inbox)} + result = subprocess.run(['bash', str(SCRIPT), '--package=' + package], env=env, + capture_output=True, text=True, timeout=10) + self.assertNotEqual(0, result.returncode) + self.assertIn('invalid Android package', result.stderr) + self.assertFalse((inbox / 'lab-request').exists()) From 8961d088f258e22c39cc9a772eed0b3b0ae18b0e Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 20:55:37 -0500 Subject: [PATCH 09/57] fix(desktop): run a store game's exe through its launcher so the EA environment and Origin process are set up (#2486) * fix(desktop): run a store game's exe through its launcher so the EA environment and Origin process are set up * fix(desktop): keep a store game's prefix and resolve its launcher through symlinks and deep folders * fix(desktop): keep the exe's resolved compatdata folder when running its launcher and find the sidecar beside a symlinked exe --- .../overlay/usr/local/bin/droiddeck-open | 23 +++++++++- .../usr/local/bin/droiddeck-proton-run | 11 +++-- .../usr/local/bin/droiddeck-store-launch | 19 +++++++- tools/tests/test_desktop_open.py | 38 +++++++++++++++ tools/tests/test_store_launch_ea.py | 46 +++++++++++++++++++ 5 files changed, 130 insertions(+), 7 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-open b/tools/linuxfs/overlay/usr/local/bin/droiddeck-open index bf0aaff7c1..d39942a2cc 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-open +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-open @@ -17,6 +17,7 @@ PROTON_RUN = os.path.join(BIN, "droiddeck-proton-run") APPIMAGE_RUN = os.path.join(BIN, "droiddeck-appimage-run") SCRIPT_RUN = os.path.join(BIN, "droiddeck-script-run") STEAM_LAUNCH = os.path.join(BIN, "droiddeck-steam-launch") +STORE_LAUNCH = os.path.join(BIN, "droiddeck-store-launch") PROGRAMS = os.path.join(BIN, "droiddeck-desktop-programs") CACHE = os.path.join(HOME, ".cache", "droiddeck") IMPORTS = {"appimage": ("/opt/appimages/user", "app"), "folder": ("/opt/droiddeck-apps", "entry")} @@ -272,12 +273,32 @@ def steam_title(path): return None +def exe_prefix(path): + try: + run = runpy.run_path(PROTON_RUN) + root = os.environ.get("STEAM_COMPAT_CLIENT_INSTALL_PATH") or run["STEAM_ROOT"] + target = run["locate"](path, root) + return ["--prefix", target.appid, "--compatdata", target.compatdata] + except (OSError, ValueError, KeyError, IndexError): + return None + + +def store_launcher(path): + try: + return runpy.run_path(STORE_LAUNCH)["store_launcher"](path) + except (OSError, ValueError, KeyError): + return None + + def command(path, args, what, window=False, appid=None): folder = os.path.dirname(path) if what == "steam": return [STEAM_LAUNCH, "desktop", appid], folder if what == "windows": - return [PROTON_RUN] + (["--window"] if window else []) + [path] + args, folder + launcher = None if args else store_launcher(path) + prefix = exe_prefix(path) if launcher else None + keep = prefix or [] + return [PROTON_RUN] + (["--window"] if window else []) + keep + [launcher or path] + args, folder if what == "x86 script": return [FEX, "run", "--mode", "on", "--for", folder, "--"] + interpreter(path) + [path] + args, folder if what == "script": diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run index 164dbd0288..6dfcbadb25 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run @@ -315,8 +315,8 @@ def locate(program, root): os.path.dirname(program), root, "own") -def fixed(program, root, appid): - return Target(appid, os.path.join(root, "steamapps", "compatdata", str(appid)), +def fixed(program, root, appid, compatdata=None): + return Target(appid, compatdata or os.path.join(root, "steamapps", "compatdata", str(appid)), os.path.dirname(program), root, "fixed") @@ -451,6 +451,7 @@ def arguments(program, args, desktop=None, compatdata=None): def main(argv): window = False prefix = None + compatdata = None verb = VERB game_id = None desktop = None @@ -461,6 +462,8 @@ def main(argv): window = True elif option == "--prefix" and argv and prefix_id(argv[0]): prefix = argv.pop(0) + elif option == "--compatdata" and argv and os.path.isabs(argv[0]): + compatdata = argv.pop(0) elif option == "--verb" and argv and argv[0] in VERBS: verb = argv.pop(0) elif option == "--game-id" and argv and argv[0].isdigit() and argv[0] != "0": @@ -484,7 +487,7 @@ def main(argv): say("%s is not an app id" % app) return 2 if not argv and app is None: - say("usage: droiddeck-proton-run [--window] [--prefix ID] [--verb run] [--game-id ID] [--desktop WxH] PROGRAM [ARGS...]") + say("usage: droiddeck-proton-run [--window] [--prefix ID [--compatdata DIR]] [--verb run] [--game-id ID] [--desktop WxH] PROGRAM [ARGS...]") return 2 root = os.environ.get("STEAM_COMPAT_CLIENT_INSTALL_PATH") or STEAM_ROOT if options is None: @@ -509,7 +512,7 @@ def main(argv): if app is not None and int(app) >= STEAM_APP_LIMIT: target = shortcut_target(app, program, start, root) elif prefix: - target = fixed(program, root, prefix) + target = fixed(program, root, prefix, compatdata) else: target = locate(program, root) available = tools(root) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch index ca6ddebc84..939504835c 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch @@ -48,14 +48,14 @@ def sidecar_at(folder): return sidecar -def find_store_game(argv): +def find_store_game(argv, depth=MAX_DEPTH): for raw in argv: arg = raw.strip().strip('"').strip("'").replace("\\", "/") low = arg.lower() if not (low.endswith(LAUNCHER) or low.endswith(".exe") or low.endswith(".bat")) or "/" not in arg: continue folder = Path(arg).parent - for _ in range(MAX_DEPTH): + for _ in range(depth): sidecar = sidecar_at(folder) if sidecar is not None: return folder, sidecar @@ -65,6 +65,21 @@ def find_store_game(argv): return None +def store_launcher(path): + real = os.path.realpath(path) + for start in dict.fromkeys([os.path.abspath(path), real]): + found = find_store_game([start], depth=len(Path(start).parts)) + if found is None: + continue + folder, sidecar = found + launcher, exe = str(sidecar.get("launcher") or ""), str(sidecar.get("exe") or "") + if not launcher or not exe or (folder / launcher).is_symlink() or not (folder / launcher).is_file(): + continue + if os.path.realpath(folder / exe).lower() == real.lower(): + return str(folder / launcher) + return None + + def drop_stale(folder, now=None): code = folder / EPIC_CODE try: diff --git a/tools/tests/test_desktop_open.py b/tools/tests/test_desktop_open.py index c32baf71a6..a7840cfa53 100644 --- a/tools/tests/test_desktop_open.py +++ b/tools/tests/test_desktop_open.py @@ -136,6 +136,30 @@ class CommandTest(Temp): self.assertEqual(OPEN["command"](script, [], "x86 script")[0], [OPEN["FEX"], "run", "--mode", "on", "--for", str(self.tmp), "--", "/bin/sh", script]) + def test_a_store_games_exe_runs_through_its_launcher(self): + exe, launcher = str(self.tmp / "game.exe"), str(self.tmp / "launch.bat") + with mock.patch.dict(OPEN, {"store_launcher": lambda path: launcher if path == exe else None, + "exe_prefix": lambda path: ["--prefix", "4242", "--compatdata", "/c/4242"]}): + keep = ["--prefix", "4242", "--compatdata", "/c/4242"] + self.assertEqual(OPEN["command"](exe, [], "windows")[0], [OPEN["PROTON_RUN"]] + keep + [launcher]) + self.assertEqual(OPEN["command"](exe, [], "windows", True)[0], + [OPEN["PROTON_RUN"], "--window"] + keep + [launcher]) + self.assertEqual(OPEN["command"](exe, ["-x"], "windows")[0], [OPEN["PROTON_RUN"], exe, "-x"]) + other = str(self.tmp / "other.exe") + self.assertEqual(OPEN["command"](other, [], "windows")[0], [OPEN["PROTON_RUN"], other]) + + def test_a_store_games_launcher_keeps_the_exes_prefix(self): + exe = self.tmp / "game.exe" + exe.write_text("x") + root = str(self.tmp / "steam") + with mock.patch.dict(os.environ, {"STEAM_COMPAT_CLIENT_INSTALL_PATH": root}), \ + mock.patch.dict(OPEN, {"PROTON_RUN": str(BIN / "droiddeck-proton-run"), + "store_launcher": lambda path: str(self.tmp / "launch.bat")}): + command = OPEN["command"](str(exe), [], "windows")[0] + located = RUN["locate"](str(exe), root) + self.assertEqual(command[1:5], ["--prefix", located.appid, "--compatdata", located.compatdata]) + self.assertEqual(str(RUN["own_id"](str(exe))), str(RUN["locate"](str(exe), root).appid)) + def test_a_native_program_on_noexec_storage_runs_from_a_copy(self): program = self.write("storage/tool", elf(183)) x86 = self.write("storage/game.x86_64", elf(62)) @@ -737,6 +761,20 @@ class ProtonRunTest(Temp): self.assertEqual(env["STEAM_COMPAT_DATA_PATH"], str(signed)) self.assertFalse((self.root / "steamapps/compatdata/2733369024").exists()) + def test_a_launcher_run_keeps_the_resolved_compatdata_folder(self): + bat = self.write("Games/Epic/Game/.droiddeck-launch.bat", b"@echo off") + signed = self.root / "steamapps/compatdata/-1561598272" + signed.mkdir(parents=True) + other = self.tmp / "Library2/steamapps/compatdata/555" + other.mkdir(parents=True) + for compatdata, appid in ((signed, "2733369024"), (other, "555")): + with self.subTest(compatdata=str(compatdata)): + code, calls, dirs = self.run_main(["--prefix", appid, "--compatdata", str(compatdata), str(bat)]) + self.assertIsNone(code) + self.assertEqual(calls[0][2]["STEAM_COMPAT_DATA_PATH"], str(compatdata)) + code, calls, dirs = self.run_main(["--prefix", "555", str(bat)]) + self.assertEqual(calls[0][2]["STEAM_COMPAT_DATA_PATH"], str(self.root / "steamapps/compatdata/555")) + def test_prefix_folder_prefers_initialized_unsigned_over_empty_signed(self): signed = self.root / "steamapps/compatdata/-1561598272" signed.mkdir(parents=True) diff --git a/tools/tests/test_store_launch_ea.py b/tools/tests/test_store_launch_ea.py index 2dd72b324b..9096d2d3c8 100644 --- a/tools/tests/test_store_launch_ea.py +++ b/tools/tests/test_store_launch_ea.py @@ -35,6 +35,52 @@ class EaHook(unittest.TestCase): self.assertIn((r'HKEY_LOCAL_MACHINE\SOFTWARE\EA Games\Game', 'DisplayName', 'Mass Effect 3'), entries) self.assertIn((r'HKEY_LOCAL_MACHINE\SOFTWARE\Respawn\Titanfall2', 'DisplayName', 'Mass Effect 3'), entries) + def test_the_games_exe_maps_to_its_launcher_only(self): + with tempfile.TemporaryDirectory() as tmp: + folder = Path(tmp) / 'Game' + (folder / 'bin').mkdir(parents=True) + for name in ('bin/Game.exe', 'bin/Other.exe', store.LAUNCHER): + (folder / name).write_text('x') + sidecar = {'store': 'ea', 'id': 'Origin.OFR.50.1', 'exe': 'bin/Game.exe', 'launcher': store.LAUNCHER} + (folder / store.SIDECAR).write_text(json.dumps(sidecar)) + self.assertEqual(store.store_launcher(str(folder / 'bin/Game.exe')), str(folder / store.LAUNCHER)) + self.assertEqual(store.store_launcher(str(folder / 'bin/game.exe')), str(folder / store.LAUNCHER)) + self.assertIsNone(store.store_launcher(str(folder / 'bin/Other.exe'))) + self.assertIsNone(store.store_launcher(str(Path(tmp) / 'Elsewhere.exe'))) + (folder / store.SIDECAR).write_text(json.dumps(dict(sidecar, launcher=''))) + self.assertIsNone(store.store_launcher(str(folder / 'bin/Game.exe'))) + + def test_a_symlinked_or_deep_exe_still_finds_its_launcher(self): + with tempfile.TemporaryDirectory() as tmp: + folder = Path(tmp) / 'Game' + deep = folder / 'a/b/c/d/e/f' + deep.mkdir(parents=True) + (deep / 'Game.exe').write_text('x') + (folder / store.LAUNCHER).write_text('x') + sidecar = {'store': 'ea', 'id': 'Origin.OFR.50.1', 'exe': 'a/b/c/d/e/f/Game.exe', 'launcher': store.LAUNCHER} + (folder / store.SIDECAR).write_text(json.dumps(sidecar)) + link = Path(tmp) / 'x/y/z/Link.exe' + link.parent.mkdir(parents=True) + link.symlink_to(deep / 'Game.exe') + expected = str(folder.resolve() / store.LAUNCHER) + self.assertEqual(store.store_launcher(str(deep / 'Game.exe')), expected) + self.assertEqual(store.store_launcher(str(link)), expected) + self.assertIsNone(store.find_store_game([str(deep / 'Game.exe')])) + + def test_a_symlinked_exe_finds_the_sidecar_beside_the_link(self): + with tempfile.TemporaryDirectory() as tmp: + outside = Path(tmp) / 'Real/Game.exe' + outside.parent.mkdir() + outside.write_text('x') + folder = Path(tmp) / 'Game' + folder.mkdir() + (folder / store.LAUNCHER).write_text('x') + (folder / 'Game.exe').symlink_to(outside) + sidecar = {'store': 'ea', 'id': 'Origin.OFR.50.1', 'exe': 'Game.exe', 'launcher': store.LAUNCHER} + (folder / store.SIDECAR).write_text(json.dumps(sidecar)) + self.assertEqual(store.store_launcher(str(folder / 'Game.exe')), str(folder / store.LAUNCHER)) + self.assertIsNone(store.store_launcher(str(outside))) + def test_legacy_games_are_registered_by_content_id(self): sidecar = {'id': 'Origin.OFR.50.0005237', 'title': 'Mass Effect 3 (2012)', 'extra': {'contentIds': '71073,71183, bad id', 'displayName': 'Mass Effect 3', 'locale': 'fr_FR'}} From a7bd6ed299ed5d1e3b03105aa749eaf94f3bd0a7 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 20:55:41 -0500 Subject: [PATCH 10/57] fix(venus): drop LIBGL_KOPPER_DISABLE without calling the guarded unsetenv (#2441) --- tools/linuxfs/preload/venus.c | 9 ++++- tools/tests/test_venus_preload.py | 66 +++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 tools/tests/test_venus_preload.py diff --git a/tools/linuxfs/preload/venus.c b/tools/linuxfs/preload/venus.c index 4feb9ee03a..aae9ebbec2 100644 --- a/tools/linuxfs/preload/venus.c +++ b/tools/linuxfs/preload/venus.c @@ -12,7 +12,14 @@ #include #include +extern char **environ; + __attribute__((constructor)) static void bl_venus_keep_kopper(void) { + static const char name[] = "LIBGL_KOPPER_DISABLE="; const char *debug = getenv("VN_DEBUG"); - if (debug && strstr(debug, "vtest")) unsetenv("LIBGL_KOPPER_DISABLE"); + if (!debug || !strstr(debug, "vtest") || !environ) return; + char **out = environ; + for (char **in = environ; *in; in++) + if (strncmp(*in, name, sizeof name - 1)) *out++ = *in; + *out = NULL; } diff --git a/tools/tests/test_venus_preload.py b/tools/tests/test_venus_preload.py new file mode 100644 index 0000000000..9f90a78f6b --- /dev/null +++ b/tools/tests/test_venus_preload.py @@ -0,0 +1,66 @@ +import os +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest + +PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" + +PROGRAM = r""" +#include +#include +int unsetenv(const char *name) { return -1; } +int setenv(const char *name, const char *value, int overwrite) { return -1; } +int putenv(char *string) { return -1; } +int main(void) { + const char *names[] = {"LIBGL_KOPPER_DISABLE", "LIBGL_KOPPER_DISABLE_X", "ZINK_DEBUG", "VN_DEBUG"}; + for (int i = 0; i < 4; i++) { + const char *value = getenv(names[i]); + printf("%s=%s\n", names[i], value ? value : "(unset)"); + } + return 0; +} +""" + + +@unittest.skipUnless(shutil.which("cc"), "needs cc") +class VenusPreloadTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + cls.tmp = Path(tempfile.mkdtemp()) + source = cls.tmp / "program.c" + source.write_text(PROGRAM) + cls.program = cls.tmp / "program" + cls.library = cls.tmp / "libvenus.so" + subprocess.run(["cc", "-O2", "-Wall", "-Werror", "-o", str(cls.program), str(source)], check=True) + subprocess.run(["cc", "-O2", "-Wall", "-Werror", "-shared", "-fPIC", "-o", str(cls.library), + str(PRELOAD / "venus.c")], check=True) + + @classmethod + def tearDownClass(cls): + shutil.rmtree(cls.tmp, ignore_errors=True) + + def values(self, **extra): + env = {"PATH": os.environ.get("PATH", ""), "LD_PRELOAD": str(self.library), **extra} + result = subprocess.run([str(self.program)], env=env, capture_output=True, text=True, check=True) + return dict(line.split("=", 1) for line in result.stdout.splitlines()) + + def test_kopper_is_kept_when_environment_changes_are_refused(self): + values = self.values(VN_DEBUG="vtest", LIBGL_KOPPER_DISABLE="true", LIBGL_KOPPER_DISABLE_X="1", + ZINK_DEBUG="mem") + self.assertEqual(values["LIBGL_KOPPER_DISABLE"], "(unset)") + self.assertEqual(values["LIBGL_KOPPER_DISABLE_X"], "1") + self.assertEqual(values["ZINK_DEBUG"], "mem") + self.assertEqual(values["VN_DEBUG"], "vtest") + + def test_other_sessions_keep_kopper_disabled(self): + self.assertEqual(self.values(LIBGL_KOPPER_DISABLE="true")["LIBGL_KOPPER_DISABLE"], "true") + self.assertEqual(self.values(VN_DEBUG="init", LIBGL_KOPPER_DISABLE="true")["LIBGL_KOPPER_DISABLE"], "true") + + def test_absent_variable_is_harmless(self): + self.assertEqual(self.values(VN_DEBUG="vtest")["LIBGL_KOPPER_DISABLE"], "(unset)") + + +if __name__ == "__main__": + unittest.main() From 8e02be244023dbeed9bdd716b6e1f286ac664602 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 11 Nov 2026 20:55:45 -0500 Subject: [PATCH 11/57] fix(steam-x64): skip empty runtime library folders when linking (#2334) --- .../overlay/usr/local/bin/droiddeck-steam-x64 | 7 +- tools/tests/test_steam_x64_runtime_libs.py | 67 +++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 tools/tests/test_steam_x64_runtime_libs.py diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 index 481d25d194..0aeb0e594c 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 @@ -449,7 +449,11 @@ mkdir -p "$srt_libs" for d in "$STEAM_X64"/steamrt64/pv-runtime/steam-runtime-steamrt/steamrt3c_platform_*/files/lib/x86_64-linux-gnu \ "$STEAM_X64"/steamrt64/pv-runtime/steam-runtime-steamrt/steamrt3c_platform_*/files/usr/lib/x86_64-linux-gnu; do [ -d "$d" ] || continue - for f in "$d"/*.so*; do [ -e "$srt_libs/$(basename "$f")" ] || ln -s "$f" "$srt_libs/"; done + for f in "$d"/*.so*; do + [ -e "$f" ] || [ -L "$f" ] || continue + s="$srt_libs/$(basename "$f")" + { [ -e "$s" ] || [ -L "$s" ]; } || ln -s "$f" "$srt_libs/" + done done FEX_ROOTFS=$ROOTFS /usr/local/bin/FEX "$ROOTFS/usr/sbin/ldconfig.real" -n "$srt_libs" >>"$LOG" 2>&1 || step "ldconfig on $srt_libs failed" sniper_compat=$X64_HOME/sniper-compat @@ -458,6 +462,7 @@ mkdir -p "$sniper_compat" hb=$(ls "$srt_libs"/libharfbuzz.so.0.* 2>/dev/null | head -n 1) if [ -n "$hb" ]; then ln -s "$hb" "$sniper_compat/libharfbuzz.so.0"; else step "warning: no HarfBuzz in Valve's runtime for the newer-runtime titles"; fi for f in "$srt_libs"/*; do + [ -e "$f" ] || [ -L "$f" ] || continue n=$(basename "$f") if [ -e "$ROOTFS/usr/lib/x86_64-linux-gnu/$n" ] || [ -e "$ROOTFS/lib/x86_64-linux-gnu/$n" ]; then rm -f "$f"; fi done diff --git a/tools/tests/test_steam_x64_runtime_libs.py b/tools/tests/test_steam_x64_runtime_libs.py new file mode 100644 index 0000000000..6f3f71c3f4 --- /dev/null +++ b/tools/tests/test_steam_x64_runtime_libs.py @@ -0,0 +1,67 @@ +import os +from pathlib import Path +import re +import subprocess +import tempfile +import unittest + + +SCRIPT = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/droiddeck-steam-x64' +SOURCE = SCRIPT.read_text() +LIBRARY_LOOP = re.search(r'^for d in "\$STEAM_X64"/steamrt64/.*?^done\nFEX_ROOTFS=', SOURCE, re.M | re.S).group() +LIBRARY_LOOP = LIBRARY_LOOP[:LIBRARY_LOOP.rfind('\nFEX_ROOTFS=')] + + +class SteamX64RuntimeLibsTest(unittest.TestCase): + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.temp.cleanup) + self.root = Path(self.temp.name) + self.steam = self.root / 'Steam' + self.runtime = self.steam / 'steamrt64/pv-runtime/steam-runtime-steamrt' + self.lib = self.runtime / 'steamrt3c_platform_a/files/lib/x86_64-linux-gnu' + self.usr_lib = self.runtime / 'steamrt3c_platform_a/files/usr/lib/x86_64-linux-gnu' + self.lib.mkdir(parents=True) + self.usr_lib.mkdir(parents=True) + self.dest = self.root / 'steamrt-libs' + self.dest.mkdir() + + def run_loop(self): + shell = 'srt_libs="$DEST"\n' + LIBRARY_LOOP + env = dict(os.environ, STEAM_X64=str(self.steam), DEST=str(self.dest)) + return subprocess.run(['bash', '-eu', '-c', shell], env=env, capture_output=True, text=True, timeout=10) + + def test_empty_library_directory_is_skipped(self): + (self.usr_lib / 'libexample.so.1').touch() + result = self.run_loop() + self.assertEqual(0, result.returncode, result.stderr) + self.assertTrue((self.dest / 'libexample.so.1').is_symlink()) + + def test_two_platform_versions_with_empty_lib_dirs_use_usr_lib(self): + platform_b = self.runtime / 'steamrt3c_platform_b' + (platform_b / 'files/lib/x86_64-linux-gnu').mkdir(parents=True) + usr_lib_b = platform_b / 'files/usr/lib/x86_64-linux-gnu' + usr_lib_b.mkdir(parents=True) + (self.usr_lib / 'libexample.so.1').touch() + (usr_lib_b / 'libother.so.1').touch() + result = self.run_loop() + self.assertEqual(0, result.returncode, result.stderr) + self.assertTrue((self.dest / 'libexample.so.1').is_symlink()) + self.assertTrue((self.dest / 'libother.so.1').is_symlink()) + + def test_stale_literal_glob_link_does_not_abort(self): + (self.dest / '*.so*').symlink_to('/missing/*.so*') + result = self.run_loop() + self.assertEqual(0, result.returncode, result.stderr) + self.assertTrue((self.dest / '*.so*').is_symlink()) + + def test_existing_dangling_library_link_is_not_recreated(self): + (self.lib / 'libexample.so.1').touch() + (self.dest / 'libexample.so.1').symlink_to('/missing/libexample.so.1') + result = self.run_loop() + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('/missing/libexample.so.1', os.readlink(self.dest / 'libexample.so.1')) + + +if __name__ == '__main__': + unittest.main() From c177b1eed1d08a106f32723049c871a4994825ec Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 11 Nov 2026 20:55:48 -0500 Subject: [PATCH 12/57] fix(gog): installs no longer hang on Finishing for large games (#2367) * fix(gog): list each folder once when checking install paths The case-clash check listed a file's parent folder again for every file, so installing a game with thousands of files stayed on Finishing for a very long time after the download. * fix(gog): check each install path prefix once instead of resolving every file --- .../launcher/stores/gog/GogInstallRecord.kt | 29 ++++++++++++++----- .../launcher/stores/gog/GogMaintenanceTest.kt | 7 +++++ 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogInstallRecord.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogInstallRecord.kt index df07991023..686ebd3c8f 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogInstallRecord.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogInstallRecord.kt @@ -65,13 +65,19 @@ internal object GogFiles { fun dir(folder: File): File = inside(folder, ".droiddeck-gog").apply { mkdirs() } fun journal(folder: File): File = File(dir(folder), "operation.json") - fun inside(root: File, raw: String): File { + private fun parts(raw: String): List { val path = raw.replace('\\', '/') + val parts = path.split('/') require(path.isNotBlank() && !path.startsWith('/') && ':' !in path && '\u0000' !in path && - path.split('/').none { it.isEmpty() || it == "." || it == ".." }) { "Invalid GOG path: $raw" } + parts.none { it.isEmpty() || it == "." || it == ".." }) { "Invalid GOG path: $raw" } + return parts + } + + fun inside(root: File, raw: String): File { + val parts = parts(raw) val base = root.canonicalFile var out = base - for (part in path.split('/')) { + for (part in parts) { out = File(out, part) require(!Files.isSymbolicLink(out.toPath())) { "GOG path is a symbolic link: $raw" } } @@ -122,21 +128,28 @@ internal object GogFiles { } fun validate(files: JSONArray, folder: File) { + val base = folder.canonicalFile val paths = HashSet() val components = HashMap() + val listings = HashMap>>() for (file in files.objects()) { val path = file.getString("path").replace('\\', '/') - inside(folder, path) + val parts = parts(path) require(!path.startsWith(".droiddeck-", true) && path != StoreGameSidecar.FILE_NAME) { "GOG content overlaps launcher metadata" } require(paths.add(path.lowercase(Locale.ROOT))) { "GOG paths differ only by case: $path" } - var parent = folder + var parent = base var relative = "" - for (part in path.split('/')) { + for (part in parts) { relative = if (relative.isEmpty()) part else "$relative/$part" + val child = File(parent, part) val previous = components.putIfAbsent(relative.lowercase(Locale.ROOT), relative) require(previous == null || previous == relative) { "GOG directory paths differ only by case: $path" } - require(parent.list()?.none { it != part && it.equals(part, true) } != false) { "An existing path differs only by case: $path" } - parent = File(parent, part) + if (previous == null) { + require(!Files.isSymbolicLink(child.toPath())) { "GOG path is a symbolic link: $path" } + val existing = listings.getOrPut(parent) { parent.list().orEmpty().groupBy { it.lowercase(Locale.ROOT) } } + require(existing[part.lowercase(Locale.ROOT)].orEmpty().all { it == part }) { "An existing path differs only by case: $path" } + } + parent = child } } } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gog/GogMaintenanceTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogMaintenanceTest.kt index 06c88bfd11..c98c1da30e 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/gog/GogMaintenanceTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogMaintenanceTest.kt @@ -302,10 +302,17 @@ class GogMaintenanceTest { File(folder, "Game.bin").writeText("original") assertThrows(IllegalArgumentException::class.java) { GogFiles.validate(JSONArray("""[{"path":"game.bin"}]"""), folder) } assertThrows(IllegalArgumentException::class.java) { GogFiles.validate(JSONArray("""[{"path":".droiddeck-store.json"}]"""), folder) } + val data = File(folder, "Data").apply { mkdirs() } + val installed = JSONArray() + for (i in 0 until 2000) { File(data, "Part$i.bin").writeText(""); installed.put(JSONObject().put("path", "Data/Part$i.bin")) } + GogFiles.validate(installed, folder) + assertThrows(IllegalArgumentException::class.java) { GogFiles.validate(JSONArray("""[{"path":"Data/Part0.bin"},{"path":"Data/part1.bin"}]"""), folder) } val outside = temporary.newFolder() try { Files.createSymbolicLink(File(folder, "link").toPath(), outside.toPath()) } catch (_: java.nio.file.FileSystemException) { return } assertThrows(IllegalArgumentException::class.java) { GogFiles.inside(folder, "link/game.exe") } + assertThrows(IllegalArgumentException::class.java) { GogFiles.validate(JSONArray("""[{"path":"Data/Part0.bin"},{"path":"link/game.exe"}]"""), folder) } + assertThrows(IllegalArgumentException::class.java) { GogFiles.validate(JSONArray("""[{"path":"a/./file"}]"""), folder) } } @Test fun resumedInstallSpaceCountsOnlyFilesStillMissing() { From 3230ccdc73c64629f947c01d0356d0e4922b68e6 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 20:55:52 -0500 Subject: [PATCH 13/57] fix(steam): offer a Games folder as a Steam library when it is not already one (#2432) * fix(steam): offer a Games folder as a Steam library when it is not already one * test(steam): cover discovery with chosen storage * fix(steam): compare Games folders and Steam libraries by the same storage path The Games-folder overlap check used the raw canonical path, so a library saved under the raw card mount and the same folder under /storage were treated as different. Reuse the library canonicalisation. --- .../droiddeck/launcher/session/GameStorage.kt | 8 ++---- .../launcher/session/SteamLibraries.kt | 10 +++++-- .../launcher/session/SteamLibrariesTest.kt | 28 +++++++++++++++++++ 3 files changed, 38 insertions(+), 8 deletions(-) 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 5bf25103b0..e9ecb7443c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt @@ -90,11 +90,11 @@ object GameStorage { fun gamesFolderLibraries(context: Context): List { if (SessionPrefs.gameStorage(context).isNotEmpty()) return emptyList() - val card = effective(context)?.let { canonical(File(it.path)) } - val added = SteamLibraries.list(context).map { canonical(it.host) } + val card = effective(context)?.let { SteamLibraries.canonical(File(it.path)) } + val added = SteamLibraries.list(context).map { SteamLibraries.canonical(it.host) } val sm = context.getSystemService(StorageManager::class.java) return AddedGames.roots(context).mapNotNull { root -> - val host = canonical(root.host) + val host = SteamLibraries.canonical(root.host) if (!hasInstalledGames(root.host)) return@mapNotNull null if ('"' in root.guest || '\\' in root.guest || !root.host.isDirectory || !root.host.canWrite()) return@mapNotNull null if (card != null && (host == card || host.startsWith("$card/") || card.startsWith("$host/"))) return@mapNotNull null @@ -109,8 +109,6 @@ object GameStorage { internal fun hasInstalledGames(root: File): Boolean = File(root, "steamapps").listFiles { f -> f.isFile && f.name.startsWith("appmanifest_") && f.name.endsWith(".acf") }?.isNotEmpty() == true - private fun canonical(file: File): String = runCatching { file.canonicalPath }.getOrDefault(file.absolutePath) - fun labelFor(context: Context, path: String): String = options(context).firstOrNull { it.path == path }?.name ?: File(path).name.ifEmpty { context.getString(R.string.gstore_folder) } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt index 0846763599..8b219470c8 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt @@ -82,13 +82,14 @@ object SteamLibraries { /** Reads storage; call off the main thread. */ fun found(context: Context): List { val entries = list(context) - val taken = taken(context, entries) + AddedGames.roots(context).map { canonical(it.host) } + val taken = taken(context, entries) + GameStorage.gamesFolderLibraries(context).map { canonical(it.host) } + val gamesFolders = AddedGames.roots(context).map { canonical(it.host) } val hits = ArrayList>() for (root in StorageRoots.list(context)) { if (!root.readable) continue for (dir in candidates(rawView(root.dir), SCAN_DEPTH)) { val games = gameCount(dir) - if (games > 0 && File(dir, "steamapps").canWrite() && taken.none { overlaps(it, canonical(dir)) }) hits += dir to games + if (games > 0 && File(dir, "steamapps").canWrite() && offered(taken, gamesFolders, canonical(dir))) hits += dir to games } } val picked = ArrayList>() @@ -101,6 +102,9 @@ object SteamLibraries { } } + internal fun offered(taken: List, gamesFolders: List, dir: String): Boolean = + taken.none { overlaps(it, dir) } && gamesFolders.none { it != dir && overlaps(it, dir) } + /** The FUSE view under /storage hides files other apps wrote unless DroidDeck has all files access; the raw card mount does not. */ private fun rawView(dir: File): File { if (!dir.path.startsWith("/storage/") || dir.path.startsWith("/storage/emulated")) return dir @@ -171,7 +175,7 @@ object SteamLibraries { internal fun overlaps(a: String, b: String): Boolean = a == b || a.startsWith("$b/") || b.startsWith("$a/") - private fun canonical(file: File): String = UsbLink.storagePath(runCatching { file.canonicalPath }.getOrDefault(file.absolutePath)) + internal fun canonical(file: File): String = UsbLink.storagePath(runCatching { file.canonicalPath }.getOrDefault(file.absolutePath)) private const val SCAN_DEPTH = 2 private const val SCAN_LIMIT = 4000 diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt index 5a3fdb26c8..5317e5ca33 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt @@ -65,6 +65,26 @@ class SteamLibrariesTest { assertTrue(SteamLibraries.add(app, nested.path) is SteamLibraries.AddResult.Refused) } + @Test fun aGamesFolderIsOfferedWholeUnlessItIsAlreadyALibrary() { + val games = "/storage/card/GameNative" + assertTrue(SteamLibraries.offered(emptyList(), listOf(games), games)) + assertFalse(SteamLibraries.offered(emptyList(), listOf(games), "$games/Steam")) + assertFalse(SteamLibraries.offered(emptyList(), listOf(games), "/storage/card")) + assertFalse(SteamLibraries.offered(listOf(games), listOf(games), games)) + assertTrue(SteamLibraries.offered(listOf("/storage/card/Other"), listOf(games), "/storage/card/New")) + } + + @Test fun aGamesFolderRemainsDiscoverableBesideChosenGameStorage() { + val card = tmp.newFolder("card") + val games = File(card, "GameNative").path + val selected = File(card, "Selected").apply { mkdirs() } + SessionPrefs.setGameStorage(app, selected.path, "Selected") + val effective = GameStorage.effective(app)!! + assertTrue(SteamLibraries.offered(listOf(effective.path), listOf(games), games)) + SessionPrefs.setGameStorage(app, card.path, "Card") + assertFalse(SteamLibraries.offered(listOf(GameStorage.effective(app)!!.path), listOf(games), games)) + } + private fun library(dir: File): File = dir.apply { File(this, "steamapps").mkdirs(); File(this, "steamapps/appmanifest_220.acf").writeText("x") } @Test fun pickingTheFolderAboveALibraryAddsTheLibraryInside() { @@ -124,6 +144,14 @@ class SteamLibrariesTest { assertEquals("${lib.guest}/steamapps/common/Game", AddedGames.guestPath(app, scanned.folder)) } + @Test fun rawAndStorageMountViewsOverlapButDistinctFoldersDoNot() { + val raw = SteamLibraries.canonical(File("/mnt/media_rw/ABCD-1234/Games")) + val storage = SteamLibraries.canonical(File("/storage/ABCD-1234/Games")) + assertEquals(storage, raw) + assertTrue(SteamLibraries.overlaps(raw, SteamLibraries.canonical(File("/storage/ABCD-1234/Games/Steam")))) + assertFalse(SteamLibraries.overlaps(raw, SteamLibraries.canonical(File("/storage/ABCD-1234/Other")))) + } + @Test fun unreadableOrInvalidEntriesAreDropped() { assertTrue(SteamLibraries.parse("{oops").isEmpty()) assertEquals(listOf("2"), SteamLibraries.parse("""[{"id":"../x","path":"/a"},{"id":"2","path":"/b","label":""}]""").map { it.id }) From afd2d91662a42a66fbcb5a1cf83cf5b0ceaa37d9 Mon Sep 17 00:00:00 2001 From: DeathKhan Date: Wed, 11 Nov 2026 19:55:56 -0600 Subject: [PATCH 14/57] fix(input): B on a controller hides the on-screen keyboard before going back (#2498) * fix(input): B on a controller hides the on-screen keyboard before going back * fix(input): B sees the on-screen keyboard on Android 8 to 10 too --- .../com/droiddeck/launcher/ui/WirelessAdbFixPage.kt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt index 8ebfb5ad69..a685e414f3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt @@ -454,6 +454,18 @@ internal fun AdbTextField( } } showSoftInputOnFocus = !bottomTyping + // B on a controller puts the keyboard away first; with no keyboard up it goes back as usual. + var hidingKeyboard = false + setOnKeyListener { view, keyCode, event -> + if (keyCode != android.view.KeyEvent.KEYCODE_BUTTON_B) return@setOnKeyListener false + if (event.action == android.view.KeyEvent.ACTION_DOWN && event.repeatCount == 0) { + hidingKeyboard = androidx.core.view.ViewCompat.getRootWindowInsets(view) + ?.isVisible(androidx.core.view.WindowInsetsCompat.Type.ime()) == true + if (hidingKeyboard) (view.context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager) + ?.hideSoftInputFromWindow(view.windowToken, 0) + } + hidingKeyboard + } setOnClickListener { if (hasFocus() && !typeOnBottom(this) && bottomTypingLatest.value) showKeyboardHere(this) } setOnFocusChangeListener { _, hasFocus -> focused = hasFocus From 8ee50e5b384eea210c80f3fce1dc4e849718a5e3 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 20:56:10 -0500 Subject: [PATCH 15/57] fix(ea): retry rejected EA licence token requests (#2440) * fix(ea): retry licence requests EA rejects for a transient token failure * test(ea): cover bounded licence retries * fix(ea): retry only token field rejections --- .../com/droiddeck/launcher/stores/ea/EaOoa.kt | 18 ++++++++- .../droiddeck/launcher/stores/ea/EaTest.kt | 37 +++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaOoa.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaOoa.kt index 9590ce4a0b..5be0d03931 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaOoa.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaOoa.kt @@ -175,13 +175,29 @@ object EaOoa { return head + EaCrypto.licenseEncrypt(licenseXml(l).toByteArray()) } + private const val AUTH_ATTEMPTS = 4 + + internal fun tokenRejected(body: String) = + body.contains("cause=\"AUTHENTICATION_FAILED\"") && body.contains("field=\"ea_eadmtoken\"") + + internal fun retryTokenRejected(request: () -> EaReply): EaReply { + var reply = request() + var attempt = 1 + while (!reply.ok && attempt < AUTH_ATTEMPTS && tokenRejected(reply.text)) { + attempt++ + reply = request() + } + return reply + } + fun request(token: String, contentId: String, machineHash: String, requestToken: String? = null, requestType: String? = null): License { val nonce = EaCrypto.hex(ByteArray(4).also(SecureRandom()::nextBytes)) val params = mutableListOf("contentId" to contentId, "machineHash" to machineHash, "nonce" to nonce, "ea_eadmtoken" to token) if (requestToken != null) params += "requestToken" to requestToken if (requestType != null) params += "requestType" to requestType val url = LICENSES + "?" + params.joinToString("&") { (k, v) -> k + "=" + URLEncoder.encode(v, "UTF-8") } - val reply = EaHttp.request(url, headers = mapOf("X-Requester-Id" to "Origin Online Activation", "User-Agent" to "EACTransaction")) + val headers = mapOf("X-Requester-Id" to "Origin Online Activation", "User-Agent" to "EACTransaction") + val reply = retryTokenRejected { EaHttp.request(url, headers = headers) } if (!reply.ok) throw IllegalStateException("EA refused the licence (${reply.status}): ${reply.text.replace(Regex("(eadmToken value=\")[^\"]*"), "$1\"").take(600)}") val signature = reply.header("x-signature") ?: throw IllegalStateException("EA's licence had no signature") return parseLicense(String(EaCrypto.licenseDecrypt(reply.body), Charsets.UTF_8), signature) diff --git a/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt index a52485035e..bb8aa159a6 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt @@ -40,6 +40,43 @@ class EaTest { assertNull(EaCrypto.challengeSeed("9", answer)) } + @Test fun onlyTokenRejectionsAreRetried() { + val rejected = EaReply(409, "".toByteArray(), emptyMap()) + val notEntitled = EaReply(409, "".toByteArray(), emptyMap()) + var authCalls = 0 + val success = EaReply(200, ByteArray(0), emptyMap()) + val result = EaOoa.retryTokenRejected { + authCalls++ + if (authCalls == 1) rejected else success + } + assertEquals(2, authCalls) + assertEquals(200, result.status) + + var entitlementCalls = 0 + val refused = EaOoa.retryTokenRejected { + entitlementCalls++ + notEntitled + } + assertEquals(1, entitlementCalls) + assertEquals(409, refused.status) + + val otherAuthFailure = EaReply(409, "".toByteArray(), emptyMap()) + var otherAuthCalls = 0 + val otherRefused = EaOoa.retryTokenRejected { + otherAuthCalls++ + otherAuthFailure + } + assertEquals(1, otherAuthCalls) + assertEquals(409, otherRefused.status) + + var failedCalls = 0 + EaOoa.retryTokenRejected { + failedCalls++ + rejected + } + assertEquals(4, failedCalls) + } + @Test fun licenceRoundTripsThroughTheFileFormat() { val xml = "kh" + "12349tokgsn" From f4503c2eda999b6609638369ce8d675f39bb525f Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 11 Nov 2026 20:56:15 -0500 Subject: [PATCH 16/57] fix(steam-x64): new store shortcuts get a compatibility tool (#2336) fix: map new Steam shortcuts to x64 Proton --- .../overlay/usr/local/bin/steam-compatibility | 2 +- tools/tests/test_steam_compat_x64.py | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index 426b6c173b..cf616c86fc 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -1540,7 +1540,7 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non auto = followers(state, current) known = {app for app in state.get("owned", ()) if isinstance(app, str)} if isinstance(state.get("owned"), list) else set() pinned = {app: current[app] for app in set(owned) - known - if current.get(app) in {TOOL, previous} | gone and app not in auto} + if app in current and current.get(app) in {TOOL, previous} | gone and app not in auto} if pinned and isinstance(auto, dict): state["auto"] = dict(auto, **pinned) state["owned"] = sorted(set(owned), key=app_order) diff --git a/tools/tests/test_steam_compat_x64.py b/tools/tests/test_steam_compat_x64.py index 9f9abc478a..9d9bf109e0 100644 --- a/tools/tests/test_steam_compat_x64.py +++ b/tools/tests/test_steam_compat_x64.py @@ -99,6 +99,31 @@ class X64RepointTest(unittest.TestCase): self.assertEqual(COMPAT["x64_repoint"](str(self.root), None), []) self.assertEqual((self.root / "config" / "config.vdf").read_text(), before) + def test_new_owned_shortcut_gets_the_x64_default_and_explicit_choice_stays(self): + app = "2350879490" + chosen = "proton-cachyos-a64" + config = self.root / "config" / "config.vdf" + state = self.root / "droiddeck-compat" + self.assertEqual(COMPAT["register_default"]( + str(config), apps=[app], protect={chosen: "proton-cachyos-a64"}, + default="GE-Proton11-7-a64", directory=str(state), + linux_tool="droiddeck-direct", owned=[app]), "GE-Proton11-7-a64") + self.assertEqual(self.mapping()[app], "GE-Proton11-7-a64") + self.assertEqual(COMPAT["register_default"]( + str(config), apps=[app], protect={chosen: "proton-cachyos-a64"}, + default="GE-Proton11-7-a64", directory=str(state), + linux_tool="droiddeck-direct", owned=[app]), "GE-Proton11-7-a64") + self.assertEqual(self.mapping()[app], "GE-Proton11-7-a64") + tokens = COMPAT["tokenize"](config.read_text()) + mapping = COMPAT["mapping_block"](tokens) + COMPAT["set_mapping"](tokens, mapping, app, chosen) + config.write_text(COMPAT["serialize"](tokens)) + COMPAT["register_default"]( + str(config), apps=[app], protect={chosen: "proton-cachyos-a64"}, + default="GE-Proton11-7-a64", directory=str(state), + linux_tool="droiddeck-direct", owned=[app]) + self.assertEqual(self.mapping()[app], chosen) + if __name__ == "__main__": unittest.main() From 65554a544cb9154a177a3e05b47bd5a727bf7fd0 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 11 Nov 2026 20:56:19 -0500 Subject: [PATCH 17/57] fix(input): digital trigger keys work again on pads that also list analog axes (#2291) Since #2205 a pad that lists an analog trigger axis had its L2/R2 keys ignored. Handhelds whose triggers can be switched to digital keep listing the axis but only send the keys in that mode, so the triggers stopped responding. A trigger key now presses its trigger when the axis is idle at that moment and holds it until the key is released; motion events with an idle axis keep it held. As soon as the axis reports a value it takes over again, so pads that send both (the #2205 case) still follow their analog axis and key repeats never change the value. --- .../droiddeck/launcher/input/PadBridge.java | 34 ++++++++++--- .../launcher/input/PadPartialAxesTest.kt | 49 ++++++++++++++++--- 2 files changed, 69 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java index c7dd27a271..71744bf866 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -56,6 +56,7 @@ public final class PadBridge { private final FakeInputWriter[] playerWriters = new FakeInputWriter[SLOTS]; private final PadState[] playerStates = new PadState[SLOTS]; private final float[][] rawSticks = new float[SLOTS][4]; + private final boolean[][] keyTriggers = new boolean[SLOTS][2]; private final int[] retainedSticks = new int[SLOTS]; private final PadState effectiveState = new PadState(); private final PadState homeGuideReport = new PadState(); @@ -407,11 +408,11 @@ public final class PadBridge { break; case KeyEvent.KEYCODE_BUTTON_L2: pad.leftTrigger = keyTrigger(pad.leftTrigger, pressed, event.getRepeatCount(), - analogTrigger(event.getDevice(), MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_BRAKE)); + analogTrigger(event.getDevice(), MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_BRAKE), keyTriggers[slot], 0); break; case KeyEvent.KEYCODE_BUTTON_R2: pad.rightTrigger = keyTrigger(pad.rightTrigger, pressed, event.getRepeatCount(), - analogTrigger(event.getDevice(), MotionEvent.AXIS_RTRIGGER, MotionEvent.AXIS_GAS)); + analogTrigger(event.getDevice(), MotionEvent.AXIS_RTRIGGER, MotionEvent.AXIS_GAS), keyTriggers[slot], 1); break; case KeyEvent.KEYCODE_DPAD_UP: pad.up = pressed; break; case KeyEvent.KEYCODE_DPAD_RIGHT: pad.right = pressed; break; @@ -471,6 +472,7 @@ public final class PadBridge { stateFor(slot).clear(); retainedSticks[slot] = 0; Arrays.fill(rawSticks[slot], 0f); + Arrays.fill(keyTriggers[slot], false); } private void mutateState(java.util.function.Consumer mutation) { @@ -525,11 +527,11 @@ public final class PadBridge { float lt = 0f; float rt = 0f; if (wired || hasAxis(device, source, MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_BRAKE)) { - lt = leftTrigger(event, wired); + lt = axisTrigger(leftTrigger(event, wired), keyTriggers[slot], 0); pad.leftTrigger = lt; } if (wired || hasAxis(device, source, MotionEvent.AXIS_RTRIGGER, MotionEvent.AXIS_GAS)) { - rt = rightTrigger(event, wired); + rt = axisTrigger(rightTrigger(event, wired), keyTriggers[slot], 1); pad.rightTrigger = rt; } if (hasAxis(device, source, MotionEvent.AXIS_HAT_X)) { @@ -553,9 +555,27 @@ public final class PadBridge { return true; } - static float keyTrigger(float current, boolean pressed, int repeatCount, boolean analog) { - if (analog || repeatCount > 0) return current; - return pressed ? 1f : 0f; + static float keyTrigger(float current, boolean pressed, int repeatCount, boolean analog, boolean[] held, int side) { + if (repeatCount > 0) return current; + if (!analog) { + held[side] = pressed; + return pressed ? 1f : 0f; + } + if (pressed) { + if (current != 0f) return current; + held[side] = true; + return 1f; + } + if (!held[side]) return current; + held[side] = false; + return 0f; + } + + static float axisTrigger(float value, boolean[] held, int side) { + if (!held[side]) return value; + if (value == 0f) return 1f; + held[side] = false; + return value; } static boolean analogTrigger(InputDevice device, int... axes) { diff --git a/app/src/test/java/com/droiddeck/launcher/input/PadPartialAxesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/PadPartialAxesTest.kt index 2a2bade1c4..ae46c9d5e3 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/PadPartialAxesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/PadPartialAxesTest.kt @@ -126,11 +126,11 @@ class PadPartialAxesTest { @Test fun wiredXboxTriggerKeysDoNotOverrideTheirAxes() { val device = device(MotionEvent.AXIS_RX, MotionEvent.AXIS_RY, MotionEvent.AXIS_Z, MotionEvent.AXIS_RZ, wired = true) - motion(device, MotionEvent.AXIS_Z to 0f, MotionEvent.AXIS_RZ to -1f) + motion(device, MotionEvent.AXIS_Z to 0f, MotionEvent.AXIS_RZ to -0.6f) key(device, KeyEvent.KEYCODE_BUTTON_L2) key(device, KeyEvent.KEYCODE_BUTTON_R2) assertEquals(0.5f, pad().leftTrigger) - assertEquals(0f, pad().rightTrigger) + assertEquals(0.2f, pad().rightTrigger, 0.0001f) } @Test fun digitalTriggerKeysStillPressAndRelease() { @@ -148,11 +148,46 @@ class PadPartialAxesTest { } @Test fun keyTriggerDecision() { - assertEquals(1f, PadBridge.keyTrigger(0f, true, 0, false)) - assertEquals(0f, PadBridge.keyTrigger(1f, false, 0, false)) - assertEquals(0.25f, PadBridge.keyTrigger(0.25f, true, 1, false)) - assertEquals(0.25f, PadBridge.keyTrigger(0.25f, true, 0, true)) - assertEquals(0.25f, PadBridge.keyTrigger(0.25f, false, 0, true)) + val held = BooleanArray(2) + assertEquals(1f, PadBridge.keyTrigger(0f, true, 0, false, held, 0)) + assertEquals(0f, PadBridge.keyTrigger(1f, false, 0, false, held, 0)) + assertEquals(0.25f, PadBridge.keyTrigger(0.25f, true, 1, false, held, 0)) + assertEquals(0.25f, PadBridge.keyTrigger(0.25f, true, 0, true, held, 0)) + assertEquals(0.25f, PadBridge.keyTrigger(0.25f, false, 0, true, held, 0)) + assertEquals(1f, PadBridge.keyTrigger(0f, true, 0, true, held, 1)) + assertEquals(1f, PadBridge.axisTrigger(0f, held, 1)) + assertEquals(0f, PadBridge.keyTrigger(1f, false, 0, true, held, 1)) + assertEquals(0f, PadBridge.axisTrigger(0f, held, 1)) + } + + @Test fun silentTriggerAxesLetTheirKeysPress() { + val device = device(MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_RTRIGGER) + motion(device) + key(device, KeyEvent.KEYCODE_BUTTON_L2) + key(device, KeyEvent.KEYCODE_BUTTON_R2) + assertEquals(1f, pad().leftTrigger) + assertEquals(1f, pad().rightTrigger) + motion(device, MotionEvent.AXIS_X to 0.8f) + key(device, KeyEvent.KEYCODE_BUTTON_L2, repeat = 1) + assertEquals(1f, pad().leftTrigger) + assertEquals(1f, pad().rightTrigger) + key(device, KeyEvent.KEYCODE_BUTTON_L2, KeyEvent.ACTION_UP) + assertEquals(0f, pad().leftTrigger) + assertEquals(1f, pad().rightTrigger) + key(device, KeyEvent.KEYCODE_BUTTON_R2, KeyEvent.ACTION_UP) + assertEquals(0f, pad().rightTrigger) + } + + @Test fun aLiveAxisTakesOverFromItsKey() { + val device = device(MotionEvent.AXIS_LTRIGGER) + key(device, KeyEvent.KEYCODE_BUTTON_L2) + assertEquals(1f, pad().leftTrigger) + motion(device, MotionEvent.AXIS_LTRIGGER to 0.4f) + assertEquals(0.4f, pad().leftTrigger) + motion(device, MotionEvent.AXIS_LTRIGGER to 0f) + assertEquals(0f, pad().leftTrigger) + key(device, KeyEvent.KEYCODE_BUTTON_L2, KeyEvent.ACTION_UP) + assertEquals(0f, pad().leftTrigger) } private fun pad(): PadState = requireNotNull(JoyConPadTest.RecordingWriter.pads[0]) From 92d4959970986fe0cb6315f4c9b7ab34c58af7bc Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 20:56:26 -0500 Subject: [PATCH 18/57] fix: run Final Fantasy VII Rebirth at D3D12 feature level 12_2 (#2289) * fix: run Final Fantasy VII Rebirth at D3D12 feature level 12_2 * fix: match FF7 Rebirth by its real executables --- .../overlay/usr/local/bin/droiddeck-game-env | 6 ++++++ tools/tests/test_game_environment.py | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index a4d8387353..459e8a6fac 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -145,6 +145,12 @@ def deep_rock_gdk_raytracing(game): return {}, ["-noraytracing", "-ini:Engine:[/Script/Engine.RendererSettings]:r.RayTracing=False"], "Deep Rock Galactic GDK: ray tracing off (D3D12 pipeline creation fails on Thor)" +@fix +def ff7_rebirth_feature_level(game): + if game.stem in ("ff7rebirth", "ff7rebirth_"): + return {"VKD3D_FEATURE_LEVEL": "12_2"}, [], "Final Fantasy VII Rebirth: D3D12 feature level 12_2 (the device-reported level fails its DX12 check)" + + @fix def arkham_city_x87(game): if "batmanac.exe" in game.files: diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 18ec5135ec..5f7b4af087 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -1522,6 +1522,19 @@ class GameEnvironmentTest(unittest.TestCase): config = {"version": 1, "shared": {}, "games": {"42": values}} self.assertEqual(MODULE["apply_config"]({}, config, "42", env), values, name) + def test_ff7_rebirth_runs_at_feature_level_12_2_unless_the_game_overrides_it(self): + with tempfile.TemporaryDirectory() as tmp: + root = Path(tmp) / "FINAL FANTASY VII REBIRTH" + game = root / "End/Binaries/Win64/ff7rebirth_.exe" + game.parent.mkdir(parents=True) + for exe in (root / "ff7rebirth.exe", game): + exe.touch() + env, extra, notes = MODULE["engine_fixes"](str(exe), []) + self.assertEqual(env, {"VKD3D_FEATURE_LEVEL": "12_2"}, exe.name) + self.assertTrue(notes) + config = {"version": 1, "shared": {}, "games": {"42": {"VKD3D_FEATURE_LEVEL": "12_1"}}} + self.assertEqual(MODULE["apply_config"]({}, config, "42", env), {"VKD3D_FEATURE_LEVEL": "12_1"}) + def test_unity_players_keep_tso_over_the_preset(self): with tempfile.TemporaryDirectory() as tmp: def game(*names): From 956f17239b2ad6ea1a37ee6c0edbda9f8c84d27e Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 20:56:30 -0500 Subject: [PATCH 19/57] fix(storage): Clean up keeps Proton EasyAntiCheat and BattlEye runtimes (#2254) --- .../main/java/com/droiddeck/launcher/storage/SteamStorage.kt | 5 ++++- .../main/java/com/droiddeck/launcher/storage/StorageScan.kt | 3 ++- app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt | 1 + app/src/main/res/values/strings.xml | 1 + .../java/com/droiddeck/launcher/storage/SteamStorageTest.kt | 2 ++ 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt b/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt index de3648e83c..2111bfdee1 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt @@ -11,6 +11,8 @@ object SteamStorage { const val PROTON_11_ARM = 4628740 const val REDISTRIBUTABLES = 228980 const val FEX = 3127680 + const val EAC_RUNTIME = 1826330 + const val BATTLEYE_RUNTIME = 1161040 const val ARM_TOOL = "droiddeck-proton-arm64" const val ARM_11_TOOL = "droiddeck-proton-11-arm64" @@ -18,7 +20,7 @@ object SteamStorage { private val VALVE_TOOLS = setOf( 858280, 961940, 1054830, 1113280, 1245040, 1420170, 1493710, 1580130, 1887720, 2180100, 2348590, 2805730, 3029110, 3658110, 4183110, 4628710, 4690330, - SCOUT, SOLDIER, SNIPER, ARM_RUNTIME, PROTON_ARM, PROTON_11_ARM, REDISTRIBUTABLES, FEX, + SCOUT, SOLDIER, SNIPER, ARM_RUNTIME, PROTON_ARM, PROTON_11_ARM, REDISTRIBUTABLES, FEX, EAC_RUNTIME, BATTLEYE_RUNTIME, ) private val APP_ID = Regex("^\\s*\"appid\"\\s*\"(\\d+)\"", RegexOption.MULTILINE) @@ -93,6 +95,7 @@ object SteamStorage { val dir = m.installDir.orEmpty() return when { m.appId == SCOUT || m.appId == SOLDIER || dir == "SteamLinuxRuntime" || dir == "SteamLinuxRuntime_soldier" -> Kind.OLD_RUNTIME + m.appId == EAC_RUNTIME || m.appId == BATTLEYE_RUNTIME -> Kind.REQUIRED dir.startsWith("Proton") && "ARM64" in dir -> Kind.ARM_PROTON m.appId == PROTON_ARM || m.appId == PROTON_11_ARM -> Kind.ARM_PROTON dir.startsWith("Proton ") -> Kind.X86_PROTON diff --git a/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt b/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt index 9c5fff91a9..3a7c52db38 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt @@ -26,7 +26,7 @@ class GameUsage( } enum class ToolState { IN_USE, REQUIRED, UNUSED } -enum class ToolReason { DEFAULT_PROTON, PROTON, FEX_RUNTIME, ARM_RUNTIME, REDISTRIBUTABLES, FEX, STEAM_TOOL, OLD_RUNTIME, X86_PROTON, CUSTOM, CUSTOM_UNKNOWN, X64_CLIENT } +enum class ToolReason { DEFAULT_PROTON, PROTON, FEX_RUNTIME, ARM_RUNTIME, REDISTRIBUTABLES, FEX, ANTICHEAT_RUNTIME, STEAM_TOOL, OLD_RUNTIME, X86_PROTON, CUSTOM, CUSTOM_UNKNOWN, X64_CLIENT } class ToolUsage( val key: String, val name: String, val bytes: Long, val state: ToolState, val reason: ToolReason, @@ -153,6 +153,7 @@ object StorageScan { SteamStorage.ARM_RUNTIME -> ToolReason.ARM_RUNTIME SteamStorage.REDISTRIBUTABLES -> ToolReason.REDISTRIBUTABLES SteamStorage.FEX -> ToolReason.FEX + SteamStorage.EAC_RUNTIME, SteamStorage.BATTLEYE_RUNTIME -> ToolReason.ANTICHEAT_RUNTIME else -> ToolReason.STEAM_TOOL } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt index 04ff93efc9..68bcb8d27d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt @@ -714,6 +714,7 @@ private fun toolDetail(t: ToolUsage): String = when (t.reason) { ToolReason.ARM_RUNTIME -> stringResource(R.string.storage_tool_arm_runtime) ToolReason.REDISTRIBUTABLES -> stringResource(R.string.storage_tool_redist) ToolReason.FEX -> stringResource(R.string.storage_tool_fex) + ToolReason.ANTICHEAT_RUNTIME -> stringResource(R.string.storage_tool_anticheat) ToolReason.STEAM_TOOL -> stringResource(R.string.storage_tool_steam) ToolReason.OLD_RUNTIME -> stringResource(R.string.storage_tool_old_runtime) ToolReason.X86_PROTON -> stringResource(R.string.storage_tool_x86_proton) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fd395216de..3f6d489aea 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3337,6 +3337,7 @@ VC++ and DirectX installers games ask for Runs Linux x86 games Steam tool + Steam downloads this for games that ship anti-cheat, even when it is off. Removing it stalls their install at 0% DroidDeck runs games without this runtime x86 Proton, which DroidDeck cannot run Default for every game diff --git a/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt b/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt index 0cfbf2e054..a3b6a8fa24 100644 --- a/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt @@ -50,6 +50,8 @@ class SteamStorageTest { assertEquals(SteamStorage.Kind.X86_PROTON, SteamStorage.kind(manifest(1493710, "Proton - Experimental"))) assertEquals(SteamStorage.Kind.X86_PROTON, SteamStorage.kind(manifest(2805730, "Proton 9.0"))) assertEquals(SteamStorage.Kind.REQUIRED, SteamStorage.kind(manifest(228980, "Steamworks Shared"))) + assertEquals(SteamStorage.Kind.REQUIRED, SteamStorage.kind(manifest(1826330, "Proton EasyAntiCheat Runtime"))) + assertEquals(SteamStorage.Kind.REQUIRED, SteamStorage.kind(manifest(1161040, "Proton BattlEye Runtime"))) assertTrue(SteamStorage.isTool(manifest(2805730, "Proton 9.0"))) assertFalse(SteamStorage.isTool(manifest(204360, "CastleCrashers"))) } From 02a5be62da4dc1af8f5e18f49dc14c0185126f04 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 11 Nov 2026 21:57:56 -0500 Subject: [PATCH 20/57] fix(input): a controller that disconnects mid-event no longer closes the app (#2369) * fix(input): a controller that disconnects mid-event no longer closes the app KeyEvent.getDevice() looks the device up on every call, so a controller removed while its event was handled made a later lookup return null and crashed in noteDevice. Look the device up once per event and ignore events whose device is gone. * fix(input): retain controller layout during disconnect * fix(input): look up the controller once per key and motion event --- .../droiddeck/launcher/input/PadBridge.java | 39 ++++++----- .../droiddeck/launcher/input/JoyConPadTest.kt | 69 +++++++++++++++++++ .../launcher/input/PadBridgeRoutingTest.kt | 16 ++++- 3 files changed, 106 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java index 71744bf866..c75602585c 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -290,7 +290,10 @@ public final class PadBridge { } public static boolean isControllerKeyEvent(KeyEvent event) { - InputDevice device = event.getDevice(); + return isControllerKeyEvent(event, event.getDevice()); + } + + static boolean isControllerKeyEvent(KeyEvent event, InputDevice device) { if (device == null || device.isVirtual() || isSystemVirtualInputName(device.getName())) return false; if (KeyEvent.isGamepadButton(event.getKeyCode())) { return device.supportsSource(InputDevice.SOURCE_GAMEPAD) @@ -315,7 +318,10 @@ public final class PadBridge { } public static boolean isControllerMotionEvent(MotionEvent event) { - InputDevice device = event.getDevice(); + return isControllerMotionEvent(event, event.getDevice()); + } + + static boolean isControllerMotionEvent(MotionEvent event, InputDevice device) { return event.isFromSource(InputDevice.SOURCE_JOYSTICK) && device != null && !device.isVirtual() && !isSystemVirtualInputName(device.getName()) && (device.supportsSource(InputDevice.SOURCE_GAMEPAD) @@ -376,10 +382,11 @@ public final class PadBridge { } public synchronized boolean onKeyEvent(KeyEvent event) { - if (!isControllerKeyEvent(event) || excluded.test(event.getDeviceId())) return false; - int slot = slotFor(event.getDevice()); + InputDevice device = event.getDevice(); + if (!isControllerKeyEvent(event, device) || excluded.test(event.getDeviceId())) return false; + int slot = slotFor(device); if (slot < 0) return false; - int side = JoyCon.side(event.getDevice()); + int side = JoyCon.side(device); if (side >= 0 && partners[slot] != NO_CONTROLLER && JoyCon.isRail(side, event.getScanCode())) return true; long timing = InputTiming.begin(); PadState pad = stateFor(slot); @@ -401,18 +408,18 @@ public final class PadBridge { case KeyEvent.KEYCODE_HOME: case KeyEvent.KEYCODE_MOVE_HOME: pad.press(PadState.GUIDE, pressed); break; case KeyEvent.KEYCODE_BUTTON_Z: - if (isPrimary(event)) DeckControls.INSTANCE.setGrip(isNovaController(event.getDevice()) ? DeckControls.R4 : DeckControls.L4, pressed); + if (isPrimary(event)) DeckControls.INSTANCE.setGrip(isNovaController(device) ? DeckControls.R4 : DeckControls.L4, pressed); break; case KeyEvent.KEYCODE_BUTTON_C: - if (isPrimary(event)) DeckControls.INSTANCE.setGrip(isNovaController(event.getDevice()) ? DeckControls.L4 : DeckControls.R4, pressed); + if (isPrimary(event)) DeckControls.INSTANCE.setGrip(isNovaController(device) ? DeckControls.L4 : DeckControls.R4, pressed); break; case KeyEvent.KEYCODE_BUTTON_L2: pad.leftTrigger = keyTrigger(pad.leftTrigger, pressed, event.getRepeatCount(), - analogTrigger(event.getDevice(), MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_BRAKE), keyTriggers[slot], 0); + analogTrigger(device, MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_BRAKE), keyTriggers[slot], 0); break; case KeyEvent.KEYCODE_BUTTON_R2: pad.rightTrigger = keyTrigger(pad.rightTrigger, pressed, event.getRepeatCount(), - analogTrigger(event.getDevice(), MotionEvent.AXIS_RTRIGGER, MotionEvent.AXIS_GAS), keyTriggers[slot], 1); + analogTrigger(device, MotionEvent.AXIS_RTRIGGER, MotionEvent.AXIS_GAS), keyTriggers[slot], 1); break; case KeyEvent.KEYCODE_DPAD_UP: pad.up = pressed; break; case KeyEvent.KEYCODE_DPAD_RIGHT: pad.right = pressed; break; @@ -420,7 +427,7 @@ public final class PadBridge { case KeyEvent.KEYCODE_DPAD_LEFT: pad.left = pressed; break; default: return false; } - noteDevice(event.getDevice(), slot); + noteDevice(device, slot); if (pressed && event.getRepeatCount() == 0 && !event.isCanceled()) noteChordInput(slot); if (pressed) notePlayerInput(); statButtons++; @@ -491,16 +498,16 @@ public final class PadBridge { } public synchronized boolean onMotionEvent(MotionEvent event) { - if (!isControllerMotionEvent(event) || excluded.test(event.getDeviceId())) return false; + InputDevice device = event.getDevice(); + if (!isControllerMotionEvent(event, device) || excluded.test(event.getDeviceId())) return false; if (event.getAction() != MotionEvent.ACTION_MOVE) return false; - int slot = slotFor(event.getDevice()); + int slot = slotFor(device); if (slot < 0) return false; long timing = InputTiming.begin(); PadState pad = stateFor(slot); - noteDevice(event.getDevice(), slot); + noteDevice(device, slot); statAxes++; scheduleStats(); - InputDevice device = event.getDevice(); int side = JoyCon.side(device); if (side >= 0) { int[] stick = JoyCon.stickAxes(side, device, event.getSource()); @@ -517,7 +524,7 @@ public final class PadBridge { } float lx = event.getAxisValue(MotionEvent.AXIS_X); float ly = event.getAxisValue(MotionEvent.AXIS_Y); - boolean wired = wiredXboxLayout(event); + boolean wired = wiredXboxLayout(device, event.getSource()); float rx = event.getAxisValue(wired ? MotionEvent.AXIS_RX : MotionEvent.AXIS_Z); float ry = event.getAxisValue(wired ? MotionEvent.AXIS_RY : MotionEvent.AXIS_RZ); retainStick(slot, JoyCon.LEFT, lx, ly); @@ -1007,7 +1014,7 @@ public final class PadBridge { } private boolean isPrimary(KeyEvent event) { - int id = event.getDevice().getId(); + int id = event.getDeviceId(); int first = firstPlayerSlot(); return owners[first] == id || partners[first] == id; } diff --git a/app/src/test/java/com/droiddeck/launcher/input/JoyConPadTest.kt b/app/src/test/java/com/droiddeck/launcher/input/JoyConPadTest.kt index 0b8c930ed0..cff58d665e 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/JoyConPadTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/JoyConPadTest.kt @@ -147,6 +147,75 @@ class JoyConPadTest { assertNull(RecordingWriter.pads[2]) } + @Test fun aControllerThatDisconnectsWhileItsKeyIsHandledIsIgnored() { + for (lookups in 0..4) { + val event = key(right, KeyEvent.KEYCODE_BUTTON_A, BTN_SOUTH) + PadBridgeRoutingTest.RegisteredKeyEvent.lookupsLeft = lookups + try { + val handled = bridge.onKeyEvent(event) + if (lookups == 0) assertFalse(handled) + if (lookups >= 2) assertTrue(handled) + } finally { PadBridgeRoutingTest.RegisteredKeyEvent.lookupsLeft = -1 } + } + assertTrue(press(right, KeyEvent.KEYCODE_BUTTON_A, BTN_SOUTH)) + } + + @Test fun aControllerThatDisconnectsAfterTheFirstLookupStillDeliversItsEvents() { + val device = controller(0x045e, 0x0b13, MotionEvent.AXIS_X, MotionEvent.AXIS_Y) + val down = key(device, KeyEvent.KEYCODE_BUTTON_A, BTN_SOUTH) + val up = key(device, KeyEvent.KEYCODE_BUTTON_A, BTN_SOUTH, KeyEvent.ACTION_UP) + val move = motion(device, MotionEvent.AXIS_X to 0.5f, MotionEvent.AXIS_Y to -0.25f) + try { + PadBridgeRoutingTest.RegisteredKeyEvent.lookupsLeft = 1 + assertTrue(bridge.onKeyEvent(down)) + assertEquals(0, PadBridgeRoutingTest.RegisteredKeyEvent.lookupsLeft) + assertTrue(pad(0).isDown(PadState.A)) + PadBridgeRoutingTest.RegisteredKeyEvent.lookupsLeft = 1 + assertTrue(bridge.onKeyEvent(up)) + assertFalse(pad(0).isDown(PadState.A)) + PadBridgeRoutingTest.RegisteredMotionEvent.lookupsLeft = 1 + assertTrue(bridge.onMotionEvent(move)) + assertEquals(0, PadBridgeRoutingTest.RegisteredMotionEvent.lookupsLeft) + assertEquals(0.5f, pad(0).leftX) + assertEquals(-0.25f, pad(0).leftY) + } finally { + PadBridgeRoutingTest.RegisteredKeyEvent.lookupsLeft = -1 + PadBridgeRoutingTest.RegisteredMotionEvent.lookupsLeft = -1 + } + } + + @Test fun nonControllerInputStaysUnhandledWithOneLookup() { + val keyboard = InputDeviceBuilder.newBuilder().setId(nextId++).setName("Keyboard").setDescriptor("keyboard") + .setExternal(true).setSources(InputDevice.SOURCE_KEYBOARD) + .setKeyboardType(InputDevice.KEYBOARD_TYPE_ALPHABETIC) + .setKeyCharacterMap(KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD)).build().also(::register) + val typed = KeyEvent(0L, 0L, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_A, 0, 0, keyboard.id, 30, 0, InputDevice.SOURCE_KEYBOARD) + val touch = MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_MOVE, 1, arrayOf(MotionEvent.PointerProperties().apply { id = 0 }), + arrayOf(MotionEvent.PointerCoords().apply { x = 10f; y = 20f }), 0, 0, 1f, 1f, keyboard.id, 0, InputDevice.SOURCE_TOUCHSCREEN, 0) + try { + PadBridgeRoutingTest.RegisteredKeyEvent.lookupsLeft = 1 + assertFalse(bridge.onKeyEvent(typed)) + PadBridgeRoutingTest.RegisteredMotionEvent.lookupsLeft = 1 + assertFalse(bridge.onMotionEvent(touch)) + } finally { + PadBridgeRoutingTest.RegisteredKeyEvent.lookupsLeft = -1 + PadBridgeRoutingTest.RegisteredMotionEvent.lookupsLeft = -1 + } + assertNull(RecordingWriter.pads[0]) + } + + @Test fun wiredMotionKeepsItsAxesWhenDeviceDisappears() { + val device = controller(0x20d6, 0x2063, MotionEvent.AXIS_RX, MotionEvent.AXIS_RY, MotionEvent.AXIS_Z, MotionEvent.AXIS_RZ) + val event = motion(device, MotionEvent.AXIS_RX to 0.75f, MotionEvent.AXIS_RY to -0.5f, + MotionEvent.AXIS_Z to -1f, MotionEvent.AXIS_RZ to 1f) + PadBridgeRoutingTest.RegisteredMotionEvent.lookupsLeft = 2 + try { assertTrue(bridge.onMotionEvent(event)) } finally { PadBridgeRoutingTest.RegisteredMotionEvent.lookupsLeft = -1 } + assertEquals(0.75f, pad(0).rightX) + assertEquals(-0.5f, pad(0).rightY) + assertEquals(0f, pad(0).leftTrigger) + assertEquals(1f, pad(0).rightTrigger) + } + @Test fun joyConsHeldForVrAreLeftAlone() { bridge.setExcluded { it == left.id } assertFalse(bridge.onKeyEvent(key(left, KeyEvent.KEYCODE_BUTTON_L1, BTN_TL))) diff --git a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeRoutingTest.kt b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeRoutingTest.kt index a76da590a3..ea66f32136 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeRoutingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeRoutingTest.kt @@ -191,12 +191,24 @@ class PadBridgeRoutingTest { @Implements(KeyEvent::class) class RegisteredKeyEvent : ShadowKeyEvent() { @RealObject private lateinit var event: KeyEvent - @Implementation override fun getDevice(): InputDevice? = Shadow.directlyOn(event as InputEvent, InputEvent::class.java, "getDevice") + @Implementation override fun getDevice(): InputDevice? { + if (lookupsLeft == 0) return null + if (lookupsLeft > 0) lookupsLeft-- + return Shadow.directlyOn(event as InputEvent, InputEvent::class.java, "getDevice") + } + + companion object { @JvmField var lookupsLeft = -1 } } @Implements(MotionEvent::class) class RegisteredMotionEvent : ShadowMotionEvent() { @RealObject private lateinit var event: MotionEvent - @Implementation override fun getDevice(): InputDevice? = Shadow.directlyOn(event as InputEvent, InputEvent::class.java, "getDevice") + @Implementation override fun getDevice(): InputDevice? { + if (lookupsLeft == 0) return null + if (lookupsLeft > 0) lookupsLeft-- + return Shadow.directlyOn(event as InputEvent, InputEvent::class.java, "getDevice") + } + + companion object { @JvmField var lookupsLeft = -1 } } } From 7da27d4ff4a5d9b006ae9febcd565b45a9eca617 Mon Sep 17 00:00:00 2001 From: KeegantheVeganat0r <58369898+KeegantheVeganat0r@users.noreply.github.com> Date: Thu, 12 Nov 2026 03:28:59 +0000 Subject: [PATCH 21/57] feat: add build watermark toggle for Lab, test, and local builds (#2488) --- .../droiddeck/launcher/FrontEndActivity.kt | 8 ++ .../launcher/session/BuildWatermarkSetting.kt | 44 +++++++++ .../launcher/session/SessionPrefs.kt | 7 ++ .../launcher/session/SettingsReset.kt | 3 +- .../droiddeck/launcher/ui/BuildWatermark.kt | 61 +++++++++--- .../droiddeck/launcher/ui/FrontEndScreen.kt | 2 + .../com/droiddeck/launcher/ui/UpdatesPage.kt | 7 ++ app/src/main/res/values-ar/strings.xml | 2 + app/src/main/res/values-b+es+419/strings.xml | 2 + app/src/main/res/values-bg/strings.xml | 2 + app/src/main/res/values-cs/strings.xml | 2 + app/src/main/res/values-da/strings.xml | 2 + app/src/main/res/values-de/strings.xml | 2 + app/src/main/res/values-el/strings.xml | 2 + app/src/main/res/values-es/strings.xml | 2 + app/src/main/res/values-fi/strings.xml | 2 + app/src/main/res/values-fr/strings.xml | 2 + app/src/main/res/values-hi/strings.xml | 2 + app/src/main/res/values-hu/strings.xml | 2 + app/src/main/res/values-in/strings.xml | 2 + app/src/main/res/values-it/strings.xml | 2 + app/src/main/res/values-ja/strings.xml | 2 + app/src/main/res/values-ko/strings.xml | 2 + app/src/main/res/values-ms/strings.xml | 2 + app/src/main/res/values-nb/strings.xml | 2 + app/src/main/res/values-nl/strings.xml | 2 + app/src/main/res/values-pl/strings.xml | 2 + app/src/main/res/values-pt-rPT/strings.xml | 2 + app/src/main/res/values-pt/strings.xml | 2 + app/src/main/res/values-ro/strings.xml | 2 + app/src/main/res/values-ru/strings.xml | 2 + app/src/main/res/values-sv/strings.xml | 2 + app/src/main/res/values-th/strings.xml | 2 + app/src/main/res/values-tr/strings.xml | 2 + app/src/main/res/values-uk/strings.xml | 2 + app/src/main/res/values-vi/strings.xml | 2 + app/src/main/res/values-zh-rCN/strings.xml | 2 + app/src/main/res/values-zh-rHK/strings.xml | 2 + app/src/main/res/values-zh-rTW/strings.xml | 2 + app/src/main/res/values/strings.xml | 2 + .../session/BuildWatermarkSettingTest.kt | 99 +++++++++++++++++++ 41 files changed, 281 insertions(+), 16 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/session/BuildWatermarkSetting.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/BuildWatermarkSettingTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 55fdf3f1f3..a8d0a5bde2 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -593,6 +593,7 @@ class FrontEndActivity : ComponentActivity() { private var vacDiagnostics by mutableStateOf(false) private var agentCommands by mutableStateOf(false) private var graphicsLogs by mutableStateOf(false) + private var buildWatermark by mutableStateOf(true) private var steamGpuDrawing by mutableStateOf(false) private var bridgeFellBack by mutableStateOf(false) private var bridgeFellBackMemory by mutableStateOf(false) @@ -1178,6 +1179,7 @@ class FrontEndActivity : ComponentActivity() { gameDebugLogsEnabled = gameDebugLogsEnabled, gameDebugLogsNeedsRestart = gameDebugLogsNeedsRestart, vacDiagnostics = vacDiagnostics, agentCommands = agentCommands, graphicsLogs = graphicsLogs, steamGpuDrawing = steamGpuDrawing, bridgeFellBack = bridgeFellBack, bridgeFellBackMemory = bridgeFellBackMemory, + buildWatermark = buildWatermark, clearCachedApps = clearCachedApps, adbPaired = adbPaired, memoryHud = memoryHud, backgroundAppLimit = backgroundAppLimit, tpUbwcMode = drivers.tpUbwcModeForDevice(), tpUbwcRestartRequired = drivers.tpUbwcRestartRequired(), canRestartApp = !runtimeChangesBlocked(), steamGames = steamGames, steamGamesX64 = steamGamesX64, emulators = emulatorList, running = runningLabel, @@ -1416,6 +1418,11 @@ class FrontEndActivity : ComponentActivity() { SessionPrefs.setDetailedGraphicsLogs(this, !SessionPrefs.detailedGraphicsLogs(this)) graphicsLogs = SessionPrefs.detailedGraphicsLogs(this) }, + onBuildWatermark = { + SessionPrefs.setBuildWatermarkEnabled(this, !SessionPrefs.buildWatermarkEnabled(this)) + buildWatermark = SessionPrefs.buildWatermarkEnabled(this) + com.droiddeck.launcher.ui.BuildWatermark.refresh(this) + }, onVacDiagnostics = { SessionPrefs.setVacDiagnostics(this, !SessionPrefs.vacDiagnostics(this)) vacDiagnostics = SessionPrefs.vacDiagnostics(this) @@ -2867,6 +2874,7 @@ class FrontEndActivity : ComponentActivity() { vacDiagnostics = SessionPrefs.vacDiagnostics(this) agentCommands = com.droiddeck.launcher.agent.AgentAccess.commandsEnabled(this) graphicsLogs = SessionPrefs.detailedGraphicsLogs(this) + buildWatermark = SessionPrefs.buildWatermarkEnabled(this) steamGpuDrawing = SessionPrefs.steamGpuCompositing(this) bridgeFellBack = SessionPrefs.bridgeFellBack(this) bridgeFellBackMemory = SessionPrefs.bridgeFellBackForMemory(this) diff --git a/app/src/main/java/com/droiddeck/launcher/session/BuildWatermarkSetting.kt b/app/src/main/java/com/droiddeck/launcher/session/BuildWatermarkSetting.kt new file mode 100644 index 0000000000..98239f8eb0 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/BuildWatermarkSetting.kt @@ -0,0 +1,44 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import android.content.Intent +import android.util.AtomicFile +import java.io.File + +internal object BuildWatermarkSetting { + const val CHANGED = "com.droiddeck.launcher.BUILD_WATERMARK_CHANGED" + + private fun file(context: Context) = AtomicFile(File(context.filesDir, "build-watermark")) + + private val processLock = Any() + + private fun locked(context: Context, action: () -> T): T = synchronized(processLock) { + File(context.filesDir, "build-watermark.lock").outputStream().channel.use { channel -> + channel.lock().use { action() } + } + } + + fun enabled(context: Context): Boolean = try { + locked(context) { + // SharedPreferences caches are process-local; read the shared file on every refresh. + file(context).readFully().decodeToString() != "off" + } + } catch (_: java.io.IOException) { + context.getSharedPreferences("session", Context.MODE_PRIVATE).getBoolean("buildWatermark", true) + } + + fun setEnabled(context: Context, on: Boolean) { + locked(context) { + val target = file(context) + val stream = target.startWrite() + try { + stream.write((if (on) "on" else "off").toByteArray()) + target.finishWrite(stream) + } catch (error: Throwable) { + target.failWrite(stream) + throw error + } + } + context.sendBroadcast(Intent(CHANGED).setPackage(context.packageName)) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 4b0a94f7b6..b682a82953 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -1048,6 +1048,13 @@ object SessionPrefs { prefs(context).edit().putBoolean("vac_diagnostics", on).apply() } + fun buildWatermarkEnabled(context: Context): Boolean = + BuildWatermarkSetting.enabled(context) + + fun setBuildWatermarkEnabled(context: Context, on: Boolean) { + BuildWatermarkSetting.setEnabled(context, on) + } + private fun resolutionCap(context: Context, mode: String): Int = prefs(context).getInt("resolutionCap.$mode", 720) fun resolutionChosen(context: Context, mode: String): Boolean = diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index 67f013b78f..321af09802 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -23,7 +23,7 @@ object SettingsReset { "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "ramCapMb", "vramCapMb", "zramClient", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", "noXalia", "fastSync", "fsyncFirst", "syncFallback", "prootNoSeccomp", "prootFastPath", "nativeUserland", "cursorComposite", - "guestHostname", "fexPreset", "forceSsbs", "logs", "gameDebugLogsEnabled", "enhancedDiagnosticsNext", "storageDiagnostics", + "guestHostname", "fexPreset", "forceSsbs", "logs", "gameDebugLogsEnabled", "enhancedDiagnosticsNext", "storageDiagnostics", "buildWatermark", "upscaler", "upscaleSharpness", "screenEffects", "textureAnisotropy", "textureLodBias", "steamDownloadsInBackground", "steam_offline", "bootMovie", "bootMovieSound", "bootMovieVolume", "bootMovieSeconds", "bootMovieApplyNext", "bootMovieSteamSeen", @@ -43,6 +43,7 @@ object SettingsReset { var ok = true val session = context.getSharedPreferences("session", Context.MODE_PRIVATE) session.edit().apply { session.all.keys.filter { isSessionSetting(it) }.forEach { remove(it) } }.commit() + BuildWatermarkSetting.setEnabled(context, true) ControllerPrefs.resetAll(context) InputProfiles.resetAll(context) context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit().clear().commit() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt b/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt index a9d0c3d1a2..446420806c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt @@ -2,7 +2,12 @@ package com.droiddeck.launcher.ui import android.app.Activity import android.app.Application +import android.content.BroadcastReceiver +import android.content.Intent +import android.content.IntentFilter import android.content.Context +import androidx.core.content.ContextCompat +import com.droiddeck.launcher.session.BuildWatermarkSetting import android.graphics.Canvas import android.graphics.Paint import android.graphics.Typeface @@ -14,11 +19,14 @@ import android.view.Gravity import android.view.View import android.view.ViewGroup import android.widget.FrameLayout +import java.util.WeakHashMap import com.droiddeck.launcher.BuildConfig import com.droiddeck.launcher.QuestXrActivity object BuildWatermark { private const val TITLE_LIMIT = 80 + private val activities = WeakHashMap() + internal var lineProvider: () -> List? = { lines() } fun lines( pr: Int = BuildConfig.PR_NUMBER, @@ -38,33 +46,56 @@ object BuildWatermark { if (text.length <= TITLE_LIMIT) text else text.take(TITLE_LIMIT - 1).trimEnd() + "…" fun install(app: Application) { - val lab = com.droiddeck.launcher.lab.LabOverlay.active?.let { "LAB | ${truncate(it.label)}" } - val lines = (listOfNotNull(lab) + lines().orEmpty()).ifEmpty { return } + ContextCompat.registerReceiver( + app, + object : BroadcastReceiver() { + override fun onReceive(context: Context, intent: Intent) { refresh(context) } + }, + IntentFilter(BuildWatermarkSetting.CHANGED), + "${app.packageName}.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION", + null, + ContextCompat.RECEIVER_NOT_EXPORTED, + ) app.registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks { override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) { if (activity is QuestXrActivity) return - val decor = activity.window.decorView as? ViewGroup ?: return - if (decor.findViewWithTag(TAG) != null) return - val margin = (8 * activity.resources.displayMetrics.density).toInt() - decor.addView( - MarkView(activity, lines).apply { tag = TAG }, - FrameLayout.LayoutParams( - ViewGroup.LayoutParams.WRAP_CONTENT, - ViewGroup.LayoutParams.WRAP_CONTENT, - Gravity.BOTTOM or Gravity.END, - ).apply { setMargins(margin, margin, margin, margin) }, - ) + synchronized(activities) { activities[activity] = Unit } + update(activity) } override fun onActivityStarted(activity: Activity) = Unit - override fun onActivityResumed(activity: Activity) = Unit + override fun onActivityResumed(activity: Activity) { update(activity) } override fun onActivityPaused(activity: Activity) = Unit override fun onActivityStopped(activity: Activity) = Unit override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit - override fun onActivityDestroyed(activity: Activity) = Unit + override fun onActivityDestroyed(activity: Activity) { synchronized(activities) { activities.remove(activity) } } }) } + fun refresh(context: Context) { + val current = synchronized(activities) { activities.keys.toList() } + current.forEach(::update) + } + + private fun update(activity: Activity) { + if (activity is QuestXrActivity) return + val decor = activity.window.decorView as? ViewGroup ?: return + decor.findViewWithTag(TAG)?.let(decor::removeView) + if (!com.droiddeck.launcher.session.SessionPrefs.buildWatermarkEnabled(activity)) return + val lab = com.droiddeck.launcher.lab.LabOverlay.active?.let { "LAB | ${truncate(it.label)}" } + val build = lineProvider().orEmpty() + val content = (listOfNotNull(lab) + build).ifEmpty { return } + val margin = (8 * activity.resources.displayMetrics.density).toInt() + decor.addView( + MarkView(activity, content).apply { tag = TAG }, + FrameLayout.LayoutParams( + ViewGroup.LayoutParams.WRAP_CONTENT, + ViewGroup.LayoutParams.WRAP_CONTENT, + Gravity.BOTTOM or Gravity.END, + ).apply { setMargins(margin, margin, margin, margin) }, + ) + } + private const val TAG = "build-watermark" private class MarkView(context: Context, private val lines: List) : View(context) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 31a8fb28c8..7638e8f042 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -108,6 +108,7 @@ class FrontEndState( val vacDiagnostics: Boolean = false, val agentCommands: Boolean = false, val graphicsLogs: Boolean = false, + val buildWatermark: Boolean = true, val steamGpuDrawing: Boolean = false, val bridgeFellBack: Boolean = false, val bridgeFellBackMemory: Boolean = false, @@ -247,6 +248,7 @@ class FrontEndActions( val onVacDiagnostics: () -> Unit = {}, val onAgentCommands: () -> Unit = {}, val onGraphicsLogs: () -> Unit = {}, + val onBuildWatermark: () -> Unit = {}, val onSteamGpuDrawing: () -> Unit = {}, val onClearCachedApps: (Boolean) -> Unit = {}, val onMemoryHud: (String) -> Unit = {}, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt index 990d085f15..e0622acf5e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt @@ -92,6 +92,7 @@ class UpdatesActions( @OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) @Composable internal fun UpdatesPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier) { + val host = rememberMenuHost() val u = s.updates val ua = a.updates val me = remember { AppUpdates.installed() } @@ -128,6 +129,12 @@ internal fun UpdatesPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie Box(Modifier.weight(1.15f)) { StatusPanel(s, u, ua, me) } } } + Box(Modifier.padding(top = 18.dp)) { + ToggleRow( + host, "build-watermark", stringResource(R.string.setup_build_watermark), + stringResource(R.string.setup_build_watermark_hint), s.buildWatermark, + ) { a.onBuildWatermark() } + } } } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 573c669b9d..5dbf1a47eb 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2674,6 +2674,8 @@ هذا الجهاز إزالة %1$s؟ التشخيص + علامة مائية لاسم الإصدار + عرض اسم إصدار الاختبار أو Lab على الشاشة. مفعّل افتراضيًا. جاهز للّعب غير جاهز للّعب بعد بيئة التشغيل %1$s diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index f38bdcee46..a14f49e9a1 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2611,6 +2611,8 @@ Este dispositivo ¿Quitar %1$s? Diagnóstico + Marca de agua de compilación + Muestra en pantalla la etiqueta de la versión de prueba o Lab. Activada de forma predeterminada. Listo para jugar Aún no está listo para jugar runtime %1$s diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 36751e5311..09c26b8075 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2566,6 +2566,8 @@ Това устройство Премахване на %1$s? Диагностика + Воден знак с етикет на компилацията + Показва етикета на тестовата или Lab компилация на екрана. Включено по подразбиране. Готово за игра Още не е готово за игра среда %1$s diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 010374a13e..43169adfb0 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2620,6 +2620,8 @@ Toto zařízení Odstranit %1$s? Diagnostika + Vodoznak s označením sestavení + Zobrazit na obrazovce označení testovacího sestavení nebo sestavení Lab. Ve výchozím nastavení zapnuté. Připraveno ke hraní Ještě není připraveno ke hraní runtime %1$s diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f0c0527365..3a41c0928b 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2566,6 +2566,8 @@ Denne enhed Fjern %1$s? Diagnostik + Vandmærke med buildmærkat + Vis mærkatet for test- eller Lab-builden på skærmen. Aktiveret som standard. Klar til at spille Ikke klar til at spille endnu runtime %1$s diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ad656b8bb8..53a0591334 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2555,6 +2555,8 @@ Dieses Gerät %1$s entfernen? Diagnose + Build-Kennzeichnung als Wasserzeichen + Kennzeichnung des Test- oder Lab-Builds auf dem Bildschirm anzeigen. Standardmäßig aktiviert. Bereit zum Spielen Noch nicht bereit zum Spielen Laufzeit %1$s diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 0d7d8e1c91..1f2a7f6fa5 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2566,6 +2566,8 @@ Αυτή η συσκευή Κατάργηση %1$s; Διαγνωστικά + Υδατογράφημα ετικέτας έκδοσης + Εμφάνιση της ετικέτας δοκιμαστικής έκδοσης ή έκδοσης Lab στην οθόνη. Ενεργό από προεπιλογή. Έτοιμο για παιχνίδι Δεν είναι ακόμα έτοιμο για παιχνίδι runtime %1$s diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 1e7fb4865a..bc362f264d 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2590,6 +2590,8 @@ Este dispositivo ¿Quitar %1$s? Diagnóstico + Marca de agua de compilación + Muestra en pantalla la etiqueta de la versión de prueba o Lab. Activada de forma predeterminada. Listo para jugar Aún no está listo para jugar runtime %1$s diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index ba86de4422..70e0c2e8ee 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2566,6 +2566,8 @@ Tämä laite Poistetaanko %1$s? Diagnostiikka + Koontiversion vesileima + Näytä testi- tai Lab-version tunniste näytöllä. Käytössä oletusarvoisesti. Valmis pelattavaksi Ei vielä valmis pelattavaksi ajoympäristö %1$s diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 02c4953bfb..8a8bd2cb69 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2590,6 +2590,8 @@ Cet appareil Supprimer %1$s ? Diagnostic + Filigrane de version + Afficher le libellé de la version de test ou Lab à l’écran. Activé par défaut. Prêt à jouer Pas encore prêt à jouer environnement d\'exécution %1$s diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index cdacc2c56d..62f8a6d867 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2566,6 +2566,8 @@ यह डिवाइस %1$s हटाएं? डायग्नोस्टिक्स + बिल्ड लेबल वॉटरमार्क + स्क्रीन पर टेस्ट या Lab बिल्ड लेबल दिखाएँ। डिफ़ॉल्ट रूप से चालू। खेलने के लिए तैयार अभी खेलने के लिए तैयार नहीं रनटाइम %1$s diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 3743a26364..854208f327 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2566,6 +2566,8 @@ Ez a készülék Eltávolítja a %1$s-t? Diagnosztika + Buildcímke vízjelként + A tesztbuild vagy Lab-build címkéjének megjelenítése a képernyőn. Alapértelmezés szerint bekapcsolva. Készen áll a játékra Még nem áll készen a játékra futtatókörnyezet: %1$s diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 395b199251..d18a42fe96 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2539,6 +2539,8 @@ Perangkat ini Hapus %1$s? Diagnostik + Tanda air label build + Tampilkan label build pengujian atau Lab di layar. Aktif secara default. Siap bermain Belum siap bermain runtime %1$s diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 9d7e3392bf..655d1bb9e5 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2582,6 +2582,8 @@ Questo dispositivo Rimuovere %1$s? Diagnostica + Filigrana con etichetta build + Mostra sullo schermo l’etichetta della build di test o Lab. Attiva per impostazione predefinita. Pronto per giocare Non ancora pronto per giocare runtime %1$s diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 2be588f1c8..0b16c04969 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2539,6 +2539,8 @@ このデバイス %1$sを削除しますか? 診断 + ビルドラベルの透かし + テストビルドまたはLabビルドのラベルを画面に表示します。デフォルトで有効です。 プレイの準備完了 まだプレイの準備ができていません 実行環境 %1$s diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 457511bbde..ec2fc2dc3c 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2539,6 +2539,8 @@ 이 기기 %1$s을(를) 제거하시겠습니까? 진단 + 빌드 라벨 워터마크 + 테스트 또는 Lab 빌드 라벨을 화면에 표시합니다. 기본적으로 켜져 있습니다. 플레이 준비 완료 아직 플레이할 준비가 되지 않음 런타임 %1$s diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 10524febe1..ff08492061 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2539,6 +2539,8 @@ Peranti ini Alih keluar %1$s? Diagnostik + Tera air label binaan + Paparkan label binaan ujian atau Lab pada skrin. Dihidupkan secara lalai. Sedia untuk bermain Belum sedia untuk bermain masa jalan %1$s diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 8ac2561bab..0be006b622 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2566,6 +2566,8 @@ Denne enheten Fjerne %1$s? Diagnostikk + Vannmerke for byggetikett + Vis etiketten for test- eller Lab-bygget på skjermen. På som standard. Klar til å spille Ikke klar til å spille ennå kjøretid %1$s diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index a7bd52c016..6097f32580 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2566,6 +2566,8 @@ Dit apparaat %1$s verwijderen? Diagnostiek + Buildlabel als watermerk + Toon het label van de testbuild of Lab-build op het scherm. Standaard ingeschakeld. Klaar om te spelen Nog niet klaar om te spelen runtime %1$s diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 4d00ba2ee8..bfe36b08d9 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2620,6 +2620,8 @@ To urządzenie Usunąć %1$s? Diagnostyka + Znak wodny z etykietą kompilacji + Pokazuj na ekranie etykietę kompilacji testowej lub Lab. Domyślnie włączone. Gotowe do gry Jeszcze nie gotowe do gry środowisko %1$s diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 17ff8cbac3..e278e59f25 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2582,6 +2582,8 @@ Este dispositivo Remover %1$s? Diagnóstico + Marca de água da compilação + Mostrar no ecrã a etiqueta da compilação de teste ou Lab. Ativada por predefinição. Pronto para jogar Ainda não está pronto para jogar ambiente de execução %1$s diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 73d1a4c4c9..9d2305b2b6 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2582,6 +2582,8 @@ Este aparelho Remover %1$s? Diagnóstico + Marca de água da compilação + Mostrar na tela a etiqueta da compilação de teste ou Lab. Ativada por padrão. Pronto para jogar Ainda não está pronto para jogar runtime %1$s diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index d3b8b9269b..cbd0b85423 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2593,6 +2593,8 @@ Acest dispozitiv Elimini %1$s? Diagnosticare + Filigrană cu eticheta versiunii + Afișează pe ecran eticheta versiunii de testare sau Lab. Activată implicit. Pregătit de joc Încă nepregătit de joc mediu de execuție %1$s diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 89dc1b2d78..0bfb8f26ae 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2700,6 +2700,8 @@ Это устройство Удалить %1$s? Диагностика + Водяной знак с меткой сборки + Показывать на экране метку тестовой сборки или сборки Lab. Включено по умолчанию. Готово к игре Пока не готово к игре среда выполнения %1$s diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index c8a3088a00..674f7ca9ff 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2566,6 +2566,8 @@ Den här enheten Ta bort %1$s? Diagnostik + Vattenstämpel med byggetikett + Visa testbyggets eller Lab-byggets etikett på skärmen. Aktiverad som standard. Redo att spela Inte redo att spela än runtime %1$s diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 4bbe6cf467..31e38b728f 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2539,6 +2539,8 @@ อุปกรณ์นี้ ลบ %1$s? การวินิจฉัย + ลายน้ำป้ายชื่อบิลด์ + แสดงป้ายชื่อบิลด์ทดสอบหรือบิลด์ Lab บนหน้าจอ เปิดไว้โดยค่าเริ่มต้น พร้อมเล่นแล้ว ยังไม่พร้อมเล่น รันไทม์ %1$s diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 1d53a2d478..f66424d69d 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2555,6 +2555,8 @@ Bu cihaz %1$s kaldırılsın mı? Tanılama + Derleme etiketi filigranı + Test veya Lab derlemesinin etiketini ekranda gösterir. Varsayılan olarak açıktır. Oynamaya hazır Henüz oynamaya hazır değil çalışma ortamı %1$s diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 79eb4138e0..8aebdeebdd 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2620,6 +2620,8 @@ Цей пристрій Видалити %1$s? Діагностика + Водяний знак із міткою збірки + Показувати на екрані мітку тестової збірки або збірки Lab. Увімкнено за замовчуванням. Готово до гри Ще не готово до гри середовище %1$s diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 537168797a..a6a392b8f0 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2539,6 +2539,8 @@ Thiết bị này Xóa %1$s? Chẩn đoán + Hình mờ nhãn bản dựng + Hiển thị nhãn bản dựng thử nghiệm hoặc Lab trên màn hình. Được bật theo mặc định. Sẵn sàng để chơi Chưa sẵn sàng để chơi runtime %1$s diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 8f0ab9c57b..45aebc4133 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2552,6 +2552,8 @@ 使用 %1$s? 移除 %1$s? 诊断 + 构建标签水印 + 在屏幕上显示测试版或 Lab 构建标签。默认启用。 可以游玩了 暂时还不能游玩 运行时 %1$s diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index b8d2bf0846..65b40bad57 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2539,6 +2539,8 @@ 此裝置 移除 %1$s? 診斷 + 建置標籤浮水印 + 在畫面上顯示測試版或 Lab 建置標籤。預設啟用。 可以開始遊戲 尚未可以開始遊戲 運行環境 %1$s diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 8b883d4a89..c05aeafcd3 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2539,6 +2539,8 @@ 此裝置 要移除 %1$s 嗎? 診斷 + 組建標籤浮水印 + 在畫面上顯示測試版或 Lab 組建標籤。預設啟用。 已可開始遊戲 尚未準備好開始遊戲 執行環境 %1$s diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3f6d489aea..9942a419fe 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -919,6 +919,8 @@ Saved after each session Enhanced diagnostics for next session Captures detailed logs for one session. May reduce performance and use more storage. Turns itself off when the session starts; review logs before sharing. + Build label watermark + Show the test or Lab build label on screen. On by default. Share diagnostic bundles Session and device Graphics diff --git a/app/src/test/java/com/droiddeck/launcher/session/BuildWatermarkSettingTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BuildWatermarkSettingTest.kt new file mode 100644 index 0000000000..f495d9e0bb --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/BuildWatermarkSettingTest.kt @@ -0,0 +1,99 @@ +package com.droiddeck.launcher.session + +import android.app.Activity +import android.app.Application +import android.content.Context +import android.content.Intent +import android.os.Looper +import android.view.View +import com.droiddeck.launcher.ui.BuildWatermark +import org.junit.After +import org.junit.Assert.* +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.ConscryptMode +import org.robolectric.annotation.GraphicsMode +import org.robolectric.annotation.Config +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@ConscryptMode(ConscryptMode.Mode.OFF) +@GraphicsMode(GraphicsMode.Mode.LEGACY) +@Config(sdk = [34], manifest = Config.NONE, application = Application::class) +class BuildWatermarkSettingTest { + private val context get() = RuntimeEnvironment.getApplication() + private val originalLineProvider = BuildWatermark.lineProvider + + @Before fun clear() { + BuildWatermark.lineProvider = { + BuildWatermark.lines(pr = 1234, ci = true, commit = "abcdef0123", title = "Test build", branch = "") + } + listOf("build-watermark", "build-watermark.new", "build-watermark.bak", "build-watermark.lock").forEach { + File(context.filesDir, it).delete() + } + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() + } + + @After fun cleanUp() { + try { + clear() + } finally { + BuildWatermark.lineProvider = originalLineProvider + } + } + + @Test fun defaultsOnAndPreservesLegacyChoice() { + assertTrue(SessionPrefs.buildWatermarkEnabled(context)) + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().putBoolean("buildWatermark", false).commit() + assertFalse(SessionPrefs.buildWatermarkEnabled(context)) + } + + @Test fun sharedFileOverridesCachedPreferencesAndNotifiesOtherProcesses() { + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().putBoolean("buildWatermark", false).commit() + SessionPrefs.setBuildWatermarkEnabled(context, true) + assertTrue(SessionPrefs.buildWatermarkEnabled(context)) + val change = shadowOf(context).broadcastIntents.last { it.action == BuildWatermarkSetting.CHANGED } + assertEquals(context.packageName, change.`package`) + File(context.filesDir, "build-watermark").writeText("off") + assertFalse(SessionPrefs.buildWatermarkEnabled(context)) + } + + @Test fun lockOpenFailureFallsBackToPreferences() { + val lock = File(context.filesDir, "build-watermark.lock") + assertTrue(lock.mkdir()) + assertTrue(SessionPrefs.buildWatermarkEnabled(context)) + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().putBoolean("buildWatermark", false).commit() + assertFalse(SessionPrefs.buildWatermarkEnabled(context)) + assertThrows(java.io.IOException::class.java) { SessionPrefs.setBuildWatermarkEnabled(context, true) } + } + + @Test fun settingReadFailureFallsBackToPreferences() { + assertTrue(File(context.filesDir, "build-watermark").mkdir()) + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().putBoolean("buildWatermark", false).commit() + assertFalse(SessionPrefs.buildWatermarkEnabled(context)) + } + + @Test fun remoteChangeRefreshesExistingAndRecreatedActivities() { + BuildWatermark.install(context) + val activity = Robolectric.buildActivity(Activity::class.java).setup() + try { + assertNotNull(activity.get().window.decorView.findViewWithTag("build-watermark")) + File(context.filesDir, "build-watermark").writeText("off") + context.sendBroadcast(Intent(BuildWatermarkSetting.CHANGED).setPackage(context.packageName)) + shadowOf(Looper.getMainLooper()).idle() + assertNull(activity.get().window.decorView.findViewWithTag("build-watermark")) + activity.recreate() + assertNull(activity.get().window.decorView.findViewWithTag("build-watermark")) + SessionPrefs.setBuildWatermarkEnabled(context, true) + shadowOf(Looper.getMainLooper()).idle() + assertNotNull(activity.get().window.decorView.findViewWithTag("build-watermark")) + } finally { + activity.pause().stop().destroy() + } + } +} From 1882520cac2f8c6d862959334ed4b1f7a12def0e Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 23:46:48 -0500 Subject: [PATCH 22/57] fix(agent): the agent survives Steam session starts, stops and restarts (#2503) * fix(agent): session starts and stops leave the agent's own processes running * feat(agent): droiddeckctl ships with the app and the brief explains the Steam session --- app/build.gradle | 2 + app/src/main/assets/agent/droiddeckctl | 2 + .../com/droiddeck/launcher/agent/AgentHost.kt | 23 ++++++++-- .../droiddeck/launcher/agent/AgentSetup.kt | 42 ++++++++++++------- .../launcher/session/OrphanReaper.kt | 5 ++- .../launcher/session/SessionService.kt | 6 ++- 6 files changed, 58 insertions(+), 22 deletions(-) create mode 100755 app/src/main/assets/agent/droiddeckctl diff --git a/app/build.gradle b/app/build.gradle index 28bf184e32..35201d85c5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -277,6 +277,8 @@ def stageRuntimeAssets = tasks.register('stageRuntimeAssets', Sync) { dependsOn(stageSessionScripts) from(layout.projectDirectory.dir('src/main/assets')) { exclude 'pulseaudio.tzst' } from(rootProject.file('tools/linuxfs/innoextract')) + from(rootProject.file('tools')) { include 'droiddeckctl', 'adb_device.py', 'proot_profile.py'; into('agent/ctl') } + from(rootProject.file('docs/agent-control.md')) { into('agent/ctl') } from(layout.buildDirectory.dir('prepared-assets')) into(runtimeAssetsDir) } diff --git a/app/src/main/assets/agent/droiddeckctl b/app/src/main/assets/agent/droiddeckctl new file mode 100755 index 0000000000..a72cb2587c --- /dev/null +++ b/app/src/main/assets/agent/droiddeckctl @@ -0,0 +1,2 @@ +#!/bin/sh +exec python3 /root/.local/share/droiddeck/ctl/droiddeckctl "$@" diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt index b1e939b088..d82ea8f127 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt @@ -14,6 +14,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import com.droiddeck.launcher.R import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.OrphanReaper import com.droiddeck.launcher.session.SessionPrefs import java.io.File import java.nio.file.Files @@ -50,7 +51,12 @@ object AgentHost { @VisibleForTesting internal const val BRIEF = "You run inside DroidDeck on the user's handheld, in its Linux userland (Ubuntu under proot, aarch64), " + "and the user talks to you from DroidDeck's Agent tab, often on a small screen, so keep replies short. " + - "droiddeckctl (in the /root/DroidDeck checkout, tools/droiddeckctl) inspects and drives the app over loopback adb (\$ADB_SERIAL). " + + "droiddeckctl inspects and drives the app over loopback adb (\$ADB_SERIAL); its guide is ${AgentSetup.CTL}/agent-control.md. " + + "Steam, the desktop and games run in DroidDeck's session, a separate guest from yours: a program you start here is not in it and has no screen. " + + "Reach the session through droiddeckctl: state, start steam, stop, launch, quit, focus, screenshot, logs, and guest to run a command inside it. " + + "Starting, stopping or restarting a session leaves you running. " + + "Never kill by a command-line pattern (pkill -f, pgrep -f piped to kill): your own command line holds the user's message, so the pattern matches you. " + + "End a game with droiddeckctl quit, the session with droiddeckctl stop, anything else by its pid. " + "dd-lab-build builds the checkout as a Lab build and restarts DroidDeck on it (docs/lab-builds.md). DroidDeck runs the build in a " + "process of its own and shows the user its progress and time left; dd-lab-build follows that build's log until it is done. " + "Run it with run_in_background and keep checking its output, so the user can talk to you meanwhile. " + @@ -252,6 +258,7 @@ object AgentHost { val workdir = workspace(app) Thread({ runCatching { current.prepare(LinuxRuntime.rootDir(app)) } + runCatching { AgentSetup.installHelpers(app) } val child = try { guest(app, command, workdir).start() } catch (e: Exception) { @@ -260,6 +267,7 @@ object AgentHost { return@Thread } val started = Turn(child, AgentProcesses.pidOf(child)) + OrphanReaper.keep(started.pid) main.post { if (generation == gen && state == State.WORKING && turn == null) turn = started else AgentProcesses.killTree(started.pid) } child.outputStream.close() var ended = false @@ -278,6 +286,7 @@ object AgentHost { } runCatching { raw?.close() } val status = runCatching { child.waitFor() }.getOrDefault(-1) + OrphanReaper.release(started.pid) main.post { if (turn === started) { turn = null @@ -500,9 +509,15 @@ object AgentHost { val child = guest(app, listOf("sh", "-c", "mkdir -p /root/.cache; DD_LAB_DETACHED=1 exec dd-lab-build \"\$@\" > /root/.cache/dd-lab-build.log 2>&1", "dd-lab-build") + args, cwd).start() main.post { labProcess = child } - child.outputStream.close() - child.inputStream.readBytes() - child.waitFor() + val pid = AgentProcesses.pidOf(child) + OrphanReaper.keep(pid) + try { + child.outputStream.close() + child.inputStream.readBytes() + child.waitFor() + } finally { + OrphanReaper.release(pid) + } }.onFailure { Log.w(TAG, "could not run a Lab build", it) } main.post { labProcess = null diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt index bc4ac2c9e9..f5c080a060 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt @@ -8,6 +8,7 @@ import androidx.compose.runtime.mutableStateMapOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.OrphanReaper import java.io.File import java.util.concurrent.TimeUnit @@ -39,7 +40,8 @@ object AgentSetup { private val main = Handler(Looper.getMainLooper()) private const val REPO = "https://github.com/Droid-Deck/DroidDeck.git" private const val CHECKOUT = "/root/DroidDeck" - private val HELPERS = listOf("android-open", "dd-gh-login") + private val HELPERS = listOf("android-open", "dd-gh-login", "droiddeckctl") + internal const val CTL = "/root/.local/share/droiddeck/ctl" private const val PROBE_TIMEOUT_S = 60L fun check(context: Context) { @@ -96,14 +98,20 @@ object AgentSetup { installHelpers(app) runCatching { harness.prepare(LinuxRuntime.rootDir(app)) } val child = AgentHost.guest(app, command).start() - child.outputStream.close() - logFile(app, step).apply { parentFile?.mkdirs() }.bufferedWriter().use { log -> - child.inputStream.bufferedReader().forEachLine { line -> - log.appendLine(line) - val text = line.trim() - if (text.isNotEmpty() && !noise(text)) main.post { detail[step] = text.take(160) } + val pid = AgentProcesses.pidOf(child) + OrphanReaper.keep(pid) + try { + child.outputStream.close() + logFile(app, step).apply { parentFile?.mkdirs() }.bufferedWriter().use { log -> + child.inputStream.bufferedReader().forEachLine { line -> + log.appendLine(line) + val text = line.trim() + if (text.isNotEmpty() && !noise(text)) main.post { detail[step] = text.take(160) } + } + child.waitFor().also { log.appendLine("exit $it") } } - child.waitFor().also { log.appendLine("exit $it") } + } finally { + OrphanReaper.release(pid) } } main.post { @@ -172,12 +180,16 @@ object AgentSetup { } /** Written before every step, so the helpers a step relies on are there and match this DroidDeck version. */ - private fun installHelpers(app: Context) { - val bin = File(LinuxRuntime.rootDir(app), "root/.local/bin").apply { mkdirs() } - for (name in HELPERS) { - val target = File(bin, name) - app.assets.open("agent/$name").use { input -> target.outputStream().use { input.copyTo(it) } } - target.setExecutable(true, false) - } + internal fun installHelpers(app: Context) { + val root = LinuxRuntime.rootDir(app) + val bin = File(root, "root/.local/bin").apply { mkdirs() } + for (name in HELPERS) copyAsset(app, "agent/$name", File(bin, name)) + val ctl = File(root, CTL.removePrefix("/")).apply { mkdirs() } + for (name in app.assets.list("agent/ctl").orEmpty()) copyAsset(app, "agent/ctl/$name", File(ctl, name)) + } + + private fun copyAsset(app: Context, asset: String, target: File) { + app.assets.open(asset).use { input -> target.outputStream().use { input.copyTo(it) } } + target.setExecutable(true, false) } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/OrphanReaper.kt b/app/src/main/java/com/droiddeck/launcher/session/OrphanReaper.kt index cbcd904bc1..a6c5117665 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/OrphanReaper.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/OrphanReaper.kt @@ -11,6 +11,9 @@ object OrphanReaper { fun release(pid: Int) { kept.remove(pid) } + /** Kept processes and everything they started, which session cleanups must leave running. */ + fun spared(): Set = descendants(kept) + fun hasOtherProcesses(): Boolean = hasOtherProcesses( File("/proc").list()?.mapNotNull { it.toIntOrNull() }, android.os.Process.myPid(), ) { pid -> @@ -30,7 +33,7 @@ object OrphanReaper { fun reap(reason: String, matching: (String) -> Boolean = { true }): Int { val me = android.os.Process.myPid() val uid = android.os.Process.myUid() - val spared = descendants(kept) + val spared = spared() var killed = 0 File("/proc").listFiles()?.forEach { entry -> val pid = entry.name.toIntOrNull() ?: return@forEach diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 4faa870866..2af6510093 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -1606,10 +1606,11 @@ class SessionService : Service() { val me = android.os.Process.myPid() val rootfs = try { File(filesDir, "linuxfs").canonicalPath } catch (e: Exception) { return } + "/" val procs = File("/proc").listFiles { f -> f.name.all { it.isDigit() } } ?: return + val spared = OrphanReaper.spared() var killed = 0 for (proc in procs) { val pid = proc.name.toIntOrNull() ?: continue - if (pid == me) continue + if (pid == me || pid in spared) continue val exe = try { File(proc, "exe").canonicalPath } catch (e: Exception) { continue } if (!exe.startsWith(rootfs)) continue android.os.Process.killProcess(pid) @@ -1621,10 +1622,11 @@ class SessionService : Service() { private fun killStragglers() { val me = android.os.Process.myPid() val procs = File("/proc").listFiles { f -> f.name.all { it.isDigit() } } ?: return + val spared = OrphanReaper.spared() var killed = 0 for (proc in procs) { val pid = proc.name.toIntOrNull() ?: continue - if (pid == me) continue + if (pid == me || pid in spared) continue val cmdline = try { File(proc, "cmdline").readBytes().toString(Charsets.UTF_8).replace('\u0000', ' ') } catch (e: Exception) { From b303423001ec49f9894f97cd4763e5536e5a494b Mon Sep 17 00:00:00 2001 From: KeegantheVeganat0r <58369898+KeegantheVeganat0r@users.noreply.github.com> Date: Thu, 12 Nov 2026 05:02:26 +0000 Subject: [PATCH 23/57] fix(lab): reuse installed add-on packs so the Agent can restart (#2512) --- .../com/droiddeck/launcher/core/AddonPack.kt | 5 ++++- .../com/droiddeck/launcher/core/AddonPackTest.kt | 16 ++++++++++++++++ docs/lab-builds.md | 4 ++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt b/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt index d3d5cf2c74..9e0452771d 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.core import android.content.Context import android.util.Log import com.droiddeck.launcher.BuildConfig +import com.droiddeck.launcher.lab.LabOverlay import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob @@ -16,6 +17,7 @@ import java.io.FileInputStream internal class AddonPack( val name: String, private val sha256: String, val size: Long, private val required: List, private val reuseDeviceCopy: Boolean = sha256.isEmpty() && !BuildConfig.CI_BUILD, + private val labBuild: Boolean = LabOverlay.active != null, private val bundle: (Context) -> java.io.InputStream = { it.assets.open("packs/$name.tar.zst") }, ) { sealed interface State { @@ -42,7 +44,8 @@ internal class AddonPack( fun installed(context: Context): Boolean = version(context).isNotEmpty() && File(dir(context), COMPLETE).isFile - private fun version(context: Context): String = if (!reuseDeviceCopy) sha256 else deviceCopy(context).orEmpty() + private fun version(context: Context): String = + if (reuseDeviceCopy || labBuild) deviceCopy(context) ?: sha256 else sha256 private fun deviceCopy(context: Context): String? = root(context).listFiles().orEmpty() .filter { dir -> diff --git a/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt b/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt index 80c6ebd328..c367c63ecc 100644 --- a/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt @@ -58,6 +58,22 @@ class AddonPackTest { assertFalse(AddonPack("sample", "", 0L, listOf("tool"), reuseDeviceCopy = false).installed(context)) } + @Test fun labBuildReusesInstalledPackDespiteDifferentSourcePin() { + installed("b".repeat(64)) + val pack = AddonPack("sample", "a".repeat(64), 1L, listOf("tool"), labBuild = true) + + assertTrue(pack.installed(context)) + assertEquals("b".repeat(64), pack.dir(context).name) + } + + @Test fun labBuildWithoutCompleteInstalledPackKeepsSourcePin() { + installed("b".repeat(64), complete = false) + val pack = AddonPack("sample", "a".repeat(64), 1L, listOf("tool"), labBuild = true) + + assertFalse(pack.installed(context)) + assertEquals("a".repeat(64), pack.dir(context).name) + } + @Test fun localBuildInstallsTheBundledPackWithoutDownloading() { val archive = tarZst("tool" to "x") val pack = AddonPack("sample", Hashes.sha256(archive), archive.length(), listOf("tool"), bundle = { archive.inputStream() }) diff --git a/docs/lab-builds.md b/docs/lab-builds.md index 177133e14d..2e01e3b9d8 100644 --- a/docs/lab-builds.md +++ b/docs/lab-builds.md @@ -5,6 +5,10 @@ or by hand, and loaded over the installed APK at the next start. Nothing is rein re-signed, so a tester on a release build keeps their games, sign-ins and settings while trying a change. +While a Lab build is active, add-on packs reuse the newest complete copy already installed on the +device, even when the checkout pins another version. This keeps helpers such as proot available +after restarting. If no complete copy exists, the pack uses the checkout's pin. + ## How it works - `tools/agent/dd-lab-build` builds the checkout with Gradle on the device (`processReleaseResources` From cd05c96d103210820f0c6891c9b690f50611d94b Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Thu, 12 Nov 2026 00:13:00 -0500 Subject: [PATCH 24/57] fix(proot): a call the filesystem does not implement no longer switches the fast path off (#2509) Android's FUSE daemon has no symlink or link, so those calls on a storage card return ENOSYS. The fast path read any ENOSYS from its trampoline as a seccomp trap and stopped for the whole process. It now asks again with the same call number and invalid arguments: a trap answers ENOSYS again, anything else means the call reached the kernel and only that call is repeated. Folders opened for a refused call are still closed. --- tools/proot/PATCHES.md | 5 +++ tools/proot/fastpath/fastpath.c | 4 +-- tools/tests/test_fastpath_fuse_dirs.py | 45 +++++++++++++++++++++++++- 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/tools/proot/PATCHES.md b/tools/proot/PATCHES.md index c4173a48c7..3099009c57 100644 --- a/tools/proot/PATCHES.md +++ b/tools/proot/PATCHES.md @@ -162,6 +162,11 @@ Prototype (inert unless `PROOT_FASTPATH` is set; see `docs/development/proot-per `ENOSYS`, because its arguments are host paths; the fast path then stops for that process and repeats the call through a plain `svc`, which the guest's filter traps with the guest path. `bench/guest-trap.c` installs a tagged `openat` trap and checks its handler answers the call. + The kernel and filesystems also return `ENOSYS` themselves: Android's FUSE daemon has no + `symlink`, so `symlinkat` on a storage card fails with it. The fast path therefore asks again + with the same call number and invalid arguments. A trap answers `ENOSYS` again and the fast path + stops for the process; any other error means the call reached the kernel, so only that one call + is repeated through a plain `svc` and the fast path stays on. Old kernel fixes: diff --git a/tools/proot/fastpath/fastpath.c b/tools/proot/fastpath/fastpath.c index 7a1e2c79a4..bcc745852a 100644 --- a/tools/proot/fastpath/fastpath.c +++ b/tools/proot/fastpath/fastpath.c @@ -59,10 +59,10 @@ static int optional_syscall(long nr) { nr == SYS_openat2 || nr == SYS_renameat2; } static long sc(long nr, long a, long b, long c, long d, long e) { - if (fp_refused) return -ENOSYS; + if (fp_refused && nr != SYS_close) return -ENOSYS; long r = fp_sys(nr, a, b, c, d, e, 0); if (r == -ENOSYS && !optional_syscall(nr)) { - __atomic_store_n(&fp_on, 0, __ATOMIC_RELAXED); + if (fp_sys(nr, -1, -1, -1, -1, -1, 0) == -ENOSYS) __atomic_store_n(&fp_on, 0, __ATOMIC_RELAXED); fp_refused = 1; } return r; diff --git a/tools/tests/test_fastpath_fuse_dirs.py b/tools/tests/test_fastpath_fuse_dirs.py index 4347e0aedf..b8b45f851a 100644 --- a/tools/tests/test_fastpath_fuse_dirs.py +++ b/tools/tests/test_fastpath_fuse_dirs.py @@ -17,7 +17,10 @@ static const char *race_from, *race_to; static dev_t race_dev; static ino_t race_ino; +static long trapped_nr = -1, unsupported_nr = -1; + static long host_sys(long nr, long a, long b, long c, long d, long e, long f) { + if (nr == trapped_nr || (nr == unsupported_nr && a != -1)) return -ENOSYS; long r = syscall(nr, a, b, c, d, e, f); struct stat fs; if (r >= 0 && nr == SYS_fcntl && b == F_DUPFD_CLOEXEC && c == DIR_FD_FLOOR && race_from @@ -72,8 +75,24 @@ int main(int argc, char **argv) { } else if (!strcmp(op, "stat")) { struct stat st; show(fp_stat(AT_FDCWD, argv[++i], AT_SYMLINK_NOFOLLOW, &st)); + } else if (!strcmp(op, "symlink")) { + long r = fp_symlink("target", AT_FDCWD, argv[++i]); + if (refused()) puts("REFUSED"); + else show(r); + } else if (!strcmp(op, "trap-symlink")) { + trapped_nr = SYS_symlinkat; + } else if (!strcmp(op, "no-symlinks")) { + unsupported_nr = SYS_symlinkat; + } else if (!strcmp(op, "on")) { + printf("%d\n", fp_ready()); + } else if (!strcmp(op, "no-folders")) { + unsupported_nr = SYS_mkdirat; + } else if (!strcmp(op, "busy-cache")) { + pthread_mutex_lock(&dir_lock); } else if (!strcmp(op, "mkdir")) { - show(fp_mkdir(AT_FDCWD, argv[++i], 0755)); + long r = fp_mkdir(AT_FDCWD, argv[++i], 0755); + if (refused()) puts("REFUSED"); + else show(r); } else if (!strcmp(op, "mv")) { show(fp_rename(AT_FDCWD, argv[i + 1], AT_FDCWD, argv[i + 2], 0)); i += 2; @@ -261,6 +280,30 @@ class FastPathFuseDirsTest(unittest.TestCase): self.assertEqual(["ok", "ok", "ok", "E2"], out) self.assertEqual(["under"], [p.name for p in data.iterdir()]) + def test_a_call_the_filesystem_does_not_implement_leaves_the_fast_path_on(self): + data = "/mnt/card/Games/steamapps/common/Game/Data" + out = self.ask("fuse", "no-symlinks", "touch", f"{data}/a", "symlink", f"{data}/link", "on", + "stat", f"{data}/a", "symlink", f"{data}/link", "on", "touch", f"{data}/b") + self.assertEqual(["ok", "REFUSED", "1", "ok", "REFUSED", "1", "ok"], out) + self.assertEqual(["a", "b"], sorted(p.name for p in (self.card / "Games/steamapps/common/Game/Data").iterdir())) + + def test_repeated_unsupported_calls_close_the_folders_they_opened(self): + data = "/mnt/card/Games/steamapps/common/Game/Data" + ops = [op for n in range(40) for op in ("mkdir", f"{data}/new{n}")] + out = self.ask("fuse", "no-folders", "busy-cache", *ops, "on", "fds") + self.assertEqual(["REFUSED"] * 40 + ["1", "0"], out) + + def test_a_trapped_call_still_stops_the_fast_path_for_the_process(self): + data = "/mnt/card/Games/steamapps/common/Game/Data" + out = self.ask("fuse", "trap-symlink", "symlink", f"{data}/link", "on") + self.assertEqual(["REFUSED", "0"], out) + + def test_a_symlink_is_made_where_the_filesystem_allows_it(self): + data = "/mnt/card/Games/steamapps/common/Game/Data" + out = self.ask("fuse", "symlink", f"{data}/link", "on") + self.assertEqual(["ok", "1"], out) + self.assertEqual("target", os.readlink(self.card / "Games/steamapps/common/Game/Data/link")) + def test_other_filesystems_keep_absolute_paths_and_open_no_folders(self): data = "/mnt/card/Games/steamapps/common/Game/Data" out = self.ask("touch", f"{data}/a", "mv", f"{data}/a", f"{data}/b", "rm", f"{data}/b", "fds") From 01bfe8519ef75eed6fc5b988424604a01cb23650 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Thu, 12 Nov 2026 01:25:21 -0500 Subject: [PATCH 25/57] fix(session): preserve guest monotonic time after long pauses (#2393) --- app/src/main/cpp/waylandcomp/CMakeLists.txt | 1 + .../main/cpp/waylandcomp/src/clock_domain.c | 72 +++++ .../main/cpp/waylandcomp/src/clock_domain.h | 11 + app/src/main/cpp/waylandcomp/src/compositor.c | 13 +- .../cpp/waylandcomp/src/waylandcomp_jni.c | 8 + .../launcher/session/SessionService.kt | 1 + .../session/SessionSuspendController.kt | 2 + .../launcher/wayland/CompositorHost.kt | 3 + .../launcher/wayland/WaylandCompositor.java | 2 + .../session/SessionSuspendControllerTest.kt | 5 + .../overlay/usr/local/bin/droiddeck-session | 3 +- tools/linuxfs/preload/clockpause.c | 1 - tools/tests/test_clock_pause_preload.py | 143 +++++++++- tools/tests/test_wayland_clock_domain.py | 267 ++++++++++++++++++ 14 files changed, 519 insertions(+), 13 deletions(-) create mode 100644 app/src/main/cpp/waylandcomp/src/clock_domain.c create mode 100644 app/src/main/cpp/waylandcomp/src/clock_domain.h create mode 100644 tools/tests/test_wayland_clock_domain.py diff --git a/app/src/main/cpp/waylandcomp/CMakeLists.txt b/app/src/main/cpp/waylandcomp/CMakeLists.txt index 61baf0d379..c7aa1b0eb4 100644 --- a/app/src/main/cpp/waylandcomp/CMakeLists.txt +++ b/app/src/main/cpp/waylandcomp/CMakeLists.txt @@ -1,5 +1,6 @@ add_library(droiddeckwayland SHARED src/compositor.c + src/clock_domain.c src/vk_present.c src/effects_chain.c src/cardboard.c diff --git a/app/src/main/cpp/waylandcomp/src/clock_domain.c b/app/src/main/cpp/waylandcomp/src/clock_domain.c new file mode 100644 index 0000000000..30fd73a4eb --- /dev/null +++ b/app/src/main/cpp/waylandcomp/src/clock_domain.c @@ -0,0 +1,72 @@ +#define _GNU_SOURCE +#include "clock_domain.h" + +#include +#include +#include +#include +#include +#include +#include + +static const int64_t *g_shift; +static pthread_mutex_t g_control_lock = PTHREAD_MUTEX_INITIALIZER; +static dev_t g_device; +static ino_t g_inode; + +void droiddeck_clock_domain_set_control(const char *path) { + int fd; + struct stat st; + pthread_mutex_lock(&g_control_lock); + if (!path || !*path) { + const int64_t *previous = g_shift; + g_shift = NULL; + if (previous) munmap((void *)previous, sizeof(*previous)); + pthread_mutex_unlock(&g_control_lock); + return; + } + fd = open(path, O_RDONLY | O_CLOEXEC); + if (fd < 0 || fstat(fd, &st) != 0 || st.st_size < (off_t)sizeof(int64_t)) { + if (fd >= 0) close(fd); + pthread_mutex_unlock(&g_control_lock); + return; + } + if (g_shift && st.st_dev == g_device && st.st_ino == g_inode) { + close(fd); + pthread_mutex_unlock(&g_control_lock); + return; + } + const int64_t *shift = mmap(NULL, sizeof(*shift), PROT_READ, MAP_SHARED, fd, 0); + close(fd); + if (shift != MAP_FAILED) { + g_device = st.st_dev; + g_inode = st.st_ino; + const int64_t *previous = g_shift; + g_shift = shift; + if (previous) munmap((void *)previous, sizeof(*previous)); + } + pthread_mutex_unlock(&g_control_lock); +} + +static int64_t shift_ns(void) { + pthread_mutex_lock(&g_control_lock); + const int64_t *mapping = g_shift; + int64_t shift = mapping ? __atomic_load_n(mapping, __ATOMIC_RELAXED) : 0; + pthread_mutex_unlock(&g_control_lock); + return shift > 0 ? shift : 0; +} + +int64_t droiddeck_clock_domain_adjust_ns(int64_t value) { + int64_t shift = shift_ns(); + return value > shift ? value - shift : 0; +} + +int64_t droiddeck_clock_domain_now_ns(void) { + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + return droiddeck_clock_domain_adjust_ns((int64_t)ts.tv_sec * 1000000000LL + ts.tv_nsec); +} + +uint32_t droiddeck_clock_domain_now_ms(void) { + return (uint32_t)(droiddeck_clock_domain_now_ns() / 1000000LL); +} diff --git a/app/src/main/cpp/waylandcomp/src/clock_domain.h b/app/src/main/cpp/waylandcomp/src/clock_domain.h new file mode 100644 index 0000000000..acb7e0e174 --- /dev/null +++ b/app/src/main/cpp/waylandcomp/src/clock_domain.h @@ -0,0 +1,11 @@ +#ifndef DROIDDECK_CLOCK_DOMAIN_H +#define DROIDDECK_CLOCK_DOMAIN_H + +#include + +void droiddeck_clock_domain_set_control(const char *path); +int64_t droiddeck_clock_domain_now_ns(void); +uint32_t droiddeck_clock_domain_now_ms(void); +int64_t droiddeck_clock_domain_adjust_ns(int64_t value); + +#endif diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index 21ef1d23f9..3510ea29a3 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -36,6 +36,7 @@ #include "droiddeck_ext.h" #include "droiddeck_color.h" #include "compositor_internal.h" +#include "clock_domain.h" #define WLOGI(...) __android_log_print(ANDROID_LOG_INFO, "DroidDeckWayland", __VA_ARGS__) #define WLOGE(...) __android_log_print(ANDROID_LOG_ERROR, "DroidDeckWayland", __VA_ARGS__) @@ -727,9 +728,7 @@ static void on_pending_buffer_destroyed(struct wl_listener *l, void *data) { static void fire_frames(struct wl_list *frames) { struct wl_resource *cb, *tmp; uint32_t t; - struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); - t = (uint32_t)(ts.tv_sec * 1000 + ts.tv_nsec / 1000000); + t = droiddeck_clock_domain_now_ms(); wl_resource_for_each_safe(cb, tmp, frames) { wl_callback_send_done(cb, t); wl_resource_destroy(cb); @@ -1061,6 +1060,7 @@ static int64_t presented_ns(int64_t render_ns) { static void feedback_present_all(struct wl_list *list, int64_t t) { struct wl_resource *fb, *tmp; + t = droiddeck_clock_domain_adjust_ns(t); uint64_t sec = (uint64_t)(t / 1000000000LL); uint32_t nsec = (uint32_t)(t % 1000000000LL); wl_resource_for_each_safe(fb, tmp, list) { @@ -2493,8 +2493,7 @@ static void on_vsync(int64_t frame_time_ns) { static uint32_t now_ms(void) { - struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); - return (uint32_t)(ts.tv_sec * 1000 + ts.tv_nsec / 1000000); + return droiddeck_clock_domain_now_ms(); } static void pointer_set_cursor(struct wl_client *c, struct wl_resource *r, uint32_t serial, @@ -3114,12 +3113,10 @@ static void relative_pointers_pointer_gone(struct wl_resource *pointer) { static int send_relative_motion(struct wl_client *client, double dx, double dy) { struct relative_pointer *rp; - struct timespec ts; uint64_t ut; int sent = 0; if (dx == 0 && dy == 0) return 0; - clock_gettime(CLOCK_MONOTONIC, &ts); - ut = (uint64_t)ts.tv_sec * 1000000ULL + (uint64_t)ts.tv_nsec / 1000; + ut = (uint64_t)(droiddeck_clock_domain_now_ns() / 1000); wl_list_for_each(rp, &g_relative_pointers, link) { if (!rp->pointer || wl_resource_get_client(rp->pointer) != client) continue; zwp_relative_pointer_v1_send_relative_motion(rp->resource, (uint32_t)(ut >> 32), (uint32_t)ut, diff --git a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c index ffbfdfd935..25b97ae0f8 100644 --- a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c +++ b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c @@ -18,6 +18,7 @@ #include "cardboard.h" #include "droiddeck_color.h" #include "gpu_clock_pin.h" +#include "clock_domain.h" extern int droiddeck_wayland_run(void); extern void droiddeck_wayland_set_scale_mode(int mode, int alignment); @@ -354,6 +355,13 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeVsync(JNIEnv *env, j droiddeck_wayland_vsync((int64_t)frameTimeNanos); } +JNIEXPORT void JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetClockControl(JNIEnv *env, jclass clazz, jstring path) { + const char *value = path ? (*env)->GetStringUTFChars(env, path, NULL) : NULL; + droiddeck_clock_domain_set_control(value); + if (value) (*env)->ReleaseStringUTFChars(env, path, value); +} + JNIEXPORT void JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetHideShell(JNIEnv *env, jclass clazz, jboolean hide) { g_hide_shell = hide ? 1 : 0; diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 2af6510093..232eaf0c6d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -822,6 +822,7 @@ class SessionService : Service() { }, zramControl = File(filesDir, "${LinuxRuntime.DIR}/tmp/.bl-zram"), clockControl = File(filesDir, "${LinuxRuntime.DIR}/tmp/.bl-clock"), + mapClockControl = { WaylandCompositor.nativeSetClockControl(it.path) }, pagedOut = { processes, unacknowledged, residentKb, swapKb, swapBeforeKb, millis -> Log.i(TAG, "paged out $processes processes ($unacknowledged unacknowledged) in $millis ms: " + "resident ${residentKb / 1024} MB, zram ${swapBeforeKb / 1024} -> ${swapKb / 1024} MB") diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt index b0a6852144..ad7360d8ee 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt @@ -23,6 +23,7 @@ internal class SessionSuspendController( private val executor: ExecutorService = Executors.newSingleThreadExecutor(), private val zramControl: File? = null, private val clockControl: File? = null, + private val mapClockControl: (File) -> Unit = {}, private val nowNanos: () -> Long = System::nanoTime, private val pagedOut: (processes: Int, unacknowledged: Int, residentKb: Long, swapKb: Long, swapBeforeKb: Long, millis: Long) -> Unit = { _, _, _, _, _, _ -> }, @@ -154,6 +155,7 @@ internal class SessionSuspendController( frozenSince = null val control = clockControl?.takeIf { it.isFile && it.length() >= Long.SIZE_BYTES } ?: return try { + mapClockControl(control) RandomAccessFile(control, "rw").use { file -> val bytes = ByteArray(Long.SIZE_BYTES) file.readFully(bytes) diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt index 7166440029..7fcdc09620 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt @@ -50,6 +50,7 @@ object CompositorHost { refreshHz: Float, fpsLimit: Int, ): Boolean { + WaylandCompositor.nativeSetClockControl(java.io.File(context.filesDir, "${com.droiddeck.launcher.runtime.LinuxRuntime.DIR}/tmp/.bl-clock").path) ownVsyncThread = SessionPrefs.vsyncThread(context) WaylandCompositor.nativeSetRenderOnCommit(SessionPrefs.renderOnCommit(context)) pace(refreshHz, fpsLimit) @@ -135,7 +136,9 @@ object CompositorHost { vsyncRunning = false } + @Synchronized fun newSession() { + WaylandCompositor.nativeSetClockControl(null) if (started) WaylandCompositor.nativeResetFirstFrame() } diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java index a2ac2171df..995f512471 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java +++ b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java @@ -178,6 +178,8 @@ public final class WaylandCompositor { public static native void nativeVsync(long frameTimeNanos); + public static native void nativeSetClockControl(String path); + public static native int nativeCompositorTid(); private static native String nativeCompositorFault(); diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt index 230eb1f12e..44aa6c73cd 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt @@ -273,9 +273,12 @@ class SessionSuspendControllerTest { val fixture = fixture(17) fixture.clock.writeBytes(shift(5_000_000L)) fixture.controller.freeze { assertTrue(it) } + fixture.clock.delete() + fixture.clock.writeBytes(shift(5_000_000L)) fixture.now += 90_000L fixture.controller.resume { assertTrue(it) } val expected = 5_000_000L + 90_000L * 1_000_000L + assertEquals(5_000_000L, fixture.clockAtMapping) assertEquals(expected, fixture.clockAtContinue) assertEquals(expected, shift(fixture.clock)) fixture.controller.resume { assertTrue(it) } @@ -478,6 +481,7 @@ class SessionSuspendControllerTest { val control = File(tmp, ".bl-zram") val clock = File(tmp, ".bl-clock") var clockAtContinue: Long? = null + var clockAtMapping: Long? = null val pagedOut = mutableListOf>() val pagedIn = mutableListOf>() var availableKb = 8_000_000L @@ -496,6 +500,7 @@ class SessionSuspendControllerTest { proc, ::signal, ::threadSignal, ::sleep, { now }, executor, zramControl = control, clockControl = clock, + mapClockControl = { clockAtMapping = ByteBuffer.wrap(it.readBytes()).order(ByteOrder.LITTLE_ENDIAN).long }, nowNanos = { now * 1_000_000L }, pagedOut = { processes, unacknowledged, resident, swap, _, _ -> pagedOut += Triple(processes, resident, swap) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 37fb2c00ad..df27767405 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -132,8 +132,7 @@ clear_stale_tmp() { [ -z "${BL_INSIDE:-}" ] && clear_stale_tmp if [ -z "${BL_INSIDE:-}" ]; then if [ "${BL_ZRAM:-0}" = 1 ]; then printf 0 > /tmp/.bl-zram; else rm -f /tmp/.bl-zram; fi - rm -f /tmp/.bl-clock - head -c 8 /dev/zero > /tmp/.bl-clock + dd if=/dev/zero of=/tmp/.bl-clock bs=8 count=1 conv=notrunc status=none fi steam_devtools() { diff --git a/tools/linuxfs/preload/clockpause.c b/tools/linuxfs/preload/clockpause.c index 19a1d728ab..eed7a401d7 100644 --- a/tools/linuxfs/preload/clockpause.c +++ b/tools/linuxfs/preload/clockpause.c @@ -81,7 +81,6 @@ static void cp_init(void) { struct stat st; void *map; int fd; - if (strcmp(program_invocation_short_name, "plasmashell") != 0) return; if (!cp_find_cond_bit()) return; fd = open(CP_CTL, O_RDONLY | O_CLOEXEC); if (fd < 0) return; diff --git a/tools/tests/test_clock_pause_preload.py b/tools/tests/test_clock_pause_preload.py index 6523811125..06ddd65a49 100644 --- a/tools/tests/test_clock_pause_preload.py +++ b/tools/tests/test_clock_pause_preload.py @@ -1,19 +1,34 @@ import os from pathlib import Path +import queue +import re +import shlex import shutil import struct import subprocess import tempfile +import threading import unittest PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" + +def clock_reset_command(control): + script = (PRELOAD.parent / "overlay/usr/local/bin/droiddeck-session").read_text() + start = script.index('if [ -z "${BL_INSIDE:-}" ]; then\n if [ "${BL_ZRAM:-0}"') + end = script.index("\nfi", start) + len("\nfi") + paths = {"/tmp/.bl-clock": shlex.quote(str(control)), + "/tmp/.bl-zram": shlex.quote(str(control.parent / "zram"))} + pattern = "|".join(re.escape(token) for token in paths) + return 'BL_INSIDE=; BL_ZRAM=0; ' + re.sub(pattern, lambda match: paths[match.group(0)], script[start:end]) + PROGRAM = r""" #define _GNU_SOURCE #include #include #include #include +#include #include #include #include @@ -36,12 +51,26 @@ static int64_t start; static void begin(void) { start = ns(CLOCK_BOOTTIME); } static void end(const char *name) { printf("%s %lld\n", name, (long long)((ns(CLOCK_BOOTTIME) - start) / 1000000LL)); } +static unsigned long long memory_probe(void) { + static volatile unsigned char memory[4 * 1024 * 1024]; + unsigned long long checksum = 0; + for (size_t i = 0; i < sizeof(memory); i += 4096) memory[i] = (unsigned char)(i / 4096 + 1); + for (size_t i = 0; i < sizeof(memory); i += 4096) checksum += memory[i]; + return checksum; +} + int main(void) { const int64_t wait = 60000000LL; printf("gap %lld\n", (long long)((ns(CLOCK_BOOTTIME) - ns(CLOCK_MONOTONIC)) / 1000000LL)); struct timespec raw; syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &raw); printf("rawgap %lld\n", (long long)((ns(CLOCK_BOOTTIME) - ((int64_t)raw.tv_sec * 1000000000LL + raw.tv_nsec)) / 1000000LL)); + printf("memory %llu\n", memory_probe()); + if (getenv("CLOCK_PAUSE_WAIT")) { puts("ready"); fflush(stdout); getchar(); } + if (getenv("CLOCK_PAUSE_WAIT")) { + printf("livegap %lld\n", (long long)((ns(CLOCK_BOOTTIME) - ns(CLOCK_MONOTONIC)) / 1000000LL)); + printf("livememory %llu\n", memory_probe()); + } pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; pthread_condattr_t attr; @@ -124,14 +153,124 @@ class ClockPausePreloadTest(unittest.TestCase): self.assertGreaterEqual(paused[name], 50, name) self.assertLess(paused[name], 1000, name) - def test_other_programs_keep_the_real_clock(self): + def test_program_without_preload_keeps_the_real_clock(self): plain = self.run_program(self.other, 0, preload=False) - paused = self.run_program(self.other, SHIFT_MS) + paused = self.run_program(self.other, SHIFT_MS, preload=False) self.assertAlmostEqual(paused["gap"], plain["gap"], delta=50) for name in ("cond_mono", "clockwait", "sem", "nanosleep", "timerfd", "futex"): self.assertGreaterEqual(paused[name], 50, name) self.assertLess(paused[name], 1000, name) + def test_every_session_program_stops_monotonic_clock_and_keeps_memory_access(self): + plain = self.run_program(self.other, 0) + paused = self.run_program(self.other, SHIFT_MS) + self.assertAlmostEqual(paused["gap"] - plain["gap"], SHIFT_MS, delta=50) + self.assertAlmostEqual(paused["rawgap"] - plain["rawgap"], SHIFT_MS, delta=50) + self.assertEqual(plain["memory"], 130560) + self.assertEqual(paused["memory"], 130560) + + def test_running_session_program_observes_pause_offset_update(self): + self.check_running_offset_update(False) + + def test_session_reset_preserves_live_guest_mapping(self): + self.check_running_offset_update(True) + + def check_running_offset_update(self, reset): + self.control.write_bytes(struct.pack("\n' + '#include "clock_domain.h"\n' + 'int main(int argc, char **argv) { (void)argc;\n' + ' droiddeck_clock_domain_set_control(argv[1]);\n' + ' printf("%lld %u %lld\\n", (long long)droiddeck_clock_domain_adjust_ns(30LL * 1000000000LL), ' + ' droiddeck_clock_domain_now_ms(), (long long)droiddeck_clock_domain_adjust_ns(5LL * 1000000000LL));\n' + ' return 0;\n' + '}\n' + ) + binary = root / "program" + subprocess.run(["cc", "-Wall", "-Wextra", "-Werror", "-O2", "-I", str(SOURCE.parent), "-o", str(binary), str(program), str(SOURCE)], + check=True) + result = subprocess.run([str(binary), str(control)], capture_output=True, text=True, check=True) + adjusted, now_ms, clamped = map(int, result.stdout.split()) + self.assertEqual(adjusted, 20_000_000_000) + self.assertGreaterEqual(now_ms, 0) + self.assertLessEqual(now_ms, 0xFFFFFFFF) + self.assertEqual(clamped, 0) + + def test_paced_release_uses_kernel_time_across_pause_offsets(self): + compositor = SOURCE.with_name("compositor.c").read_text() + functions = extract_function(compositor, "now_ns") + "\n" + extract_void_function(compositor, "arm_release_timer") + harness = r''' +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include "clock_domain.h" + +struct pending_release { void *buffer; int64_t at_ns; struct pending_release *next; }; +static struct pending_release *g_pending_releases; +static int g_release_timer_fd; +#define wl_list_for_each(pr, list, link) for (pr = *(list); pr; pr = pr->next) +static int buffer_release_blocked(void *buffer) { return buffer != NULL; } + +@FUNCTIONS@ + +int main(int argc, char **argv) { + (void)argc; + droiddeck_clock_domain_set_control(argv[1]); + int control = open(argv[1], O_WRONLY); + assert(control >= 0); + g_release_timer_fd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK | TFD_CLOEXEC); + assert(g_release_timer_fd >= 0); + const int64_t offsets[] = {0, 10000000000LL, 300000000000LL}; + for (unsigned i = 0; i < sizeof(offsets) / sizeof(offsets[0]); i++) { + assert(pwrite(control, &offsets[i], sizeof(offsets[i]), 0) == sizeof(offsets[i])); + struct timespec started, ended; + clock_gettime(CLOCK_MONOTONIC, &started); + int64_t start = now_ns(); + struct pending_release blocked = {(void *)1, start + 1000000LL, NULL}; + struct pending_release release = {NULL, start + 60000000LL, &blocked}; + g_pending_releases = &release; + arm_release_timer(); + int64_t next_offset = offsets[i] + 10000000000LL; + assert(pwrite(control, &next_offset, sizeof(next_offset), 0) == sizeof(next_offset)); + struct pollfd pollfd = {g_release_timer_fd, POLLIN, 0}; + assert(poll(&pollfd, 1, 1000) == 1); + clock_gettime(CLOCK_MONOTONIC, &ended); + int64_t elapsed = (ended.tv_sec - started.tv_sec) * 1000000000LL + ended.tv_nsec - started.tv_nsec; + assert(elapsed >= 50000000LL && elapsed < 1000000000LL); + uint64_t expirations; + assert(read(g_release_timer_fd, &expirations, sizeof(expirations)) == sizeof(expirations)); + assert(expirations == 1); + g_pending_releases = &blocked; + arm_release_timer(); + struct itimerspec remaining; + assert(timerfd_gettime(g_release_timer_fd, &remaining) == 0); + assert(remaining.it_value.tv_sec == 0 && remaining.it_value.tv_nsec == 0); + } + close(g_release_timer_fd); + close(control); + return 0; +} +''' + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + control = root / "clock" + control.write_bytes(struct.pack("\n' + '#include "clock_domain.h"\n' + 'int main(int argc, char **argv) { (void)argc;\n' + ' droiddeck_clock_domain_set_control(argv[1]);\n' + ' printf("%lld\\n", (long long)droiddeck_clock_domain_adjust_ns(30LL * 1000000000LL));\n' + ' droiddeck_clock_domain_set_control(argv[2]);\n' + ' printf("%lld\\n", (long long)droiddeck_clock_domain_adjust_ns(30LL * 1000000000LL));\n' + ' return 0;\n' + '}\n' + ) + binary = root / "program" + subprocess.run(["cc", "-Wall", "-Wextra", "-Werror", "-O2", "-I", str(SOURCE.parent), "-o", str(binary), str(program), str(SOURCE)], + check=True) + result = subprocess.run([str(binary), str(control), str(root / "missing")], capture_output=True, text=True, check=True) + self.assertEqual(result.stdout.split(), ["30000000000", "30000000000"]) + + def test_replaced_control_file_updates_offset_without_invalidating_readers(self): + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + control = root / "clock" + replacement = root / "replacement" + control.write_bytes(struct.pack("\n' + '#include "clock_domain.h"\n' + 'int main(int argc, char **argv) { (void)argc;\n' + ' droiddeck_clock_domain_set_control(argv[1]);\n' + ' printf("%lld\\n", (long long)droiddeck_clock_domain_adjust_ns(30LL * 1000000000LL));\n' + ' if (rename(argv[2], argv[1]) != 0) return 1;\n' + ' droiddeck_clock_domain_set_control(argv[1]);\n' + ' printf("%lld\\n", (long long)droiddeck_clock_domain_adjust_ns(30LL * 1000000000LL));\n' + ' return 0;\n' + '}\n' + ) + binary = root / "program" + subprocess.run(["cc", "-Wall", "-Wextra", "-Werror", "-O2", "-I", str(SOURCE.parent), "-o", str(binary), str(program), str(SOURCE)], + check=True) + result = subprocess.run([str(binary), str(control), str(replacement)], capture_output=True, text=True, check=True) + self.assertEqual(result.stdout.split(), ["20000000000", "10000000000"]) + + def test_session_transition_clears_stale_offset_but_live_failures_preserve_it(self): + harness = r''' +#include +#include +#include +#include +#include "clock_domain.h" + +int main(int argc, char **argv) { + (void)argc; + int64_t shift = 10000000000LL; + int fd = open(argv[1], O_CREAT | O_RDWR, 0600); + assert(fd >= 0); + assert(write(fd, &shift, sizeof(shift)) == sizeof(shift)); + droiddeck_clock_domain_set_control(argv[1]); + assert(droiddeck_clock_domain_adjust_ns(30000000000LL) == 20000000000LL); + assert(unlink(argv[1]) == 0); + droiddeck_clock_domain_set_control(argv[1]); + assert(droiddeck_clock_domain_adjust_ns(30000000000LL) == 20000000000LL); + int replacement = open(argv[1], O_CREAT | O_RDWR, 0600); + assert(replacement >= 0); + droiddeck_clock_domain_set_control(argv[1]); + assert(droiddeck_clock_domain_adjust_ns(30000000000LL) == 20000000000LL); + droiddeck_clock_domain_set_control(NULL); + droiddeck_clock_domain_set_control(argv[1]); + assert(droiddeck_clock_domain_adjust_ns(30000000000LL) == 30000000000LL); + shift = 20000000000LL; + assert(write(replacement, &shift, sizeof(shift)) == sizeof(shift)); + droiddeck_clock_domain_set_control(argv[1]); + assert(droiddeck_clock_domain_adjust_ns(30000000000LL) == 10000000000LL); + close(replacement); + close(fd); + return 0; +} +''' + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + program = root / "program.c" + program.write_text(harness) + binary = root / "program" + subprocess.run(["cc", "-Wall", "-Wextra", "-Werror", "-O2", "-I", str(SOURCE.parent), + "-o", str(binary), str(program), str(SOURCE)], check=True) + subprocess.run([str(binary), str(root / "clock")], check=True, timeout=5) + host = SOURCE.parents[3] / "java/com/droiddeck/launcher/wayland/CompositorHost.kt" + self.assertIn("nativeSetClockControl(null)", host.read_text().split("fun newSession() {", 1)[1].split("}", 1)[0]) + + def test_startup_reset_keeps_host_and_guest_on_the_same_inode(self): + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + control = root / "clock" + control.write_bytes(struct.pack("\n' + '#include "clock_domain.h"\n' + 'int main(int argc, char **argv) { (void)argc;\n' + ' droiddeck_clock_domain_set_control(argv[1]);\n' + ' printf("%lld\\n", (long long)droiddeck_clock_domain_adjust_ns(30LL * 1000000000LL));\n' + ' if (rename(argv[2], argv[1]) != 0) return 1;\n' + ' droiddeck_clock_domain_set_control(argv[1]);\n' + ' printf("%lld\\n", (long long)droiddeck_clock_domain_adjust_ns(30LL * 1000000000LL));\n' + ' return 0;\n' + '}\n' + ) + binary = root / "program" + subprocess.run(["cc", "-Wall", "-Wextra", "-Werror", "-O2", "-I", str(SOURCE.parent), + "-o", str(binary), str(program), str(SOURCE)], check=True) + result = subprocess.run([str(binary), str(control), str(replacement)], capture_output=True, text=True, check=True) + self.assertEqual(result.stdout.split(), ["30000000000", "10000000000"]) + + +if __name__ == "__main__": + unittest.main() From da5a36151b7f82a394049409a75efc4888077f43 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 02:10:34 -0500 Subject: [PATCH 26/57] feat(ui): option to hide the Agent tab (#2515) --- .../main/java/com/droiddeck/launcher/App.kt | 3 ++- .../droiddeck/launcher/FrontEndActivity.kt | 3 ++- .../com/droiddeck/launcher/agent/AgentTab.kt | 23 +++++++++++++++++++ .../launcher/session/SessionPrefs.kt | 6 +++++ .../launcher/session/SettingsReset.kt | 2 +- .../com/droiddeck/launcher/ui/FrontEndRail.kt | 2 +- .../droiddeck/launcher/ui/FrontEndSetup.kt | 5 ++++ .../launcher/ui/SessionDrawerPage.kt | 2 +- app/src/main/res/values/strings.xml | 1 + 9 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index 79f42d118a..ac9995412b 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -43,7 +43,8 @@ class App : Application() { process == "$packageName:shortcuts_sync" || process == "$packageName:bottom_desktop") return CrashHandler.install(this) com.droiddeck.launcher.agent.AgentHost.refresh(this) - if (com.droiddeck.launcher.agent.AgentHost.available) com.droiddeck.launcher.lab.LabNotice.openOnInstall = "agent" + com.droiddeck.launcher.agent.AgentTab.load(this) + if (com.droiddeck.launcher.agent.AgentTab.visible) com.droiddeck.launcher.lab.LabNotice.openOnInstall = "agent" com.droiddeck.launcher.lab.LabNotice.started(this) com.droiddeck.launcher.core.SteamIntegration.syncShortcutsListing(this) com.droiddeck.launcher.session.QuestExperimental.initialize(this) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index a8d0a5bde2..699dd9643b 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1107,7 +1107,7 @@ class FrontEndActivity : ComponentActivity() { if (savedInstanceState == null) readIntegrationIntent(intent) readGameIntent(intent) // A Lab build is usually the agent's work, so the app comes back where the agent is. - if (savedInstanceState == null && navRequest == null && com.droiddeck.launcher.lab.LabOverlay.promoted && com.droiddeck.launcher.agent.AgentHost.available) navRequest = "agent" + if (savedInstanceState == null && navRequest == null && com.droiddeck.launcher.lab.LabOverlay.promoted && com.droiddeck.launcher.agent.AgentTab.visible) navRequest = "agent" gameSyncFolder = GameFileSync.folder(this) displayManager = getSystemService(DISPLAY_SERVICE) as DisplayManager refreshPhantomStatus() @@ -3054,6 +3054,7 @@ class FrontEndActivity : ComponentActivity() { com.droiddeck.launcher.core.AppLanguage.setChosen(this, com.droiddeck.launcher.core.AppLanguage.SYSTEM) if (!ok) android.widget.Toast.makeText(this, R.string.setup_reset_settings_partial, android.widget.Toast.LENGTH_LONG).show() com.droiddeck.launcher.ui.Motion.refresh(this) + com.droiddeck.launcher.agent.AgentTab.load(this) if (!switchLauncherIcon(LauncherIcon.DARK)) recreate() } }, "reset-settings").start() diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt new file mode 100644 index 0000000000..7392473c72 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt @@ -0,0 +1,23 @@ +package com.droiddeck.launcher.agent + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.session.SessionPrefs + +object AgentTab { + var shown by mutableStateOf(true) + private set + + val visible: Boolean get() = shown && AgentHost.available + + fun load(context: Context) { + shown = SessionPrefs.agentTab(context) + } + + fun set(context: Context, show: Boolean) { + shown = show + SessionPrefs.setAgentTab(context, show) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index b682a82953..a14490bb8d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -253,6 +253,12 @@ object SessionPrefs { prefs(context).edit().putBoolean("railLabels", show).apply() } + fun agentTab(context: Context): Boolean = prefs(context).getBoolean("agentTab", true) + + fun setAgentTab(context: Context, show: Boolean) { + prefs(context).edit().putBoolean("agentTab", show).apply() + } + fun libraryShowUninstalled(context: Context): Boolean = prefs(context).getBoolean("libraryShowUninstalled", false) fun setLibraryShowUninstalled(context: Context, show: Boolean) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index 321af09802..756b05f45f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -18,7 +18,7 @@ object SettingsReset { "storesInstallLanguage", "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "__KEEP_droidDeckHud__", "__KEEP_droidDeckHudPos__", "backHold", "backActionsInverted", "backDoubleTapMs", "touch", "osc", "shape", "steamController", "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", - "stretch16x9", "picturePosition", "railLabels", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", + "stretch16x9", "picturePosition", "railLabels", "agentTab", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "ramCapMb", "vramCapMb", "zramClient", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt index 5358b221e1..351eded54c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -125,7 +125,7 @@ internal fun navigationKeys(s: FrontEndState) = buildList { add("steam"); add("games") if (s.gameStoresEnabled) add("stores") add("desktop") - if (com.droiddeck.launcher.agent.AgentHost.available) add("agent") + if (com.droiddeck.launcher.agent.AgentTab.visible) add("agent") add("components") if (s.isHomeApp) add("android-apps") add("setup"); add("updates") diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 79ce769131..f90cf1b26b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -455,6 +455,11 @@ internal fun SetupPanel( val railContext = androidx.compose.ui.platform.LocalContext.current remember { RailLabels.load(railContext) } ToggleRow(host, "rail-labels", stringResource(R.string.setup_rail_labels), stringResource(R.string.setup_rail_labels_hint), RailLabels.shown) { RailLabels.set(railContext, it) } + if (com.droiddeck.launcher.agent.AgentHost.available) { + ToggleRow(host, "agent-tab", stringResource(R.string.setup_agent_tab), null, com.droiddeck.launcher.agent.AgentTab.shown) { + com.droiddeck.launcher.agent.AgentTab.set(railContext, it) + } + } LanguageRow(host, s.language, a.onLanguage) ToggleRow(host, "show-stores", stringResource(R.string.setup_stores), null, s.gameStoresEnabled, onChange = a.onGameStoresEnabled) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt index a0d75f027a..cb438903b7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt @@ -14,7 +14,7 @@ internal enum class SessionDrawerPage(val firstControl: String) { } internal fun sessionDrawerPages( - hasSecondScreen: Boolean, hasGlasses: Boolean = false, hasAgent: Boolean = com.droiddeck.launcher.agent.AgentHost.installed, + hasSecondScreen: Boolean, hasGlasses: Boolean = false, hasAgent: Boolean = com.droiddeck.launcher.agent.AgentHost.installed && com.droiddeck.launcher.agent.AgentTab.shown, ): List = SessionDrawerPage.entries.filter { (hasSecondScreen || it != SessionDrawerPage.SECOND_SCREEN) && (hasGlasses || it != SessionDrawerPage.GLASSES) && diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9942a419fe..b658b8d8b7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2641,6 +2641,7 @@ Sort Sidebar labels Show names under the sidebar icons. Turn off for a slimmer sidebar. + Agent tab Display Larger cards Smaller cards From a8237e89277706b3b9256a0bbe338e5f0acc18d0 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Thu, 12 Nov 2026 07:38:28 -0500 Subject: [PATCH 27/57] fix(memory): reclaim idle session memory under pressure (#2382) --- .../droiddeck/launcher/core/HostProcess.kt | 7 + .../launcher/core/SessionLogCapture.kt | 52 +++++ .../launcher/session/SessionArtifacts.kt | 5 + docs/development/low-memory.md | 46 ++-- .../overlay/usr/local/bin/droiddeck-session | 147 +++++++++---- tools/tests/test_client_zram_focus.py | 1 + tools/tests/test_memory_pressure.py | 203 +++++++++++++++--- 7 files changed, 379 insertions(+), 82 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt b/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt index 0757192461..114e337892 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt @@ -13,6 +13,11 @@ object HostProcess { @JvmStatic fun start(command: String, env: Array?, dir: File?, onExit: Consumer?, onLine: Consumer?, outputFile: File?): Int { + return start(command, env, dir, onExit, onLine, outputFile, null) + } + + @JvmStatic + fun start(command: String, env: Array?, dir: File?, onExit: Consumer?, onLine: Consumer?, outputFile: File?, onOutputComplete: Runnable?): Int { val argv = split(command) if (argv.isEmpty()) return -1 return try { @@ -35,6 +40,8 @@ object HostProcess { try { process.inputStream.bufferedReader().useLines { lines -> lines.forEach { onLine.accept(it) } } } catch (e: Exception) { + } finally { + onOutputComplete?.run() } }, "proc-out-$pid").apply { priority = Thread.NORM_PRIORITY - 1; isDaemon = true; start() } } diff --git a/app/src/main/java/com/droiddeck/launcher/core/SessionLogCapture.kt b/app/src/main/java/com/droiddeck/launcher/core/SessionLogCapture.kt index b9c0256dbf..c7b4a78c7c 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/SessionLogCapture.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/SessionLogCapture.kt @@ -5,6 +5,9 @@ import android.util.Log import java.io.BufferedWriter import java.io.File import java.io.FileOutputStream +import java.nio.file.Files +import java.nio.file.StandardCopyOption +import java.util.concurrent.atomic.AtomicInteger object SessionLogCapture { private const val TAG = "SessionLogCapture" @@ -104,4 +107,53 @@ object SessionLogCapture { Log.w(TAG, "could not dump the crash buffer", e) } } + + fun dumpMemoryPressure(target: File) { + var temporary: File? = null + try { + val staged = File.createTempFile(target.name, ".part", target.parentFile).also { temporary = it } + val lines = StringBuilder() + val done = java.util.concurrent.CountDownLatch(1) + val outputDone = java.util.concurrent.CountDownLatch(1) + val exitStatus = AtomicInteger(Int.MIN_VALUE) + val pid = HostProcess.start( + "/system/bin/logcat -b events -d -v threadtime -t 800", null, target.parentFile, + { status -> exitStatus.set(status); done.countDown() }, + { line -> synchronized(lines) { lines.append(line).append('\n') } }, + null, + outputDone::countDown, + ) + val deadline = System.nanoTime() + java.util.concurrent.TimeUnit.SECONDS.toNanos(10) + val finished = if (pid == -1) false else { + val exitTime = deadline - System.nanoTime() + exitTime > 0 && done.await(exitTime, java.util.concurrent.TimeUnit.NANOSECONDS) && + (deadline - System.nanoTime()).let { it > 0 && outputDone.await(it, java.util.concurrent.TimeUnit.NANOSECONDS) } + } + val body = synchronized(lines) { lines.toString() } + val status = exitStatus.get() + val pressure = runCatching { File("/proc/pressure/memory").readText() }.getOrDefault("unavailable\n") + val meminfo = runCatching { File("/proc/meminfo").readText() }.getOrDefault("unavailable\n") + val gpu = runCatching { File("/sys/class/kgsl/kgsl/page_alloc").readText() }.getOrDefault("unavailable\n") + staged.writeText( + "Android memory events:\n" + + when { + pid == -1 -> "(logcat could not be started at all)\n" + status != Int.MIN_VALUE && status != 0 -> "(logcat failed with exit status $status; no Android memory events were captured)\n" + + if (body.isEmpty()) "" else "\nlogcat command output:\n$body" + !finished -> if (body.isEmpty()) "(logcat did not finish within 10 s; nothing captured)\n" + else body + "(logcat did not finish within 10 s; later events may be missing)\n" + body.isNotEmpty() -> body + else -> "(no readable events were returned)\n" + } + + "\n/proc/pressure/memory:\n$pressure\n/proc/meminfo:\n$meminfo\n/sys/class/kgsl/kgsl/page_alloc:\n$gpu" + ) + Files.move( + staged.toPath(), target.toPath(), + StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE, + ) + } catch (e: Exception) { + temporary?.delete() + Log.w(TAG, "could not dump memory pressure diagnostics", e) + } + } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt index cb766a2de3..3ac0ef8ab6 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt @@ -77,6 +77,7 @@ object SessionArtifacts { copySteamLogs(context, dir, record, steamArch) VacDiagnostics.collect(context, dir) SessionLogCapture.dumpCrashBuffer(File(dir, "crash.log")) + SessionLogCapture.dumpMemoryPressure(File(dir, "memory-pressure.log")) val scrubbed = markScrubbed(scrubTree(record)) SessionEvents.record("session.artifacts_collected", mapOf("reason" to reason), dir) if (scrubbed) File(dir, COMPLETE_MARKER).writeText("collected: $reason at ${now()}\n") @@ -594,6 +595,10 @@ object SessionArtifacts { if (!crashLog.exists()) { SessionLogCapture.dumpCrashBuffer(crashLog) } + val memoryLog = File(dir, "memory-pressure.log") + if (newest && !memoryLog.exists()) { + SessionLogCapture.dumpMemoryPressure(memoryLog) + } if (stopWhenSessionStarts && SessionState.running) { record.failed = true record.deferred = true diff --git a/docs/development/low-memory.md b/docs/development/low-memory.md index 4b8e9b459e..81055ff0b1 100644 --- a/docs/development/low-memory.md +++ b/docs/development/low-memory.md @@ -9,8 +9,10 @@ Every five seconds the monitor reads `MemAvailable`, swap headroom and memory PS headroom means less than one fifth of total RAM (bounded to 512–1536 MiB), or at least 1% `some avg10` memory stall with less than one third of RAM available. Pressure requests target only the launcher processes already recognized by the monitor, never the game. They require -at least 128 MiB launcher RSS and enough free swap to cover its entire RSS while leaving -one fifth of swap (at least 256 MiB) free. The regular automatic client request uses the +at least 128 MiB launcher RSS and enough free swap to cover its anonymous RSS while leaving +one fifth of swap (at least 256 MiB) free. File-backed resident pages do not consume this +budget: the page-out helper targets private anonymous mappings. If `RssAnon` is absent from a +process's status, its full RSS is used instead. The regular automatic client request uses the same swap guard. An explicit session RAM cap retains its existing behavior. Pressure requests are at least 30 seconds apart. Reclaiming less than 16 MiB doubles the @@ -41,27 +43,32 @@ reduced aggregate launcher RSS only from 263 to 255 MiB and backed off. Thus lau does not resolve this load failure, and this run did not exhaust swap. The unevictable/shmem growth needs allocation attribution before treating it as a driver or GPU-memory diagnosis. -## Low-RAM devices: compressing idle game memory +## Pressure reclaim: compressing idle game memory -On devices with at most 13 GiB `MemTotal` (every 12 GB phone and handheld and below), the -monitor also compresses the game session itself when memory runs out. The trigger is absolute -headroom, not a percentage: Android's `lmkd` killed a session on a 7.5 GiB device with +The monitor also compresses the game session itself when observed pressure approaches the +system kill boundary. There is no RAM-size gate. The trigger is absolute real headroom, not a +percentage: Android's `lmkd` killed a session on a 7.5 GiB device with 490 MiB still available, so a 95% used threshold (about 400 MiB left on 8 GB) is already past the kill. A world load added 1 GiB of GPU memory in about ten seconds, and compressing 1.4 GiB took 2.6 seconds, so the request has to leave room for both. -The session request runs when available memory falls below a quarter of RAM (bounded to -768–2560 MiB, 1.85 GiB on an 8 GB device), or below one and a half times that with at least 1% -`some avg10` memory stall. One request pages out every session process that loaded -`libblsession.so`: the game, Wine and its services, plus the launcher processes unless their -compression is turned off, under a single wait. It runs before the launcher-only check, which -can wait up to 12 seconds for acknowledgements. While a game runs and available memory is under -twice that level, memory is read every second instead of every five. Requests are at least 30 seconds apart and need the same swap reserve as launcher -requests. When the session has read back more than half of what the previous request compressed, -that memory is in use: the request is skipped and the wait doubles, up to five minutes. A -request whose memory stayed compressed resets it to 30 seconds. Below half the headroom the -wait is ignored and only the 30-second spacing applies. The state resets when the game exits. Devices above 13 GiB keep the -launcher-only behaviour. +The session request runs when real headroom falls below a quarter of RAM (bounded to +768–2560 MiB), or below one and a half times that with at least 1% `some` or `full avg10` +memory stall. Real headroom subtracts positive growth in KGSL allocation, `Unevictable`, and +`Shmem` from `MemAvailable`; a rapid fall also qualifies near twice the headroom. The monitor +may first request page-out of idle Steam and hidden launchers, subject to the Performance +setting and client reclaim limits. When both qualify, both requests are sent before waiting +for either to complete, so a slow launcher acknowledgement does not delay the game request. Until the client +request finishes, its anonymous RSS remains reserved from the session's swap budget. Completion +and backoff are measured against the processes that received each request, even if a later scan +finds different processes. The session request targets processes that loaded +`libblsession.so`: the game, Wine and its services, and excludes Steam and hidden launchers. +Requests are at least 30 seconds apart and need the same +swap reserve as launcher requests. When the session has read back more than half of what the +previous request compressed, that memory is in use: the request is skipped and the wait doubles, +up to five minutes. A request whose memory stayed compressed resets it to 30 seconds. Below half +the headroom the wait is ignored and only the 30-second spacing applies. The state resets when +the game exits. Measured on a Retroid Pocket Duo (7.5 GiB, kernel 6.6, 6 GiB lzo-rle zram plus a 4 GiB swap file) entering the world in World of Warcraft: Forever, one run each: @@ -91,7 +98,8 @@ A second run on that build showed the trigger arriving too late: character selec there. During the load, available memory crossed the headroom 9 seconds after Enter World, but the launcher check ran first and waited 12 seconds for acknowledgements; the game request started at 21 seconds, moved about 200 MiB, and `lmkd` ended the session at 30 seconds. The quarter-of-RAM -level and the game-first single request address both. +level starts reclaim earlier. Sending both requests before waiting removes the launcher +acknowledgement delay; it does not guarantee that reclaim can keep up with every loading peak. Without root an app cannot write its memory cgroup's `memory.reclaim` (owned by `system`), `process_madvise` on another process returns `EPERM`, `PAGEMAP_SCAN` is absent before Linux 6.7, diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index df27767405..9ec12398f4 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -811,19 +811,30 @@ case $mode in fi } bl_zram_usage() { - local _p _k _v _u _rss=0 _swap=0 + local _p _k _v _u _resident _anonymous _rss=0 _anon=0 _swap=0 for _p in "$@"; do + _resident=0 _anonymous=-1 while read -r _k _v _u; do - case $_k in VmRSS:) _rss=$((_rss + _v)) ;; VmSwap:) _swap=$((_swap + _v)) ;; esac + case $_v in ''|*[!0-9]*) continue ;; esac + case $_k in + VmRSS:) _resident=$_v ;; + RssAnon:) _anonymous=$_v ;; + VmSwap:) _swap=$((_swap + _v)) ;; + esac done 2>/dev/null < "/proc/$_p/status" + [ "$_anonymous" -ge 0 ] || _anonymous=$_resident + _rss=$((_rss + _resident)) _anon=$((_anon + _anonymous)) done - _bl_rss=$_rss + _bl_rss=$_rss _bl_anon=$_anon _bl_swap=$_swap echo "$# processes, resident $((_rss / 1024)) MB, in zram $((_swap / 1024)) MB" } bl_memory_read() { - local _k _v _u _kind _fields _avg - _bl_mem_total=0 _bl_available=-1 _bl_swap_total=0 _bl_swap_free=-1 _bl_psi=0 + local _k _v _u _kind _fields _avg _whole _frac _gpu_bytes _growth _saved_growth _saved_fall + _saved_growth=${_bl_preserved_growth:-0} _saved_fall=${_bl_preserved_fall:-0} + _bl_preserved_growth=0 _bl_preserved_fall=0 + _bl_mem_total=0 _bl_available=-1 _bl_swap_total=0 _bl_swap_free=-1 + _bl_psi_some=0 _bl_psi_full=0 _bl_gpu=0 _bl_unevictable=0 _bl_shmem=0 while read -r _k _v _u; do case $_v in ''|*[!0-9]*) continue ;; esac case $_k in @@ -831,15 +842,50 @@ case $mode in MemAvailable:) _bl_available=$_v ;; SwapTotal:) _bl_swap_total=$_v ;; SwapFree:) _bl_swap_free=$_v ;; + Unevictable:) _bl_unevictable=$_v ;; + Shmem:) _bl_shmem=$_v ;; esac done 2>/dev/null < /proc/meminfo if [ -r /proc/pressure/memory ]; then while read -r _kind _fields; do - [ "$_kind" = some ] || continue - _avg=${_fields#avg10=} _avg=${_avg%% *} _avg=${_avg%%.*} - case $_avg in ''|*[!0-9]*) ;; *) _bl_psi=$((10#$_avg)) ;; esac + [ "$_kind" = some ] || [ "$_kind" = full ] || continue + _avg=${_fields#avg10=} _avg=${_avg%% *} + _whole=${_avg%%.*} _frac=${_avg#*.} + [ "$_frac" = "$_avg" ] && _frac=00 + _frac=${_frac}00 + _frac=${_frac:0:2} + case $_whole$_frac in ''|*[!0-9]*) continue ;; esac + if [ "$_kind" = some ]; then + _bl_psi_some=$((10#$_whole * 100 + 10#$_frac)) + else + _bl_psi_full=$((10#$_whole * 100 + 10#$_frac)) + fi done 2>/dev/null < /proc/pressure/memory fi + if [ -r /sys/class/kgsl/kgsl/page_alloc ]; then + read -r _gpu_bytes _u < /sys/class/kgsl/kgsl/page_alloc + case $_gpu_bytes in ''|*[!0-9]*) _gpu_bytes=0 ;; esac + _bl_gpu=$((_gpu_bytes / 1024)) + fi + _bl_psi=$_bl_psi_some + [ "$_bl_psi_full" -gt "$_bl_psi" ] && _bl_psi=$_bl_psi_full + if [ "${_bl_sample_at:-}" = "" ]; then + _bl_growth=0 _bl_fall=0 + _bl_sample_at=$SECONDS _bl_sample_available=$_bl_available _bl_sample_gpu=$_bl_gpu + _bl_sample_unevictable=$_bl_unevictable _bl_sample_shmem=$_bl_shmem + elif [ "$SECONDS" -gt "$_bl_sample_at" ]; then + _bl_growth=0 _bl_fall=0 + _growth=$((_bl_gpu - _bl_sample_gpu)); [ "$_growth" -gt 0 ] && _bl_growth=$((_bl_growth + _growth)) + _growth=$((_bl_unevictable - _bl_sample_unevictable)); [ "$_growth" -gt 0 ] && _bl_growth=$((_bl_growth + _growth)) + _growth=$((_bl_shmem - _bl_sample_shmem)); [ "$_growth" -gt 0 ] && _bl_growth=$((_bl_growth + _growth)) + _bl_fall=$((_bl_sample_available - _bl_available)) + [ "$_saved_growth" -gt "$_bl_growth" ] && _bl_growth=$_saved_growth + [ "$_saved_fall" -gt "$_bl_fall" ] && _bl_fall=$_saved_fall + _bl_sample_at=$SECONDS _bl_sample_available=$_bl_available _bl_sample_gpu=$_bl_gpu + _bl_sample_unevictable=$_bl_unevictable _bl_sample_shmem=$_bl_shmem + fi + _bl_real_available=$_bl_available + [ "$_bl_real_available" -ge 0 ] && _bl_real_available=$((_bl_real_available - _bl_growth)) _bl_headroom=$((_bl_mem_total / 5)) [ "$_bl_headroom" -ge $((512 * 1024)) ] || _bl_headroom=$((512 * 1024)) [ "$_bl_headroom" -le $((1536 * 1024)) ] || _bl_headroom=$((1536 * 1024)) @@ -851,25 +897,29 @@ case $mode in } bl_memory_tight() { [ "$_bl_mem_total" -gt 0 ] && [ "$_bl_available" -ge 0 ] && - { [ "$_bl_available" -lt "$_bl_headroom" ] || - { [ "$_bl_psi" -ge 1 ] && [ "$_bl_available" -lt $((_bl_mem_total / 3)) ]; }; } + { [ "$_bl_real_available" -lt "$_bl_headroom" ] || + { [ "$_bl_psi" -ge 100 ] && [ "$_bl_real_available" -lt $((_bl_mem_total / 3)) ]; } || + { [ "$_bl_fall" -ge $((256 * 1024)) ] && [ "$_bl_real_available" -lt $((_bl_headroom * 2)) ]; }; } } bl_client_can_pageout() { bl_memory_read bl_zram_usage "${_bl_pids[@]}" > /dev/null - [ "$_bl_mem_total" -gt 0 ] && [ "$_bl_swap_total" -gt 0 ] && - [ $((_bl_swap_free - _bl_rss)) -ge "$_bl_swap_reserve" ] + [ "$_bl_mem_total" -gt 0 ] && bl_zram_has_room + } + bl_zram_has_room() { + [ "$_bl_swap_total" -gt 0 ] && + [ $((_bl_swap_free - _bl_anon - ${_bl_client_reserve:-0})) -ge "$_bl_swap_reserve" ] } bl_client_can_readback() { bl_memory_read bl_zram_usage "${_bl_pids[@]}" > /dev/null - [ "$_bl_mem_total" -gt 0 ] && ! bl_memory_tight && - [ "$_bl_available" -ge $((_bl_swap * 2)) ] && - [ $((_bl_available - _bl_swap)) -ge "$_bl_headroom" ] + [ "$_bl_mem_total" -gt 0 ] && ! bl_memory_tight && ! bl_memory_critical && + [ "$_bl_real_available" -ge $((_bl_swap * 2)) ] && + [ $((_bl_real_available - _bl_swap)) -ge "$_bl_headroom" ] } bl_client_pressure() { [ "${BL_ZRAM_CLIENT:-1}" = 1 ] && [ "$_bl_game" = 1 ] && - [ "${#_bl_pids[@]}" -gt 0 ] && bl_memory_tight || return 0 + [ "${#_bl_pids[@]}" -gt 0 ] && { bl_memory_tight || bl_memory_critical; } || return 0 [ "$_bl_pressure_at" -lt 0 ] || [ $((SECONDS - _bl_pressure_at)) -ge "$_bl_pressure_backoff" ] || return 0 [ "$_bl_packed" -lt 0 ] || [ $((SECONDS - _bl_packed)) -ge 30 ] || return 0 @@ -879,12 +929,29 @@ case $mode in return 0 fi [ "$_bl_rss" -ge $((128 * 1024)) ] || return 0 - local _before=$_bl_rss - bl_zram_send 1 "memory pressure, compressing the client (available $((_bl_available / 1024)) MB, swap free $((_bl_swap_free / 1024)) MB)" client + _bl_pressure_before=$_bl_rss + if [ "${1:-}" = defer ]; then + _bl_client_reserve=$_bl_anon + _bl_client_pending=1 + fi + bl_zram_send 1 "memory pressure, compressing the client (available $((_bl_available / 1024)) MB, swap free $((_bl_swap_free / 1024)) MB)" client "${1:-}" _bl_packed=$SECONDS + if [ "${1:-}" = defer ]; then + _bl_client_targets=("${_bl_zram_targets[@]}") + else + bl_client_pressure_result + fi + } + bl_client_pressure_finish() { + [ "${_bl_client_pending:-0}" = 1 ] || return 0 + bl_zram_finish 1 "${_bl_client_targets[@]}" + bl_client_pressure_result "${_bl_client_targets[@]}" + _bl_client_pending=0 _bl_client_reserve=0 _bl_client_targets=() + } + bl_client_pressure_result() { [ "${_bl_pageout_complete:-0}" = 1 ] || return 0 - bl_zram_usage "${_bl_pids[@]}" > /dev/null - if [ $((_before - _bl_rss)) -lt $((16 * 1024)) ]; then + if [ "$#" -gt 0 ]; then bl_zram_usage "$@" > /dev/null; else bl_zram_usage "${_bl_pids[@]}" > /dev/null; fi + if [ $((_bl_pressure_before - _bl_rss)) -lt $((16 * 1024)) ]; then _bl_pressure_backoff=$((_bl_pressure_backoff * 2 > 300 ? 300 : _bl_pressure_backoff * 2)) else _bl_pressure_backoff=30 @@ -892,15 +959,13 @@ case $mode in } bl_memory_critical() { [ "$_bl_mem_total" -gt 0 ] && [ "$_bl_available" -ge 0 ] && - { [ "$_bl_available" -lt "$_bl_tier_headroom" ] || - { [ "$_bl_psi" -ge 1 ] && [ "$_bl_available" -lt $((_bl_tier_headroom * 3 / 2)) ]; }; } - } - bl_low_ram() { - [ "$_bl_mem_total" -gt 0 ] && [ "$_bl_mem_total" -le $((13 * 1024 * 1024)) ] + { [ "$_bl_real_available" -lt "$_bl_tier_headroom" ] || + { [ "$_bl_psi" -ge 100 ] && [ "$_bl_real_available" -lt $((_bl_tier_headroom * 3 / 2)) ]; } || + { [ "$_bl_fall" -ge $((256 * 1024)) ] && [ "$_bl_real_available" -lt $((_bl_tier_headroom * 2)) ]; }; } } bl_session_pressure() { bl_memory_read - [ "$_bl_game" = 1 ] && bl_low_ram && bl_memory_critical || return 0 + [ "$_bl_game" = 1 ] && bl_memory_critical || return 0 local _wait=$_bl_tier_backoff _before _pids _targets [ "$_bl_available" -ge $((_bl_headroom / 2)) ] || [ "$_bl_tier_pushed" -lt 0 ] || _wait=30 [ "$_bl_tier_at" -lt 0 ] || [ $((SECONDS - _bl_tier_at)) -ge "$_wait" ] || return 0 @@ -916,21 +981,18 @@ case $mode in fi fi _bl_tier_at=$SECONDS _bl_tier_pushed=0 - bl_zram_pick game + bl_zram_pick session bl_zram_usage "${_pids[@]}" > /dev/null [ "$_bl_rss" -ge $((256 * 1024)) ] || return 0 - if [ "$_bl_swap_total" -le 0 ] || [ $((_bl_swap_free - _bl_rss)) -lt "$_bl_swap_reserve" ]; then + if ! bl_zram_has_room; then step "zRAM: low-memory page-out skipped, swap headroom too small ($((_bl_swap_free / 1024)) MB free)" return 0 fi _targets=("${_pids[@]}") _before=$_bl_swap - bl_zram_send 1 "low memory (available $((_bl_available / 1024)) MB), compressing idle game memory" game + bl_zram_send 1 "low memory (available $((_bl_real_available / 1024)) MB), compressing idle game memory" session bl_zram_usage "${_targets[@]}" > /dev/null _bl_tier_pushed=$((_bl_swap - _before)) bl_tier_note "${_targets[@]}" - if [ "${_bl_pageout_complete:-0}" = 1 ] && [ "${BL_ZRAM_CLIENT:-1}" = 1 ] && [ "${#_bl_pids[@]}" -gt 0 ]; then - _bl_pressure_at=$SECONDS _bl_packed=$SECONDS - fi } bl_proc_start() { local _s= @@ -961,7 +1023,7 @@ case $mode in } bl_watch_nap() { local _i - if [ "$_bl_game" = 1 ] && bl_low_ram && [ "$_bl_available" -ge 0 ] && [ "$_bl_available" -lt $((_bl_tier_headroom * 2)) ]; then + if [ "$_bl_game" = 1 ] && [ "$_bl_available" -ge 0 ] && [ "$_bl_real_available" -lt $((_bl_tier_headroom * 2)) ]; then for _i in 1 2 3 4 5; do nap 1 bl_memory_read @@ -1017,10 +1079,16 @@ case $mode in for _p in "${_pids[@]}"; do rm -f "/tmp/.bl-zram.ack.$_p"; done printf '%s' "$_mode" > /tmp/.bl-zram [ "${#_pids[@]}" = 0 ] || kill -URG "${_pids[@]}" 2>/dev/null - if [ "$_mode" = 1 ]; then bl_zram_wait "${_pids[@]}"; else nap 5; fi + _bl_zram_targets=("${_pids[@]}") + [ "${4:-}" != defer ] || return 0 + bl_zram_finish "$_mode" "${_pids[@]}" + } + bl_zram_finish() { + local _mode=$1 + shift + if [ "$_mode" = 1 ]; then bl_zram_wait "$@"; else nap 5; fi bl_zram_scan - bl_zram_pick "$_which" - step "zRAM: done ($(bl_zram_usage "${_pids[@]}"))" + step "zRAM: done ($(bl_zram_usage "$@"))" } bl_game_focused() { if [ "${BL_DESKTOP:-}" = 1 ] || [ -z "${BL_LAUNCH_DIR:-}" ]; then @@ -1047,6 +1115,8 @@ case $mode in } _bl_since=-1 _bl_since_apps= _bl_packed=-1 _bl_measured=-1 _bl_unpack=0 _bl_capped=-1 _bl_backoff=30 _bl_pressure_at=-1 _bl_pressure_backoff=30 _bl_tier_at=-1 _bl_tier_backoff=30 _bl_tier_pushed=0 _bl_tier_back=0 _bl_tier_targets=() _bl_tier_swaps=() _bl_tier_starts=() + _bl_client_pending=0 _bl_client_reserve=0 _bl_client_targets=() + _bl_sample_at= _bl_sample_available=0 _bl_sample_gpu=0 _bl_sample_unevictable=0 _bl_sample_shmem=0 while kill -0 $$ 2>/dev/null; do bl_zram_scan bl_memory_read @@ -1073,8 +1143,11 @@ case $mode in _bl_backoff=30 fi fi + _bl_preserved_growth=$_bl_growth _bl_preserved_fall=$_bl_fall + bl_client_pressure defer + _bl_preserved_growth=$_bl_growth _bl_preserved_fall=$_bl_fall bl_session_pressure - bl_client_pressure + bl_client_pressure_finish if [ "$_bl_game" = 1 ] && bl_game_focused; then if [ "$_bl_since" -lt 0 ] || [ "$_bl_since_apps" != "$_bl_apps" ]; then _bl_since=$SECONDS _bl_since_apps=$_bl_apps diff --git a/tools/tests/test_client_zram_focus.py b/tools/tests/test_client_zram_focus.py index 5cd7d3cd4a..db2d3f80e1 100644 --- a/tools/tests/test_client_zram_focus.py +++ b/tools/tests/test_client_zram_focus.py @@ -121,6 +121,7 @@ step() { :; } bl_zram_scan() { :; } bl_memory_read() { :; } bl_client_pressure() { :; } +bl_client_pressure_finish() { :; } bl_session_pressure() { :; } bl_client_can_pageout() { return 0; } bl_client_can_readback() { [ "${readback:-1}" = 1 ]; } diff --git a/tools/tests/test_memory_pressure.py b/tools/tests/test_memory_pressure.py index 13f9e2f8d3..01c32c3f82 100644 --- a/tools/tests/test_memory_pressure.py +++ b/tools/tests/test_memory_pressure.py @@ -2,7 +2,7 @@ from pathlib import Path import tempfile import unittest -from tools.tests.test_client_zram_focus import function_source, run_bash +from tools.tests.test_client_zram_focus import SCRIPT, function_source, run_bash class MemoryPressureTest(unittest.TestCase): @@ -20,8 +20,8 @@ class MemoryPressureTest(unittest.TestCase): def run_policy(self, body): functions = '\n'.join(function_source(name) for name in ( - 'bl_memory_read', 'bl_memory_tight', 'bl_client_can_pageout', - 'bl_client_can_readback', 'bl_client_pressure')) + 'bl_memory_read', 'bl_memory_tight', 'bl_memory_critical', 'bl_client_can_pageout', + 'bl_client_can_readback', 'bl_client_pressure', 'bl_client_pressure_result', 'bl_zram_has_room')) functions = functions.replace('/proc/meminfo', str(self.root / 'meminfo')) functions = functions.replace('/proc/pressure/memory', str(self.root / 'pressure')) harness = ''' @@ -29,7 +29,7 @@ set -u _bl_pids=(123) _bl_game=1 _bl_packed=-1 _bl_pressure_at=-1 _bl_pressure_backoff=30 rss=$((384 * 1024)) client_swap=$((512 * 1024)) reclaimed=$((128 * 1024)) step() { :; } -bl_zram_usage() { _bl_rss=$rss _bl_swap=$client_swap; } +bl_zram_usage() { _bl_rss=$rss _bl_anon=${anon:-$rss} _bl_swap=$client_swap; } bl_zram_send() { echo "send:$1:$3"; rss=$((rss - reclaimed)); _bl_pageout_complete=${pageout_complete:-1}; } ''' + functions + '\nbl_memory_read\n' + body result = run_bash('NOW=0\n' + harness.replace('SECONDS', 'NOW')) @@ -80,6 +80,13 @@ if bl_client_can_readback; then echo yes; else echo no; fi self.assertEqual(['no'], self.run_policy(''' bl_client_pressure if bl_client_can_pageout; then echo yes; else echo no; fi +''')) + + def test_client_swap_budget_excludes_file_backed_memory(self): + self.memory(swap_free=1536) + self.assertEqual(['send:1:client'], self.run_policy(''' +rss=$((2048 * 1024)) anon=$((256 * 1024)) +bl_client_pressure ''')) def test_without_swap_automatic_pageout_is_disabled(self): @@ -152,20 +159,20 @@ class SessionPressureTest(unittest.TestCase): def run_policy(self, body): functions = '\n'.join(function_source(name) for name in ( - 'bl_memory_read', 'bl_memory_tight', 'bl_memory_critical', 'bl_low_ram', - 'bl_session_pressure', 'bl_watch_nap', 'bl_zram_pick', 'bl_tier_note', 'bl_tier_readback')) + 'bl_memory_read', 'bl_memory_tight', 'bl_memory_critical', + 'bl_session_pressure', 'bl_zram_has_room', 'bl_watch_nap', 'bl_zram_pick', 'bl_tier_note', 'bl_tier_readback')) functions = functions.replace('/proc/meminfo', str(self.root / 'meminfo')) functions = functions.replace('/proc/pressure/memory', str(self.root / 'pressure')) harness = ''' set -u _bl_game=1 _bl_tier_at=-1 _bl_tier_backoff=30 _bl_tier_pushed=0 _bl_tier_back=0 _bl_tier_targets=() _bl_tier_swaps=() _bl_tier_starts=() _bl_pids=(999) _bl_pressure_at=-1 _bl_packed=-1 -rss=$((1536 * 1024)) swap=0 pushed=$((1024 * 1024)) alive=999 started=100 complete=1 +rss=$((1536 * 1024)) swap=0 pushed=$((1024 * 1024)) alive="999 321 654" started=100 complete=1 step() { :; } bl_proc_start() { _bl_start=; case " $alive " in *" $1 "*) _bl_start=$started; return 0 ;; esac; return 1; } nap() { echo "nap:$1"; } bl_session_others() { _bl_session=(321 654); } -bl_zram_usage() { _bl_rss=$rss _bl_swap=$swap; } +bl_zram_usage() { _bl_rss=$rss _bl_anon=${anon:-$rss} _bl_swap=$swap; } bl_zram_send() { echo "send:$1:$3"; rss=$((rss - pushed)); swap=$((swap + pushed)); _bl_pageout_complete=$complete; } ''' + functions + '\nbl_memory_read\n' + body result = run_bash('NOW=0\n' + harness.replace('SECONDS', 'NOW')) @@ -174,19 +181,27 @@ bl_zram_send() { echo "send:$1:$3"; rss=$((rss - pushed)); swap=$((swap + pushed return result.stdout.splitlines() def test_low_headroom_compresses_the_game_session_at_most_every_30_seconds(self): - self.assertEqual(['send:1:game', 'send:1:game'], self.run_policy(''' + self.assertEqual(['send:1:session', 'send:1:session'], self.run_policy(''' SECONDS=0; bl_session_pressure SECONDS=10; bl_session_pressure SECONDS=29; bl_session_pressure SECONDS=30; bl_session_pressure ''')) - def test_twelve_gigabyte_devices_are_included_and_larger_ones_are_not(self): - for total, expected in ((11264, ['send:1:game']), (12288, ['send:1:game']), (15360, [])): + def test_pressure_policy_is_independent_of_ram_size(self): + for total, expected in ((11264, ['send:1:session']), (12288, ['send:1:session']), (16384, ['send:1:session'])): with self.subTest(total=total): self.memory(total=total) self.assertEqual(expected, self.run_policy('bl_session_pressure')) + def test_large_device_with_real_headroom_does_not_reclaim(self): + self.memory(total=16384, available=5120, psi='12.34') + self.assertEqual([], self.run_policy('bl_session_pressure')) + + def test_large_device_with_psi_and_moderate_headroom_reclaims(self): + self.memory(total=16384, available=3072, psi='1.23') + self.assertEqual(['send:1:session'], self.run_policy('bl_session_pressure')) + def test_no_game_does_not_compress_the_session(self): self.assertEqual([], self.run_policy('_bl_game=0; bl_session_pressure')) @@ -196,15 +211,26 @@ SECONDS=30; bl_session_pressure def test_stalls_with_moderate_headroom_compress_before_the_hard_limit(self): self.memory(available=2048, psi='1.50') - self.assertEqual(['send:1:game'], self.run_policy('bl_session_pressure')) + self.assertEqual(['send:1:session'], self.run_policy('bl_session_pressure')) def test_moderate_headroom_without_stalls_waits(self): self.memory(available=2048) self.assertEqual([], self.run_policy('bl_session_pressure')) + def test_same_second_memory_read_preserves_the_pressure_baseline(self): + self.memory(available=2048) + meminfo = self.root / 'meminfo' + self.assertEqual(['1048576:524288:2097152'], self.run_policy(f''' +SECONDS=100 +_bl_sample_at=100 _bl_sample_available=2097152 _bl_growth=0 _bl_fall=524288 +sed -i 's/MemAvailable: 2097152 kB/MemAvailable: 1048576 kB/' {meminfo} +bl_memory_read +echo "$_bl_available:$_bl_fall:$_bl_sample_available" +''')) + def test_game_reading_back_most_of_a_pageout_skips_and_doubles_the_wait(self): - self.assertEqual(['send:1:game', 'backoff:60', 'send:1:game', 'backoff:60', - 'send:1:game', 'backoff:30'], self.run_policy(''' + self.assertEqual(['send:1:session', 'backoff:60', 'send:1:session', 'backoff:60', + 'send:1:session', 'backoff:30'], self.run_policy(''' pushed=$((512 * 1024)) SECONDS=0; bl_session_pressure swap=$((swap / 4)) @@ -226,7 +252,7 @@ echo "backoff:$_bl_tier_backoff" def test_nearly_out_of_memory_ignores_the_backoff_but_keeps_30_seconds(self): self.memory(available=512) - self.assertEqual(['send:1:game', 'send:1:game'], self.run_policy(''' + self.assertEqual(['send:1:session', 'send:1:session'], self.run_policy(''' _bl_tier_backoff=300 SECONDS=0; bl_session_pressure SECONDS=20; bl_session_pressure @@ -235,7 +261,7 @@ SECONDS=30; bl_session_pressure def test_nearly_out_of_memory_still_backs_off_when_the_game_reads_its_pageout_back(self): self.memory(available=512) - self.assertEqual(['send:1:game', 'backoff:60', 'send:1:game'], self.run_policy(''' + self.assertEqual(['send:1:session', 'backoff:60', 'send:1:session'], self.run_policy(''' SECONDS=0; bl_session_pressure swap=0 SECONDS=30; bl_session_pressure @@ -247,7 +273,7 @@ SECONDS=90; bl_session_pressure def test_nearly_out_of_memory_retries_a_skipped_pageout_after_30_seconds(self): self.memory(available=512) - self.assertEqual(['send:1:game', 'send:1:game'], self.run_policy(''' + self.assertEqual(['send:1:session', 'send:1:session'], self.run_policy(''' SECONDS=0; bl_session_pressure swap=0 SECONDS=30; bl_session_pressure @@ -263,6 +289,24 @@ SECONDS=360; bl_session_pressure self.memory(swap_free=1536, swap_total=2048) self.assertEqual([], self.run_policy('bl_session_pressure')) + def test_file_backed_resident_memory_does_not_consume_the_swap_budget(self): + self.memory(swap_free=3088, swap_total=6144) + self.assertEqual(['send:1:session'], self.run_policy(''' +rss=$((4096 * 1024)) anon=$((1024 * 1024)) +bl_session_pressure +''')) + + def test_anonymous_memory_and_pending_client_still_need_the_full_swap_reserve(self): + self.memory(swap_free=3088, swap_total=6144) + self.assertEqual([], self.run_policy(''' +rss=$((4096 * 1024)) anon=$((2048 * 1024)) +bl_session_pressure +''')) + self.assertEqual([], self.run_policy(''' +rss=$((4096 * 1024)) anon=$((1536 * 1024)) _bl_client_reserve=$((512 * 1024)) +bl_session_pressure +''')) + def test_small_session_is_left_alone(self): self.assertEqual([], self.run_policy('rss=$((128 * 1024)); bl_session_pressure')) @@ -275,10 +319,10 @@ SECONDS=360; bl_session_pressure self.assertEqual(['nap:5'], self.run_policy('bl_watch_nap')) self.assertEqual(['nap:5'], self.run_policy('_bl_game=0; bl_watch_nap')) - def test_one_push_compresses_the_game_and_the_launcher_and_restarts_the_launcher_wait(self): - self.assertEqual(['send:1:game', 'pids:321 654 999', 'client:0:0'], self.run_policy(''' + def test_session_push_preserves_client_timestamps(self): + self.assertEqual(['send:1:session', 'pids:321 654', 'client:-1:-1'], self.run_policy(''' SECONDS=0; bl_session_pressure -bl_zram_pick game; echo "pids:${_pids[*]}" +bl_zram_pick session; echo "pids:${_pids[*]}" echo "client:$_bl_pressure_at:$_bl_packed" ''')) @@ -286,19 +330,19 @@ echo "client:$_bl_pressure_at:$_bl_packed" self.assertEqual(['pids:321 654', 'client:-1:-1'], self.run_policy(''' BL_ZRAM_CLIENT=0 SECONDS=0; bl_session_pressure -bl_zram_pick game; echo "pids:${_pids[*]}" +bl_zram_pick session; echo "pids:${_pids[*]}" echo "client:$_bl_pressure_at:$_bl_packed" ''')[1:]) def test_low_ram_devices_compress_with_a_quarter_of_memory_left(self): self.memory(available=1700) - self.assertEqual(['send:1:game'], self.run_policy('bl_session_pressure')) + self.assertEqual(['send:1:session'], self.run_policy('bl_session_pressure')) self.memory(available=1900) self.assertEqual([], self.run_policy('bl_session_pressure')) def test_a_compressed_process_that_exits_is_not_counted_as_read_back(self): - self.assertEqual(['send:1:game', 'send:1:game', 'backoff:30'], self.run_policy(''' + self.assertEqual(['send:1:session', 'send:1:session', 'backoff:30'], self.run_policy(''' SECONDS=0; bl_session_pressure alive=""; swap=0 SECONDS=30; bl_session_pressure @@ -306,7 +350,7 @@ echo "backoff:$_bl_tier_backoff" ''')) def test_a_process_that_starts_after_a_pageout_is_not_in_its_read_back(self): - self.assertEqual(['send:1:game', 'targets:999', 'send:1:game', 'backoff:30'], self.run_policy(''' + self.assertEqual(['send:1:session', 'targets:321 654', 'send:1:session', 'backoff:30'], self.run_policy(''' SECONDS=0; bl_session_pressure echo "targets:${_bl_tier_targets[*]}" alive="999 1234" @@ -315,7 +359,7 @@ echo "backoff:$_bl_tier_backoff" ''')) def test_an_incomplete_pageout_does_not_restart_the_launcher_wait(self): - self.assertEqual(['send:1:game', 'client:-1:-1'], self.run_policy(''' + self.assertEqual(['send:1:session', 'client:-1:-1'], self.run_policy(''' complete=0 SECONDS=0; bl_session_pressure echo "client:$_bl_pressure_at:$_bl_packed" @@ -323,7 +367,7 @@ echo "client:$_bl_pressure_at:$_bl_packed" def test_a_reused_process_id_is_not_counted_as_read_back(self): - self.assertEqual(['send:1:game', 'send:1:game', 'backoff:30'], self.run_policy(''' + self.assertEqual(['send:1:session', 'send:1:session', 'backoff:30'], self.run_policy(''' SECONDS=0; bl_session_pressure started=200; swap=0 SECONDS=30; bl_session_pressure @@ -344,5 +388,112 @@ echo "backoff:$_bl_tier_backoff" self.assertEqual(['gone'], result.stdout.split()) +class ReclaimDispatchTest(unittest.TestCase): + def run_cycle(self, client=1, game=1, anonymous=384, complete=1, reclaimed=128, body=None, available=1024, fall=0, tick=0): + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + (root / 'meminfo').write_text( + f'MemTotal: 7340032 kB\nMemAvailable: {available * 1024} kB\n' + 'SwapTotal: 6291456 kB\nSwapFree: 4194304 kB\n') + (root / 'pressure').write_text('some avg10=0.00 avg60=0.00 avg300=0.00 total=0\n') + names = ('bl_memory_read', 'bl_memory_tight', 'bl_memory_critical', + 'bl_zram_has_room', 'bl_client_can_pageout', 'bl_client_pressure', + 'bl_client_pressure_result', 'bl_client_pressure_finish', + 'bl_session_pressure', 'bl_zram_send', 'bl_zram_finish', 'bl_zram_pick') + source = '\n'.join(function_source(name) for name in names) + source = source.replace('/proc/meminfo', str(root / 'meminfo')) + source = source.replace('/proc/pressure/memory', str(root / 'pressure')) + source = source.replace('/tmp/.bl-zram', str(root / 'ctl')) + monitor = SCRIPT.read_text() + start = monitor.index(' _bl_preserved_growth=$_bl_growth', monitor.index('while kill -0 $$')) + stop = monitor.index(' if [ "$_bl_game" = 1 ] && bl_game_focused', start) + cycle = monitor[start:stop] if body is None else body + script = f''' +set -u +BL_ZRAM_CLIENT={client} _bl_game={game} _bl_pids=(123) _bl_others=(321) +_bl_pressure_at=-1 _bl_pressure_backoff=30 _bl_packed=-1 +_bl_tier_at=-1 _bl_tier_backoff=30 _bl_tier_pushed=0 +_bl_client_reserve=0 client_rss=393216 client_anon={anonymous * 1024} +step() {{ :; }} +bl_session_others() {{ _bl_session=(321); }} +bl_zram_scan() {{ _bl_pids=(456); }} +nap() {{ echo "nap:$*:at:$NOW"; }} +bl_zram_usage() {{ + if [ "$1" = 123 ]; then + _bl_rss=$client_rss _bl_anon=$client_anon _bl_swap=0 + else + _bl_rss=3145728 _bl_anon=1572864 _bl_swap=0 + fi +}} +kill() {{ echo "signal:$*:at:$NOW"; NOW=$((NOW + {tick})); }} +bl_zram_wait() {{ + echo "wait:$*:at:$NOW" + NOW=$((NOW + 12)) + _bl_pageout_complete={complete} + [ "$1" != 123 ] || client_rss=$((client_rss - {reclaimed * 1024})) +}} +bl_tier_note() {{ :; }} +''' + source + f''' +bl_memory_read +_bl_fall={fall * 1024} +''' + cycle + ''' +echo "client:$_bl_pressure_backoff:${_bl_client_reserve:-0}:${_bl_client_pending:-0}" +''' + result = run_bash('NOW=0\n' + script.replace('SECONDS', 'NOW')) + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('', result.stderr) + return result.stdout.splitlines() + + def test_both_requests_are_sent_before_either_wait(self): + self.assertEqual(['signal:-URG 123:at:0', 'signal:-URG 321:at:0', + 'wait:321:at:0', 'wait:123:at:12', 'client:30:0:0'], self.run_cycle()) + + def test_disabled_client_is_never_signalled_or_waited_for(self): + self.assertEqual(['signal:-URG 321:at:0', 'wait:321:at:0', 'client:30:0:0'], + self.run_cycle(client=0)) + + def test_no_game_requests_nothing(self): + self.assertEqual(['client:30:0:0'], self.run_cycle(game=0)) + + def test_a_client_with_no_anonymous_pages_still_finishes_its_request(self): + self.assertEqual(['signal:-URG 123:at:0', 'signal:-URG 321:at:0', + 'wait:321:at:0', 'wait:123:at:12', 'client:30:0:0'], + self.run_cycle(anonymous=0)) + + def test_falling_headroom_survives_a_tick_between_requests(self): + self.assertEqual(['signal:-URG 123:at:0', 'signal:-URG 321:at:1', + 'wait:321:at:2', 'wait:123:at:14', 'client:30:0:0'], + self.run_cycle(available=2304, fall=512, tick=1)) + + def test_deferred_ineffective_reclaim_still_doubles_the_backoff(self): + self.assertEqual('client:60:0:0', self.run_cycle(reclaimed=0)[-1]) + + def test_deferred_incomplete_reclaim_does_not_double_the_backoff(self): + self.assertEqual('client:30:0:0', self.run_cycle(reclaimed=0, complete=0)[-1]) + + def test_explicit_combined_send_keeps_its_synchronous_wait(self): + self.assertEqual(['signal:-URG 321 123:at:0', 'wait:321 123:at:0', 'client:30:0:0'], + self.run_cycle(body='bl_zram_send 1 cap game\n')) + self.assertEqual(['signal:-URG 321:at:0', 'wait:321:at:0', 'client:30:0:0'], + self.run_cycle(client=0, body='bl_zram_send 1 cap game\n')) + + def test_readback_keeps_its_synchronous_delay(self): + self.assertEqual(['signal:-URG 123:at:0', 'nap:5:at:0', 'client:30:0:0'], + self.run_cycle(body='bl_zram_send 0 readback client\n')) + + def test_usage_sums_anonymous_rss_and_falls_back_per_process(self): + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + for pid, contents in ((123, 'VmRSS: 2000 kB\nRssAnon: 300 kB\nVmSwap: 100 kB\n'), + (321, 'VmRSS: 4000 kB\nVmSwap: 200 kB\n'), + (654, 'VmRSS: 1000 kB\nRssAnon: 0 kB\n')): + (root / str(pid)).mkdir() + (root / str(pid) / 'status').write_text(contents) + source = function_source('bl_zram_usage').replace('/proc/', str(root) + '/') + result = run_bash(source + '\nbl_zram_usage 123 321 654 > /dev/null; echo "$_bl_rss:$_bl_anon:$_bl_swap"') + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('7000:4300:300', result.stdout.strip()) + + if __name__ == '__main__': unittest.main() From c8dec0a8bc4285d9cf9da59ad7a663f0e28e9400 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 10:02:46 -0500 Subject: [PATCH 28/57] fix(stores): EA and Ubisoft libraries list only games the account can download (#2521) * fix(stores): EA and Ubisoft libraries list only games the account can download * fix(stores): keep owned games through entitlement and manifest lookup failures --- .../droiddeck/launcher/stores/ea/EaLibrary.kt | 33 ++++++- .../launcher/stores/ubisoft/UbisoftBackend.kt | 92 +++++++++---------- .../droiddeck/launcher/stores/ea/EaTest.kt | 14 +++ .../launcher/stores/ubisoft/UbisoftTest.kt | 31 +++++-- 4 files changed, 106 insertions(+), 64 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLibrary.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLibrary.kt index 2a90b2550c..37fd6269f8 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLibrary.kt @@ -69,8 +69,8 @@ data class EaGame( } object EaLibrary { - private const val KEY_CACHE = "library_cache" - private const val KEY_SYNCED_AT = "library_synced_at" + private const val KEY_CACHE = "library_cache_v2" + private const val KEY_SYNCED_AT = "library_synced_at_v2" private const val THROTTLE_MS = 6 * 60 * 60 * 1000L private const val ART_TTL_MS = 7 * 24 * 60 * 60 * 1000L private const val ART_THREADS = 4 @@ -137,6 +137,16 @@ object EaLibrary { }.sortedBy { it.first.name.lowercase() } } + /** + * Offers EA lists as owned whose entitlements grant no active game download: an online pass or product-key + * link such as Burnout Paradise's VALIDATED_ONLINE_ACCESS, or a Game Pass title disabled once the + * subscription lapsed. EA refuses their licence. Offers with no entitlement rows at all are left alone. + */ + internal fun withoutGameDownload(rows: List): Map> = + rows.groupBy { it.optString("productId") }.filterKeys { it.isNotEmpty() }.filterValues { offer -> + offer.none { it.optString("entitlementType").equals("ORIGIN_DOWNLOAD", true) && it.optString("status").equals("ACTIVE", true) } + } + private fun art(app: Context, token: String, slugs: Collection, gen: Int): Map { val prefs = EaPrefs.get(app) val now = System.currentTimeMillis() @@ -229,13 +239,28 @@ object EaLibrary { status(R.string.stores_sync_sign_in) val token = EaAuth.accessToken(app) ?: return problem(StoresState.notSignedInLine(store)) status(R.string.stores_sync_game_list) - val owned = withToken(app, token) { EaApi.owned(it) } + val listed = withToken(app, token) { EaApi.owned(it) } + val rows = try { + withToken(app, token) { EaApi.legacyEntitlements(it) } + } catch (e: Exception) { + if (e is EaApiException && e.status == 401) throw e + if (e !is EaApiException && e !is java.io.IOException) throw e + StoresState.logLine("ea: entitlements unavailable, keeping every owned product: ${e.message}") + emptyList() + } + val unplayable = withoutGameDownload(rows) + for ((id, held) in unplayable) if (listed.any { it.offerId == id }) StoresState.logLine( + "ea: left out $id, no game download: " + held.joinToString(",") { it.optString("entitlementTag") + "/" + it.optString("status") + "/" + it.optString("statusReasonCode") + "/" + it.optString("externalType") }) + val owned = listed.filterNot { it.offerId in unplayable } val offers = withToken(app, token) { EaApi.offers(it, owned.map { o -> o.offerId }) }.associateBy { it.offerId } val picked = pick(owned, offers) StoresState.logLine("ea: ${owned.size} owned products, ${picked.size} games") for ((o, offer) in picked) StoresState.logLine( "ea: owned ${o.offerId} content=${offer.contentId} master=${offer.masterTitleId} mp=${offer.multiplayerId} via=${o.ownership.joinToString("+")} type=${o.gameType}") - if (picked.isEmpty()) return problem(if (cache.isEmpty()) app.getString(R.string.stores_sync_no_games, store.label) else null) + if (picked.isEmpty()) { + if (owned.size < listed.size && storeCache(app, emptyList(), gen)) publish(app, emptyList(), gen) + return problem(app.getString(R.string.stores_sync_no_games, store.label).takeIf { cache.isEmpty() || owned.size < listed.size }) + } if (gen != generation.get()) return status(R.string.stores_sync_cover_art) val images = art(app, token, picked.map { it.first.slug }, gen) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt index 09008e1927..8a4b253135 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt @@ -48,11 +48,6 @@ object UbisoftBackend : StoreBackend { override fun install(context: Context, item: CatalogItem, root: java.io.File) { val app = context.applicationContext - item.extra[STEAM_APP]?.takeIf { item.extra["productId"] == null }?.let { steam -> - StoresState.logLine("Ubisoft: ${item.title} is owned on Steam; installing Steam app $steam") - installInSteam(app, steam) - return - } if (!UbisoftNative.ready()) { StoresState.logLine(UbisoftNative.ENGINE_MISSING) StoresState.post { StoresState.problems[store] = UbisoftNative.ENGINE_MISSING } @@ -65,19 +60,6 @@ object UbisoftBackend : StoreBackend { } override fun uninstall(context: Context, game: InstalledStoreGame) {} - - const val STEAM_APP = "steamAppId" - - /** Steam asks to install a game it does not have when told to run it. */ - private fun installInSteam(app: Context, steamAppId: String) { - if (com.droiddeck.launcher.session.SessionState.running) { - if (!com.droiddeck.launcher.session.SessionService.launchGame(app, steamAppId)) StoresState.logLine("Ubisoft: Steam is busy; install Steam app $steamAppId there") - return - } - app.startActivity(Intent(app, com.droiddeck.launcher.SessionActivity::class.java) - .putExtra(com.droiddeck.launcher.session.SessionService.EXTRA_STEAM_URL, com.droiddeck.launcher.frontend.GameLaunchLink.steamUrl(steamAppId)) - .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) - } } internal class UbisoftLogin(override val userAgent: String) : StoreLoginActivity.Flow { @@ -134,11 +116,20 @@ object UbisoftLibrary { return items to games.optInt("totalCount", items.size) } - /** Base games with a manifest, by UbiServices space; add-ons and bundles share spaces with their game. */ + private val THIRD_PARTY = Regex("""^\s*third_party_platform:\s*\r?\n\s+name:\s*['"]?([^'"\r\n]+?)['"]?\s*$""", RegexOption.MULTILINE) + + /** The store a product's configuration says delivers it, such as Steam, when not Ubisoft itself. */ + internal fun thirdParty(configuration: String): String? = THIRD_PARTY.find(configuration)?.groupValues?.get(1)?.trim()?.takeIf { it.isNotEmpty() } + + /** + * Owned base games Ubisoft delivers itself, by UbiServices space; add-ons and bundles share spaces with their + * game. A game whose manifest Ubisoft did not send stays: the manifest only names the build to download. + */ internal fun ownedBySpace(owned: JSONObject?): Map { val list = owned?.optJSONArray("games") ?: return emptyMap() val games = (0 until list.length()).mapNotNull { list.optJSONObject(it) } - .filter { it.optString("manifest").isNotEmpty() && it.optInt("productType") == 0 && it.optBoolean("owned", true) } + .filter { it.optInt("productType") == 0 && it.optBoolean("owned", true) && thirdParty(it.optString("configuration")) == null } + .sortedByDescending { it.optString("manifest").isNotEmpty() } val out = LinkedHashMap() for (key in listOf("spaceId")) for (g in games) { val space = g.optString(key).takeIf { it.isNotEmpty() } ?: continue @@ -147,19 +138,30 @@ object UbisoftLibrary { return out } - private val STEAM_ID = Regex("""^\s*steam_app_id:\s*['"]?(\d+)""", RegexOption.MULTILINE) - private val THIRD_PARTY = Regex("""^\s*third_party_platform:\s*\r?\n\s+name:\s*['"]?Steam\b""", setOf(RegexOption.MULTILINE, RegexOption.IGNORE_CASE)) + private fun download(o: JSONObject) = listOfNotNull( + "productId" to o.optLong("productId").toString(), + o.optString("manifest").takeIf { it.isNotEmpty() }?.let { "manifest" to it }, + o.optString("appId").takeIf { it.isNotEmpty() }?.let { "appId" to it }, + executable(o.optString("configuration"))?.let { "exe" to it }, + ) - /** The Steam app of a product Ubisoft says is owned and installed through Steam. */ - internal fun steamApp(configuration: String): String? = - if (THIRD_PARTY.containsMatchIn(configuration)) STEAM_ID.find(configuration)?.groupValues?.get(1) else null - - /** Owned games Ubisoft delivers through Steam, by UbiServices space. */ - internal fun steamBySpace(owned: JSONObject?): Map { - val list = owned?.optJSONArray("games") ?: return emptyMap() - return (0 until list.length()).mapNotNull { list.optJSONObject(it) } - .filter { it.optInt("productType") == 0 && it.optBoolean("owned", true) && it.optString("spaceId").isNotEmpty() } - .mapNotNull { o -> steamApp(o.optString("configuration"))?.let { o.optString("spaceId") to it } }.toMap() + /** + * Games Connect owns and delivers itself. The profile's game list also names games only played through + * Ubisoft+, free weekends or another store; without an ownership answer that list is all there is. + */ + internal fun assemble(listed: List, owned: JSONObject?): List { + val known = owned?.optJSONArray("games") != null && owned.optString("error").isEmpty() + val bySpace = ownedBySpace(owned) + val matched = listed.map { g -> bySpace[g.id]?.let { g.copy(extra = g.extra + download(it)) } ?: g } + .filter { !known || it.extra["productId"] != null } + .let { games -> games.filter { g -> g.extra["productId"] == null || games.first { it.extra["productId"] == g.extra["productId"] } === g } } + .let { games -> games.filter { g -> g.extra["productId"] != null || games.none { it !== g && it.title == g.title && it.extra["productId"] != null } } } + val products = matched.mapNotNull { it.extra["productId"] }.toSet() + val unlisted = bySpace.filterKeys { space -> listed.none { it.id == space } }.filterValues { it.optLong("productId").toString() !in products }.mapNotNull { (space, o) -> + val title = title(o.optString("configuration")) ?: return@mapNotNull null + CatalogItem(Store.UBISOFT, space, title, null, owned = true, extra = mapOf("spaceId" to space) + download(o)) + } + return (matched + unlisted).sortedBy { it.title.lowercase() } } private val RELATIVE = Regex("""relative:\s*['"]?([^'"\r\n]+?)['"]?\s*$""", RegexOption.MULTILINE) @@ -205,29 +207,19 @@ object UbisoftLibrary { } val owned = UbisoftNative.call("owned", JSONObject().put("ticket", s.ticket).put("sessionId", s.sessionId)) owned?.optString("error")?.takeIf { it.isNotEmpty() }?.let { StoresState.logLine("Ubisoft: ownership: $it") } - val bySpace = ownedBySpace(owned) owned?.takeIf { it.optInt("manifestsAsked") > 0 }?.let { StoresState.logLine("Ubisoft: latest manifests: ${it.optInt("manifestsFound")} of ${it.optInt("manifestsAsked")} ${it.optString("manifestError")}".trim()) } - fun download(o: JSONObject) = listOfNotNull( - "productId" to o.optLong("productId").toString(), - o.optString("manifest").takeIf { it.isNotEmpty() }?.let { "manifest" to it }, - o.optString("appId").takeIf { it.isNotEmpty() }?.let { "appId" to it }, - executable(o.optString("configuration"))?.let { "exe" to it }, - ) val listed = all.distinctBy { it.id } - val onSteam = steamBySpace(owned) - val matched = listed.map { g -> bySpace[g.id]?.let { g.copy(extra = g.extra + download(it)) } ?: onSteam[g.id]?.let { g.copy(extra = g.extra + (UbisoftBackend.STEAM_APP to it)) } ?: g } - .let { games -> games.filter { g -> g.extra["productId"] == null || games.first { it.extra["productId"] == g.extra["productId"] } === g } } - .let { games -> games.filter { g -> g.extra["productId"] != null || games.none { it !== g && it.title == g.title && it.extra["productId"] != null } } } - val products = matched.mapNotNull { it.extra["productId"] }.toSet() - val unlisted = bySpace.filterKeys { space -> listed.none { it.id == space } }.filterValues { it.optLong("productId").toString() !in products }.mapNotNull { (space, o) -> - val title = title(o.optString("configuration")) ?: return@mapNotNull null - CatalogItem(Store.UBISOFT, space, title, null, owned = true, extra = mapOf("spaceId" to space) + download(o)) + val games = assemble(listed, owned) + ownedBySpace(owned).values.filter { it.optString("manifest").isEmpty() }.takeIf { it.isNotEmpty() }?.let { bare -> + StoresState.logLine("Ubisoft: owned without a manifest: " + bare.joinToString(", ") { (title(it.optString("configuration")) ?: "?") + "=" + it.optLong("productId") }) } - val games = (matched + unlisted).sortedBy { it.title.lowercase() } - StoresState.logLine("Ubisoft: ${bySpace.size} downloadable products; " + + StoresState.logLine("Ubisoft: ${ownedBySpace(owned).size} owned products; " + games.filter { it.extra.containsKey("productId") }.joinToString(", ") { "${it.title}=${it.extra["productId"]}" }) + listed.filter { g -> games.none { it.id == g.id } }.takeIf { it.isNotEmpty() }?.let { left -> + StoresState.logLine("Ubisoft: left out ${left.size} games Connect does not deliver to this account: " + left.joinToString(", ") { it.title }) + } post(gen) { StoresState.status.remove(Store.UBISOFT) StoresState.problems.remove(Store.UBISOFT) @@ -235,7 +227,7 @@ object UbisoftLibrary { StoresState.shelves[Store.UBISOFT] = com.droiddeck.launcher.stores.StoreShelves( trending = games.sortedByDescending { it.extra.containsKey("productId") }, art = games.mapNotNull { it.imageUrl }) } - StoresState.logLine("Ubisoft: ${games.size} owned games; on Steam: " + games.filter { it.extra.containsKey(UbisoftBackend.STEAM_APP) }.joinToString(", ") { "${it.title}=${it.extra[UbisoftBackend.STEAM_APP]}" }) + StoresState.logLine("Ubisoft: ${games.size} owned games") } catch (e: Exception) { StoresState.logLine("Ubisoft: library sync failed: ${e.javaClass.simpleName} ${e.message.orEmpty().take(200)}") post(gen) { StoresState.status.remove(Store.UBISOFT); StoresState.problems[Store.UBISOFT] = app.getString(R.string.stores_sync_failed) } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt index bb8aa159a6..83c03495ae 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt @@ -225,6 +225,20 @@ class EaTest { assertEquals(listOf("1", "3"), picked.map { it.first.offerId }) } + @Test fun anOwnedProductWithoutAnActiveGameDownloadIsLeftOut() { + fun row(id: String, type: String, tag: String = type, status: String = "ACTIVE") = + JSONObject().put("productId", id).put("entitlementType", type).put("entitlementTag", tag).put("status", status) + val rows = listOf( + row("DR:106479900", "DEFAULT", "VALIDATED_ONLINE_ACCESS"), + row("DR:231813200", "ORIGIN_DOWNLOAD", status = "DISABLED"), + row("Origin.OFR.50.0003426", "ONLINE_ACCESS"), + row("Origin.OFR.50.0003426", "ORIGIN_DOWNLOAD"), + row("Origin.OFR.50.0005237", "ORIGIN_DOWNLOAD"), + ) + assertEquals(setOf("DR:106479900", "DR:231813200"), EaLibrary.withoutGameDownload(rows).keys) + assertTrue(EaLibrary.withoutGameDownload(emptyList()).isEmpty()) + } + @Test fun ownedPageParses() { val page = JSONObject( """{"me":{"ownedGameProducts":{"next":"100","items":[{"originOfferId":"Origin.OFR.50.0001","product":{"id":"x","name":"N","downloadable":true,"gameSlug":"titanfall-2", diff --git a/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt index 58e361db81..7f163ce351 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.stores.ubisoft +import com.droiddeck.launcher.stores.CatalogItem import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreGameSidecar import com.droiddeck.launcher.stores.StoreLaunch @@ -20,18 +21,28 @@ class UbisoftTest { private val steamConfig = "version: 2.0\r\nroot:\r\n name: Assassin's Creed Syndicate\r\n start_game:\r\n steam:\r\n steam_app_id: 368500\r\n" + " third_party_platform:\r\n name: Steam\r\n override_uplayid: 1875\r\n" - @Test fun aProductUbisoftDeliversThroughSteamNamesItsSteamApp() { - assertEquals("368500", UbisoftLibrary.steamApp(steamConfig)) - assertNull(UbisoftLibrary.steamApp("root:\n start_game:\n online:\n executables:\n - path:\n relative: bin/game.exe\n")) + private fun listed(space: String, name: String) = CatalogItem(Store.UBISOFT, space, name, null, owned = true, extra = mapOf("spaceId" to space)) + + private val owned = JSONObject().put("games", JSONArray() + .put(JSONObject().put("productId", 1957).put("spaceId", "space-s").put("productType", 0).put("owned", true).put("configuration", steamConfig)) + .put(JSONObject().put("productId", 109).put("spaceId", "space-sc").put("productType", 0).put("owned", true).put("manifest", "AB").put("configuration", "root: {}")) + .put(JSONObject().put("productId", 1961).put("spaceId", "space-addon").put("productType", 1).put("owned", true).put("manifest", "CD").put("configuration", steamConfig)) + .put(JSONObject().put("productId", 720).put("spaceId", "space-plus").put("productType", 0).put("owned", false).put("manifest", "EF").put("configuration", "root: {}")) + .put(JSONObject().put("productId", 3539).put("spaceId", "space-o").put("productType", 0).put("owned", true).put("configuration", "root: {}"))) + + @Test fun onlyGamesConnectDeliversAreInTheLibrary() { + val profile = listOf(listed("space-sc", "Splinter Cell"), listed("space-s", "Syndicate"), listed("space-plus", "Ubisoft+ Game"), listed("space-gone", "Free Weekend"), listed("space-o", "Origins")) + val games = UbisoftLibrary.assemble(profile, owned) + assertEquals(listOf("space-o", "space-sc"), games.map { it.id }) + assertEquals(listOf("3539", "109"), games.map { it.extra["productId"] }) + assertEquals(null, games.first().extra["manifest"]) + assertEquals("Steam", UbisoftLibrary.thirdParty(steamConfig)) } - @Test fun steamOwnedGamesAreKeyedByTheirSpace() { - val owned = JSONObject().put("games", JSONArray() - .put(JSONObject().put("productId", 1957).put("spaceId", "space-s").put("productType", 0).put("owned", true).put("configuration", steamConfig)) - .put(JSONObject().put("productId", 109).put("spaceId", "space-sc").put("productType", 0).put("owned", true).put("manifest", "AB").put("configuration", "root: {}")) - .put(JSONObject().put("productId", 1961).put("spaceId", "space-addon").put("productType", 1).put("owned", true).put("configuration", steamConfig))) - assertEquals(mapOf("space-s" to "368500"), UbisoftLibrary.steamBySpace(owned)) - assertEquals(setOf("space-sc"), UbisoftLibrary.ownedBySpace(owned).keys) + @Test fun withoutAnOwnershipAnswerTheProfileListStays() { + val profile = listOf(listed("space-sc", "Splinter Cell"), listed("space-gone", "Free Weekend")) + assertEquals(listOf("space-gone", "space-sc"), UbisoftLibrary.assemble(profile, JSONObject().put("error", "demux closed")).map { it.id }) + assertEquals(listOf("space-gone", "space-sc"), UbisoftLibrary.assemble(profile, null).map { it.id }) } @Test fun theEntitlementNamesTheGamesApplication() { From 3b1366f85c1d432c7bcfc5c627668eb7d77876fb Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 10:23:38 -0500 Subject: [PATCH 29/57] feat(agent): choose the reasoning effort in the Agent tab (#2507) * feat(agent): choose the reasoning effort in the Agent tab; agent processes survive Steam session cleanup; sdkmanager license step tolerates SIGPIPE * docs(agent): on-device build and commit pitfalls for the agent --- AGENTS.md | 10 ++++++++++ .../com/droiddeck/launcher/agent/AgentHarness.kt | 8 +++++++- .../java/com/droiddeck/launcher/agent/AgentHost.kt | 12 +++++++++++- .../main/java/com/droiddeck/launcher/ui/AgentPage.kt | 2 +- .../java/com/droiddeck/launcher/ui/AgentPanels.kt | 12 +++++++++++- app/src/main/res/values/strings.xml | 1 + 6 files changed, 41 insertions(+), 4 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index c22c5647c0..447807615b 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -1,3 +1,13 @@ # Rules - Comments should be rare, factual, and explain only non-obvious external constraints or business invariants. + +# Working on the device + +- `dd-lab-build` builds only committed work. Check `git status` and `gh api user` for the identity before committing; if `git config user.name` is empty, use the `gh` login's name and noreply email for this repo, never a guess. +- Do not commit or start a build in the same step: a build started next to a failed commit fails too. Commit first, check it, then build. +- Uncommitted changes in the tree may not be yours. Read `git diff` before committing them and tell the user what they do. +- If `dd-lab-build` says "could not read DroidDeck's state", loopback adb is down and `$ADB_SERIAL` is stale. Run `adb devices`; the port changes whenever wireless debugging is toggled. Ask the user to turn it on rather than retrying. +- A build that "did not start" can be adb, not the app. Read `~/.cache/dd-lab-build.json` and `.log` for the real reason; they can be stale from an earlier build, so compare their times with `date`. +- Run `dd-lab-build` with `run_in_background` and read its output file. A foreground `sleep` is blocked; wait with Monitor and an until-loop. +- The build restarts DroidDeck and ends your process. A turn that ends this way is not a failure. diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt index 722c6e4029..78dbbd1900 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt @@ -21,6 +21,8 @@ interface AgentHarness { val signIn: List /** Whether [Options.plan] means anything to this CLI. */ val plans: Boolean + /** Reasoning effort levels the CLI accepts, lowest first; empty when it has none. */ + val efforts: List /** Models to offer besides the CLI's default; [rootfs] is where the CLI's own files can be read. */ fun models(rootfs: File): List /** The guest command for one turn; [conversation] is null for the first one. */ @@ -32,7 +34,7 @@ interface AgentHarness { data class Model(val id: String, val label: String) - data class Options(val model: String? = null, val plan: Boolean = false, val brief: String? = null) + data class Options(val model: String? = null, val plan: Boolean = false, val brief: String? = null, val effort: String? = null) companion object { val all: List = listOf(ClaudeCode, Codex) @@ -60,6 +62,7 @@ object ClaudeCode : AgentHarness { override val signedIn = listOf("sh", "-c", "$binary auth status | grep -q '\"loggedIn\": true'") override val signIn = listOf(binary, "auth", "login", "--claudeai") override val plans = true + override val efforts = listOf("low", "medium", "high", "xhigh", "max") /** * Commits and pull requests the agent makes carry no Claude Code credit or co-author line by @@ -92,6 +95,7 @@ object ClaudeCode : AgentHarness { addAll(listOf(binary, "-p", message, "--output-format", "stream-json", "--verbose", "--include-partial-messages")) addAll(listOf("--permission-mode", if (options.plan) "plan" else "bypassPermissions")) options.model?.let { addAll(listOf("--model", it)) } + options.effort?.let { addAll(listOf("--effort", it)) } options.brief?.let { addAll(listOf("--append-system-prompt", it)) } if (conversation != null) addAll(listOf("--resume", conversation)) } @@ -212,6 +216,7 @@ object Codex : AgentHarness { override val signedIn = listOf(binary, "login", "status") override val signIn = listOf(binary, "login") override val plans = false + override val efforts = listOf("low", "medium", "high") /** Codex keeps the models its account can use in `~/.codex/models_cache.json` once it has run. */ override fun models(rootfs: File): List = runCatching { @@ -231,6 +236,7 @@ object Codex : AgentHarness { if (conversation != null) addAll(listOf("resume", conversation)) addAll(listOf("--json", "--dangerously-bypass-approvals-and-sandbox", "--skip-git-repo-check")) options.model?.let { addAll(listOf("-m", it)) } + options.effort?.let { addAll(listOf("-c", "model_reasoning_effort=\"$it\"")) } // codex exec has no system prompt option, so a new conversation starts with the brief. add(if (conversation == null && options.brief != null) "${options.brief}\n\n$message" else message) } diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt index d82ea8f127..ac47bd5235 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt @@ -78,6 +78,9 @@ object AgentHost { /** The chosen model for [harness]; null is the CLI's default. */ var model by mutableStateOf(null) private set + /** The chosen reasoning effort for [harness]; null is the CLI's default. */ + var effort by mutableStateOf(null) + private set var plan by mutableStateOf(false) private set var chat by mutableStateOf(null) @@ -131,6 +134,7 @@ object AgentHost { File(app.filesDir, "agent").mkdirs() harness = AgentHarness.byId(prefs(app).getString(HARNESS_KEY, null)) model = prefs(app).getString(modelKey(harness), null) + effort = prefs(app).getString(effortKey(harness), null)?.takeIf { it in harness.efforts } plan = prefs(app).getBoolean(PLAN_KEY, false) available = LinuxRuntime.hasRootfs(app) installed = harness.files.all { guestFileExists(app, it) } @@ -220,6 +224,11 @@ object AgentHost { prefs(context).edit().putString(modelKey(harness), id).apply() } + fun chooseEffort(context: Context, level: String?) { + effort = level + prefs(context).edit().putString(effortKey(harness), level).apply() + } + fun choosePlan(context: Context, on: Boolean) { plan = on prefs(context).edit().putBoolean(PLAN_KEY, on).apply() @@ -254,7 +263,7 @@ object AgentHost { AgentHostService.start(app) val current = harness val prompt = AgentAttachments.prompt(message, attached) - val command = current.turn(prompt, conversation, AgentHarness.Options(model, plan && current.plans, BRIEF)) + val command = current.turn(prompt, conversation, AgentHarness.Options(model, plan && current.plans, BRIEF, effort)) val workdir = workspace(app) Thread({ runCatching { current.prepare(LinuxRuntime.rootDir(app)) } @@ -546,6 +555,7 @@ object AgentHost { private const val RETRY_MS = 3_000L private fun modelKey(harness: AgentHarness) = "model_${harness.id}" + private fun effortKey(harness: AgentHarness) = "effort_${harness.id}" internal fun prefs(context: Context) = context.getSharedPreferences("agent", Context.MODE_PRIVATE) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt index 9956d0469a..3886f2bca6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -121,7 +121,7 @@ private fun AgentHeader(panel: AgentPanel, onPanel: (AgentPanel) -> Unit, onSetu verticalAlignment = Alignment.CenterVertically, modifier = Modifier.clip(Shape12).clickable { onPanel(AgentPanel.MODEL) }.padding(vertical = 2.dp).testTag("agent-model"), ) { - val parts = listOfNotNull(AgentHost.harness.name, model, stringResource(R.string.agent_plan_short).takeIf { AgentHost.plan && AgentHost.harness.plans }) + val parts = listOfNotNull(AgentHost.harness.name, model, AgentHost.effort, stringResource(R.string.agent_plan_short).takeIf { AgentHost.plan && AgentHost.harness.plans }) Text(parts.joinToString(" · "), fontSize = 13.sp, color = if (panel == AgentPanel.MODEL) pal.primary else pal.onSurfaceVariant) Icon(Icons.Outlined.ExpandMore, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(16.dp)) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt index fd9b9bf8cf..8d247f8de6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt @@ -48,7 +48,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.withContext -/** The model and plan mode for the next turns; a conversation keeps going with whatever is chosen. */ +/** The model, reasoning effort and plan mode for the next turns; a conversation keeps going with whatever is chosen. */ @Composable internal fun AgentModelPicker() { val context = LocalContext.current @@ -63,6 +63,16 @@ internal fun AgentModelPicker() { else SecondaryButton(choice.label, compact = true) { AgentHost.chooseModel(context, id) } } } + if (AgentHost.harness.efforts.isNotEmpty()) Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { + Text(stringResource(R.string.agent_effort), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground, modifier = Modifier.padding(horizontal = 2.dp)) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.horizontalScroll(rememberScrollState())) { + for (level in listOf(null) + AgentHost.harness.efforts) { + val label = level ?: stringResource(R.string.agent_model_default) + if (level == AgentHost.effort) PrimaryButton(label, compact = true) {} + else SecondaryButton(label, compact = true) { AgentHost.chooseEffort(context, level) } + } + } + } if (AgentHost.harness.plans) Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(horizontal = 2.dp)) { Column(Modifier.weight(1f)) { Text(stringResource(R.string.agent_plan), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b658b8d8b7..114ec48d94 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1190,6 +1190,7 @@ Attach Remove Default + Reasoning effort Plan first Plan Proposes a plan without changing anything From 514f7964286dedb48082baf65dfff2f84da638ee Mon Sep 17 00:00:00 2001 From: KeegantheVeganat0r <58369898+KeegantheVeganat0r@users.noreply.github.com> Date: Thu, 12 Nov 2026 16:07:39 +0000 Subject: [PATCH 30/57] Fix Agent composer keyboard spacing and scrolling (#2529) * fix(agent): keep composer above the software keyboard * fix(agent): place growing composer directly above keyboard --- .../java/com/droiddeck/launcher/FrontEndActivity.kt | 1 + .../main/java/com/droiddeck/launcher/ui/AgentPage.kt | 12 +++++++++--- .../java/com/droiddeck/launcher/ui/FrontEndScreen.kt | 6 +++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 699dd9643b..3b6b6378f6 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1099,6 +1099,7 @@ class FrontEndActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) drivers.restartBlocked = ::runtimeChangesBlocked drivers.loadTpUbwcMode() pendingSessionLogExport = savedInstanceState?.getString(KEY_PENDING_SESSION_LOG_EXPORT)?.let(::File) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt index 3886f2bca6..01a684abec 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -11,9 +11,12 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.imePadding +import androidx.compose.foundation.layout.ime import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.widthIn @@ -57,6 +60,7 @@ import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle @@ -92,7 +96,7 @@ internal fun AgentPage(modifier: Modifier, inputModifier: Modifier = Modifier, v return } var panel by rememberSaveable { mutableStateOf(AgentPanel.NONE) } - Column(modifier.fillMaxSize()) { + Column(modifier.fillMaxSize().imePadding()) { AgentHeader(panel, { panel = if (panel == it) AgentPanel.NONE else it }, onSetup = { setup = true }) when (panel) { AgentPanel.HISTORY -> AgentHistory(Modifier.weight(1f)) { panel = AgentPanel.NONE } @@ -327,9 +331,10 @@ private fun AgentComposer(draftState: MutableState, inputModifier: Modif for (path in AgentAttachments.pending.toList()) AttachmentChip(path) { AgentAttachments.pending.remove(path) } } var focused by remember { mutableStateOf(false) } + val keyboardOpen = WindowInsets.ime.getBottom(LocalDensity.current) > 0 Row( verticalAlignment = Alignment.Bottom, - modifier = Modifier.fillMaxWidth().padding(top = 10.dp, bottom = 16.dp).clip(Shape16).background(colors.surface) + modifier = Modifier.fillMaxWidth().padding(top = 10.dp, bottom = if (keyboardOpen) 4.dp else 16.dp).clip(Shape16).background(colors.surface) .border(1.dp, if (focused) pal.primary else pal.line, Shape16).padding(start = 6.dp, end = 6.dp, top = 6.dp, bottom = 6.dp), ) { if (LocalActivityResultRegistryOwner.current != null) AttachButton() @@ -345,7 +350,8 @@ private fun AgentComposer(draftState: MutableState, inputModifier: Modif cursorBrush = SolidColor(pal.primary), keyboardOptions = KeyboardOptions(imeAction = ImeAction.Send), keyboardActions = KeyboardActions(onSend = { send() }), - maxLines = 6, + minLines = 1, + maxLines = 8, ) } if (working) RoundButton(Icons.Outlined.Stop, stringResource(R.string.agent_stop), pal.error.copy(alpha = 0.22f), colors.error, "agent-stop") { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 7638e8f042..1e4aaa88b0 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -40,6 +40,8 @@ import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.ime +import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.systemBars import androidx.compose.foundation.layout.width @@ -689,9 +691,11 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com onRailSelect(key) }, a) CompositionLocalProvider(LocalShowSection provides { key -> selected = key }) { + val agentKeyboardOpen = railSelection == "agent" && WindowInsets.ime.getBottom(androidx.compose.ui.platform.LocalDensity.current) > 0 LauncherLayout( bottomNavigation && !s.dualScreen, pal.line, Modifier.fillMaxSize().onGloballyPositioned { screenAt = it.positionInRoot() } + .then(if (railSelection == "agent") Modifier.imePadding() else Modifier) .then(if (s.dualScreen) Modifier.onKeyEvent { event -> val step = dualPageStep(event.nativeKeyEvent) ?: return@onKeyEvent false if (event.type == KeyEventType.KeyDown && !processSettingsPageVisible) { @@ -705,7 +709,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com true } else Modifier), navigation = { - if (s.dualScreen) Unit + if (s.dualScreen || (bottomNavigation && agentKeyboardOpen)) Unit else if (bottomNavigation) BottomBar(s, railSelection, onRailSelect, onRailFocus, a, railFocus) else SideRail(s, railSelection, onRailSelect, onRailFocus, a, railFocus.fillMaxHeight()) }, From 08a8de9bc4e2c94578cef0aa5bdf14073360cef3 Mon Sep 17 00:00:00 2001 From: KeegantheVeganat0r <58369898+KeegantheVeganat0r@users.noreply.github.com> Date: Thu, 12 Nov 2026 16:38:31 +0000 Subject: [PATCH 31/57] Fix Agent keyboard panning and collapsed landscape input (#2530) * fix(agent): prevent Android panning the IME-aware chat * fix(agent): reserve composer space before chat status panels --- .../droiddeck/launcher/FrontEndActivity.kt | 1 - .../com/droiddeck/launcher/ui/AgentPage.kt | 26 ++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 3b6b6378f6..699dd9643b 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1099,7 +1099,6 @@ class FrontEndActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) drivers.restartBlocked = ::runtimeChangesBlocked drivers.loadTpUbwcMode() pendingSessionLogExport = savedInstanceState?.getString(KEY_PENDING_SESSION_LOG_EXPORT)?.let(::File) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt index 01a684abec..645ce77f1c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -1,5 +1,8 @@ package com.droiddeck.launcher.ui +import android.app.Activity +import android.content.ContextWrapper +import android.view.WindowManager import androidx.activity.compose.LocalActivityResultRegistryOwner import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts @@ -45,6 +48,7 @@ import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.MutableState import androidx.compose.runtime.derivedStateOf @@ -56,11 +60,14 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.clipToBounds import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.LocalView +import androidx.compose.ui.window.DialogWindowProvider import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle @@ -86,6 +93,17 @@ private val CLI_COMMANDS = listOf("/compact", "/cost", "/review", "/init") @Composable internal fun AgentPage(modifier: Modifier, inputModifier: Modifier = Modifier, visible: Boolean = true) { val context = LocalContext.current + val view = LocalView.current + DisposableEffect(view, visible) { + val window = (view.parent as? DialogWindowProvider)?.window + ?: generateSequence(view.context) { (it as? ContextWrapper)?.baseContext } + .filterIsInstance().firstOrNull()?.window + val previousMode = window?.attributes?.softInputMode + if (visible) window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING) + onDispose { + if (visible && previousMode != null) window?.setSoftInputMode(previousMode) + } + } remember { AgentHost.refresh(context) } LaunchedEffect(AgentHost.unseen, visible) { if (visible) AgentHost.seen() } remember { AgentSetup.check(context) } @@ -102,9 +120,11 @@ internal fun AgentPage(modifier: Modifier, inputModifier: Modifier = Modifier, v AgentPanel.HISTORY -> AgentHistory(Modifier.weight(1f)) { panel = AgentPanel.NONE } AgentPanel.PROCESSES -> AgentProcessList(Modifier.weight(1f)) else -> { - if (panel == AgentPanel.MODEL) AgentModelPicker() - AgentConversation(Modifier.weight(1f)) - AgentStatus() + Column(Modifier.weight(1f).clipToBounds()) { + if (panel == AgentPanel.MODEL) AgentModelPicker() + AgentConversation(Modifier.weight(1f)) + AgentStatus() + } AgentComposer(draft, inputModifier) { panel = it } } } From a5712c0d20d292f0d5b97d65cbca699828863c60 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 12:08:33 -0500 Subject: [PATCH 32/57] feat(stores): EA and Ubisoft stores browse their catalogs, and EA's Get for free works in the app (#2527) * feat(stores): EA and Ubisoft stores browse their catalogs with prices, deals and search * feat(stores): Get for free adds EA's free games to the account in the app * fix(stores): an owned EA game matches its store card by its full product name --- .../droiddeck/launcher/stores/StoreCatalog.kt | 1 + .../droiddeck/launcher/stores/StoreFront.kt | 119 ++++++++++++++++ .../droiddeck/launcher/stores/StoresState.kt | 27 ++++ .../com/droiddeck/launcher/stores/ea/EaApi.kt | 14 ++ .../droiddeck/launcher/stores/ea/EaBackend.kt | 30 +++- .../droiddeck/launcher/stores/ea/EaLibrary.kt | 16 ++- .../droiddeck/launcher/stores/ea/EaStore.kt | 120 ++++++++++++++++ .../launcher/stores/ubisoft/UbisoftBackend.kt | 20 ++- .../launcher/stores/ubisoft/UbisoftStore.kt | 129 ++++++++++++++++++ .../com/droiddeck/launcher/ui/GameDetail.kt | 7 +- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-b+es+419/strings.xml | 1 + app/src/main/res/values-bg/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-hi/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values-ms/strings.xml | 1 + app/src/main/res/values-nb/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rPT/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ro/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-th/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-vi/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + .../ea/graphql/GetGameProductOfferIds.gql | 15 ++ .../resources/ea/graphql/grantEntitlement.gql | 23 ++++ .../droiddeck/launcher/stores/ea/EaTest.kt | 42 ++++++ .../launcher/stores/ubisoft/UbisoftTest.kt | 30 ++++ 47 files changed, 614 insertions(+), 12 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/StoreFront.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ea/EaStore.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftStore.kt create mode 100644 app/src/main/resources/ea/graphql/GetGameProductOfferIds.gql create mode 100644 app/src/main/resources/ea/graphql/grantEntitlement.gql diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt index cb46d23601..e87266df65 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt @@ -106,6 +106,7 @@ fun detailCatalogItem( library.firstOrNull { it.store == store && it.id == id } ?: found.firstOrNull { it.store == store && it.id == id } ?: shelves?.all?.firstOrNull { it.store == store && it.id == id } + ?: shelves?.all?.firstOrNull { it.store == store && it.extra[StoreFront.STORE_CARD] == id } fun mergeItems(old: List?, new: List): List { if (old.isNullOrEmpty()) return new diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreFront.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreFront.kt new file mode 100644 index 0000000000..5791656111 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreFront.kt @@ -0,0 +1,119 @@ +package com.droiddeck.launcher.stores + +import android.content.SharedPreferences +import org.json.JSONArray +import org.json.JSONObject +import java.text.Normalizer +import java.util.Locale + +/** Store shelves fetched from a public catalog, kept in memory and on disk between refreshes. */ +internal class StoreFront( + private val store: Store, + private val prefs: () -> SharedPreferences, + private val fetch: () -> Catalog, + private val key: String = "store_front", + private val ttlMs: Long = 3 * 60 * 60 * 1000L, +) { + /** One refresh: the shelves and every game the store lists, for search. */ + class Catalog(val shelves: StoreShelves, val all: List = shelves.all) + + @Volatile private var memory: Catalog? = null + @Volatile private var memoryAt = 0L + + fun cached(): StoreShelves? = cachedCatalog()?.shelves + + fun everything(): List = cachedCatalog()?.all.orEmpty() + + private fun cachedCatalog(): Catalog? = memory ?: decode(prefs().getString(key, null))?.also { memory = it } + + /** The shelves, refreshed when stale; a refresh that fails keeps the last good set. */ + fun shelves(force: Boolean): StoreShelves? { + val now = System.currentTimeMillis() + if (!force) { + memory?.takeIf { now - memoryAt in 0 until ttlMs }?.let { return it.shelves } + val at = prefs().getLong("${key}_at", 0L) + if (now - at in 0 until ttlMs) decode(prefs().getString(key, null))?.let { memory = it; memoryAt = at; return it.shelves } + } + val fresh = runCatching(fetch).onFailure { StoresState.logLine("${store.label}: store shelves failed: ${it.javaClass.simpleName} ${it.message.orEmpty().take(160)}") } + .getOrNull()?.takeUnless { it.shelves.isEmpty } + ?: return cached() + prefs().edit().putString(key, encode(fresh)).putLong("${key}_at", now).apply() + memory = fresh + memoryAt = now + return fresh.shelves + } + + private fun encode(c: Catalog): String = JSONObject().apply { + val s = c.shelves + listOf(s.whatsNew, s.deals, s.free, s.trending).zip(SHELVES).forEach { (items, k) -> put(k, JSONArray(items.map { it.id })) } + put("art", JSONArray(s.art)) + put("items", JSONArray().apply { (c.all + s.all).distinctBy { it.id }.forEach { put(itemJson(it)) } }) + }.toString() + + private fun decode(text: String?): Catalog? { + val o = text?.let { runCatching { JSONObject(it) }.getOrNull() } ?: return null + val items = o.optJSONArray("items")?.let { a -> (0 until a.length()).mapNotNull { a.optJSONObject(it)?.let(::itemFrom) } }.orEmpty() + val byId = items.associateBy { it.id } + fun shelf(k: String) = o.optJSONArray(k)?.let { a -> (0 until a.length()).mapNotNull { byId[a.optString(it)] } }.orEmpty() + val art = o.optJSONArray("art")?.let { a -> List(a.length()) { a.optString(it) }.filter { it.isNotEmpty() } }.orEmpty() + val shelves = StoreShelves(shelf("new"), shelf("deals"), shelf("free"), shelf("trending"), art).takeUnless { it.isEmpty } ?: return null + return Catalog(shelves, items) + } + + private fun itemJson(i: CatalogItem) = JSONObject() + .put("id", i.id).put("title", i.title).put("image", i.imageUrl.orEmpty()).put("tall", i.tallImageUrl.orEmpty()).put("tags", i.tags) + .put("free", i.isFree).put("hasPrice", i.hasPrice).put("final", i.finalPrice).put("orig", i.originalPrice).put("disc", i.discountPercent) + .put("url", i.storeUrl).put("dev", i.developer).put("pub", i.publisher).put("rel", i.releaseDate).put("desc", i.description) + .put("mature", i.mature).put("logo", i.logoUrl.orEmpty()).put("extra", JSONObject(i.extra as Map<*, *>)) + + private fun itemFrom(o: JSONObject): CatalogItem? { + val extra = LinkedHashMap() + o.optJSONObject("extra")?.let { e -> e.keys().forEach { k -> extra[k] = e.optString(k) } } + return CatalogItem( + store = store, id = o.optString("id").ifEmpty { return null }, title = o.optString("title").ifEmpty { return null }, + imageUrl = o.optString("image").ifEmpty { null }, tallImageUrl = o.optString("tall").ifEmpty { null }, tags = o.optString("tags"), + isFree = o.optBoolean("free"), hasPrice = o.optBoolean("hasPrice"), finalPrice = o.optString("final"), originalPrice = o.optString("orig"), + discountPercent = o.optInt("disc"), storeUrl = o.optString("url"), developer = o.optString("dev"), publisher = o.optString("pub"), + releaseDate = o.optString("rel"), description = o.optString("desc"), mature = o.optBoolean("mature"), + logoUrl = o.optString("logo").ifEmpty { null }, extra = extra, + ) + } + + companion object { + /** On an owned game standing in for a store card: the card's id, so a page opened on the card still finds it. */ + const val STORE_CARD = "storeCard" + private val SHELVES = listOf("new", "deals", "free", "trending") + private val MARKS = Regex("[\\u2122\\u00AE\\u00A9]") + private val COMBINING = Regex("\\p{M}+") + private val NOT_WORD = Regex("[^\\p{L}\\p{N}]+") + + /** A title reduced to letters and digits, so "Far Cry® 6" and "Far Cry 6" meet, and "Pokémon" meets "Pokemon". */ + fun titleKey(title: String): String = + Normalizer.normalize(title.replace(MARKS, ""), Normalizer.Form.NFD).replace(COMBINING, "") + .lowercase(Locale.ROOT).replace(NOT_WORD, " ").trim() + + /** + * Shelf cards the account owns become its library entry, which carries what installing needs, + * keeping the shelf's art and price. + */ + fun markOwned(s: StoreShelves, library: List?, match: (CatalogItem, CatalogItem) -> Boolean): StoreShelves { + if (library.isNullOrEmpty()) return s + fun mark(list: List) = markOwned(list, library, match) + return StoreShelves(mark(s.whatsNew), mark(s.deals), mark(s.free), mark(s.trending), s.art) + } + + fun markOwned(list: List, library: List?, match: (CatalogItem, CatalogItem) -> Boolean): List { + if (library.isNullOrEmpty()) return list + return list.map { shelf -> + val owned = library.firstOrNull { match(shelf, it) } ?: return@map shelf + owned.copy( + imageUrl = shelf.imageUrl ?: owned.imageUrl, tallImageUrl = owned.tallImageUrl ?: shelf.tallImageUrl, + tags = owned.tags.ifBlank { shelf.tags }, description = owned.description.ifBlank { shelf.description }, + releaseDate = owned.releaseDate.ifBlank { shelf.releaseDate }, storeUrl = shelf.storeUrl.ifBlank { owned.storeUrl }, + developer = owned.developer.ifBlank { shelf.developer }, mature = shelf.mature, + extra = owned.extra + (STORE_CARD to shelf.id), + ) + }.distinctBy { it.id } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt index e7a9383f32..40fedbded2 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt @@ -236,6 +236,27 @@ object StoresState { var itchPicking by mutableStateOf(null) var gameJoltPicking by mutableStateOf(null) + /** Store cards whose free game is being added to the account. */ + val claiming = mutableStateMapOf() + + fun canClaim(item: CatalogItem): Boolean = !item.accessible && isSignedIn(item.store) && backends[item.store]?.canClaim(item) == true + + /** Adds a free game to the account, then refreshes the library so it can be installed; [failed] runs when the store refused. */ + fun claim(context: Context, item: CatalogItem, failed: () -> Unit) { + val backend = backends[item.store] ?: return failed() + if (claiming.put(item.key, true) == true) return + val app = context.applicationContext + background("stores-claim", onFailure = { main.post { claiming.remove(item.key); failed() } }) { + val ok = backend.claim(app, item) + logLine("${item.store.label}: ${item.title} ${if (ok) "added to the library" else "could not be added; opening the store page"}") + if (ok) backend.syncLibrary(app, true) + main.post { + claiming.remove(item.key) + if (!ok) failed() + } + } + } + fun requestInstall(context: Context, item: CatalogItem) { askForNotifications(context) if (item.store == Store.ITCH && item.extra["uploadId"].isNullOrEmpty()) { itchPicking = item; return } @@ -359,6 +380,12 @@ interface StoreBackend { fun syncLibrary(context: Context, force: Boolean) fun loadShelves(context: Context, force: Boolean) fun search(context: Context, query: String): List = emptyList() + + /** Whether this store can add a free game to the account itself, rather than through its website. */ + fun canClaim(item: CatalogItem): Boolean = false + + /** Adds a free game to the account; true once the store has it in the account's library. */ + fun claim(context: Context, item: CatalogItem): Boolean = false fun install(context: Context, item: CatalogItem, root: java.io.File) fun uninstall(context: Context, game: InstalledStoreGame) } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaApi.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaApi.kt index 185e23f424..55ecf79455 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaApi.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaApi.kt @@ -22,6 +22,7 @@ object EaApi { val downloadable: Boolean, val trial: Boolean, val ownership: List, + val productName: String = "", ) class Offer( @@ -109,6 +110,7 @@ object EaApi { downloadable = product.optBoolean("downloadable", true), trial = product.optJSONObject("trialDetails")?.optString("trialType").orEmpty().let { it.isNotEmpty() && it != "null" }, ownership = (0 until (methods?.length() ?: 0)).map { methods!!.optString(it) }, + productName = product.optString("name").replace("\n", " ").trim(), ) } val next = owned.optString("next").takeIf { it.isNotBlank() && it != "null" } @@ -197,6 +199,18 @@ object EaApi { } } + /** The free offer EA sells under a store slug, or null when the game has none. */ + fun freeOffer(token: String, slug: String): String? { + val variables = JSONObject().put("slug", slug).put("locale", "en-us").put("overrideCountryCode", "US") + val product = call(token, "GetGameProductOfferIds", variables).optJSONObject("game")?.optJSONObject("lowestPriceGameProduct") ?: return null + return product.optString("originOfferId").takeIf { product.optBoolean("isFree") && it.isNotBlank() && it != "null" } + } + + /** Adds a free offer to the account, as the EA app's "Get for free" does; the answer names what EA refused. */ + fun grantEntitlement(token: String, offerId: String): JSONObject = + call(token, "grantEntitlement", JSONObject().put("input", JSONObject().put("offerId", offerId).put("source", EaAuth.CLIENT_ID))) + .optJSONObject("grantEntitlement") ?: throw EaApiException(0, "EA gave no answer to the grant") + fun legacyEntitlements(token: String): List { val out = ArrayList() var next: String? = "0" diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaBackend.kt index 091243ae53..bd8d5c1212 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaBackend.kt @@ -11,6 +11,7 @@ import com.droiddeck.launcher.stores.InstalledStoreGame import com.droiddeck.launcher.stores.LoginFlows import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreBackend +import com.droiddeck.launcher.stores.StoreFront import com.droiddeck.launcher.stores.StoreInstallRoot import com.droiddeck.launcher.stores.StoreLoginActivity import com.droiddeck.launcher.stores.StoresState @@ -40,6 +41,8 @@ object EaBackend : StoreBackend { val app = context.applicationContext EaAuth.signOut(app) EaLibrary.reset(app) + signOuts.incrementAndGet() + StoresState.post { StoresState.shelves.remove(store) } EaUpdates.available.clear() runCatching { WebCookies.expire(EaLogin.SIGN_IN_URLS, ".ea.com", listOf("/")) {} } } @@ -50,7 +53,32 @@ object EaBackend : StoreBackend { Thread({ EaLibrary.sync(app, force) }, "ea-sync").start() } - override fun loadShelves(context: Context, force: Boolean) {} + override fun loadShelves(context: Context, force: Boolean) { + val app = context.applicationContext + val account = signOuts.get() + EaStore.cached(app)?.let { s -> StoresState.post { StoresState.shelves[store] = StoreFront.markOwned(s, StoresState.library[store], EaStore::sameGame) } } + Thread({ + val shelves = EaStore.featured(app, force) ?: return@Thread + StoresState.post { if (signOuts.get() == account) StoresState.shelves[store] = StoreFront.markOwned(shelves, StoresState.library[store], EaStore::sameGame) } + }, "ea-shelves").start() + } + + private val signOuts = java.util.concurrent.atomic.AtomicInteger() + + override fun canClaim(item: CatalogItem): Boolean = item.isFree && !item.extra["slug"].isNullOrEmpty() + + override fun claim(context: Context, item: CatalogItem): Boolean { + val app = context.applicationContext + val token = EaAuth.accessToken(app) ?: return false + val slug = item.extra["slug"] ?: return false + val offer = EaApi.freeOffer(token, slug) ?: run { StoresState.logLine("ea: no free offer for $slug"); return false } + val answer = EaApi.grantEntitlement(token, offer) + StoresState.logLine("ea: grant $offer for $slug: $answer") + return answer.optBoolean("success") || answer.optJSONArray("entitledOfferIds")?.let { ids -> (0 until ids.length()).any { ids.optString(it) == offer } } == true + } + + override fun search(context: Context, query: String): List = + StoreFront.markOwned(EaStore.search(context.applicationContext, query), StoresState.library[store], EaStore::sameGame) override fun install(context: Context, item: CatalogItem, root: java.io.File) { val app = context.applicationContext diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLibrary.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLibrary.kt index 37fd6269f8..336b8b6390 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLibrary.kt @@ -5,8 +5,8 @@ import android.content.SharedPreferences import com.droiddeck.launcher.R import com.droiddeck.launcher.stores.CatalogItem import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreFront import com.droiddeck.launcher.stores.StoreNet -import com.droiddeck.launcher.stores.StoreShelves import com.droiddeck.launcher.stores.StoresState import com.droiddeck.launcher.stores.mergeItems import org.json.JSONArray @@ -36,13 +36,14 @@ data class EaGame( val masterTitleId: String = "", val cloudSaves: String = "", val locales: List = emptyList(), + val productName: String = "", ) { fun toJson(): JSONObject = JSONObject() .put("offerId", offerId).put("contentId", contentId).put("title", title).put("slug", slug) .put("tall", tall).put("wide", wide).put("logo", logo).put("version", version) .put("executePath", executePath).put("installCheck", installCheck).put("parameters", parameters) .put("multiplayerId", multiplayerId).put("masterTitleId", masterTitleId).put("cloudSaves", cloudSaves) - .put("locales", JSONArray(locales)) + .put("locales", JSONArray(locales)).put("productName", productName) companion object { fun fromJson(o: JSONObject): EaGame? { @@ -63,14 +64,15 @@ data class EaGame( masterTitleId = o.optString("masterTitleId"), cloudSaves = o.optString("cloudSaves"), locales = (0 until (locales?.length() ?: 0)).map { locales!!.optString(it) }, + productName = o.optString("productName"), ) } } } object EaLibrary { - private const val KEY_CACHE = "library_cache_v2" - private const val KEY_SYNCED_AT = "library_synced_at_v2" + private const val KEY_CACHE = "library_cache_v3" + private const val KEY_SYNCED_AT = "library_synced_at_v3" private const val THROTTLE_MS = 6 * 60 * 60 * 1000L private const val ART_TTL_MS = 7 * 24 * 60 * 60 * 1000L private const val ART_THREADS = 4 @@ -118,7 +120,7 @@ object EaLibrary { owned = true, sizeBytes = prefs.getLong("size_${g.offerId}", 0L), storeUrl = STORE_URL, - extra = mapOf("contentId" to g.contentId, "slug" to g.slug, "version" to g.version), + extra = mapOf("contentId" to g.contentId, "slug" to g.slug, "version" to g.version, "productName" to g.productName), logoUrl = g.logo.ifEmpty { null }, ) } @@ -199,8 +201,7 @@ object EaLibrary { StoresState.post { if (gen != generation.get()) return@post StoresState.library[store] = mergeItems(StoresState.library[store], items) - val installed = StoresState.installed.filter { it.sidecar.store == store }.map { it.sidecar.id }.toSet() - StoresState.shelves[store] = StoreShelves(trending = items.filterNot { it.id in installed }, art = StoresState.shelves[store]?.art.orEmpty()) + StoresState.shelves[store]?.let { StoresState.shelves[store] = StoreFront.markOwned(it, items, EaStore::sameGame) } } } @@ -271,6 +272,7 @@ object EaLibrary { tall = img?.tall.orEmpty(), wide = img?.wide.orEmpty(), logo = img?.logo.orEmpty(), version = offer.gameVersion, executePath = offer.executePathOverride, installCheck = offer.installCheckOverride, parameters = offer.executeParameters, multiplayerId = offer.multiplayerId, masterTitleId = offer.masterTitleId, cloudSaves = offer.cloudSaves, locales = offer.locales, + productName = o.productName, ) } if (!storeCache(app, games, gen)) return diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaStore.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaStore.kt new file mode 100644 index 0000000000..b585dfec98 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaStore.kt @@ -0,0 +1,120 @@ +package com.droiddeck.launcher.stores.ea + +import android.content.Context +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreFront +import com.droiddeck.launcher.stores.StoreNet +import com.droiddeck.launcher.stores.StoreShelves +import com.droiddeck.launcher.stores.cleanStoreText +import org.json.JSONObject +import java.time.Instant +import java.util.concurrent.Executors +import java.util.concurrent.TimeUnit + +/** EA's PC catalog, read from the game pages ea.com renders for the EA app's games. */ +object EaStore { + private const val SITE = "https://www.ea.com" + private const val CATALOG = "$SITE/games/library/pc-download" + private const val PAGE_SIZE = 12 + private const val MAX_PAGES = 20 + private const val SHELF = 24 + private val NEXT_DATA = Regex("""""", RegexOption.DOT_MATCHES_ALL) + + private var front: StoreFront? = null + + private fun front(context: Context): StoreFront = synchronized(this) { + front ?: StoreFront(Store.EA, { EaPrefs.get(context) }, { fetchAll().let { StoreFront.Catalog(shelves(it), it) } }, key = "store_front_catalog").also { front = it } + } + + fun cached(context: Context): StoreShelves? = front(context).cached() + + fun featured(context: Context, force: Boolean): StoreShelves? = front(context).shelves(force) + + fun search(context: Context, query: String): List { + val q = StoreFront.titleKey(query) + if (q.length < 2) return emptyList() + return front(context).everything().filter { StoreFront.titleKey(it.title).contains(q) } + } + + /** Whether a store card and a library entry are the same game. */ + fun sameGame(shelf: CatalogItem, owned: CatalogItem): Boolean { + val slug = shelf.extra["slug"].orEmpty() + if (slug.isNotEmpty() && slug == owned.extra["slug"]) return true + val shelfKey = StoreFront.titleKey(shelf.title).ifEmpty { return false } + return listOf(owned.title, owned.extra["productName"].orEmpty()).any { StoreFront.titleKey(it) == shelfKey } + } + + /** + * The device's currency. ea.com's pages are cached with whichever region asked first, so one page can carry + * roubles and the next dollars; a price in another currency is left off rather than shown wrong. + */ + private fun localCurrency(): String = + runCatching { java.util.Currency.getInstance(java.util.Locale.getDefault()).currencyCode }.getOrNull() ?: "USD" + + internal fun parsePage(html: String, currency: String = localCurrency()): Pair, Int> { + val data = NEXT_DATA.find(html)?.groupValues?.get(1) ?: return emptyList() to 0 + val props = JSONObject(data).optJSONObject("props")?.optJSONObject("pageProps") ?: return emptyList() to 0 + val games = props.optJSONArray("games") ?: return emptyList() to 0 + val items = (0 until games.length()).mapNotNull { games.optJSONObject(it) }.mapNotNull { item(it, currency) } + return items to props.optInt("totalItems", items.size) + } + + internal fun item(g: JSONObject, currency: String): CatalogItem? { + fun s(o: JSONObject?, k: String) = o?.optString(k)?.takeIf { it.isNotBlank() && it != "null" } + val slug = s(g, "slug") ?: return null + val title = s(g, "title")?.replace("\n", " ")?.trim() ?: return null + val art = g.optJSONObject("packArt") + val price = g.optJSONObject("price") + val total = s(price, "displayTotal").orEmpty() + val now = s(price, "displayTotalWithDiscount") ?: total + val discount = price?.optInt("discountPercentage") ?: 0 + val free = g.optBoolean("isFreeToPlay") || now.filter { it.isDigit() }.trimStart('0').isEmpty() && now.isNotEmpty() + val shown = !free && s(price, "currency").equals(currency, true) + val genres = g.optJSONArray("genres") + val franchise = s(g, "franchiseSlug") + return CatalogItem( + store = Store.EA, id = "ea-store:$slug", title = title, + imageUrl = s(art, "ar16X9") ?: s(art, "ar2X1"), tallImageUrl = s(art, "ar2X3") ?: s(art, "ar3X4"), + tags = (0 until (genres?.length() ?: 0)).mapNotNull { genres!!.optJSONObject(it)?.optString("name")?.takeIf(String::isNotBlank) }.take(3).joinToString(", "), + isFree = free, hasPrice = shown, finalPrice = if (shown) now else "", + originalPrice = if (shown && discount > 0) total else "", discountPercent = discount.coerceAtLeast(0), + storeUrl = if (franchise != null) "$SITE/games/$franchise/$slug" else "$SITE/games/$slug", + publisher = "Electronic Arts", releaseDate = s(g, "releaseDate")?.take(10).orEmpty(), + description = cleanStoreText(s(g, "shortDescription")), + extra = buildMap { put("slug", slug); s(g, "tier")?.let { put("tier", it) } }, + ) + } + + private fun page(n: Int): Pair, Int>? = + StoreNet.get(if (n == 1) CATALOG else "$CATALOG?page=$n", headers = mapOf("Accept" to "text/html"))?.let(::parsePage) + + /** Every page of the catalog; a page that fails fails the whole refresh, so a partial list never replaces a good one. */ + private fun fetchAll(): List { + val (first, total) = page(1) ?: throw java.io.IOException("ea.com catalog page 1 failed") + val pages = ((total + PAGE_SIZE - 1) / PAGE_SIZE).coerceIn(1, MAX_PAGES) + val rest = java.util.concurrent.ConcurrentHashMap>() + val pool = Executors.newFixedThreadPool(4) + try { + for (n in 2..pages) pool.execute { page(n)?.first?.let { rest[n] = it } } + } finally { + pool.shutdown() + if (!pool.awaitTermination(1, TimeUnit.MINUTES)) pool.shutdownNow() + } + (2..pages).firstOrNull { !rest.containsKey(it) }?.let { throw java.io.IOException("ea.com catalog page $it failed") } + return (first + (2..pages).flatMap { rest.getValue(it) }).distinctBy { it.id } + } + + internal fun shelves(all: List, now: Instant = Instant.now()): StoreShelves { + val today = now.toString().take(10) + val released = all.filter { it.releaseDate.isNotEmpty() && it.releaseDate <= today } + val headline = released.filter { it.extra["tier"] == "Tier1" || it.extra["tier"] == "Tier2" } + return StoreShelves( + whatsNew = released.sortedByDescending { it.releaseDate }.take(SHELF), + deals = released.filter { it.discountPercent > 0 }.sortedByDescending { it.discountPercent }.take(SHELF), + free = released.filter { it.isFree }.take(SHELF), + trending = (headline + released).distinctBy { it.id }.take(SHELF), + art = all.mapNotNull { it.imageUrl }.take(SHELF), + ) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt index 8a4b253135..5d1a8c31bc 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt @@ -10,6 +10,7 @@ import com.droiddeck.launcher.stores.InstalledStoreGame import com.droiddeck.launcher.stores.LoginFlows import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreBackend +import com.droiddeck.launcher.stores.StoreFront import com.droiddeck.launcher.stores.StoreInstallRoot import com.droiddeck.launcher.stores.download.DownloadEntry import com.droiddeck.launcher.stores.download.DownloadQueue @@ -44,7 +45,18 @@ object UbisoftBackend : StoreBackend { Thread({ UbisoftLibrary.sync(app, force) }, "ubisoft-sync").start() } - override fun loadShelves(context: Context, force: Boolean) {} + override fun loadShelves(context: Context, force: Boolean) { + val app = context.applicationContext + val account = UbisoftLibrary.account() + UbisoftStore.cached(app)?.let { s -> StoresState.post { StoresState.shelves[store] = StoreFront.markOwned(s, StoresState.library[store], UbisoftStore::sameGame) } } + Thread({ + val shelves = UbisoftStore.featured(app, force) ?: return@Thread + StoresState.post { if (UbisoftLibrary.account() == account) StoresState.shelves[store] = StoreFront.markOwned(shelves, StoresState.library[store], UbisoftStore::sameGame) } + }, "ubisoft-shelves").start() + } + + override fun search(context: Context, query: String): List = + StoreFront.markOwned(UbisoftStore.search(query), StoresState.library[store], UbisoftStore::sameGame) override fun install(context: Context, item: CatalogItem, root: java.io.File) { val app = context.applicationContext @@ -97,6 +109,9 @@ object UbisoftLibrary { StoresState.post { StoresState.shelves.remove(Store.UBISOFT) } } + /** Changes on every sign-out, so work begun for the old account can tell. */ + fun account(): Int = generation.get() + private fun post(gen: Int, block: () -> Unit) = StoresState.post { if (generation.get() == gen) block() } internal fun parsePage(body: String): Pair, Int> { @@ -224,8 +239,7 @@ object UbisoftLibrary { StoresState.status.remove(Store.UBISOFT) StoresState.problems.remove(Store.UBISOFT) StoresState.library[Store.UBISOFT] = games - StoresState.shelves[Store.UBISOFT] = com.droiddeck.launcher.stores.StoreShelves( - trending = games.sortedByDescending { it.extra.containsKey("productId") }, art = games.mapNotNull { it.imageUrl }) + StoresState.shelves[Store.UBISOFT]?.let { StoresState.shelves[Store.UBISOFT] = StoreFront.markOwned(it, games, UbisoftStore::sameGame) } } StoresState.logLine("Ubisoft: ${games.size} owned games") } catch (e: Exception) { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftStore.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftStore.kt new file mode 100644 index 0000000000..13edb2084f --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftStore.kt @@ -0,0 +1,129 @@ +package com.droiddeck.launcher.stores.ubisoft + +import android.content.Context +import android.net.Uri +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreFront +import com.droiddeck.launcher.stores.StoreNet +import com.droiddeck.launcher.stores.StoreShelves +import com.droiddeck.launcher.stores.cleanStoreText +import com.droiddeck.launcher.stores.matureByAge +import org.json.JSONArray +import org.json.JSONObject +import java.text.NumberFormat +import java.time.Instant +import java.util.Currency +import java.util.Locale + +/** Ubisoft's PC catalog, from the product search the Ubisoft Store website uses. */ +object UbisoftStore { + /** The Ubisoft Store website's own read-only search key, sent by every store page. */ + private const val APP = "XELY3U4LOD" + private const val KEY = "5638539fd9edb8f2c6b024b49ec375bd" + private const val SHELF = 24 + private val RATING_AGE = mapOf("esrb-m" to 17, "esrb-ao" to 18, "pegi-18" to 18, "pegi-16" to 16, "usk-18" to 18) + + /** The store sites with an English catalog: site, index locale, currency. */ + private val SITES = mapOf( + "US" to Triple("us", "en_US", "USD"), "GB" to Triple("uk", "en_GB", "GBP"), + "CA" to Triple("ca", "en_CA", "CAD"), "AU" to Triple("anz", "en_AU", "AUD"), "NZ" to Triple("anz", "en_AU", "NZD"), + ) + + private fun site() = SITES[Locale.getDefault().country.uppercase(Locale.ROOT)] ?: SITES.getValue("US") + + private fun index(site: Triple, order: String) = "production__${site.first}_ubisoft__products__${site.second}__$order" + + private val fronts = HashMap, StoreFront>() + + /** Each store site keeps its own shelves, so a region change never shows another region's prices. */ + private fun front(context: Context): StoreFront = synchronized(fronts) { + val site = site() + fronts.getOrPut(site) { + StoreFront(Store.UBISOFT, { context.applicationContext.getSharedPreferences("stores.ubisoft", Context.MODE_PRIVATE) }, + { fetch(site) }, key = "store_front_${site.first}_${site.third}") + } + } + + fun cached(context: Context): StoreShelves? = front(context).cached() + + fun featured(context: Context, force: Boolean): StoreShelves? = front(context).shelves(force) + + fun search(query: String): List { + val term = query.trim() + if (term.length < 2) return emptyList() + return query(site(), "best_sellers", 40, query = term).orEmpty() + } + + /** Whether a store card and a library entry are the same game. */ + fun sameGame(shelf: CatalogItem, owned: CatalogItem): Boolean { + val product = shelf.extra["productId"].orEmpty() + if (product.isNotEmpty() && product == owned.extra["productId"]) return true + val key = StoreFront.titleKey(owned.title) + return key.isNotEmpty() && key == baseTitle(shelf.title) + } + + /** A product title without its edition, so "Far Cry® 6 - Gold Edition" is "far cry 6". */ + internal fun baseTitle(title: String): String = StoreFront.titleKey(title.substringBefore(" - ")) + + /** One page of the index, or null when Ubisoft did not answer. */ + private fun query(site: Triple, order: String, hits: Int, query: String = "", filters: String = "", facets: List = emptyList()): List? { + val facetFilters = JSONArray().put("product_type:Games").put("Platform:PC (Digital)").apply { facets.forEach { put(it) } } + val url = Uri.parse("https://$APP-dsn.algolia.net/1/indexes/${index(site, order)}").buildUpon() + .appendQueryParameter("query", query) + .appendQueryParameter("hitsPerPage", (hits * 2).toString()) + .appendQueryParameter("facetFilters", facetFilters.toString()) + .apply { if (filters.isNotEmpty()) appendQueryParameter("filters", filters) } + .build().toString() + val body = StoreNet.get(url, headers = mapOf("X-Algolia-Application-Id" to APP, "X-Algolia-API-Key" to KEY)) ?: return null + return parse(JSONObject(body), site.third).take(hits) + } + + internal fun parse(answer: JSONObject, currency: String, now: Instant = Instant.now()): List { + val hits = answer.optJSONArray("hits") ?: return emptyList() + val items = (0 until hits.length()).mapNotNull { hits.optJSONObject(it) }.mapNotNull { item(it, currency, now) } + return items.groupBy { baseTitle(it.title) }.values.map { editions -> editions.firstOrNull { " - " !in it.title } ?: editions.first() } + } + + private fun money(amount: Double, currency: String): String = NumberFormat.getCurrencyInstance(Locale.US).apply { + this.currency = Currency.getInstance(currency) + }.format(amount) + + internal fun item(h: JSONObject, currency: String, now: Instant): CatalogItem? { + fun s(k: String) = h.optString(k).takeIf { it.isNotBlank() && it != "null" } + val id = s("objectID") ?: s("id") ?: return null + val title = s("title") ?: s("name") ?: return null + if (s("Free_offer") == "demo") return null + val price = h.optJSONObject("price")?.optDouble(currency)?.takeUnless { it.isNaN() } + val base = h.optJSONObject("default_price")?.optDouble(currency)?.takeUnless { it.isNaN() } + val discount = s("promotion_percentage")?.toDoubleOrNull()?.toInt() ?: 0 + val released = s("release_date")?.let { runCatching { Instant.parse(it) }.getOrNull() } + if (released != null && released.isAfter(now) && s("preorder") != "true") return null + val free = s("Free_offer") == "freeplay" || price == 0.0 + val image = s("image_link")?.substringBefore("?") + return CatalogItem( + store = Store.UBISOFT, id = "ubisoft-store:$id", title = title.trim(), + imageUrl = image, tallImageUrl = image, tags = listOfNotNull(s("Genre"), s("Edition")).joinToString(", "), + isFree = free, hasPrice = price != null, finalPrice = price?.let { money(it, currency) }.orEmpty(), + originalPrice = if (discount > 0 && base != null) money(base, currency) else "", discountPercent = if (discount > 0 && base != null) discount else 0, + storeUrl = s("link") ?: s("linkWeb").orEmpty(), publisher = "Ubisoft", releaseDate = released?.toString()?.take(10).orEmpty(), + description = cleanStoreText(s("longDescription")), + mature = s("adult").equals("TRUE", true) || matureByAge(listOfNotNull(s("Rating")?.let(RATING_AGE::get))), + extra = buildMap { + s("productLauncherIDString")?.let { put("productId", it) } + if (s("partOfUbisoftPlus").equals("true", true)) put("ubisoftPlus", "true") + }, + ) + } + + /** All four rows, or a failure when any of them failed, so a partial refresh never replaces a good one. */ + private fun fetch(site: Triple): StoreFront.Catalog { + fun row(order: String, filters: String = "", facets: List = emptyList()) = + query(site, order, SHELF, filters = filters, facets = facets) ?: throw java.io.IOException("Ubisoft store $order $filters$facets failed") + val trending = row("best_sellers") + val newest = row("release_date") + val deals = row("best_sellers", filters = "promotion_percentage > 0") + val free = row("best_sellers", facets = listOf("Free_offer:freeplay")) + return StoreFront.Catalog(StoreShelves(whatsNew = newest, deals = deals, free = free, trending = trending, art = trending.mapNotNull { it.imageUrl })) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index f42a85de51..9ac3a96027 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -505,7 +505,12 @@ internal fun GameActions( InstallButton(stringResource(R.string.stores_install), leadOn) { StoresState.requestInstall(ctx, item) } SecondaryButton(stringResource(R.string.stores_view_on, item.store.shortLabel)) { openStoreUrl(ctx, item) } } - item != null && item.isFree -> PrimaryButton(stringResource(R.string.stores_get_free), main = true, modifier = leadOn) { openStoreUrl(ctx, item) } + item != null && item.isFree -> { + val adding = StoresState.claiming[item.key] == true + PrimaryButton(stringResource(if (adding) R.string.stores_claiming else R.string.stores_get_free), enabled = !adding, main = true, modifier = leadOn) { + if (StoresState.canClaim(item)) StoresState.claim(ctx, item) { openStoreUrl(ctx, item) } else openStoreUrl(ctx, item) + } + } item != null -> PrimaryButton(buyLabel(item), main = true, modifier = leadOn) { openStoreUrl(ctx, item) } } if (cloud && (download != null || failed != null)) { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 5dbf1a47eb..cc56dbb7a7 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2335,6 +2335,7 @@ منقطع تثبيت · %1$s احصل عليها مجانًا + جارٍ الإضافة إلى المكتبة… عرض على %1$s شراء · %1$s مثبَّتة diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index a14f49e9a1..46e5035656 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2304,6 +2304,7 @@ Interrumpida Instalar · %1$s Obtener gratis + Agregando a la biblioteca… Ver en %1$s Comprar · %1$s Instalado diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 09c26b8075..d3e14dd32c 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2235,6 +2235,7 @@ Прекъснато Инсталация · %1$s Вземи безплатно + Добавяне в библиотеката… Виж в %1$s Купи · %1$s Инсталирана diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 43169adfb0..c318b3081b 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2285,6 +2285,7 @@ Přerušeno Instalace · %1$s Získat zdarma + Přidávání do knihovny… Zobrazit na %1$s Koupit · %1$s Nainstalováno diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 3a41c0928b..0936040739 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2235,6 +2235,7 @@ Afbrudt Installation · %1$s Få gratis + Føjer til biblioteket… Se på %1$s Køb · %1$s Installeret diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 53a0591334..1db47d2b34 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2227,6 +2227,7 @@ Unterbrochen Installieren · %1$s Kostenlos erhalten + Wird zur Bibliothek hinzugefügt… Auf %1$s ansehen Kaufen · %1$s Installiert diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 1f2a7f6fa5..4fe414040c 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2235,6 +2235,7 @@ Διακόπηκε Εγκατάσταση · %1$s Απόκτηση δωρεάν + Προσθήκη στη βιβλιοθήκη… Προβολή στο %1$s Αγορά · %1$s Εγκατεστημένο diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index bc362f264d..8cff6535ff 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2260,6 +2260,7 @@ Interrumpida Instalar · %1$s Obtener gratis + Añadiendo a la biblioteca… Ver en %1$s Comprar · %1$s Instalado diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 70e0c2e8ee..71a1e78a74 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2235,6 +2235,7 @@ Keskeytynyt Asenna · %1$s Hanki ilmaiseksi + Lisätään kirjastoon… Näytä %1$s:ssä Osta · %1$s Asennettu diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 8a8bd2cb69..a182aeb39a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2260,6 +2260,7 @@ Interrompu Installer · %1$s Obtenir gratuitement + Ajout à la bibliothèque… Voir sur %1$s Acheter · %1$s Installé diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 62f8a6d867..ad96817016 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2235,6 +2235,7 @@ बाधित इंस्टॉल · %1$s मुफ़्त में पाएं + लाइब्रेरी में जोड़ा जा रहा है… %1$s पर देखें खरीदें · %1$s इंस्टॉल है diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 854208f327..26fafb1bd2 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2235,6 +2235,7 @@ Megszakítva Telepítés · %1$s Ingyenes beszerzés + Hozzáadás a könyvtárhoz… Megtekintés itt: %1$s Megvétel · %1$s Telepítve diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index d18a42fe96..fc440af4e9 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2210,6 +2210,7 @@ Terhenti Instal · %1$s Dapatkan gratis + Menambahkan ke pustaka… Lihat di %1$s Beli · %1$s Terinstal diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 655d1bb9e5..6e2493bc4b 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2252,6 +2252,7 @@ Interrotto Installa · %1$s Ottieni gratis + Aggiunta alla libreria… Visualizza su %1$s Acquista · %1$s Installato diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 0b16c04969..326f88634d 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2210,6 +2210,7 @@ 中断 インストール · %1$s 無料で入手 + ライブラリに追加中… %1$sで見る 購入 · %1$s インストール済み diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index ec2fc2dc3c..c93c5b0d20 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2210,6 +2210,7 @@ 중단됨 설치 · %1$s 무료로 받기 + 라이브러리에 추가하는 중… %1$s에서 보기 구매 · %1$s 설치됨 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index ff08492061..6d0077c92e 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2210,6 +2210,7 @@ Terganggu Pasang · %1$s Dapatkan percuma + Menambah ke pustaka… Lihat pada %1$s Beli · %1$s Dipasang diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 0be006b622..b95bffcc69 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2235,6 +2235,7 @@ Avbrutt Installer · %1$s Hent gratis + Legger til i biblioteket … Vis på %1$s Kjøp · %1$s Installert diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 6097f32580..b9c476a349 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2235,6 +2235,7 @@ Onderbroken Installeren · %1$s Gratis verkrijgen + Toevoegen aan bibliotheek… Bekijken op %1$s Kopen · %1$s Geïnstalleerd diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index bfe36b08d9..cba0b85efa 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2285,6 +2285,7 @@ Przerwano Instalacja · %1$s Odbierz bezpłatnie + Dodawanie do biblioteki… Zobacz w %1$s Kup · %1$s Zainstalowano diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index e278e59f25..39b93f25b0 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2252,6 +2252,7 @@ Interrompida Instalar · %1$s Obter grátis + A adicionar à biblioteca… Ver em %1$s Comprar · %1$s Instalado diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 9d2305b2b6..b4d3cf7ddd 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2252,6 +2252,7 @@ Interrompido Instalar · %1$s Obter grátis + Adicionando à biblioteca… Ver em %1$s Comprar · %1$s Instalado diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index cbd0b85423..bd8696e74a 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2260,6 +2260,7 @@ Întreruptă Instalare · %1$s Obține gratuit + Se adaugă în bibliotecă… Vezi pe %1$s Cumpără · %1$s Instalat diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 0bfb8f26ae..8dee9e4c9e 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2368,6 +2368,7 @@ Прервано Установить · %1$s Получить бесплатно + Добавление в библиотеку… Открыть в %1$s Купить · %1$s Установлено diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 674f7ca9ff..5a35123390 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2235,6 +2235,7 @@ Avbruten Installation · %1$s Hämta gratis + Lägger till i biblioteket … Visa på %1$s Köp · %1$s Installerat diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 31e38b728f..81017bbb02 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2210,6 +2210,7 @@ ถูกขัดจังหวะ ติดตั้ง · %1$s รับไปเลยฟรี + กำลังเพิ่มลงในคลัง… ดูบน %1$s ซื้อ · %1$s ติดตั้งแล้ว diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index f66424d69d..b65fc85813 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2227,6 +2227,7 @@ Kesintiye uğradı Yükle · %1$s Ücretsiz al + Kitaplığa ekleniyor… %1$s\'te görüntüle Satın al · %1$s Yüklü diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 8aebdeebdd..bd977f8e42 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2285,6 +2285,7 @@ Перервано Встановити · %1$s Отримати безкоштовно + Додавання до бібліотеки… Переглянути на %1$s Купити · %1$s Встановлено diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a6a392b8f0..a6411681d2 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2210,6 +2210,7 @@ Bị gián đoạn Cài · %1$s Lấy miễn phí + Đang thêm vào thư viện… Xem trên %1$s Mua · %1$s Đã cài diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 45aebc4133..e3263afcc6 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2291,6 +2291,7 @@ 已中断 安装 · %1$s 免费领取 + 正在添加到游戏库… 在 %1$s 上查看 购买 · %1$s 已安装 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 65b40bad57..6ea69859e5 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2210,6 +2210,7 @@ 已中斷 安裝 · %1$s 免費領取 + 正在加入遊戲庫… 在 %1$s 查看 購買 · %1$s 已安裝 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index c05aeafcd3..6b34c26263 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2210,6 +2210,7 @@ 已中斷 安裝 · %1$s 免費取得 + 正在加入收藏庫… 在 %1$s 檢視 購買 · %1$s 已安裝 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 114ec48d94..cc8da5f577 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2585,6 +2585,7 @@ Interrupted Install · %1$s Get for free + Adding to library… View on %1$s Buy · %1$s Installed diff --git a/app/src/main/resources/ea/graphql/GetGameProductOfferIds.gql b/app/src/main/resources/ea/graphql/GetGameProductOfferIds.gql new file mode 100644 index 0000000000..9c1c1dbd5c --- /dev/null +++ b/app/src/main/resources/ea/graphql/GetGameProductOfferIds.gql @@ -0,0 +1,15 @@ +query GetGameProductOfferIds($slug: String!, $locale: Locale!, $overrideCountryCode: String!) { + game(slug: $slug, locale: $locale) { + id + isFreeToPlay + slug + lowestPriceGameProduct(availabilities: [ACQUIRABLE], overrideCountryCode: $overrideCountryCode) { + id + isFree + name + originOfferId + __typename + } + __typename + } +} diff --git a/app/src/main/resources/ea/graphql/grantEntitlement.gql b/app/src/main/resources/ea/graphql/grantEntitlement.gql new file mode 100644 index 0000000000..9871d7231f --- /dev/null +++ b/app/src/main/resources/ea/graphql/grantEntitlement.gql @@ -0,0 +1,23 @@ +mutation grantEntitlement($input: GrantEntitlementInput!) { + grantEntitlement(input: $input) { + success + entitledOfferIds + entitlementType + errors { + ... on GrantEntitlementOfferDoesNotExistError { + __typename + } + ... on GrantEntitlementNotQualifiedError { + __typename + } + ... on GrantEntitlementNotFreeOrNoAppropriateSubscriptionError { + __typename + } + ... on GrantEntitlementUpstreamConflictError { + __typename + } + __typename + } + __typename + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt index 83c03495ae..b9deb11a11 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.stores.ea +import com.droiddeck.launcher.stores.CatalogItem import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreGameSidecar import com.droiddeck.launcher.stores.StoreLaunch @@ -239,6 +240,47 @@ class EaTest { assertTrue(EaLibrary.withoutGameDownload(emptyList()).isEmpty()) } + @Test fun theStorePageNamesEachGameWithItsPrice() { + val game = { slug: String, title: String, date: String, price: String, sale: String, off: Int, free: Boolean -> + """{"slug":"$slug","title":"$title +","isFreeToPlay":$free,"franchiseSlug":"f","tier":"Tier1","releaseDate":"$date", + "packArt":{"ar16X9":"https://img/$slug-wide","ar2X3":"https://img/$slug-tall"},"genres":[{"name":"RPG"}], + "price":{"displayTotal":"$price","displayTotalWithDiscount":"$sale","discountPercentage":$off,"currency":"USD"}}""" + } + val html = """" + val (items, total) = EaStore.parsePage(html, "USD") + assertEquals("", EaStore.parsePage(html, "EUR").first.first().finalPrice) + assertEquals(40, total) + val ultima = items.first() + assertEquals("Ultima VII", ultima.title) + assertEquals("$2.49", ultima.finalPrice) + assertEquals("$4.99", ultima.originalPrice) + assertEquals(50, ultima.discountPercent) + assertEquals("https://www.ea.com/games/f/ultima-7", ultima.storeUrl) + assertTrue(items[1].isFree) + val shelves = EaStore.shelves(items, java.time.Instant.parse("2026-11-12T00:00:00Z")) + assertEquals(listOf("Ultima VII", "REDSEC"), shelves.whatsNew.map { it.title }) + assertEquals(listOf("Ultima VII"), shelves.deals.map { it.title }) + assertEquals(listOf("REDSEC"), shelves.free.map { it.title }) + val owned = CatalogItem(Store.EA, "Origin.OFR.1", "Ultima™ VII", null, owned = true, extra = mapOf("slug" to "other")) + val marked = com.droiddeck.launcher.stores.StoreFront.markOwned(shelves, listOf(owned), EaStore::sameGame) + assertEquals("Origin.OFR.1", marked.deals.single().id) + assertEquals("https://img/ultima-7-wide", marked.deals.single().imageUrl) + val bf = CatalogItem(Store.EA, "Origin.OFR.50.0005511", "Battlefield™", null, owned = true, extra = mapOf("slug" to "glacier", "productName" to "Battlefield™ 6")) + assertTrue(EaStore.sameGame(CatalogItem(Store.EA, "ea-store:battlefield-6", "Battlefield™ 6", null, extra = mapOf("slug" to "battlefield-6")), bf)) + assertFalse(EaStore.sameGame(CatalogItem(Store.EA, "ea-store:bf-2042", "Battlefield™ 2042", null), bf)) + } + + @Test fun titlesMatchAcrossMarksAndAccentsButNeverWhenEmpty() { + assertEquals("pokemon", com.droiddeck.launcher.stores.StoreFront.titleKey("Pokémon™")) + assertEquals("ファイナル 7", com.droiddeck.launcher.stores.StoreFront.titleKey("ファイナル® 7")) + val shelf = CatalogItem(Store.EA, "ea-store:a", "™", null) + assertFalse(EaStore.sameGame(shelf, CatalogItem(Store.EA, "Origin.OFR.2", "®", null, owned = true))) + } + @Test fun ownedPageParses() { val page = JSONObject( """{"me":{"ownedGameProducts":{"next":"100","items":[{"originOfferId":"Origin.OFR.50.0001","product":{"id":"x","name":"N","downloadable":true,"gameSlug":"titanfall-2", diff --git a/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt index 7f163ce351..aecf4ca779 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt @@ -45,6 +45,36 @@ class UbisoftTest { assertEquals(listOf("space-gone", "space-sc"), UbisoftLibrary.assemble(profile, null).map { it.id }) } + @Test fun theStoreSearchNamesEachGameWithItsPrice() { + fun hit(id: String, title: String, price: Double, base: Double, off: String, date: String, free: String = "") = JSONObject() + .put("objectID", id).put("title", title).put("price", JSONObject().put("USD", price)).put("default_price", JSONObject().put("USD", base)) + .put("promotion_percentage", off).put("release_date", date).put("Free_offer", free).put("link", "https://store.ubisoft.com/us/$id.html") + .put("image_link", "https://img/$id.jpg?sw=300").put("productLauncherIDString", id.takeLast(3)).put("Rating", "esrb-m") + val answer = JSONObject().put("hits", JSONArray() + .put(hit("p-109", "Far Cry® 6", 15.0, 60.0, "75", "2021-10-07T00:00:00.000Z")) + .put(hit("p-110", "Far Cry® 6 - Gold Edition", 30.0, 100.0, "70", "2021-10-07T00:00:00.000Z")) + .put(hit("p-111", "Some Demo", 0.0, 0.0, "", "2021-10-07T00:00:00.000Z", free = "demo")) + .put(hit("p-112", "Next Year", 70.0, 70.0, "", "2030-01-01T00:00:00.000Z"))) + val items = UbisoftStore.parse(answer, "USD", java.time.Instant.parse("2026-11-12T00:00:00Z")) + assertEquals(listOf("Far Cry® 6"), items.map { it.title }) + val game = items.single() + assertEquals("$15.00", game.finalPrice) + assertEquals("$60.00", game.originalPrice) + assertEquals(75, game.discountPercent) + assertEquals("https://img/p-109.jpg", game.imageUrl) + assertTrue(game.mature) + val owned = CatalogItem(Store.UBISOFT, "space-fc6", "Far Cry 6", null, owned = true, extra = mapOf("productId" to "5266")) + val ezio = CatalogItem(Store.UBISOFT, "ubisoft-store:x", "Assassin's Creed® The Ezio Collection", null) + assertTrue(UbisoftStore.sameGame(game, owned)) + assertTrue(!UbisoftStore.sameGame(ezio, CatalogItem(Store.UBISOFT, "space-ac", "Assassin's Creed™", null, owned = true))) + } + + @Test fun theBaseEditionStandsForItsGameWhicheverComesFirst() { + fun hit(id: String, title: String) = JSONObject().put("objectID", id).put("title", title).put("price", JSONObject().put("USD", 10.0)) + val answer = JSONObject().put("hits", JSONArray().put(hit("gold", "Far Cry® 6 - Gold Edition")).put(hit("base", "Far Cry® 6"))) + assertEquals(listOf("ubisoft-store:base"), UbisoftStore.parse(answer, "USD").map { it.id }) + } + @Test fun theEntitlementNamesTheGamesApplication() { val body = JSONObject().put("items", JSONArray() .put(JSONObject().put("productId", 82).put("applicationId", "app-82")) From bd022f04beaab221e80c643299bf8c7130eb0a6f Mon Sep 17 00:00:00 2001 From: DeathKhan Date: Thu, 12 Nov 2026 11:10:05 -0600 Subject: [PATCH 33/57] fix(apps): center the folder title and rename by selecting it (#2492) * fix(apps): center the folder title and rename by selecting it The open folder showed its name on the left with a pencil button and a close button. The title is now centered and is itself the rename control: tap it, or highlight it and confirm. The close button is gone; Back, B, or a tap outside the folder closes it as before. * fix(apps): the folder title shows a faint chip at rest, so it reads as selectable --- .../droiddeck/launcher/ui/AndroidAppsPage.kt | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt index f43e191a66..a7742c42ea 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt @@ -55,8 +55,6 @@ import androidx.compose.foundation.lazy.grid.rememberLazyGridState import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Close -import androidx.compose.material.icons.filled.Edit import androidx.compose.material.icons.filled.FilterAlt import androidx.compose.material.icons.filled.Sort import androidx.compose.material.icons.filled.Widgets @@ -779,19 +777,30 @@ private fun FolderSheet( .focusGroup() .padding(16.dp), ) { - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp)) { - if (renaming) Box(Modifier.weight(1f)) { + Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp)) { + if (renaming) { AdbTextField( value = name, onValueChange = { name = it.take(40) }, label = stringResource(R.string.apps_folder_name), keyboardType = KeyboardType.Text, imeAction = ImeAction.Done, compact = true, showLabel = false, placeholder = folder.name, focusOnShow = true, onDone = { commit() }, ) } else { - Text(folder.name, fontSize = 20.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false)) - SmallIconButton(Icons.Filled.Edit, stringResource(R.string.apps_folder_rename), tint = colors.onSurfaceVariant) { renaming = true } - Spacer(Modifier.weight(1f)) + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val rename = { renaming = true } + Text( + folder.name, fontSize = 20.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, + maxLines = 1, overflow = TextOverflow.Ellipsis, textAlign = TextAlign.Center, + // A faint chip at rest shows the name can be selected, now that the pencil is gone. + modifier = Modifier.clip(Shape12) + .background(if (hot) pal.signal.copy(alpha = 0.12f) else colors.onBackground.copy(alpha = 0.07f)) + .glideBorder(hot, Shape12, pal.signal) + .hoverable(src) + .clickable(interactionSource = src, indication = LocalIndication.current, onClickLabel = stringResource(R.string.apps_folder_rename), role = Role.Button, onClick = rename) + .controllerConfirm(onClick = rename) + .padding(horizontal = 14.dp, vertical = 6.dp), + ) } - SmallIconButton(Icons.Filled.Close, stringResource(R.string.common_close), tint = colors.onSurfaceVariant) { close() } } LazyVerticalGrid( columns = GridCells.Adaptive(92.dp), From 52bf19ad8ece1a4857a0e6b4e54f73cbeaaf53e0 Mon Sep 17 00:00:00 2001 From: DeathKhan Date: Thu, 12 Nov 2026 11:10:32 -0600 Subject: [PATCH 34/57] feat(home): choose the page the Home button opens (#2493) * feat(home): choose the page the Home button opens As the Home app, DroidDeck always came back to whichever page was last open, and a cold start landed on Steam. A new choice under Setup > Launcher, shown while "Use as Home screen" is on, lets Home open the Android apps page instead. The default stays Steam, which keeps the current behaviour. * fix(home): a Home request for the apps page closes a page open over the rail --- .../droiddeck/launcher/FrontEndActivity.kt | 12 ++++++++++++ .../com/droiddeck/launcher/HomeActivity.kt | 6 ++++++ .../com/droiddeck/launcher/core/AppUiPrefs.kt | 19 +++++++++++++++++++ .../droiddeck/launcher/ui/FrontEndScreen.kt | 10 ++++++++++ .../droiddeck/launcher/ui/FrontEndSetup.kt | 5 +++++ app/src/main/res/values/strings.xml | 2 ++ .../com/droiddeck/launcher/ui/AppScaleTest.kt | 8 ++++++++ 7 files changed, 62 insertions(+) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 699dd9643b..23171a6c17 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -196,6 +196,7 @@ class FrontEndActivity : ComponentActivity() { private var stretch16x9 by mutableStateOf(false) private var orientation by mutableStateOf(android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE) private var launcherOrientation by mutableStateOf(android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER) + private var homePage by mutableStateOf(com.droiddeck.launcher.core.AppUiPrefs.HOME_PAGE_STEAM) private var launcherFullscreen by mutableStateOf(true) private var downloadSource by mutableStateOf(DownloadSource.MODE_AUTO) private var downloadMirror by mutableStateOf("") @@ -829,6 +830,10 @@ class FrontEndActivity : ComponentActivity() { private fun readGameIntent(request: Intent) { request.getStringExtra(com.droiddeck.launcher.stores.download.StoreDownloadService.EXTRA_NAV)?.let { navRequest = it; request.removeExtra(com.droiddeck.launcher.stores.download.StoreDownloadService.EXTRA_NAV) } + if (navRequest == com.droiddeck.launcher.core.AppUiPrefs.HOME_PAGE_APPS) { + homeAppSelected = HomeApp.isHomeScreenEnabled(this) && HomeApp.isDefault(this) + if (!homeAppSelected) navRequest = null + } shortcutPicker = request.action == Intent.ACTION_CREATE_SHORTCUT if (shortcutPicker) { steamGames = emptyList() @@ -1122,6 +1127,7 @@ class FrontEndActivity : ComponentActivity() { orientation = SessionPrefs.orientation(this) launcherOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) requestedOrientation = launcherOrientation + homePage = com.droiddeck.launcher.core.AppUiPrefs.homePage(this) launcherFullscreen = SessionPrefs.launcherFullscreen(this) downloadSource = DownloadSource.mode(this) downloadMirror = DownloadSource.mirror(this) @@ -1218,6 +1224,7 @@ class FrontEndActivity : ComponentActivity() { showPhantomGate = showPhantomGate, orientation = orientation, launcherOrientation = launcherOrientation, + homePage = homePage, launcherFullscreen = launcherFullscreen, downloadSource = downloadSource, downloadMirror = downloadMirror, @@ -1515,6 +1522,10 @@ class FrontEndActivity : ComponentActivity() { launcherOrientation = value requestedOrientation = value }, + onHomePage = { value -> + com.droiddeck.launcher.core.AppUiPrefs.setHomePage(this, value) + homePage = value + }, onLauncherFullscreen = { on -> SessionPrefs.setLauncherFullscreen(this, on) launcherFullscreen = on @@ -1907,6 +1918,7 @@ class FrontEndActivity : ComponentActivity() { orientation = SessionPrefs.orientation(this) launcherOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) requestedOrientation = launcherOrientation + homePage = com.droiddeck.launcher.core.AppUiPrefs.homePage(this) SteamIntegration.syncShortcutsListing(this) refreshWifiDiscovery() com.droiddeck.launcher.stores.StoresState.refresh(this) diff --git a/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt b/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt index 59e10c48e7..3947263c03 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt @@ -25,6 +25,12 @@ class HomeActivity : Activity() { } else { Intent(this, FrontEndActivity::class.java) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) + .apply { + val page = com.droiddeck.launcher.core.AppUiPrefs.homePage(this@HomeActivity) + if (page != com.droiddeck.launcher.core.AppUiPrefs.HOME_PAGE_STEAM) { + putExtra(com.droiddeck.launcher.stores.download.StoreDownloadService.EXTRA_NAV, page) + } + } } startActivity(destination) finish() diff --git a/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt b/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt index 7b8536202d..3f308636db 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt @@ -27,6 +27,25 @@ object AppUiPrefs { context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit().putInt("orientation", value).apply() } + const val HOME_PAGE_STEAM = "steam" + const val HOME_PAGE_APPS = "android-apps" + + val homePageOptions = listOf( + HOME_PAGE_STEAM to R.string.rail_steam, + HOME_PAGE_APPS to R.string.content_android_apps, + ) + + fun homePage(context: Context): String = + context.getSharedPreferences("app-ui", Context.MODE_PRIVATE) + .getString("home-page", null) + .takeIf { value -> homePageOptions.any { it.first == value } } + ?: HOME_PAGE_STEAM + + fun setHomePage(context: Context, value: String) { + require(homePageOptions.any { it.first == value }) + context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit().putString("home-page", value).apply() + } + internal fun normalizeScale(percent: Int): Int = percent.takeIf { it in scales } ?: DEFAULT_SCALE fun scale(context: Context): Int = normalizeScale( diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 1e4aaa88b0..3cc28e1890 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -171,6 +171,7 @@ class FrontEndState( val showPhantomGate: Boolean = false, val orientation: Int = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, val launcherOrientation: Int = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER, + val homePage: String = com.droiddeck.launcher.core.AppUiPrefs.HOME_PAGE_STEAM, val launcherFullscreen: Boolean = true, val downloadSource: String = DownloadSource.MODE_AUTO, val downloadMirror: String = "", @@ -271,6 +272,7 @@ class FrontEndActions( val onLauncherIcon: (String) -> Unit = {}, val onOrientation: (Int) -> Unit = {}, val onLauncherOrientation: (Int) -> Unit = {}, + val onHomePage: (String) -> Unit = {}, val onLauncherFullscreen: (Boolean) -> Unit = {}, val onAnimationsEnabled: (Boolean) -> Unit = {}, val onLowStorageWarning: (Boolean) -> Unit = {}, @@ -466,6 +468,14 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com "setup:launcher" -> { SetupTabs.openLauncher = true; selected = "setup" } com.droiddeck.launcher.sync.SyncthingService.NAV -> com.droiddeck.launcher.sync.Syncthing.requestOpen() "setup:integration" -> { SetupTabs.openOverview = true; selected = "setup" } + com.droiddeck.launcher.core.AppUiPrefs.HOME_PAGE_APPS -> { + // Home lands on the apps page itself, so a page open over the rail (Components, Performance) closes first. + if (s.pageKey != null) a.onPageBack() + Hops.origin = null + Hops.restore = null + Hops.sinking = null + selected = target + } else -> selected = target } a.onNavigated() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index f90cf1b26b..bfdbd7ecef 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -473,6 +473,11 @@ internal fun SetupPanel( ) { a.onHomeScreen(it) } if (s.homeScreenEnabled) { ActionRow(stringResource(R.string.setup_default_home), s.defaultHomeLabel ?: stringResource(R.string.setup_choose_home), stringResource(R.string.setup_choose), a.onHomeApp) + ChoiceRow( + host, "home-page", stringResource(R.string.setup_home_page), stringResource(R.string.setup_home_page_hint), + com.droiddeck.launcher.core.AppUiPrefs.homePageOptions.map { (value, label) -> value to stringResource(label) }, + s.homePage, onPick = a.onHomePage, + ) } ChoiceRow( host, "launcher-orientation", stringResource(R.string.setup_launcher_orientation), null, diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cc8da5f577..c5acad050c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -982,6 +982,8 @@ Use as Home screen DroidDeck can be the Home app DroidDeck is never offered as a Home app + Home button opens + The page shown when DroidDeck is the Home app and you press Home In Add Games, set DroidDeck to Include Orientation Launcher orientation diff --git a/app/src/test/java/com/droiddeck/launcher/ui/AppScaleTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/AppScaleTest.kt index 56a6db50b5..e3e741b65a 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/AppScaleTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/AppScaleTest.kt @@ -87,4 +87,12 @@ class AppScaleTest { assertEquals(540, base.screenHeightDp) assertEquals(320, base.densityDpi) } + + @Test fun homePageDefaultsToSteamAndIgnoresAnUnknownStoredPage() { + assertEquals(AppUiPrefs.HOME_PAGE_STEAM, AppUiPrefs.homePage(context)) + AppUiPrefs.setHomePage(context, AppUiPrefs.HOME_PAGE_APPS) + assertEquals(AppUiPrefs.HOME_PAGE_APPS, AppUiPrefs.homePage(context)) + context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit().putString("home-page", "gone").commit() + assertEquals(AppUiPrefs.HOME_PAGE_STEAM, AppUiPrefs.homePage(context)) + } } From a1dfb967089deb7d1ee3aef570502c5c19d3b214 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 12:11:45 -0500 Subject: [PATCH 35/57] fix(steam): share the Steam app's prefix with shortcuts of the same install (#2463) * fix(steam): share the Steam app's prefix with shortcuts of the same install * fix(steam): prefer the matching install's save prefix * fix(steam): tolerate an unreadable library when linking a shortcut prefix A library folder that cannot be listed made the shortcut writer exit, so no added game was registered. * fix(steam): repair a dangling shortcut prefix link and keep Steam library installs to their own prefix * fix(steam): only change shortcut prefix links the importer created * fix(steam): record a prefix link only when the importer created it --- docs/development/steam-game-imports.md | 6 + .../usr/local/bin/droiddeck-steam-games | 70 +++++++- tools/tests/test_steam_games.py | 166 ++++++++++++++++++ 3 files changed, 239 insertions(+), 3 deletions(-) diff --git a/docs/development/steam-game-imports.md b/docs/development/steam-game-imports.md index 04065e3a55..2e4a0cc3e7 100644 --- a/docs/development/steam-game-imports.md +++ b/docs/development/steam-game-imports.md @@ -52,6 +52,12 @@ again. A failed title lookup undoes nothing. The launcher likewise drops artwork fetched for the app the files named before and fetches it again; pictures the user chose are kept. +A game that stays a shortcut but sits in a Steam install directory with a single matching +manifest links its shortcut prefix to that app's existing `compatdata/`, so cloud +saves the client downloaded are the ones the shortcut sees. A Steam library install only +uses its own library's prefix. An existing shortcut prefix is never replaced, a link to a +missing prefix is removed first, and nothing is copied. + The account's `.droiddeck-routes.json` maps shortcut IDs to real Steam app IDs so the Android launcher uses the same title and Proton prefix as Steam. Other accounts do not inherit those routes. Managed shortcuts are replaced; user-created shortcuts and diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games index c902676d3f..ac8213d41e 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games @@ -71,7 +71,11 @@ def store_game(game): def manifest_ids(steamapps, name): matches = [] - for manifest in Path(steamapps).glob("appmanifest_*.acf"): + try: + manifests = list(Path(steamapps).glob("appmanifest_*.acf")) + except OSError: + return matches + for manifest in manifests: try: install = re.search(r'"installdir"\s*"([^"\\]*)"', manifest.read_text(), re.I) if install and install[1] == name: @@ -81,13 +85,21 @@ def manifest_ids(steamapps, name): return matches -def identify(game): +def manifest_identity(game): folder = Path(game["folder"]) steamapps = folder.parent.parent for library in ([steamapps] if folder.parent.name == "common" and steamapps.name == "steamapps" else []) + [folder.parent / WINNATIVE]: matches = [appid for appid in manifest_ids(library, folder.name) if appid != SPACEWAR] if matches: - return matches[0] if len(matches) == 1 else None + return (matches[0], library) if len(matches) == 1 else None + return False + + +def identify(game): + folder = Path(game["folder"]) + found = manifest_identity(game) + if found is not False: + return found[0] if found is not None else None ids = set() for parent in {folder, Path(game["exe"]).parent}: try: @@ -508,6 +520,57 @@ def release(steam_root, game, stale, reason): print(f"droiddeck-steam-games: {game.get('name', appid)} {reason}; it is no longer Steam app {appid}") +PREFIX_LINKS = ".droiddeck-prefix-links.json" + + +def steam_prefix(steam_root, game): + identity = manifest_identity(game) + if not identity or not identity[0]: + return None, None + appid, steamapps = identity + installed = steamapps == Path(game["folder"]).parent.parent + for library in [steamapps.parent] if installed else dict.fromkeys([steamapps.parent] + libraries(steam_root)): + prefix = library / "steamapps/compatdata" / str(appid) + if (prefix / "pfx/drive_c").is_dir(): + return appid, str(prefix) + return appid, None + + +def share_prefix(steam_root, game): + shortcut = Path(steam_root) / "steamapps/compatdata" / str(game["appid"] & 0xFFFFFFFF) + record = Path(steam_root) / "steamapps" / PREFIX_LINKS + links = read_json(record, {}) + if not isinstance(links, dict): + links = {} + before = dict(links) + key = str(shortcut) + name = game.get("name", "game") + appid, target = steam_prefix(steam_root, game) + try: + current = os.readlink(shortcut) if os.path.islink(shortcut) else None + if current is not None and links.get(key) == current and current != target: + if target is not None or (not os.path.exists(shortcut) and Path(current).parent.parent.is_dir()): + shortcut.unlink() + current = None + if current is None: + links.pop(key, None) + if current is None and os.path.lexists(shortcut): + if target is not None: + print(f"droiddeck-steam-games: {name} keeps its own prefix; Steam app {appid} saves are in {target}") + elif current is None and target is not None: + shortcut.parent.mkdir(parents=True, exist_ok=True) + shortcut.symlink_to(target) + links[key] = target + print(f"droiddeck-steam-games: {name} shares the saves prefix of Steam app {appid}") + except OSError as error: + print(f"droiddeck-steam-games: {name} keeps its own prefix ({error})") + if links != before: + try: + save_json(record, links) + except OSError as error: + print(f"droiddeck-steam-games: prefix links not recorded ({error})") + + def route(steam_root, acct, games): snapshot = read_json(Path(acct) / "config" / STATE, {}) if not isinstance(snapshot, dict): @@ -557,6 +620,7 @@ def route(steam_root, acct, games): elif named and seeded(steamapps, game, appid): routes[str(game["appid"])] = appid continue + share_prefix(steam_root, game) shortcuts.append(game) try: park(steamapps) diff --git a/tools/tests/test_steam_games.py b/tools/tests/test_steam_games.py index 16c08e142f..13235e68b4 100644 --- a/tools/tests/test_steam_games.py +++ b/tools/tests/test_steam_games.py @@ -3,6 +3,7 @@ import importlib.util import json import os from pathlib import Path +import shutil import subprocess import tempfile import unittest @@ -56,6 +57,171 @@ class ImportsTest(unittest.TestCase): self.assertEqual(self.folder, (self.steam / 'steamapps/common/DroidDeck-42').resolve()) self.assertEqual(b'game', self.exe.read_bytes()) + def steam_install(self, appid=42): + library = self.root / 'Library' + folder = library / 'steamapps/common/Example' + folder.mkdir(parents=True) + (folder / 'Example.exe').write_bytes(b'game') + (library / f'steamapps/appmanifest_{appid}.acf').write_text(f'"AppState"\n{{\n"appid" "{appid}"\n"installdir" "Example"\n}}\n') + saves = library / f'steamapps/compatdata/{appid}/pfx/drive_c/users/steamuser' + saves.mkdir(parents=True) + (saves / 'save.dat').write_bytes(b'cloud') + return dict(self.game, folder=str(folder), exe=str(folder / 'Example.exe'), dir=str(folder)), library + + def shortcut_prefix(self): + return self.steam / 'steamapps/compatdata' / str(self.game['appid'] & 0xFFFFFFFF) + + def link_shortcut_prefix(self, target, owned=True): + (self.steam / 'steamapps/compatdata').mkdir(parents=True, exist_ok=True) + self.shortcut_prefix().symlink_to(target) + if owned: + imports.save_json(self.steam / 'steamapps' / imports.PREFIX_LINKS, + {str(self.shortcut_prefix()): str(target)}) + + def test_shortcut_of_a_steam_install_shares_the_steam_apps_prefix(self): + game, library = self.steam_install() + (self.steam / 'steamapps').mkdir(parents=True) + (self.steam / 'steamapps/libraryfolders.vdf').write_text(f'"libraryfolders"\n{{\n"1" {{ "path" "{library}" }}\n}}\n') + games, routes = imports.route(self.steam, self.acct, [game]) + self.assertEqual(([game], {}), (games, routes)) + self.assertEqual(library / 'steamapps/compatdata/42', self.shortcut_prefix().resolve()) + self.assertEqual(b'cloud', (self.shortcut_prefix() / 'pfx/drive_c/users/steamuser/save.dat').read_bytes()) + + def test_matching_install_prefix_precedes_an_older_prefix_in_another_library(self): + game, library = self.steam_install() + (self.steam / 'steamapps').mkdir(parents=True) + (self.steam / 'steamapps/libraryfolders.vdf').write_text(f'"libraryfolders"\n{{\n"1" {{ "path" "{library}" }}\n}}\n') + older = self.steam / 'steamapps/compatdata/42/pfx/drive_c/users/steamuser' + older.mkdir(parents=True) + (older / 'save.dat').write_bytes(b'old') + imports.route(self.steam, self.acct, [game]) + self.assertEqual(library / 'steamapps/compatdata/42', self.shortcut_prefix().resolve()) + self.assertEqual(b'cloud', (self.shortcut_prefix() / 'pfx/drive_c/users/steamuser/save.dat').read_bytes()) + self.assertEqual(b'old', (older / 'save.dat').read_bytes()) + + def test_an_existing_shortcut_prefix_is_never_replaced(self): + game, library = self.steam_install() + (self.steam / 'steamapps').mkdir(parents=True, exist_ok=True) + (self.steam / 'steamapps/libraryfolders.vdf').write_text(f'"libraryfolders"\n{{\n"1" {{ "path" "{library}" }}\n}}\n') + local = self.shortcut_prefix() / 'pfx/drive_c' + local.mkdir(parents=True) + (local / 'local.dat').write_bytes(b'local') + imports.route(self.steam, self.acct, [game]) + self.assertFalse(self.shortcut_prefix().is_symlink()) + self.assertEqual(b'local', (local / 'local.dat').read_bytes()) + self.assertEqual(b'cloud', (library / 'steamapps/compatdata/42/pfx/drive_c/users/steamuser/save.dat').read_bytes()) + + def test_shortcuts_without_a_manifest_identity_keep_their_own_prefix(self): + game, library = self.steam_install() + (self.steam / 'steamapps').mkdir(parents=True, exist_ok=True) + (self.steam / 'steamapps/libraryfolders.vdf').write_text(f'"libraryfolders"\n{{\n"1" {{ "path" "{library}" }}\n}}\n') + imports.route(self.steam, self.acct, [self.game, dict(game, folder=str(self.folder.parent / 'Other'))]) + self.assertFalse(os.path.lexists(self.shortcut_prefix())) + + def test_a_manifest_without_a_steam_prefix_links_nothing(self): + game, library = self.steam_install() + shutil.rmtree(library / 'steamapps/compatdata/42') + (self.steam / 'steamapps').mkdir(parents=True, exist_ok=True) + (self.steam / 'steamapps/libraryfolders.vdf').write_text(f'"libraryfolders"\n{{\n"1" {{ "path" "{library}" }}\n}}\n') + imports.route(self.steam, self.acct, [game]) + self.assertFalse(os.path.lexists(self.shortcut_prefix())) + + def test_an_older_prefix_in_another_library_is_not_linked_for_a_steam_install(self): + game, library = self.steam_install() + shutil.rmtree(library / 'steamapps/compatdata/42') + (self.steam / 'steamapps').mkdir(parents=True, exist_ok=True) + (self.steam / 'steamapps/libraryfolders.vdf').write_text(f'"libraryfolders"\n{{\n"1" {{ "path" "{library}" }}\n}}\n') + (self.steam / 'steamapps/compatdata/42/pfx/drive_c').mkdir(parents=True) + imports.route(self.steam, self.acct, [game]) + self.assertFalse(os.path.lexists(self.shortcut_prefix())) + + def test_a_dangling_shortcut_prefix_link_is_replaced(self): + game, library = self.steam_install() + self.link_shortcut_prefix(self.root / 'moved') + imports.route(self.steam, self.acct, [game]) + self.assertEqual(library / 'steamapps/compatdata/42', self.shortcut_prefix().resolve()) + + def test_a_dangling_shortcut_prefix_link_is_removed_without_a_replacement(self): + game, library = self.steam_install() + shutil.rmtree(library / 'steamapps/compatdata/42') + self.link_shortcut_prefix(self.root / 'moved') + imports.route(self.steam, self.acct, [game]) + self.assertFalse(os.path.lexists(self.shortcut_prefix())) + + def test_a_link_the_user_made_is_never_changed(self): + game, library = self.steam_install() + for target in (self.root / 'moved', library / 'steamapps/compatdata/42', self.folder): + if os.path.lexists(self.shortcut_prefix()): + self.shortcut_prefix().unlink() + self.link_shortcut_prefix(target, owned=False) + imports.route(self.steam, self.acct, [game]) + self.assertEqual(str(target), os.readlink(self.shortcut_prefix())) + + def test_a_user_link_to_the_matching_prefix_is_never_recorded_or_removed(self): + game, library = self.steam_install() + target = library / 'steamapps/compatdata/42' + self.link_shortcut_prefix(target, owned=False) + imports.route(self.steam, self.acct, [game]) + self.assertEqual(str(target), os.readlink(self.shortcut_prefix())) + self.assertNotIn(str(self.shortcut_prefix()), imports.read_json(self.steam / 'steamapps' / imports.PREFIX_LINKS, {})) + shutil.rmtree(target) + imports.route(self.steam, self.acct, [game]) + self.assertTrue(os.path.islink(self.shortcut_prefix())) + self.assertEqual(str(target), os.readlink(self.shortcut_prefix())) + + def test_our_link_survives_a_library_that_is_temporarily_missing(self): + game, library = self.steam_install() + imports.route(self.steam, self.acct, [game]) + hidden = self.root / 'Hidden' + library.rename(hidden) + imports.route(self.steam, self.acct, [game]) + self.assertTrue(os.path.islink(self.shortcut_prefix())) + hidden.rename(library) + imports.route(self.steam, self.acct, [game]) + self.assertEqual(library / 'steamapps/compatdata/42', self.shortcut_prefix().resolve()) + self.assertEqual(b'cloud', (self.shortcut_prefix() / 'pfx/drive_c/users/steamuser/save.dat').read_bytes()) + + def test_our_link_is_dropped_once_its_prefix_is_deleted(self): + game, library = self.steam_install() + imports.route(self.steam, self.acct, [game]) + shutil.rmtree(library / 'steamapps/compatdata/42') + imports.route(self.steam, self.acct, [game]) + self.assertFalse(os.path.lexists(self.shortcut_prefix())) + self.assertEqual({}, imports.read_json(self.steam / 'steamapps' / imports.PREFIX_LINKS, None)) + + def test_a_replaced_link_record_is_forgotten_when_the_user_makes_a_real_prefix(self): + game, library = self.steam_install() + imports.route(self.steam, self.acct, [game]) + self.shortcut_prefix().unlink() + (self.shortcut_prefix() / 'pfx/drive_c').mkdir(parents=True) + imports.route(self.steam, self.acct, [game]) + self.assertFalse(self.shortcut_prefix().is_symlink()) + self.assertEqual({}, imports.read_json(self.steam / 'steamapps' / imports.PREFIX_LINKS, None)) + + def test_a_shortcut_prefix_with_its_own_saves_is_reported_and_kept(self): + game, library = self.steam_install() + local = self.shortcut_prefix() / 'pfx/drive_c' + local.mkdir(parents=True) + with patch('builtins.print') as printed: + imports.route(self.steam, self.acct, [game]) + self.assertTrue(local.is_dir()) + self.assertIn('keeps its own prefix', printed.call_args_list[-1][0][0]) + + def test_a_winnative_game_shares_the_prefix_the_steam_client_uses(self): + self.winnative_manifest() + (self.steam / 'steamapps/libraryfolders.vdf').parent.mkdir(parents=True, exist_ok=True) + saves = self.steam / 'steamapps/compatdata/42/pfx/drive_c/users/steamuser' + saves.mkdir(parents=True) + (saves / 'save.dat').write_bytes(b'cloud') + imports.share_prefix(self.steam, self.game) + self.assertEqual(self.steam / 'steamapps/compatdata/42', self.shortcut_prefix().resolve()) + + def test_an_unreadable_library_does_not_stop_the_routing(self): + with patch.object(Path, 'glob', side_effect=PermissionError): + games, routes = imports.route(self.steam, self.acct, [self.game]) + self.assertEqual([self.game], games) + self.assertFalse(os.path.lexists(self.shortcut_prefix())) + def test_store_installs_stay_shortcuts_even_when_owned_on_steam(self): self.snapshot() game = dict(self.game, store='amazon') From 76f0c512352670369ff7adda78ddf26d8103a4f4 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 12:12:24 -0500 Subject: [PATCH 36/57] feat(stores): show the pre-install size in store game details (#2438) * feat(stores): show the download size in store game details * test(stores): preserve other catalog sizes * fix(stores): restart the pre-install size lookup when the item becomes accessible * fix(stores): retry size lookups that returned no size * fix(stores): complete shared size lookups only after a failed one is cleared * fix(stores): complete synchronous size lookup failures without an API 31 call --- .../droiddeck/launcher/stores/StoreSizes.kt | 23 ++++- .../com/droiddeck/launcher/ui/GameDetail.kt | 14 ++- .../launcher/stores/StoreSizesTest.kt | 96 +++++++++++++++++++ 3 files changed, 128 insertions(+), 5 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/StoreSizesTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt index 5e8ce7c6d7..b102c8114c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt @@ -43,7 +43,7 @@ object StoreSizes { if (available != null) return CompletableFuture.completedFuture(available) val app = context.applicationContext val version = item.extra["version"].orEmpty() - return sizeRequests.computeIfAbsent(item.key) { + return shared(sizeRequests, item.key) { CompletableFuture.supplyAsync({ val cached = cache(app, item.store).get(item.id, version) val bytes = cached ?: runCatching { fetch(app, item) } @@ -66,6 +66,25 @@ object StoreSizes { } } + internal fun shared( + requests: ConcurrentHashMap>, + key: String, + start: () -> CompletableFuture, + ): CompletableFuture { + var created: CompletableFuture? = null + val shared = requests.computeIfAbsent(key) { CompletableFuture().also { created = it } } + if (created === shared) { + val source = runCatching(start).getOrElse { failure -> + CompletableFuture().apply { completeExceptionally(failure) } + } + source.whenComplete { bytes, error -> + if (bytes == null) requests.remove(key, shared) + if (error != null) shared.completeExceptionally(error) else shared.complete(bytes) + } + } + return shared + } + val onDisk = mutableStateMapOf() fun requestDisk(context: Context, key: String, game: InstalledStoreGame) { @@ -78,7 +97,7 @@ object StoreSizes { onDisk[key]?.let { return CompletableFuture.completedFuture(it) } val app = context.applicationContext val version = "disk:${game.sidecar.installedAt}:${game.sidecar.installVersion}" - return diskRequests.computeIfAbsent(key) { + return shared(diskRequests, key) { CompletableFuture.supplyAsync({ val c = cache(app, game.sidecar.store) c.get("disk:${game.sidecar.id}", version) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index 9ac3a96027..bee82bbd2c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -309,7 +309,7 @@ private fun GameStatusLine(source: String, game: Library.SteamGame?, item: Catal item?.accessible == true -> listOf(stringResource(R.string.stores_eyebrow_library)) else -> listOf(stringResource(R.string.stores_eyebrow_store)) } - val size = if (folder != null && (installed != null || game != null)) diskSize(installed, folder) else (item?.sizeBytes ?: 0L).takeIf { it > 0 } + val size = if (folder != null && (installed != null || game != null)) diskSize(installed, folder) else catalogSize(item).takeIf { it > 0 } val line = (state + listOfNotNull(size?.let { formatBytes(it) })).filter { it.isNotBlank() }.joinToString(" · ").replaceFirstChar { it.uppercase() } val muted = colors.onBackground.copy(alpha = 0.78f) Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { @@ -399,6 +399,7 @@ internal fun GameActions( val download = rawDownload?.takeIf { it.isActive } val failed = rawDownload?.takeIf { it.state == DownloadState.FAILED } val cloud = game?.library == Library.XBOX_CLOUD && installed == null + val downloadBytes = catalogSize(item) Actions { when { s.shortcutPicker && game != null -> { @@ -474,7 +475,7 @@ internal fun GameActions( if (item?.installable == true && item.xboxPc) { SecondaryButton( if (StoresState.isUnfinished(item)) stringResource(R.string.stores_resume_install) - else if (item.sizeBytes > 0) stringResource(R.string.stores_install_size, formatBytes(item.sizeBytes)) + else if (downloadBytes > 0) stringResource(R.string.stores_install_size, formatBytes(downloadBytes)) else stringResource(R.string.stores_install), ) { StoresState.requestInstall(ctx, item) } } @@ -492,7 +493,7 @@ internal fun GameActions( } item?.installable == true -> { InstallButton( - if (item.sizeBytes > 0) stringResource(R.string.stores_install_size, formatBytes(item.sizeBytes)) else stringResource(R.string.stores_install), + if (downloadBytes > 0) stringResource(R.string.stores_install_size, formatBytes(downloadBytes)) else stringResource(R.string.stores_install), leadOn, ) { StoresState.requestInstall(ctx, item) } if (store == Store.XBOX && item.xboxCloud) { @@ -1016,6 +1017,13 @@ internal fun FactRow(label: String, value: String, labelWidth: androidx.compose. } } +@Composable +internal fun catalogSize(item: CatalogItem?): Long { + val ctx = LocalContext.current + if (item != null) LaunchedEffect(item.key, item.accessible) { StoreSizes.request(ctx, item) } + return item?.let { StoreSizes.size(it) } ?: 0L +} + @Composable internal fun diskSize(installed: InstalledStoreGame?, folder: File): Long? { val ctx = LocalContext.current diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreSizesTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreSizesTest.kt new file mode 100644 index 0000000000..2a306aeff8 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreSizesTest.kt @@ -0,0 +1,96 @@ +package com.droiddeck.launcher.stores + +import java.util.concurrent.CompletableFuture +import java.util.concurrent.ConcurrentHashMap +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotSame +import org.junit.Assert.assertSame +import org.junit.Assert.assertTrue +import org.junit.Test + +class StoreSizesTest { + private val ea = CatalogItem(Store.EA, "Origin.OFR.50.0001", "Game", imageUrl = null, owned = true) + + @After fun clear() { + StoreSizes.known.clear() + } + + @Test fun anUnresolvedSizeIsUnknown() { + assertEquals(0L, StoreSizes.size(ea)) + } + + @Test fun aResolvedSizeReplacesTheCatalogValue() { + StoreSizes.known[ea.key] = 4_200_000_000L + assertEquals(4_200_000_000L, StoreSizes.size(ea)) + } + + @Test fun aResolvedSizeOnlyAppliesToItsOwnGame() { + StoreSizes.known[ea.key] = 4_200_000_000L + assertEquals(0L, StoreSizes.size(ea.copy(id = "Origin.OFR.50.0002"))) + assertEquals(7L, StoreSizes.size(ea.copy(id = "Origin.OFR.50.0002", sizeBytes = 7L))) + } + + @Test fun anEaSizeDoesNotReplaceAnotherStoresCatalogSize() { + StoreSizes.known[ea.key] = 4_200_000_000L + val epic = ea.copy(store = Store.EPIC, id = "Epic.Game", sizeBytes = 7L) + assertEquals(7L, StoreSizes.size(epic)) + } + + @Test fun aFailedLookupIsRetriedOnTheNextRequest() { + val requests = ConcurrentHashMap>() + val failed = StoreSizes.shared(requests, ea.key) { CompletableFuture.completedFuture(null) } + assertEquals(null, failed.get()) + val retried = StoreSizes.shared(requests, ea.key) { CompletableFuture.completedFuture(9L) } + assertNotSame(failed, retried) + assertEquals(9L, retried.get()) + } + + @Test fun aResolvedLookupIsSharedAndKept() { + val requests = ConcurrentHashMap>() + val first = StoreSizes.shared(requests, ea.key) { CompletableFuture.completedFuture(5L) } + val second = StoreSizes.shared(requests, ea.key) { CompletableFuture.completedFuture(6L) } + assertSame(first, second) + assertEquals(5L, second.get()) + } + + @Test fun anInFlightLookupIsSharedBetweenRequests() { + val requests = ConcurrentHashMap>() + val pending = CompletableFuture() + val first = StoreSizes.shared(requests, ea.key) { pending } + val second = StoreSizes.shared(requests, ea.key) { CompletableFuture.completedFuture(1L) } + assertSame(first, second) + pending.complete(null) + assertEquals(null, second.get()) + assertEquals(0, requests.size) + } + + @Test fun aContinuationThatRequestsAgainAfterAFailureStartsANewLookup() { + val requests = ConcurrentHashMap>() + val pending = CompletableFuture() + val first = StoreSizes.shared(requests, ea.key) { pending } + val retried = CompletableFuture() + first.thenAccept { bytes -> + if (bytes == null) retried.complete(StoreSizes.shared(requests, ea.key) { CompletableFuture.completedFuture(9L) }.get()) + } + pending.complete(null) + assertEquals(9L, retried.get()) + } + + @Test fun concurrentCallersShareOneLookup() { + val requests = ConcurrentHashMap>() + val pending = CompletableFuture() + var starts = 0 + val callers = (1..3).map { StoreSizes.shared(requests, ea.key) { starts++; pending } } + pending.complete(3L) + assertEquals(1, starts) + callers.forEach { assertEquals(3L, it.get()) } + } + + @Test fun synchronousStartFailureCompletesAndAllowsRetry() { + val requests = ConcurrentHashMap>() + val failed = StoreSizes.shared(requests, ea.key) { throw IllegalStateException("boom") } + assertTrue(failed.isCompletedExceptionally) + assertEquals(4L, StoreSizes.shared(requests, ea.key) { CompletableFuture.completedFuture(4L) }.get()) + } +} From dacfee64abfa275a0f72c7693c6946cc1a2db910 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 12:21:36 -0500 Subject: [PATCH 37/57] feat(agent): compact composer, plan go or revise, usage limits, diffs and send now (#2531) * fix(runtime): the userland resolver survives a crash mid-write * feat(agent): compact composer, plan go or revise, usage limits, diffs and send now --- .../droiddeck/launcher/agent/AgentChats.kt | 9 +- .../droiddeck/launcher/agent/AgentHarness.kt | 78 ++- .../com/droiddeck/launcher/agent/AgentHost.kt | 69 ++- .../runtime/LinuxNetworkLinkComponent.kt | 25 +- .../com/droiddeck/launcher/ui/AgentEntries.kt | 124 +++- .../com/droiddeck/launcher/ui/AgentPage.kt | 554 +++++++++++++----- .../com/droiddeck/launcher/ui/AgentPanels.kt | 70 +++ .../droiddeck/launcher/ui/SessionOverlay.kt | 1 + app/src/main/res/values/strings.xml | 22 + .../droiddeck/launcher/agent/AgentHostTest.kt | 47 +- .../droiddeck/launcher/ui/AgentChangesTest.kt | 41 ++ 11 files changed, 874 insertions(+), 166 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/AgentChangesTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentChats.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentChats.kt index e228f1aa5d..aedd840dd0 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentChats.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentChats.kt @@ -74,7 +74,11 @@ object AgentChats { is Entry.Used -> JSONObject().put("used", entry.tool).put("detail", entry.detail).put("id", entry.id).put("input", entry.input) .apply { entry.output?.let { put("output", it).put("failed", entry.failed) } } is Entry.Finished -> JSONObject().put("finished", true).put("error", entry.error ?: JSONObject.NULL).put("stopped", entry.stopped).apply { - entry.usage?.let { put("ms", it.durationMs).put("cost", it.costUsd).put("in", it.inputTokens).put("out", it.outputTokens) } + if (entry.planned) put("planned", true) + entry.usage?.let { + put("ms", it.durationMs).put("cost", it.costUsd).put("in", it.inputTokens).put("out", it.outputTokens) + if (it.context > 0) put("ctx", it.context).put("win", it.window) + } } }.toString() @@ -105,7 +109,8 @@ object AgentChats { o.has("result") -> Entry.Result(o.getString("result"), o.optString("output"), o.optBoolean("failed")) o.has("finished") -> Entry.Finished( if (o.isNull("error")) null else o.optString("error"), o.optBoolean("stopped"), - if (o.has("ms")) AgentHost.Usage(o.optLong("ms"), o.optDouble("cost", 0.0), o.optLong("in"), o.optLong("out")) else null, + if (o.has("ms")) AgentHost.Usage(o.optLong("ms"), o.optDouble("cost", 0.0), o.optLong("in"), o.optLong("out"), o.optLong("ctx"), o.optLong("win")) else null, + o.optBoolean("planned"), ) else -> null } diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt index 78dbbd1900..6709399b01 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt @@ -31,6 +31,8 @@ interface AgentHarness { fun parse(line: String): AgentEvent? /** Sets the CLI's own defaults in the userland before it runs; [rootfs] is the userland's root. */ fun prepare(rootfs: File) {} + /** Context and plan limits the CLI keeps on disk rather than printing, read once a turn of [conversation] is done. */ + fun usage(rootfs: File, conversation: String?): AgentEvent? = null data class Model(val id: String, val label: String) @@ -50,6 +52,9 @@ data class AgentEvent( val thinking: String? = null, /** Tokens the conversation's context holds after this step. */ val context: Long? = null, + /** Tokens the model's context can hold. */ + val window: Long? = null, + val limits: List? = null, val usage: AgentHost.Usage? = null, ) @@ -139,10 +144,12 @@ object ClaudeCode : AgentHarness { } AgentEvent(conversation, results) } + "rate_limit_event" -> AgentEvent(conversation, limits = limits(o.optJSONObject("rate_limit_info"))) // A resumed session first answers background tasks the last run left behind; that result is not the turn's. "result" -> if (o.optJSONObject("origin")?.optString("kind") == "task-notification") conversation?.let { AgentEvent(it) } else AgentEvent( conversation, listOf(AgentHost.Entry.Finished(if (o.optBoolean("is_error")) o.optString("result").ifEmpty { o.optString("subtype") } else null)), + window = window(o.optJSONObject("modelUsage")), usage = AgentHost.Usage( o.optLong("duration_ms"), o.optDouble("total_cost_usd", 0.0), o.optJSONObject("usage")?.let { it.optLong("input_tokens") + it.optLong("cache_read_input_tokens") + it.optLong("cache_creation_input_tokens") } ?: 0, @@ -153,6 +160,24 @@ object ClaudeCode : AgentHarness { } } + private val WINDOW_MINUTES = mapOf("five_hour" to 300, "seven_day" to 10_080) + + @VisibleForTesting + internal fun limits(info: JSONObject?): List? { + val windows = info?.optJSONObject("unifiedWindows") ?: return null + return WINDOW_MINUTES.mapNotNull { (key, minutes) -> + val w = windows.optJSONObject(key) ?: return@mapNotNull null + AgentHost.Limit(minutes, (w.optDouble("utilization", 0.0) * 100).toInt(), w.optLong("resetsAt")) + }.takeIf { it.isNotEmpty() } + } + + /** The context window of the model that did most of the turn; subagents may run a smaller one. */ + private fun window(models: JSONObject?): Long? { + models ?: return null + return models.keys().asSequence().mapNotNull { models.optJSONObject(it) } + .maxByOrNull { it.optDouble("costUSD", 0.0) }?.optLong("contextWindow")?.takeIf { it > 0 } + } + private fun resultText(content: Any?): String = when (content) { is String -> content is JSONArray -> (0 until content.length()).mapNotNull { i -> @@ -180,8 +205,8 @@ object ClaudeCode : AgentHarness { input ?: return "" return when { tool == "Bash" -> input.optString("command") - tool == "Edit" -> "${input.optString("file_path")}\n\n- ${input.optString("old_string").replace("\n", "\n- ")}\n\n+ ${input.optString("new_string").replace("\n", "\n+ ")}" - tool == "Write" -> "${input.optString("file_path")}\n\n${input.optString("content")}" + tool == "Edit" -> input.optString("file_path") + "\n" + lineDiff(input.optString("old_string"), input.optString("new_string")) + tool == "Write" -> input.optString("file_path") + "\n" + lineDiff("", input.optString("content")) tool == "TodoWrite" -> todos(input.optJSONArray("todos")) else -> input.toString(2) } @@ -287,6 +312,33 @@ object Codex : AgentHarness { return if (entries.isEmpty()) null else AgentEvent(entries = entries) } + private const val TOKEN_COUNT = "\"payload\":{\"type\":\"token_count\"" + + /** Codex prints no limits with --json; its session log, named after the thread, has a token_count event each step. */ + override fun usage(rootfs: File, conversation: String?): AgentEvent? { + conversation ?: return null + val log = File(rootfs, "root/.codex/sessions").walkBottomUp().filter { it.isFile && it.name.endsWith("-$conversation.jsonl") } + .maxByOrNull { it.lastModified() } ?: return null + val last = runCatching { log.readLines().lastOrNull { it.contains(TOKEN_COUNT) } }.getOrNull() ?: return null + return tokenCount(last) + } + + @VisibleForTesting + internal fun tokenCount(line: String): AgentEvent? { + val payload = runCatching { JSONObject(line).optJSONObject("payload") }.getOrNull()?.takeIf { it.optString("type") == "token_count" } ?: return null + val info = payload.optJSONObject("info") + val rates = payload.optJSONObject("rate_limits") + val limits = listOf("primary", "secondary").mapNotNull { key -> + val w = rates?.optJSONObject(key) ?: return@mapNotNull null + AgentHost.Limit(w.optInt("window_minutes"), w.optDouble("used_percent", 0.0).toInt(), w.optLong("resets_at")) + } + return AgentEvent( + context = info?.optJSONObject("last_token_usage")?.optLong("total_tokens")?.takeIf { it > 0 }, + window = info?.optLong("model_context_window")?.takeIf { it > 0 }, + limits = limits.takeIf { it.isNotEmpty() }, + ) + } + private fun todoEntry(id: String, item: JSONObject): AgentHost.Entry.Used { val items = item.optJSONArray("items") ?: JSONArray() val text = (0 until items.length()).mapNotNull { i -> @@ -305,6 +357,28 @@ object Codex : AgentHarness { @VisibleForTesting internal fun firstLine(text: String) = text.lineSequence().first().take(160) +private const val DIFF_CONTEXT = 2 + +/** + * [old] against [new], one line per changed or nearby line, each led by ' ', '-' or '+'. Edits + * replace a short span, so the lines both share at the start and end are cut to [DIFF_CONTEXT]. + */ +@VisibleForTesting +internal fun lineDiff(old: String, new: String): String { + val a = if (old.isEmpty()) emptyList() else old.removeSuffix("\n").lines() + val b = if (new.isEmpty()) emptyList() else new.removeSuffix("\n").lines() + var head = 0 + while (head < a.size && head < b.size && a[head] == b[head]) head++ + var tail = 0 + while (tail < a.size - head && tail < b.size - head && a[a.size - 1 - tail] == b[b.size - 1 - tail]) tail++ + return buildList { + a.subList(maxOf(0, head - DIFF_CONTEXT), head).forEach { add(" $it") } + a.subList(head, a.size - tail).forEach { add("-$it") } + b.subList(head, b.size - tail).forEach { add("+$it") } + a.subList(a.size - tail, minOf(a.size, a.size - tail + DIFF_CONTEXT)).forEach { add(" $it") } + }.joinToString("\n") +} + private val SHELL_WRAPPER = Regex("^/bin/(?:ba)?sh -l?c '(.*)'$", RegexOption.DOT_MATCHES_ALL) /** Codex runs each command as `/bin/bash -lc ''`; the command is what the user wants to read. */ diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt index ac47bd5235..aa369a6883 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt @@ -32,10 +32,18 @@ object AgentHost { /** A tool call; [output] stays null until its result arrives. */ data class Used(val id: String, val tool: String, val detail: String, val input: String = "", val output: String? = null, val failed: Boolean = false) : Entry data class Result(val id: String, val output: String, val failed: Boolean) : Entry - data class Finished(val error: String?, val stopped: Boolean = false, val usage: Usage? = null) : Entry + /** [planned]: the turn ran in plan mode, so it ends on a plan that nothing has carried out yet. */ + data class Finished(val error: String?, val stopped: Boolean = false, val usage: Usage? = null, val planned: Boolean = false) : Entry } - data class Usage(val durationMs: Long, val costUsd: Double, val inputTokens: Long, val outputTokens: Long) + /** [context] of [window] tokens is what the conversation held when the turn ended. */ + data class Usage( + val durationMs: Long, val costUsd: Double, val inputTokens: Long, val outputTokens: Long, + val context: Long = 0, val window: Long = 0, + ) + + /** A plan usage limit over a rolling window of [minutes]; [resetsAt] is in epoch seconds. */ + data class Limit(val minutes: Int, val usedPercent: Int, val resetsAt: Long) /** A message typed while the agent was working, sent when the turn ends. */ data class Queued(val text: String, val files: List) @@ -103,6 +111,12 @@ object AgentHost { /** Tokens in the conversation's context after its last step. */ var context by mutableLongStateOf(0L) private set + /** Tokens the model's context can hold; 0 until a turn has told. */ + var window by mutableLongStateOf(0L) + private set + /** The account's plan limits as [harness] last reported them. */ + var limits by mutableStateOf>(emptyList()) + private set var lab by mutableStateOf(null) private set @@ -119,6 +133,7 @@ object AgentHost { /** The running Lab build was asked for by the current turn, so stopping the turn stops it. */ private var labFromTurn = false private var conversation: String? = null + private var turnPlanned = false private var loaded = false private var appContext: Context? = null @@ -136,6 +151,7 @@ object AgentHost { model = prefs(app).getString(modelKey(harness), null) effort = prefs(app).getString(effortKey(harness), null)?.takeIf { it in harness.efforts } plan = prefs(app).getBoolean(PLAN_KEY, false) + limits = decodeLimits(prefs(app).getString(limitsKey(harness), null)) available = LinuxRuntime.hasRootfs(app) installed = harness.files.all { guestFileExists(app, it) } if (!installed) state = State.MISSING else if (state == State.MISSING) state = State.IDLE @@ -158,7 +174,9 @@ object AgentHost { conversation = loaded.conversation entries.clear() entries.addAll(loaded.entries) - context = 0 + val last = loaded.entries.lastOrNull { it is Entry.Finished && (it.usage?.context ?: 0) > 0 } as? Entry.Finished + context = last?.usage?.context ?: 0 + window = last?.usage?.window ?: 0 } /** Opens a kept conversation, switching to the CLI it belongs to. */ @@ -263,11 +281,15 @@ object AgentHost { AgentHostService.start(app) val current = harness val prompt = AgentAttachments.prompt(message, attached) - val command = current.turn(prompt, conversation, AgentHarness.Options(model, plan && current.plans, BRIEF, effort)) + turnPlanned = plan && current.plans + val command = current.turn(prompt, conversation, AgentHarness.Options(model, turnPlanned, BRIEF, effort)) val workdir = workspace(app) + var threadConversation = conversation Thread({ runCatching { current.prepare(LinuxRuntime.rootDir(app)) } runCatching { AgentSetup.installHelpers(app) } + // Without a session nothing else keeps the userland's resolver current. + runCatching { com.droiddeck.launcher.runtime.LinuxNetworkLinkComponent(app, LinuxRuntime.rootDir(app)).publish() } val child = try { guest(app, command, workdir).start() } catch (e: Exception) { @@ -288,8 +310,12 @@ object AgentHost { runCatching { child.inputStream.bufferedReader().forEachLine { line -> runCatching { raw?.apply { write(line); newLine(); flush() } } - val event = current.parse(line) ?: return@forEachLine - if (event.entries.any { it is Entry.Finished }) ended = true + val parsed = current.parse(line) ?: return@forEachLine + parsed.conversation?.let { threadConversation = it } + val done = parsed.entries.any { it is Entry.Finished } + if (done) ended = true + val event = if (!done) parsed else runCatching { current.usage(LinuxRuntime.rootDir(app), threadConversation) }.getOrNull() + ?.let { parsed.copy(context = it.context ?: parsed.context, window = it.window ?: parsed.window, limits = it.limits ?: parsed.limits) } ?: parsed main.post { if (turn === started) apply(app, event) } } } @@ -323,6 +349,16 @@ object AgentHost { queue.remove(item) } + /** Sends [item] now: the running turn stops where it is, and the rest of the queue waits for the next one. */ + fun sendNow(context: Context, item: Queued) { + val app = context.applicationContext + if (!queue.remove(item)) return + val rest = queue.toList() + stop(app) + queue.addAll(rest) + send(app, item.text, item.files) + } + /** Starts a new conversation; the current one stays in the history. */ fun forget(context: Context) { stop(context) @@ -331,6 +367,7 @@ object AgentHost { chat = null conversation = null this.context = 0 + window = 0 prefs(context).edit().remove(CHAT_KEY).apply() state = if (installed) State.IDLE else State.MISSING } @@ -380,6 +417,11 @@ object AgentHost { event.text?.let { live += it } event.thinking?.let { liveThinking += it } event.context?.let { context = it } + event.window?.let { window = it } + event.limits?.let { reported -> + limits = (limits.filter { old -> reported.none { it.minutes == old.minutes } } + reported).sortedBy { it.minutes } + prefs(app).edit().putString(limitsKey(harness), encodeLimits(limits)).apply() + } for (entry in event.entries) when (entry) { is Entry.Finished -> finish(app, entry.error, usage = event.usage) else -> { @@ -397,7 +439,8 @@ object AgentHost { if (!stopped) labFromTurn = false live = "" liveThinking = "" - record(app, Entry.Finished(error, stopped, usage)) + val held = if (context > 0) (usage ?: Usage(0, 0.0, 0, 0)).copy(context = context, window = window) else usage + record(app, Entry.Finished(error, stopped, held, planned = turnPlanned && !stopped && error == null)) state = State.IDLE unseen = true failed = error != null @@ -555,6 +598,18 @@ object AgentHost { private const val RETRY_MS = 3_000L private fun modelKey(harness: AgentHarness) = "model_${harness.id}" + private fun limitsKey(harness: AgentHarness) = "limits_${harness.id}" + + @VisibleForTesting + internal fun encodeLimits(list: List) = org.json.JSONArray(list.map { + org.json.JSONObject().put("minutes", it.minutes).put("used", it.usedPercent).put("resets", it.resetsAt) + }).toString() + + @VisibleForTesting + internal fun decodeLimits(text: String?): List = runCatching { + val a = org.json.JSONArray(text ?: return emptyList()) + (0 until a.length()).map { a.getJSONObject(it) }.map { Limit(it.optInt("minutes"), it.optInt("used"), it.optLong("resets")) } + }.getOrDefault(emptyList()) private fun effortKey(harness: AgentHarness) = "effort_${harness.id}" internal fun prefs(context: Context) = context.getSharedPreferences("agent", Context.MODE_PRIVATE) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt index 7081d88114..46c29aadb8 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt @@ -157,9 +157,7 @@ class LinuxNetworkLinkComponent( synchronized(lock) { try { file.parentFile?.mkdirs() - val staged = File(file.path + ".staged") - staged.writeText(describe(properties, capabilities)) - if (!staged.renameTo(file)) throw IOException("Could not replace $file") + replace(file, describe(properties, capabilities)) } catch (e: IOException) { Log.w(TAG, "Could not publish the network link", e) } @@ -241,9 +239,7 @@ class LinuxNetworkLinkComponent( } try { val file = File(rootDir, "etc/droiddeck-network.json") - val staged = File(file.path + ".staged") - staged.writeText(state.toString()) - if (!staged.renameTo(file)) throw IOException("Could not replace network state") + replace(file, state.toString()) } catch (e: IOException) { Log.w(TAG, "Could not publish the network state", e) } @@ -272,6 +268,19 @@ class LinuxNetworkLinkComponent( return Pair(servers.sortedWith(order), gateways.sortedWith(order)) } + /** + * Writes [text] to [file] through a staged copy. The copy is synced before the rename, or a + * crash or power cut can keep the rename and lose the data, leaving a file of NUL bytes. + */ + private fun replace(file: File, text: String) { + val staged = File(file.path + ".staged") + java.io.FileOutputStream(staged).use { out -> + out.write(text.toByteArray()) + out.fd.sync() + } + if (!staged.renameTo(file)) throw IOException("Could not replace $file") + } + private fun writeResolver(properties: LinkProperties?) { val own = properties?.dnsServers.orEmpty() .filter { !it.isLinkLocalAddress && !it.isLoopbackAddress && !it.isAnyLocalAddress } @@ -286,9 +295,7 @@ class LinuxNetworkLinkComponent( } try { val etc = File(rootDir, "etc") - val staged = File(etc, "resolv.conf.staged") - staged.writeText(text) - if (!staged.renameTo(File(etc, "resolv.conf"))) throw IOException("Could not replace resolv.conf") + replace(File(etc, "resolv.conf"), text) val hosts = File(etc, "hosts") if (!hosts.isFile || !hosts.readText().contains("localhost")) { hosts.writeText("127.0.0.1 localhost\n::1 localhost\n") diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt index 63dde38872..d651aec3a5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt @@ -29,6 +29,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue @@ -39,6 +40,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.SpanStyle @@ -57,7 +59,7 @@ import com.droiddeck.launcher.agent.AgentHost import com.droiddeck.launcher.agent.AgentHost.Entry @Composable -internal fun AgentEntry(entry: Entry, running: Boolean, last: Boolean = false) { +internal fun AgentEntry(entry: Entry, running: Boolean, last: Boolean = false, changes: Changes? = null, onRevise: () -> Unit = {}) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current when (entry) { @@ -72,12 +74,66 @@ internal fun AgentEntry(entry: Entry, running: Boolean, last: Boolean = false) { is Entry.Thought -> AgentThought(entry.text, live = false) is Entry.Used -> if (entry.tool == "TodoWrite") AgentTodos(entry.input) else AgentToolCall(entry, running) is Entry.Result -> Unit - is Entry.Finished -> if (last && AgentHost.answerless(AgentHost.entries)) AgentNoReply() else AgentTurnEnd(entry) + is Entry.Finished -> when { + last && AgentHost.answerless(AgentHost.entries) -> AgentNoReply() + last && entry.planned -> Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + AgentTurnEnd(entry, changes) + AgentPlanActions(onRevise) + } + else -> AgentTurnEnd(entry, changes) + } } } +/** A plan turn changed nothing; Go carries the plan out with plan mode off, Revise asks for another. */ @Composable -private fun AgentTurnEnd(entry: Entry.Finished) { +private fun AgentPlanActions(onRevise: () -> Unit) { + val context = LocalContext.current + val pal = LocalPalette.current + val go = stringResource(R.string.agent_plan_go_message) + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.padding(horizontal = 4.dp)) { + PrimaryButton(stringResource(R.string.agent_plan_go), compact = true, modifier = Modifier.testTag("agent-plan-go")) { + AgentHost.choosePlan(context, false) + AgentHost.send(context, go) + } + SecondaryButton(stringResource(R.string.agent_plan_revise), compact = true, modifier = Modifier.testTag("agent-plan-revise")) { + AgentHost.choosePlan(context, true) + onRevise() + } + Text(stringResource(R.string.agent_plan_untouched), fontSize = 12.sp, color = pal.onSurfaceVariant) + } +} + +/** What a turn's edits added up to: files touched and lines added and removed. */ +internal data class Changes(val files: Int, val added: Int, val removed: Int) + +/** The edits of the turn that ends at [end], or null when it changed no file. */ +internal fun turnChanges(entries: List, end: Int): Changes? { + val start = entries.subList(0, end).indexOfLast { it is Entry.Asked } + // Plan mode saves its plan as a file of its own, which is not a change to anything. + val edits = entries.subList(start + 1, end).filterIsInstance().filter { !it.failed }.mapNotNull { diffOf(it) } + .filter { !it.path.contains("/.claude/plans/") } + if (edits.isEmpty()) return null + return Changes(edits.map { it.path }.distinct().size, edits.sumOf { it.added }, edits.sumOf { it.removed }) +} + +internal class Diff(val path: String, val lines: List) { + val added = lines.count { it.startsWith("+") } + val removed = lines.count { it.startsWith("-") } +} + +/** The diff an Edit or Write carries: its path, then lines led by ' ', '-' or '+'. */ +internal fun diffOf(entry: Entry.Used): Diff? { + if (entry.tool != "Edit" && entry.tool != "Write") return null + val lines = entry.input.lines() + val body = lines.drop(1).filter { it.isNotEmpty() } + if (lines.first().isBlank() || body.isEmpty() || body.any { it[0] != ' ' && it[0] != '-' && it[0] != '+' }) return null + if (body.none { it[0] != ' ' }) return null + return Diff(lines.first(), body) +} + +@Composable +private fun AgentTurnEnd(entry: Entry.Finished, changes: Changes?) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val text = when { @@ -90,10 +146,19 @@ private fun AgentTurnEnd(entry: Entry.Finished) { if (u.inputTokens > 0 || u.outputTokens > 0) add(stringResource(R.string.agent_tokens, tokens(u.inputTokens), tokens(u.outputTokens))) }.joinToString(" · ") } - } ?: return - if (text.isEmpty()) return - Text(text, fontSize = 12.sp, color = if (entry.error != null && !entry.stopped) colors.error else pal.onSurfaceVariant, - modifier = Modifier.padding(horizontal = 4.dp)) + } + if (text.isNullOrEmpty() && changes == null) return + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.padding(horizontal = 4.dp)) { + if (changes != null) Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.clip(Shape12).background(pal.surfaceVariant).padding(horizontal = 9.dp, vertical = 4.dp).testTag("agent-changes"), + ) { + Text(pluralStringResource(R.plurals.agent_files_changed, changes.files, changes.files), fontSize = 12.sp, color = pal.onSurfaceVariant) + Text("+${changes.added}", fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = pal.good) + Text("−${changes.removed}", fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = colors.error) + } + if (!text.isNullOrEmpty()) Text(text, fontSize = 12.sp, color = if (entry.error != null && !entry.stopped) colors.error else pal.onSurfaceVariant) + } } @Composable @@ -105,7 +170,11 @@ private fun AgentNoReply() { } } -internal fun tokens(n: Long) = if (n >= 1000) "${n / 1000}k" else n.toString() +internal fun tokens(n: Long) = when { + n >= 1_000_000 -> if (n % 1_000_000 == 0L) "${n / 1_000_000}M" else String.format(java.util.Locale.US, "%.1fM", n / 1_000_000.0) + n >= 1000 -> "${n / 1000}k" + else -> n.toString() +} @Composable internal fun AgentThought(text: String, live: Boolean) { @@ -149,12 +218,13 @@ private fun AgentTodos(list: String) { } } -/** A tool call: one line with its status, opening to the full input and output. */ +/** A tool call: one line with its status, opening to the full input and output, or to the diff of an edit. */ @Composable private fun AgentToolCall(entry: Entry.Used, running: Boolean) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current var open by rememberSaveable(entry.id.ifEmpty { entry.detail }) { mutableStateOf(false) } + val diff = remember(entry.input) { diffOf(entry) } Column( Modifier.fillMaxWidth().padding(horizontal = 4.dp).clip(Shape12).background(pal.surfaceVariant).animateContentSize(), ) { @@ -171,11 +241,19 @@ private fun AgentToolCall(entry: Entry.Used, running: Boolean) { } } Text(entry.tool, fontSize = 12.5.sp, fontWeight = FontWeight.SemiBold, color = pal.primary, modifier = Modifier.padding(start = 8.dp)) - Text(entry.detail, fontSize = 12.5.sp, fontFamily = FontFamily.Monospace, color = pal.onSurfaceVariant, + Text(diff?.path?.substringAfterLast('/') ?: entry.detail, fontSize = 12.5.sp, fontFamily = FontFamily.Monospace, color = pal.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f).padding(start = 8.dp)) + if (diff != null) { + Text("+${diff.added}", fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = pal.good, modifier = Modifier.padding(start = 8.dp)) + Text("\u2212${diff.removed}", fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = colors.error, modifier = Modifier.padding(start = 6.dp, end = 4.dp)) + } Icon(if (open) Icons.Outlined.ExpandLess else Icons.Outlined.ExpandMore, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(18.dp)) } - if (open) Column(Modifier.padding(start = 10.dp, end = 10.dp, bottom = 10.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { + if (open && diff != null) Column(Modifier.padding(start = 10.dp, end = 10.dp, bottom = 10.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { + if (diff.path.contains('/')) Text(diff.path, fontSize = 11.5.sp, fontFamily = FontFamily.Monospace, color = pal.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + DiffBox(diff) + if (entry.failed && !entry.output.isNullOrBlank()) CodeBox(stringResource(R.string.agent_tool_output), entry.output, colors.error) + } else if (open) Column(Modifier.padding(start = 10.dp, end = 10.dp, bottom = 10.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { if (entry.input.isNotBlank()) CodeBox(stringResource(R.string.agent_tool_input), entry.input, colors.onSurface) when { entry.output == null && running -> Text(stringResource(R.string.agent_tool_running), fontSize = 12.sp, color = pal.onSurfaceVariant) @@ -187,6 +265,30 @@ private fun AgentToolCall(entry: Entry.Used, running: Boolean) { } } +@Composable +private fun DiffBox(diff: Diff) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Column( + Modifier.fillMaxWidth().heightIn(max = 360.dp).clip(Shape12).background(colors.surface) + .verticalScroll(rememberScrollState()).padding(vertical = 6.dp), + ) { + for (line in diff.lines) { + val tint = when (line[0]) { + '+' -> pal.good + '-' -> colors.error + else -> null + } + Text( + line[0] + " " + line.substring(1), + fontSize = 12.sp, fontFamily = FontFamily.Monospace, lineHeight = 17.sp, + color = tint ?: pal.onSurfaceVariant, + modifier = Modifier.fillMaxWidth().background(tint?.copy(alpha = 0.12f) ?: Color.Transparent).padding(horizontal = 10.dp), + ) + } + } +} + @Composable private fun CodeBox(label: String, text: String, color: Color) { val pal = LocalPalette.current diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt index 645ce77f1c..868cf4fbf0 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -2,13 +2,21 @@ package com.droiddeck.launcher.ui import android.app.Activity import android.content.ContextWrapper +import android.view.KeyEvent import android.view.WindowManager import androidx.activity.compose.LocalActivityResultRegistryOwner import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.animation.expandVertically +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.shrinkVertically +import androidx.compose.foundation.Canvas import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable +import androidx.compose.foundation.gestures.awaitEachGesture +import androidx.compose.foundation.gestures.awaitFirstDown import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -18,13 +26,13 @@ import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.ime +import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape @@ -34,12 +42,15 @@ import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.outlined.Send import androidx.compose.material.icons.outlined.Add +import androidx.compose.material.icons.outlined.ArrowDownward import androidx.compose.material.icons.outlined.AttachFile import androidx.compose.material.icons.outlined.AutoAwesome +import androidx.compose.material.icons.outlined.Build import androidx.compose.material.icons.outlined.Close import androidx.compose.material.icons.outlined.ExpandMore import androidx.compose.material.icons.outlined.History import androidx.compose.material.icons.outlined.Memory +import androidx.compose.material.icons.outlined.MoreHoriz import androidx.compose.material.icons.outlined.Settings import androidx.compose.material.icons.outlined.Stop import androidx.compose.material3.CircularProgressIndicator @@ -51,23 +62,38 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.MutableState +import androidx.compose.runtime.Stable import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue +import androidx.compose.runtime.snapshotFlow import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clipToBounds +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.input.key.onPreviewKeyEvent +import androidx.compose.ui.input.nestedscroll.NestedScrollConnection +import androidx.compose.ui.input.nestedscroll.NestedScrollSource +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.input.pointer.PointerEventPass +import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.platform.LocalView -import androidx.compose.ui.window.DialogWindowProvider import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle @@ -76,22 +102,33 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import androidx.compose.ui.window.DialogWindowProvider import com.droiddeck.launcher.R import com.droiddeck.launcher.agent.AgentAttachments import com.droiddeck.launcher.agent.AgentHost import com.droiddeck.launcher.agent.AgentHost.Entry import com.droiddeck.launcher.agent.AgentSetup +import kotlinx.coroutines.launch -internal enum class AgentPanel { NONE, MODEL, HISTORY, PROCESSES } +internal enum class AgentPanel { NONE, MODEL, USAGE, HISTORY, PROCESSES } /** Slash commands the app handles itself; others go to the CLI, which has its own. */ private val LOCAL_COMMANDS = listOf("/new", "/model", "/plan", "/history", "/processes", "/stop") private val CLI_COMMANDS = listOf("/compact", "/cost", "/review", "/init") +private const val COMPOSER_SLIDE_MS = 350L +/** + * The chat with the composer at the bottom. The composer is the full editor only while it is + * being typed in; reading shrinks it to one line, and scrolling back through older messages + * hides it behind a small pill. [startTyping] opens an empty conversation ready to type. + */ @Composable -internal fun AgentPage(modifier: Modifier, inputModifier: Modifier = Modifier, visible: Boolean = true) { +internal fun AgentPage( + modifier: Modifier, inputModifier: Modifier = Modifier, visible: Boolean = true, startTyping: Boolean = true, +) { val context = LocalContext.current val view = LocalView.current DisposableEffect(view, visible) { @@ -114,58 +151,115 @@ internal fun AgentPage(modifier: Modifier, inputModifier: Modifier = Modifier, v return } var panel by rememberSaveable { mutableStateOf(AgentPanel.NONE) } - Column(modifier.fillMaxSize().imePadding()) { - AgentHeader(panel, { panel = if (panel == it) AgentPanel.NONE else it }, onSetup = { setup = true }) + val composer = remember { ComposerState(startTyping && AgentHost.entries.isEmpty()) } + val focusManager = LocalFocusManager.current + val togglePanel: (AgentPanel) -> Unit = { panel = if (panel == it) AgentPanel.NONE else it } + // The keyboard leaves too little height for a panel and the editor together, so typing closes the panel. + val keyboardOpen = WindowInsets.ime.getBottom(LocalDensity.current) > 0 + LaunchedEffect(keyboardOpen) { if (keyboardOpen && (panel == AgentPanel.MODEL || panel == AgentPanel.USAGE)) panel = AgentPanel.NONE } + Column( + modifier.fillMaxSize().imePadding().onPreviewKeyEvent { e -> + val k = e.nativeKeyEvent + if (k.keyCode != KeyEvent.KEYCODE_BUTTON_Y || composer.typing) return@onPreviewKeyEvent false + if (k.action == KeyEvent.ACTION_UP) composer.open() + true + }, + ) { when (panel) { - AgentPanel.HISTORY -> AgentHistory(Modifier.weight(1f)) { panel = AgentPanel.NONE } - AgentPanel.PROCESSES -> AgentProcessList(Modifier.weight(1f)) + AgentPanel.HISTORY -> { + AgentPanelBar(stringResource(R.string.agent_history)) { panel = AgentPanel.NONE } + AgentHistory(Modifier.weight(1f)) { panel = AgentPanel.NONE } + } + AgentPanel.PROCESSES -> { + AgentPanelBar(stringResource(R.string.agent_processes)) { panel = AgentPanel.NONE } + AgentProcessList(Modifier.weight(1f)) + } else -> { - Column(Modifier.weight(1f).clipToBounds()) { - if (panel == AgentPanel.MODEL) AgentModelPicker() - AgentConversation(Modifier.weight(1f)) - AgentStatus() + val list = rememberLazyListState() + val scope = rememberCoroutineScope() + // Only dragging back through older messages hides the composer; showing it again shrinks the list, which must not hide it once more. + var readingBack by remember { mutableStateOf(false) } + LaunchedEffect(list) { snapshotFlow { list.canScrollForward }.collect { if (!it) readingBack = false } } + val dragBack = remember { + object : NestedScrollConnection { + override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset { + if (source == NestedScrollSource.Drag && available.y > 1f && list.canScrollBackward) readingBack = true + return Offset.Zero + } + } + } + val toLatest: () -> Unit = { + readingBack = false + scope.launch { list.scrollToItem(maxOf(0, list.layoutInfo.totalItemsCount - 1), Int.MAX_VALUE / 2) } + } + val hidden = !composer.typing && readingBack && AgentHost.entries.isNotEmpty() + var wasHidden by remember { mutableStateOf(false) } + LaunchedEffect(hidden) { + if (hidden) wasHidden = true + else if (wasHidden) { + wasHidden = false + // The composer takes its height back as it slides in; the latest message stays above it. + kotlinx.coroutines.delay(COMPOSER_SLIDE_MS) + list.scrollToItem(maxOf(0, list.layoutInfo.totalItemsCount - 1), Int.MAX_VALUE / 2) + } + } + Box(Modifier.weight(1f).fillMaxWidth().clipToBounds().nestedScroll(dragBack)) { + AgentConversation( + Modifier.fillMaxSize().pointerInput(Unit) { + awaitEachGesture { + awaitFirstDown(requireUnconsumed = false, pass = PointerEventPass.Initial) + if (panel == AgentPanel.MODEL || panel == AgentPanel.USAGE) panel = AgentPanel.NONE + if (composer.typing) focusManager.clearFocus() + } + }, + list, onRevise = { composer.open() }, + ) + androidx.compose.animation.AnimatedVisibility( + hidden, enter = fadeIn(), exit = fadeOut(), modifier = Modifier.align(Alignment.BottomCenter).padding(bottom = 8.dp), + ) { + AgentJumpPill(toLatest) + } + } + androidx.compose.animation.AnimatedVisibility(!hidden, enter = expandVertically() + fadeIn(), exit = shrinkVertically() + fadeOut()) { + AgentComposer(composer, draft, inputModifier, panel, togglePanel) { setup = true } } - AgentComposer(draft, inputModifier) { panel = it } } } } } -@Composable -private fun AgentHeader(panel: AgentPanel, onPanel: (AgentPanel) -> Unit, onSetup: () -> Unit) { - val context = LocalContext.current - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val working = AgentHost.state == AgentHost.State.WORKING - Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp)) { - Column(Modifier.weight(1f)) { - Text(stringResource(R.string.rail_agent), fontSize = 22.sp, fontWeight = FontWeight.Bold, color = colors.onBackground) - val model = AgentHost.models(context).firstOrNull { it.id == AgentHost.model }?.label ?: AgentHost.model ?: stringResource(R.string.agent_model_default) - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.clip(Shape12).clickable { onPanel(AgentPanel.MODEL) }.padding(vertical = 2.dp).testTag("agent-model"), - ) { - val parts = listOfNotNull(AgentHost.harness.name, model, AgentHost.effort, stringResource(R.string.agent_plan_short).takeIf { AgentHost.plan && AgentHost.harness.plans }) - Text(parts.joinToString(" · "), fontSize = 13.sp, color = if (panel == AgentPanel.MODEL) pal.primary else pal.onSurfaceVariant) - Icon(Icons.Outlined.ExpandMore, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(16.dp)) - } - } - HeaderAction(Icons.Outlined.History, stringResource(R.string.agent_history), selected = panel == AgentPanel.HISTORY, tag = "agent-history") { onPanel(AgentPanel.HISTORY) } - HeaderAction(Icons.Outlined.Memory, stringResource(R.string.agent_processes), selected = panel == AgentPanel.PROCESSES, tag = "agent-processes") { onPanel(AgentPanel.PROCESSES) } - HeaderAction(Icons.Outlined.Add, stringResource(R.string.agent_new), enabled = !working && AgentHost.entries.isNotEmpty(), tag = "agent-new") { - AgentHost.forget(context) - if (panel != AgentPanel.NONE) onPanel(panel) - } - HeaderAction(Icons.Outlined.Settings, stringResource(R.string.agent_setup_title), enabled = !working, tag = "agent-settings", onClick = onSetup) +/** Whether the composer is the full editor; [open] also puts the cursor in it. */ +@Stable +private class ComposerState(typing: Boolean) { + var typing by mutableStateOf(typing) + var focusRequests by mutableIntStateOf(0) + private set + /** Opened and waiting for the text field to take focus; focus passes through nothing on the way. */ + var opening = false + + fun open() { + typing = true + opening = true + focusRequests++ } } @Composable -internal fun HeaderAction(icon: ImageVector, label: String, enabled: Boolean = true, selected: Boolean = false, tag: String? = null, onClick: () -> Unit) { +private fun AgentPanelBar(title: String, onClose: () -> Unit) { + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(bottom = 6.dp)) { + Text(title, fontSize = 17.sp, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground, modifier = Modifier.weight(1f)) + HeaderAction(Icons.Outlined.Close, stringResource(R.string.agent_close), size = 36.dp, tag = "agent-panel-close", onClick = onClose) + } +} + +@Composable +internal fun HeaderAction( + icon: ImageVector, label: String, enabled: Boolean = true, selected: Boolean = false, tag: String? = null, size: Dp = 44.dp, onClick: () -> Unit, +) { val pal = LocalPalette.current Box( contentAlignment = Alignment.Center, - modifier = Modifier.padding(start = 8.dp).size(44.dp).clip(Shape12) + modifier = Modifier.padding(start = if (size < 44.dp) 4.dp else 8.dp).size(size).clip(Shape12) .background(if (selected) pal.primary.copy(alpha = 0.2f) else pal.surfaceVariant) .clickable(enabled = enabled, onClick = onClick) .then(if (tag != null) Modifier.testTag(tag) else Modifier), @@ -174,18 +268,21 @@ internal fun HeaderAction(icon: ImageVector, label: String, enabled: Boolean = t selected -> pal.primary enabled -> pal.onBackground else -> pal.onSurfaceVariant.copy(alpha = 0.5f) - }, modifier = Modifier.size(22.dp)) + }, modifier = Modifier.size(if (size < 44.dp) 19.dp else 22.dp)) } } @Composable -private fun AgentConversation(modifier: Modifier) { +private fun AgentConversation(modifier: Modifier, list: LazyListState, onRevise: () -> Unit) { val pal = LocalPalette.current - val list = rememberLazyListState() val working = AgentHost.state == AgentHost.State.WORKING val atBottom by remember { derivedStateOf { !list.canScrollForward } } val items = AgentHost.entries.size + (if (working) 1 else 0) - LaunchedEffect(items) { if (items > 0) list.animateScrollToItem(items - 1) } + LaunchedEffect(items) { + if (items == 0) return@LaunchedEffect + list.animateScrollToItem(items - 1) + list.scrollToItem(items - 1, Int.MAX_VALUE / 2) + } LaunchedEffect(AgentHost.live.length / 80, AgentHost.liveThinking.length / 80) { if (atBottom && items > 0) list.scrollToItem(items - 1, Int.MAX_VALUE / 2) } @@ -201,12 +298,31 @@ private fun AgentConversation(modifier: Modifier) { LazyColumn(modifier.fillMaxWidth(), state = list, verticalArrangement = Arrangement.spacedBy(10.dp)) { items(AgentHost.entries.size) { i -> val entry = AgentHost.entries[i] - AgentEntry(entry, running = working && i > start && entry is Entry.Used && entry.output == null, last = !working && i == AgentHost.entries.lastIndex) + AgentEntry( + entry, running = working && i > start && entry is Entry.Used && entry.output == null, last = !working && i == AgentHost.entries.lastIndex, + changes = if (entry is Entry.Finished) turnChanges(AgentHost.entries, i) else null, onRevise = onRevise, + ) } if (working) item { AgentLive() } } } +/** Where the composer was, while it is hidden for reading back: what the agent is doing, and the way to the latest message. */ +@Composable +private fun AgentJumpPill(onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.clip(CircleShape).background(colors.surface).border(1.dp, pal.line, CircleShape) + .clickable(onClick = onClick).padding(horizontal = 14.dp, vertical = 8.dp).testTag("agent-latest"), + ) { + if (AgentHost.state == AgentHost.State.WORKING) CircularProgressIndicator(Modifier.size(13.dp), strokeWidth = 2.dp, color = pal.primary) + Text(stringResource(if (AgentHost.state == AgentHost.State.WORKING) R.string.agent_working_short else R.string.agent_latest), fontSize = 13.sp, color = pal.onSurfaceVariant) + Icon(Icons.Outlined.ArrowDownward, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(16.dp)) + } +} + /** The reply being written, and what the agent is doing right now. */ @Composable private fun AgentLive() { @@ -235,65 +351,41 @@ internal fun clock(seconds: Long): String { } } -/** Above the composer: a Lab build's progress, the todo item in progress, and queued messages. */ @Composable -private fun AgentStatus() { +private fun AgentLabCard() { val context = LocalContext.current val colors = MaterialTheme.colorScheme val pal = LocalPalette.current - val lab = AgentHost.lab - if (lab != null) { - var armed by remember(lab.pid) { mutableStateOf(false) } - Column( - Modifier.fillMaxWidth().padding(top = 10.dp).clip(Shape14).background(colors.surface).border(1.dp, if (lab.failed) AttentionAmber else pal.line, Shape14) - .padding(horizontal = 14.dp, vertical = 10.dp).testTag("agent-lab"), - ) { - Row(verticalAlignment = Alignment.CenterVertically) { - Column(Modifier.weight(1f)) { - Text( - stringResource(if (lab.prepare) R.string.agent_lab_preparing else R.string.agent_lab_building) + " · " + labStage(lab), - fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = if (lab.failed) AttentionAmber else colors.onBackground, - ) - val facts = buildList { - if (lab.running && lab.total > 0) add("${lab.done}/${lab.total}") - add(clock(lab.elapsedSeconds.toLong())) - if (lab.running && lab.etaSeconds >= 0) add(stringResource(R.string.agent_lab_left, clock(lab.etaSeconds.toLong()))) - } - Text(facts.joinToString(" · "), fontSize = 12.5.sp, color = pal.onSurfaceVariant) - } - if (lab.running) SecondaryButton(stringResource(if (armed) R.string.agent_lab_cancel_confirm else R.string.agent_lab_cancel), compact = true) { - if (armed) AgentHost.cancelLabBuild(context) else armed = true - } - } - if (lab.running) { - LinearProgressIndicator( - progress = { lab.permille / 1000f }, color = pal.primary, trackColor = pal.surfaceVariant, - modifier = Modifier.fillMaxWidth().padding(top = 8.dp).height(6.dp).clip(CircleShape), + val lab = AgentHost.lab ?: return + var armed by remember(lab.pid) { mutableStateOf(false) } + Column( + Modifier.fillMaxWidth().padding(top = 8.dp).clip(Shape14).background(colors.surface).border(1.dp, if (lab.failed) AttentionAmber else pal.line, Shape14) + .padding(horizontal = 14.dp, vertical = 10.dp).testTag("agent-lab"), + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Column(Modifier.weight(1f)) { + Text( + stringResource(if (lab.prepare) R.string.agent_lab_preparing else R.string.agent_lab_building) + " · " + labStage(lab), + fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = if (lab.failed) AttentionAmber else colors.onBackground, ) - if (lab.task.isNotEmpty()) Text(lab.task, fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = pal.onSurfaceVariant, - maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.padding(top = 4.dp)) + val facts = buildList { + if (lab.running && lab.total > 0) add("${lab.done}/${lab.total}") + add(clock(lab.elapsedSeconds.toLong())) + if (lab.running && lab.etaSeconds >= 0) add(stringResource(R.string.agent_lab_left, clock(lab.etaSeconds.toLong()))) + } + Text(facts.joinToString(" · "), fontSize = 12.5.sp, color = pal.onSurfaceVariant) + } + if (lab.running) SecondaryButton(stringResource(if (armed) R.string.agent_lab_cancel_confirm else R.string.agent_lab_cancel), compact = true) { + if (armed) AgentHost.cancelLabBuild(context) else armed = true } } - } - val todos = AgentHost.todos()?.lines()?.filter { it.isNotBlank() } - if (AgentHost.state == AgentHost.State.WORKING && !todos.isNullOrEmpty()) { - val doing = todos.firstOrNull { it.startsWith("[~]") } ?: todos.firstOrNull { it.startsWith("[ ]") } - val done = todos.count { it.startsWith("[x]") } - if (doing != null) Text( - "${doing.drop(4)} · $done/${todos.size}", fontSize = 13.sp, color = pal.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, - modifier = Modifier.padding(top = 8.dp, start = 4.dp), - ) - } - for (queued in AgentHost.queue) { - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.padding(top = 8.dp).fillMaxWidth().clip(Shape12).background(pal.surfaceVariant).padding(start = 12.dp), - ) { - Text(stringResource(R.string.agent_queued, queued.text), fontSize = 13.sp, color = pal.onSurfaceVariant, maxLines = 1, - overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) - Box(contentAlignment = Alignment.Center, modifier = Modifier.size(40.dp).clickable { AgentHost.unqueue(queued) }) { - Icon(Icons.Outlined.Close, stringResource(R.string.agent_unqueue), tint = pal.onSurfaceVariant, modifier = Modifier.size(18.dp)) - } + if (lab.running) { + LinearProgressIndicator( + progress = { lab.permille / 1000f }, color = pal.primary, trackColor = pal.surfaceVariant, + modifier = Modifier.fillMaxWidth().padding(top = 8.dp).height(6.dp).clip(CircleShape), + ) + if (lab.task.isNotEmpty()) Text(lab.task, fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = pal.onSurfaceVariant, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.padding(top = 4.dp)) } } } @@ -308,13 +400,99 @@ private fun labStage(lab: com.droiddeck.launcher.agent.LabProgress) = when (lab. else -> stringResource(R.string.agent_lab_stage_starting) } +private fun hasActivity() = AgentHost.lab != null || AgentHost.queue.isNotEmpty() || currentTodo() != null + +/** The todo item in progress and how many are done, while the agent works through a list. */ +private fun currentTodo(): String? { + if (AgentHost.state != AgentHost.State.WORKING) return null + val todos = AgentHost.todos()?.lines()?.filter { it.isNotBlank() }.orEmpty() + val doing = todos.firstOrNull { it.startsWith("[~]") } ?: todos.firstOrNull { it.startsWith("[ ]") } ?: return null + return "${todos.count { it.startsWith("[x]") }}/${todos.size} · ${doing.drop(4)}" +} + +/** A Lab build, the todo item in progress and queued messages, one chip each. */ @Composable -private fun AgentComposer(draftState: MutableState, inputModifier: Modifier, onPanel: (AgentPanel) -> Unit) { +private fun AgentActivity(labOpen: Boolean, onLab: () -> Unit) { val context = LocalContext.current - val colors = MaterialTheme.colorScheme val pal = LocalPalette.current + AgentHost.lab?.let { lab -> + AgentChip(selected = labOpen, warn = lab.failed, tag = "agent-lab-chip", onClick = onLab) { + Icon(Icons.Outlined.Build, null, tint = if (lab.failed) AttentionAmber else pal.onSurfaceVariant, modifier = Modifier.size(14.dp)) + Text(labStage(lab), fontSize = 12.5.sp, color = if (lab.failed) AttentionAmber else pal.onSurfaceVariant, maxLines = 1, + overflow = TextOverflow.Ellipsis, modifier = Modifier.widthIn(max = 160.dp)) + } + } + currentTodo()?.let { todo -> + AgentChip { + Text(todo, fontSize = 12.5.sp, color = pal.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.widthIn(max = 220.dp)) + } + } + for (queued in AgentHost.queue) AgentChip(warn = true) { + Text(stringResource(R.string.agent_queued, queued.text), fontSize = 12.5.sp, color = AttentionAmber, maxLines = 1, + overflow = TextOverflow.Ellipsis, modifier = Modifier.widthIn(max = 180.dp)) + Text( + stringResource(R.string.agent_send_now), fontSize = 12.5.sp, fontWeight = FontWeight.SemiBold, color = pal.onPrimary, + modifier = Modifier.clip(Shape12).background(pal.primary).clickable { AgentHost.sendNow(context, queued) } + .padding(horizontal = 8.dp, vertical = 3.dp).testTag("agent-send-now"), + ) + Icon(Icons.Outlined.Close, stringResource(R.string.agent_unqueue), tint = pal.onSurfaceVariant, + modifier = Modifier.size(22.dp).clip(CircleShape).clickable { AgentHost.unqueue(queued) }.padding(3.dp)) + } +} + +@Composable +private fun AgentChip(selected: Boolean = false, warn: Boolean = false, tag: String? = null, onClick: (() -> Unit)? = null, content: @Composable () -> Unit) { + val pal = LocalPalette.current + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.height(30.dp).clip(Shape12) + .background(if (warn) AttentionAmber.copy(alpha = 0.14f) else if (selected) pal.primary.copy(alpha = 0.2f) else pal.surfaceVariant) + .then(if (onClick != null) Modifier.clickable(onClick = onClick) else Modifier) + .then(if (tag != null) Modifier.testTag(tag) else Modifier) + .padding(horizontal = 9.dp), + ) { content() } +} + +/** How full the context is, or failing that the plan limit nearest its end; amber when little is left. */ +@Composable +private fun ContextRing(tag: String, onClick: () -> Unit) { + val pal = LocalPalette.current + val percent = usagePercent() ?: return + val warn = percent >= 80 + val tint = if (warn) AttentionAmber else pal.primary + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(5.dp), + modifier = Modifier.height(30.dp).clip(Shape12).clickable(onClick = onClick).padding(horizontal = 6.dp).testTag(tag), + ) { + val track = pal.line + Canvas(Modifier.size(16.dp)) { + val stroke = Stroke(width = 2.5.dp.toPx(), cap = StrokeCap.Round) + drawArc(track, 0f, 360f, false, style = stroke) + drawArc(tint, -90f, 360f * percent / 100f, false, style = stroke) + } + Text("$percent%", fontSize = 12.5.sp, color = if (warn) AttentionAmber else pal.onSurfaceVariant) + } +} + +/** The context's fill, unless a plan limit is nearly reached: that is the wall the user meets first. */ +internal fun usagePercent(): Int? { + val limit = AgentHost.limits.maxOfOrNull { liveUsed(it) } + val context = if (AgentHost.window > 0 && AgentHost.context > 0) (AgentHost.context * 100 / AgentHost.window).toInt().coerceIn(0, 100) else null + return if (limit != null && (limit >= 90 || context == null)) maxOf(limit, context ?: 0) else context +} + +/** A limit whose window has passed since it was reported is back to nothing used. */ +internal fun liveUsed(limit: AgentHost.Limit) = if (limit.resetsAt > 0 && limit.resetsAt * 1000 < System.currentTimeMillis()) 0 else limit.usedPercent + +@Composable +private fun AgentComposer( + composer: ComposerState, draftState: MutableState, inputModifier: Modifier, panel: AgentPanel, onPanel: (AgentPanel) -> Unit, onSetup: () -> Unit, +) { + val context = LocalContext.current var draft by draftState - val working = AgentHost.state == AgentHost.State.WORKING + var labOpen by rememberSaveable { mutableStateOf(false) } + if (AgentHost.lab == null) labOpen = false + var hadFocus by remember { mutableStateOf(false) } val send = send@{ val text = draft.trim() when (text.substringBefore(' ')) { @@ -332,11 +510,84 @@ private fun AgentComposer(draftState: MutableState, inputModifier: Modif } draft = "" } + val keyboardOpen = WindowInsets.ime.getBottom(LocalDensity.current) > 0 + // Leaving the composer for the conversation, by touch or D-pad, is reading. + Column( + Modifier.fillMaxWidth().padding(bottom = if (keyboardOpen) 4.dp else 8.dp).onFocusChanged { + if (it.hasFocus) hadFocus = true + else if (hadFocus) { + hadFocus = false + if (composer.typing && !composer.opening) composer.typing = false + } + }, + ) { + if (labOpen) AgentLabCard() + when (panel) { + AgentPanel.MODEL -> Box(Modifier.padding(top = 8.dp)) { AgentModelPicker() } + AgentPanel.USAGE -> Box(Modifier.padding(top = 8.dp)) { AgentUsage() } + else -> Unit + } + if (composer.typing) { + if (hasActivity()) Row( + horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.padding(top = 8.dp).fillMaxWidth().horizontalScroll(rememberScrollState()), + ) { AgentActivity(labOpen) { labOpen = !labOpen } } + AgentEditor(composer, draftState, inputModifier, panel, onPanel, onSetup, send) + } else AgentReadingBar(composer, draft, inputModifier, labOpen, onLab = { labOpen = !labOpen }) { onPanel(AgentPanel.USAGE) } + } +} + +/** The composer while reading: one line holding what is going on, opened by a press or by Y. */ +@Composable +private fun AgentReadingBar( + composer: ComposerState, draft: String, inputModifier: Modifier, labOpen: Boolean, onLab: () -> Unit, onUsage: () -> Unit, +) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val working = AgentHost.state == AgentHost.State.WORKING + var focused by remember { mutableStateOf(false) } + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth().padding(top = 8.dp).height(44.dp).clip(Shape16).background(colors.surface) + .border(if (focused) 2.dp else 1.dp, if (focused) pal.primary else pal.line, Shape16) + .then(inputModifier).onFocusChanged { focused = it.isFocused }.clickable { composer.open() }.testTag("agent-composer-bar") + .padding(start = 14.dp, end = 4.dp), + ) { + Text( + draft.ifBlank { stringResource(if (working) R.string.agent_hint_working else R.string.agent_message) }, fontSize = 15.sp, + color = if (draft.isBlank()) pal.onSurfaceVariant else colors.onSurface, maxLines = 1, overflow = TextOverflow.Ellipsis, + modifier = Modifier.weight(1f, fill = !hasActivity()).widthIn(min = 72.dp), + ) + if (hasActivity()) Row( + horizontalArrangement = Arrangement.spacedBy(6.dp), verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.weight(1f).padding(start = 8.dp).horizontalScroll(rememberScrollState()), + ) { AgentActivity(labOpen, onLab) } + ContextRing("agent-usage-bar", onUsage) + if (working) Box( + contentAlignment = Alignment.Center, + modifier = Modifier.padding(start = 4.dp).size(36.dp).clip(CircleShape).background(pal.error.copy(alpha = 0.22f)) + .clickable { AgentHost.stop(context) }.testTag("agent-stop"), + ) { Icon(Icons.Outlined.Stop, stringResource(R.string.agent_stop), tint = colors.error, modifier = Modifier.size(20.dp)) } + } +} + +/** The full editor: model and usage on top, the text with attach, stop and send under them. */ +@Composable +private fun AgentEditor( + composer: ComposerState, draftState: MutableState, inputModifier: Modifier, panel: AgentPanel, onPanel: (AgentPanel) -> Unit, + onSetup: () -> Unit, send: () -> Unit, +) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + var draft by draftState + val working = AgentHost.state == AgentHost.State.WORKING if (draft.startsWith("/") && !draft.contains(' ')) { val matches = (LOCAL_COMMANDS + CLI_COMMANDS).filter { it.startsWith(draft) && it != draft } if (matches.isNotEmpty()) Row( horizontalArrangement = Arrangement.spacedBy(8.dp), - modifier = Modifier.padding(top = 10.dp).fillMaxWidth().horizontalScroll(rememberScrollState()), + modifier = Modifier.padding(top = 8.dp).fillMaxWidth().horizontalScroll(rememberScrollState()), ) { for (command in matches) Text( command, fontSize = 13.sp, fontFamily = FontFamily.Monospace, color = pal.primary, @@ -346,42 +597,77 @@ private fun AgentComposer(draftState: MutableState, inputModifier: Modif } if (AgentAttachments.pending.isNotEmpty()) Row( horizontalArrangement = Arrangement.spacedBy(8.dp), - modifier = Modifier.padding(top = 10.dp).fillMaxWidth().horizontalScroll(rememberScrollState()), + modifier = Modifier.padding(top = 8.dp).fillMaxWidth().horizontalScroll(rememberScrollState()), ) { for (path in AgentAttachments.pending.toList()) AttachmentChip(path) { AgentAttachments.pending.remove(path) } } var focused by remember { mutableStateOf(false) } - val keyboardOpen = WindowInsets.ime.getBottom(LocalDensity.current) > 0 - Row( - verticalAlignment = Alignment.Bottom, - modifier = Modifier.fillMaxWidth().padding(top = 10.dp, bottom = if (keyboardOpen) 4.dp else 16.dp).clip(Shape16).background(colors.surface) - .border(1.dp, if (focused) pal.primary else pal.line, Shape16).padding(start = 6.dp, end = 6.dp, top = 6.dp, bottom = 6.dp), + var menu by rememberSaveable { mutableStateOf(false) } + val field = remember { FocusRequester() } + LaunchedEffect(composer.focusRequests) { if (composer.focusRequests > 0) runCatching { field.requestFocus() } } + Column( + Modifier.fillMaxWidth().padding(top = 8.dp).clip(Shape16).background(colors.surface) + .border(1.dp, if (focused) pal.primary else pal.line, Shape16).padding(6.dp), ) { - if (LocalActivityResultRegistryOwner.current != null) AttachButton() - Box(Modifier.weight(1f).padding(start = 8.dp, top = 11.dp, bottom = 11.dp)) { - if (draft.isEmpty()) Text( - stringResource(if (working) R.string.agent_hint_working else R.string.agent_hint), fontSize = 16.sp, - color = pal.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, - ) - BasicTextField( - draft, { draft = it }, - Modifier.fillMaxWidth().onFocusChanged { focused = it.isFocused }.testTag("agent-input").then(inputModifier), - textStyle = TextStyle(fontSize = 16.sp, color = colors.onSurface), - cursorBrush = SolidColor(pal.primary), - keyboardOptions = KeyboardOptions(imeAction = ImeAction.Send), - keyboardActions = KeyboardActions(onSend = { send() }), - minLines = 1, - maxLines = 8, - ) + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().height(36.dp)) { + val model = AgentHost.models(context).firstOrNull { it.id == AgentHost.model }?.label ?: AgentHost.model ?: stringResource(R.string.agent_model_default) + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.weight(1f)) { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.weight(1f, fill = false).height(30.dp).clip(Shape12).clickable { onPanel(AgentPanel.MODEL) } + .padding(horizontal = 8.dp).testTag("agent-model"), + ) { + val parts = listOfNotNull(AgentHost.harness.name, model, AgentHost.effort, stringResource(R.string.agent_plan_short).takeIf { AgentHost.plan && AgentHost.harness.plans }) + Text(parts.joinToString(" · "), fontSize = 13.sp, color = if (panel == AgentPanel.MODEL) pal.primary else pal.onSurfaceVariant, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false)) + Icon(Icons.Outlined.ExpandMore, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(16.dp)) + } + ContextRing("agent-usage", onClick = { onPanel(AgentPanel.USAGE) }) + } + if (menu) { + HeaderAction(Icons.Outlined.History, stringResource(R.string.agent_history), size = 32.dp, tag = "agent-history") { menu = false; onPanel(AgentPanel.HISTORY) } + HeaderAction(Icons.Outlined.Memory, stringResource(R.string.agent_processes), size = 32.dp, tag = "agent-processes") { menu = false; onPanel(AgentPanel.PROCESSES) } + HeaderAction(Icons.Outlined.Add, stringResource(R.string.agent_new), enabled = !working && AgentHost.entries.isNotEmpty(), size = 32.dp, tag = "agent-new") { + menu = false + AgentHost.forget(context) + } + HeaderAction(Icons.Outlined.Settings, stringResource(R.string.agent_setup_title), enabled = !working, size = 32.dp, tag = "agent-settings") { + menu = false + onSetup() + } + } + HeaderAction(if (menu) Icons.Outlined.Close else Icons.Outlined.MoreHoriz, stringResource(R.string.agent_more), size = 32.dp, tag = "agent-menu") { menu = !menu } } - if (working) RoundButton(Icons.Outlined.Stop, stringResource(R.string.agent_stop), pal.error.copy(alpha = 0.22f), colors.error, "agent-stop") { - AgentHost.stop(context) + Row(verticalAlignment = Alignment.Bottom) { + if (LocalActivityResultRegistryOwner.current != null) AttachButton() + Box(Modifier.weight(1f).padding(start = 8.dp, top = 10.dp, bottom = 10.dp)) { + if (draft.isEmpty()) Text( + stringResource(if (working) R.string.agent_hint_working else R.string.agent_hint), fontSize = 16.sp, + color = pal.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, + ) + BasicTextField( + draft, { draft = it }, + Modifier.fillMaxWidth().focusRequester(field).onFocusChanged { + focused = it.isFocused + if (it.isFocused) composer.opening = false + }.testTag("agent-input").then(inputModifier), + textStyle = TextStyle(fontSize = 16.sp, color = colors.onSurface), + cursorBrush = SolidColor(pal.primary), + keyboardOptions = KeyboardOptions(imeAction = ImeAction.Send), + keyboardActions = KeyboardActions(onSend = { send() }), + minLines = 1, + maxLines = 8, + ) + } + if (working) RoundButton(Icons.Outlined.Stop, stringResource(R.string.agent_stop), pal.error.copy(alpha = 0.22f), colors.error, "agent-stop") { + AgentHost.stop(context) + } + val canSend = draft.isNotBlank() || AgentAttachments.pending.isNotEmpty() + RoundButton( + Icons.AutoMirrored.Outlined.Send, stringResource(if (working) R.string.agent_queue else R.string.agent_send), + if (canSend) pal.primary else pal.surfaceVariant, if (canSend) pal.onPrimary else pal.onSurfaceVariant, "agent-send", enabled = canSend, + ) { send() } } - val canSend = draft.isNotBlank() || AgentAttachments.pending.isNotEmpty() - RoundButton( - Icons.AutoMirrored.Outlined.Send, stringResource(if (working) R.string.agent_queue else R.string.agent_send), - if (canSend) pal.primary else pal.surfaceVariant, if (canSend) pal.onPrimary else pal.onSurfaceVariant, "agent-send", enabled = canSend, - ) { send() } } } @@ -411,9 +697,9 @@ private fun RoundButton( ) { Box( contentAlignment = Alignment.Center, - modifier = Modifier.padding(start = 6.dp).size(46.dp).clip(CircleShape).background(background) + modifier = Modifier.padding(start = 6.dp).size(42.dp).clip(CircleShape).background(background) .clickable(enabled = enabled, onClick = onClick).testTag(tag), ) { - Icon(icon, label, tint = tint, modifier = Modifier.size(22.dp)) + Icon(icon, label, tint = tint, modifier = Modifier.size(21.dp)) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt index 8d247f8de6..eed2fd6d13 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt @@ -14,10 +14,12 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.text.selection.SelectionContainer +import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -190,3 +192,71 @@ internal fun AgentProcessList(modifier: Modifier) { } } } + +/** How full the conversation's context is, how much of the plan's limits is used, and what this conversation cost. */ +@Composable +internal fun AgentUsage() { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Column( + Modifier.fillMaxWidth().clip(Shape14).background(colors.surface).border(1.dp, pal.line, Shape14).padding(horizontal = 14.dp, vertical = 10.dp), + verticalArrangement = Arrangement.spacedBy(8.dp), + ) { + if (AgentHost.window > 0) UsageRow( + stringResource(R.string.agent_usage_context), + stringResource(R.string.agent_usage_of, tokens(AgentHost.context), tokens(AgentHost.window)), + (AgentHost.context.toFloat() / AgentHost.window).coerceIn(0f, 1f), + ) + for (limit in AgentHost.limits) { + val used = liveUsed(limit) + val label = when { + limit.minutes in 9_000..11_000 -> stringResource(R.string.agent_limit_week) + limit.minutes >= 60 -> stringResource(R.string.agent_limit_hours, limit.minutes / 60) + else -> stringResource(R.string.agent_limit_minutes, limit.minutes) + } + val value = if (limit.resetsAt * 1000 > System.currentTimeMillis()) stringResource(R.string.agent_limit_resets, used, resetTime(context, limit.resetsAt)) else "$used%" + UsageRow(label, value, used / 100f) + } + val turns = AgentHost.entries.filterIsInstance().mapNotNull { it.usage } + val cost = turns.sumOf { it.costUsd } + val ms = turns.sumOf { it.durationMs } + Row(verticalAlignment = Alignment.CenterVertically) { + val facts = buildList { + if (ms > 0) add(clock(ms / 1000)) + if (cost >= 0.005) add("$" + String.format(java.util.Locale.US, "%.2f", cost)) + } + Text( + if (facts.isEmpty()) stringResource(R.string.agent_usage_unknown) else stringResource(R.string.agent_usage_conversation, facts.joinToString(" · ")), + fontSize = 12.5.sp, color = pal.onSurfaceVariant, modifier = Modifier.weight(1f), + ) + if (AgentHost.harness.plans && AgentHost.entries.isNotEmpty() && AgentHost.state == AgentHost.State.IDLE) { + SecondaryButton("/compact", compact = true) { AgentHost.send(context, "/compact") } + } + } + } +} + +@Composable +private fun UsageRow(label: String, value: String, fraction: Float) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(label, fontSize = 14.sp, color = colors.onBackground, modifier = Modifier.weight(1f)) + Text(value, fontSize = 12.5.sp, color = pal.onSurfaceVariant) + } + LinearProgressIndicator( + progress = { fraction }, color = if (fraction >= 0.8f) AttentionAmber else pal.primary, trackColor = pal.surfaceVariant, + modifier = Modifier.fillMaxWidth().height(5.dp).clip(CircleShape), + ) + } +} + +/** A reset later today shows its time; one further off shows the day too. */ +private fun resetTime(context: android.content.Context, epochSeconds: Long): String { + val ms = epochSeconds * 1000 + val flags = if (ms - System.currentTimeMillis() < 20 * 3_600_000L) DateUtils.FORMAT_SHOW_TIME + else DateUtils.FORMAT_SHOW_WEEKDAY or DateUtils.FORMAT_ABBREV_WEEKDAY or DateUtils.FORMAT_SHOW_TIME + return DateUtils.formatDateTime(context, ms, flags) +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index 5752578234..e140ffa1ad 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -558,6 +558,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont Modifier.weight(1f).fillMaxWidth().padding(top = 8.dp, start = 14.dp, end = 14.dp), inputModifier = focus.track(page, "agent-input"), visible = open, + startTyping = false, ) else Column( modifier = Modifier.weight(1f).fillMaxWidth().verticalScroll(pageScroll.getValue(page)), ) { CompositionLocalProvider(LocalChipMinWidth provides 96.dp, LocalCompactSettings provides true) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c5acad050c..3c6fb2b59e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1193,6 +1193,28 @@ Remove Default Reasoning effort + Go + Revise + Nothing changed yet + Go ahead with the plan. + Send now + Message + More + Close + Latest + Working + Context + %1$s of %2$s + This conversation · %1$s + Usage shows after the first reply + %1$d-hour limit + %1$d-minute limit + Weekly limit + %1$d%% · resets %2$s + + %1$d file + %1$d files + Plan first Plan Proposes a plan without changing anything diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt index 13e88edac4..11ecd7aea8 100644 --- a/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt @@ -74,7 +74,8 @@ class AgentHostTest { } @Test fun claudeShowsWholeEditsAndTodos() { - assertEquals("a.kt\n\n- old\n\n+ new", ClaudeCode.fullInput("Edit", org.json.JSONObject("""{"file_path":"a.kt","old_string":"old","new_string":"new"}"""))) + assertEquals("a.kt\n-old\n+new", ClaudeCode.fullInput("Edit", org.json.JSONObject("""{"file_path":"a.kt","old_string":"old","new_string":"new"}"""))) + assertEquals("b.kt\n+one\n+two", ClaudeCode.fullInput("Write", org.json.JSONObject("""{"file_path":"b.kt","content":"one\ntwo"}"""))) assertEquals("[x] read\n[~] fix\n[ ] test", ClaudeCode.fullInput("TodoWrite", org.json.JSONObject( """{"todos":[{"content":"read","status":"completed"},{"content":"fix","status":"in_progress"},{"content":"test","status":"pending"}]}"""))) } @@ -164,6 +165,7 @@ class AgentHostTest { val written = listOf( Entry.Asked("hi", listOf("/root/x.png")), Entry.Said("hello"), Entry.Thought("hm"), Entry.Used("t1", "Read", "/root/x", "{}"), Entry.Result("t1", "contents", false), Entry.Finished(null, usage = AgentHost.Usage(1, 0.5, 2, 3)), Entry.Finished("boom", stopped = true), + Entry.Finished(null, usage = AgentHost.Usage(1, 0.5, 2, 3, context = 40_000, window = 200_000), planned = true), ) written.forEach { AgentChats.append(file, it) } file.appendText("broken line\n") @@ -173,6 +175,7 @@ class AgentHostTest { assertEquals(listOf( Entry.Asked("hi", listOf("/root/x.png")), Entry.Said("hello"), Entry.Thought("hm"), Entry.Used("t1", "Read", "/root/x", "{}", "contents", false), Entry.Finished(null, usage = AgentHost.Usage(1, 0.5, 2, 3)), Entry.Finished("boom", stopped = true), + Entry.Finished(null, usage = AgentHost.Usage(1, 0.5, 2, 3, context = 40_000, window = 200_000), planned = true), ), loaded.entries) assertEquals(emptyList(), AgentChats.read(File(file.path + ".missing")).entries) } @@ -208,4 +211,46 @@ class AgentHostTest { assertTrue(p.running && !p.prepare) assertEquals(95, p.etaSeconds) } + + @Test fun anEditBecomesALineDiffWithItsNearbyLines() { + assertEquals(" a\n b\n-c\n+C\n+D\n e\n f", lineDiff("x\na\nb\nc\ne\nf\ny", "x\na\nb\nC\nD\ne\nf\ny")) + assertEquals("+only", lineDiff("", "only")) + assertEquals("-gone", lineDiff("gone", "")) + assertEquals("+one\n+two", lineDiff("", "one\ntwo\n")) + } + + @Test fun claudeRateLimitsAndContextWindowAreRead() { + val event = ClaudeCode.parse("""{"type":"rate_limit_event","rate_limit_info":{"status":"allowed_warning","unifiedWindows":{"five_hour":{"utilization":0.07,"resetsAt":1794435600},"seven_day":{"utilization":0.85,"resetsAt":1794592800}}},"session_id":"s"}""")!! + assertEquals(listOf(AgentHost.Limit(300, 7, 1794435600), AgentHost.Limit(10_080, 85, 1794592800)), event.limits) + val result = ClaudeCode.parse("""{"type":"result","subtype":"success","is_error":false,"result":"done","usage":{},"modelUsage":{"claude-haiku":{"costUSD":0.01,"contextWindow":200000},"claude-sonnet":{"costUSD":0.7,"contextWindow":1000000}}}""")!! + assertEquals(1_000_000L, result.window) + } + + @Test fun codexTokenCountsCarryContextAndLimits() { + val event = Codex.tokenCount("""{"timestamp":"t","type":"event_msg","payload":{"type":"token_count","info":{"total_token_usage":{"total_tokens":90000},"last_token_usage":{"total_tokens":41000},"model_context_window":272000},"rate_limits":{"primary":{"used_percent":12.5,"window_minutes":300,"resets_at":1794435600},"secondary":{"used_percent":40.0,"window_minutes":10080,"resets_at":1794592800}}}}""")!! + assertEquals(41_000L, event.context) + assertEquals(272_000L, event.window) + assertEquals(listOf(AgentHost.Limit(300, 12, 1794435600), AgentHost.Limit(10_080, 40, 1794592800)), event.limits) + assertNull(Codex.tokenCount("""{"type":"event_msg","payload":{"type":"agent_message"}}""")) + } + + @Test fun codexUsageComesFromTheThreadsSessionLog() { + val root = Files.createTempDirectory("rootfs").toFile() + val log = File(root, "root/.codex/sessions/2026/11/12/rollout-2026-11-12T10-00-00-thread1.jsonl").apply { parentFile!!.mkdirs() } + log.writeText( + """{"type":"event_msg","payload":{"type":"token_count","info":{"last_token_usage":{"total_tokens":15692},"model_context_window":258400},"rate_limits":{"primary":{"used_percent":86.0,"window_minutes":10080,"resets_at":1794716485},"secondary":null}}}""" + "\n" + + """{"type":"response_item","payload":{"type":"additional_tools","tools":[{"description":"reports token_count as it goes"}]}}""" + "\n", + ) + val event = Codex.usage(root, "thread1")!! + assertEquals(15_692L, event.context) + assertEquals(258_400L, event.window) + assertEquals(listOf(AgentHost.Limit(10_080, 86, 1794716485)), event.limits) + assertNull(Codex.usage(root, "other")) + } + + @Test fun limitsRoundTripThroughPrefs() { + val limits = listOf(AgentHost.Limit(300, 7, 1794435600), AgentHost.Limit(10_080, 85, 1794592800)) + assertEquals(limits, AgentHost.decodeLimits(AgentHost.encodeLimits(limits))) + assertEquals(emptyList(), AgentHost.decodeLimits("not json")) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/AgentChangesTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/AgentChangesTest.kt new file mode 100644 index 0000000000..38eddd563b --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/AgentChangesTest.kt @@ -0,0 +1,41 @@ +package com.droiddeck.launcher.ui + +import com.droiddeck.launcher.agent.AgentHost.Entry +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class AgentChangesTest { + @Test fun aTurnAddsUpTheEditsItMade() { + val entries = listOf( + Entry.Asked("before"), Entry.Used("e0", "Edit", "old.kt", "old.kt\n-a\n+b"), Entry.Finished(null), + Entry.Asked("fix it"), + Entry.Used("e1", "Edit", "a.kt", "src/a.kt\n x\n-y\n+z\n+w"), + Entry.Used("e2", "Write", "b.kt", "src/b.kt\n+one"), + Entry.Used("e3", "Edit", "a.kt", "src/a.kt\n-q", failed = true), + Entry.Used("e4", "Edit", "a.kt", "src/a.kt\n-r"), + Entry.Used("b1", "Bash", "ls", "ls"), + Entry.Finished(null), + ) + assertEquals(Changes(files = 2, added = 3, removed = 2), turnChanges(entries, entries.lastIndex)) + assertEquals(Changes(1, 1, 1), turnChanges(entries, 2)) + } + + @Test fun onlyEditsCarryingADiffCount() { + assertNull(diffOf(Entry.Used("c", "Edit", "a.kt, b.kt", "a.kt\nb.kt"))) + assertNull(diffOf(Entry.Used("b", "Bash", "ls", "ls\n+x"))) + assertEquals(2, diffOf(Entry.Used("e", "Edit", "a.kt", "a.kt\n\n- old\n\n+ new"))?.lines?.size) + assertNull(turnChanges(listOf(Entry.Asked("hi"), Entry.Said("hello"), Entry.Finished(null)), 2)) + } + + @Test fun aSavedPlanIsNotAChange() { + val entries = listOf(Entry.Asked("plan it"), Entry.Used("w", "Write", "plan.md", "/root/.claude/plans/plan.md\n+step"), Entry.Finished(null)) + assertNull(turnChanges(entries, 2)) + } + + @Test fun bigCountsReadAsMillions() { + assertEquals("1M", tokens(1_000_000)) + assertEquals("1.5M", tokens(1_500_000)) + assertEquals("23k", tokens(23_400)) + } +} From b1b6ab79317e6d752f3539863a214b1ca8cc65d8 Mon Sep 17 00:00:00 2001 From: measlesbagel <49631653+measlesbagel@users.noreply.github.com> Date: Thu, 12 Nov 2026 11:57:12 -0600 Subject: [PATCH 38/57] feat(apps): add icon packs, per-app icons and an Appearance panel (#2207) * feat(apps): add an Appearance panel to the Apps page A Palette button in the Apps header opens a panel for icon size, spacing and hiding app names. * feat(apps): support icon packs and per-app icons The Appearance panel gains an Icon pack choice. Packs are found through the ADW and Nova theme intents and must ship an appfilter.xml in res/xml, res/raw or assets. Work profile apps keep their badge. Apps a pack does not cover are drawn on its iconback, iconmask, iconupon and scale tags when it has them, and keep their system icon otherwise. For packs with an iconback, App color background paints that plate in each app's main color instead of the pack's own. With a pack selected, an app's long-press menu offers Change icon, which opens a searchable picker listing icons that match the app first. Reset icon removes one choice, and Reset in the panel removes them all. Calendar apps use the pack's icon for today's date. * feat(apps): translate the Appearance panel and icon strings Adds the 19 new strings to all 32 languages, reusing each language's existing wording where it has one. Icon size and spacing labels are kept short to fit the panel's tabs. * fix(apps): finish loading custom icons before marking them loaded Two app list refreshes can start together on resume. The second one could see the overrides as loaded before the first had read them, and build the list without custom icons. --- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 6 + .../droiddeck/launcher/FrontEndActivity.kt | 8 + .../java/com/droiddeck/launcher/HomeApp.kt | 19 +- .../java/com/droiddeck/launcher/HomeIcons.kt | 46 ++++ .../java/com/droiddeck/launcher/IconPack.kt | 198 ++++++++++++++++++ .../droiddeck/launcher/ui/AndroidAppsPage.kt | 108 ++++++++-- .../droiddeck/launcher/ui/AppIconPicker.kt | 188 +++++++++++++++++ .../droiddeck/launcher/ui/AppsAppearance.kt | 120 +++++++++++ .../droiddeck/launcher/ui/FrontEndContent.kt | 2 +- .../droiddeck/launcher/ui/FrontEndScreen.kt | 1 + app/src/main/res/values-ar/strings.xml | 19 ++ app/src/main/res/values-b+es+419/strings.xml | 19 ++ app/src/main/res/values-bg/strings.xml | 19 ++ app/src/main/res/values-cs/strings.xml | 19 ++ app/src/main/res/values-da/strings.xml | 19 ++ app/src/main/res/values-de/strings.xml | 19 ++ app/src/main/res/values-el/strings.xml | 19 ++ app/src/main/res/values-es/strings.xml | 19 ++ app/src/main/res/values-fi/strings.xml | 19 ++ app/src/main/res/values-fr/strings.xml | 19 ++ app/src/main/res/values-hi/strings.xml | 19 ++ app/src/main/res/values-hu/strings.xml | 19 ++ app/src/main/res/values-in/strings.xml | 19 ++ app/src/main/res/values-it/strings.xml | 19 ++ app/src/main/res/values-ja/strings.xml | 19 ++ app/src/main/res/values-ko/strings.xml | 19 ++ app/src/main/res/values-ms/strings.xml | 19 ++ app/src/main/res/values-nb/strings.xml | 19 ++ app/src/main/res/values-nl/strings.xml | 19 ++ app/src/main/res/values-pl/strings.xml | 19 ++ app/src/main/res/values-pt-rPT/strings.xml | 19 ++ app/src/main/res/values-pt/strings.xml | 19 ++ app/src/main/res/values-ro/strings.xml | 19 ++ app/src/main/res/values-ru/strings.xml | 19 ++ app/src/main/res/values-sv/strings.xml | 19 ++ app/src/main/res/values-th/strings.xml | 19 ++ app/src/main/res/values-tr/strings.xml | 19 ++ app/src/main/res/values-uk/strings.xml | 19 ++ app/src/main/res/values-vi/strings.xml | 19 ++ app/src/main/res/values-zh-rCN/strings.xml | 19 ++ app/src/main/res/values-zh-rHK/strings.xml | 19 ++ app/src/main/res/values-zh-rTW/strings.xml | 19 ++ app/src/main/res/values/strings.xml | 19 ++ .../com/droiddeck/launcher/HomeIconsTest.kt | 26 +++ .../com/droiddeck/launcher/IconPackTest.kt | 127 +++++++++++ .../com/droiddeck/launcher/ui/AppsGridTest.kt | 21 ++ 47 files changed, 1475 insertions(+), 23 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/HomeIcons.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/IconPack.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/AppIconPicker.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/AppsAppearance.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/HomeIconsTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/IconPackTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/AppsGridTest.kt diff --git a/app/build.gradle b/app/build.gradle index 35201d85c5..d493877cc2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -389,6 +389,7 @@ dependencies { implementation 'androidx.camera:camera-camera2:1.4.2' implementation 'androidx.camera:camera-lifecycle:1.4.2' implementation 'androidx.webkit:webkit:1.12.1' + implementation 'androidx.palette:palette:1.0.0' implementation 'io.github.webrtc-sdk:android:125.6422.07' implementation("com.google.mediapipe:tasks-vision:${trackingPack.MEDIAPIPE_VERSION}") { exclude group: 'com.google.auto.value', module: 'auto-value' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0f3addcb7b..01d980059d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,6 +18,12 @@ + + + + + + diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 23171a6c17..b2f45bc4ed 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -227,6 +227,11 @@ class FrontEndActivity : ComponentActivity() { refreshWifiDiscovery() } } + private val dateReceiver = object : android.content.BroadcastReceiver() { + override fun onReceive(context: android.content.Context?, intent: Intent?) { + refreshAndroidApps() + } + } private val mediaRefresh = Runnable { refresh() refreshAddedGames() @@ -1594,6 +1599,7 @@ class FrontEndActivity : ComponentActivity() { refreshHomeAppState() } }, + onAppIconsChanged = { refreshAndroidApps() }, onAndroidApp = { app, displayId -> launchAndroidApp(app, displayId) }, onBackActionsInverted = { inverted -> SessionPrefs.setBackActionsInverted(this, inverted) @@ -1972,6 +1978,7 @@ class FrontEndActivity : ComponentActivity() { override fun onStart() { super.onStart() registerReceiver(wifiLocationReceiver, android.content.IntentFilter(android.location.LocationManager.MODE_CHANGED_ACTION)) + registerReceiver(dateReceiver, android.content.IntentFilter(Intent.ACTION_DATE_CHANGED)) registerReceiver(mediaReceiver, android.content.IntentFilter().apply { for (action in listOf(Intent.ACTION_MEDIA_MOUNTED, Intent.ACTION_MEDIA_UNMOUNTED, Intent.ACTION_MEDIA_REMOVED, Intent.ACTION_MEDIA_EJECT, Intent.ACTION_MEDIA_BAD_REMOVAL)) addAction(action) @@ -2038,6 +2045,7 @@ class FrontEndActivity : ComponentActivity() { override fun onStop() { if (!homeChoiceOpen) HomeApp.releaseUnusedHomeEntry(this) unregisterReceiver(wifiLocationReceiver) + unregisterReceiver(dateReceiver) unregisterReceiver(mediaReceiver) getSystemService(android.content.pm.LauncherApps::class.java).unregisterCallback(packageCallback) HomeWidgets.stopListening(this) diff --git a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt index 9a724d9044..8d3c7dc54c 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt @@ -41,7 +41,7 @@ object HomeApp { val userSerial: Long = 0L, ) { val component get() = ComponentName(packageName, className) - val key get() = "$packageName/$className" + if (userSerial != 0L) "#$userSerial" else "" + val key get() = appKey(packageName, className, userSerial) val work get() = userSerial != 0L } @@ -101,6 +101,9 @@ object HomeApp { ?: resolved.loadLabel(pm)?.toString()?.trim()?.takeIf { it.isNotEmpty() } } + private fun appKey(packageName: String, className: String, userSerial: Long) = + "$packageName/$className" + if (userSerial != 0L) "#$userSerial" else "" + fun roleRequestIntent(context: Context): Intent? { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) return null val roles = context.getSystemService(RoleManager::class.java) ?: return null @@ -116,13 +119,25 @@ object HomeApp { val pm = context.packageManager val own = Process.myUserHandle() val iconPx = (ICON_DP * context.resources.displayMetrics.density).roundToInt() + val densityDpi = context.resources.displayMetrics.densityDpi + val pack = IconPack.active(context) + val appColors = IconPack.appColors(context) + HomeIcons.load(context) + val overrides = HomeIcons.overrides val apps = users.userProfiles.flatMap { user -> val serial = if (user == own) 0L else users.getSerialNumberForUser(user) runCatching { launcher.getActivityList(null, user) }.getOrDefault(emptyList()).mapNotNull { info -> val component = info.componentName if (component.packageName == context.packageName && user == own) return@mapNotNull null val label = info.label?.toString()?.trim().orEmpty().ifEmpty { component.packageName } - val icon = runCatching { info.getBadgedIcon(0).toBitmap(iconPx, iconPx) }.getOrNull() + val icon = runCatching { + (overrides[appKey(component.packageName, component.className, serial)] + ?.let { IconPack.drawable(context, it.pack, it.drawable, densityDpi) } + ?: pack?.icon(component, densityDpi) + ?: pack?.plated(info.getIcon(0), iconPx, densityDpi, appColors)) + ?.let { pm.getUserBadgedIcon(it, user) } + ?.toBitmap(iconPx, iconPx) + }.getOrNull() ?: runCatching { info.getBadgedIcon(0).toBitmap(iconPx, iconPx) }.getOrNull() val app = info.applicationInfo val updated = if (user == own) runCatching { pm.getPackageInfo(component.packageName, 0).lastUpdateTime }.getOrNull() else null @Suppress("DEPRECATION") diff --git a/app/src/main/java/com/droiddeck/launcher/HomeIcons.kt b/app/src/main/java/com/droiddeck/launcher/HomeIcons.kt new file mode 100644 index 0000000000..d3a57be2b4 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/HomeIcons.kt @@ -0,0 +1,46 @@ +package com.droiddeck.launcher + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue + +object HomeIcons { + private const val PREFS = "home_launcher" + private const val KEY = "icon_overrides" + private const val SEPARATOR = '\t' + + data class Choice(val pack: String, val drawable: String) + + var overrides by mutableStateOf>(emptyMap()) + private set + @Volatile private var loaded = false + + @Synchronized + fun load(context: Context) { + if (loaded) return + overrides = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE) + .getStringSet(KEY, emptySet()).orEmpty().mapNotNull(::decode).toMap() + loaded = true + } + + fun set(context: Context, key: String, pack: String, drawable: String) = save(context, overrides + (key to Choice(pack, drawable))) + + fun clear(context: Context, key: String) = save(context, overrides - key) + + fun clearAll(context: Context) = save(context, emptyMap()) + + private fun save(context: Context, next: Map) { + overrides = next + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit() + .putStringSet(KEY, next.map { (key, choice) -> encode(key, choice) }.toSet()).apply() + } + + internal fun encode(key: String, choice: Choice) = listOf(key, choice.pack, choice.drawable).joinToString(SEPARATOR.toString()) + + internal fun decode(entry: String): Pair? { + val parts = entry.split(SEPARATOR) + if (parts.size != 3 || parts.any { it.isEmpty() }) return null + return parts[0] to Choice(parts[1], parts[2]) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/IconPack.kt b/app/src/main/java/com/droiddeck/launcher/IconPack.kt new file mode 100644 index 0000000000..227714277e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/IconPack.kt @@ -0,0 +1,198 @@ +package com.droiddeck.launcher + +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.content.pm.PackageManager +import android.content.res.Resources +import android.graphics.Bitmap +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.PorterDuff +import android.graphics.PorterDuffColorFilter +import android.graphics.PorterDuffXfermode +import android.graphics.Rect +import android.graphics.drawable.Drawable +import android.util.Xml +import androidx.core.content.res.ResourcesCompat +import androidx.core.graphics.createBitmap +import androidx.core.graphics.drawable.toBitmap +import androidx.core.graphics.drawable.toDrawable +import androidx.palette.graphics.Palette +import org.xmlpull.v1.XmlPullParser +import java.time.LocalDate +import kotlin.math.roundToInt + +object IconPack { + const val NONE = "" + private const val PREFS = "home_launcher" + private const val KEY = "icon_pack" + private const val APP_COLORS = "icon_pack_app_colors" + private const val FILTER = "appfilter" + private const val DRAWABLES = "drawable" + + private val ACTIONS = listOf("org.adw.launcher.THEMES", "com.novalauncher.THEME") + + data class Pack(val packageName: String, val label: String) + + internal data class Plate(val back: String?, val mask: String?, val upon: String?, val scale: Float) + + internal data class Filter(val icons: Map, val calendars: Map, val plate: Plate?) { + fun names(component: String, day: Int) = listOfNotNull(calendars[component]?.plus(day), icons[component]) + } + + class Loaded internal constructor( + private val resources: Resources, + internal val pack: String, + internal val updatedAt: Long, + private val filter: Filter, + ) { + fun icon(component: ComponentName, densityDpi: Int) = + filter.names(component.flattenToString(), LocalDate.now().dayOfMonth).firstNotNullOfOrNull { load(resources, pack, it, densityDpi) } + + val hasBack get() = filter.plate?.back != null + + fun plated(icon: Drawable, size: Int, densityDpi: Int, appColor: Boolean): Drawable? { + val plate = filter.plate ?: return null + fun image(name: String?) = name?.let { load(resources, pack, it, densityDpi) }?.toBitmap(size, size) + val base = icon.toBitmap(size, size) + val color = if (appColor) Palette.from(base).generate().getDominantColor(0).takeIf { it != 0 } else null + return compose(base, image(plate.back), image(plate.mask), image(plate.upon), plate.scale, color).toDrawable(resources) + } + } + + @Volatile private var cached: Loaded? = null + + fun selected(context: Context): String = + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getString(KEY, NONE).orEmpty() + + fun select(context: Context, pack: String) { + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putString(KEY, pack).apply() + } + + fun appColors(context: Context): Boolean = + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getBoolean(APP_COLORS, false) + + fun setAppColors(context: Context, on: Boolean) { + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putBoolean(APP_COLORS, on).apply() + } + + fun installed(context: Context): List { + val pm = context.packageManager + return ACTIONS.flatMap { pm.queryIntentActivities(Intent(it), 0) } + .map { it.activityInfo.applicationInfo } + .distinctBy { it.packageName } + .filter { app -> resources(pm, app.packageName)?.let { withXml(it, app.packageName, FILTER) { true } } == true } + .map { app -> Pack(app.packageName, app.loadLabel(pm).toString().trim().ifEmpty { app.packageName }) } + .sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.label }) + } + + fun active(context: Context): Loaded? { + val pack = selected(context) + if (pack == NONE) return null + val pm = context.packageManager + val updatedAt = runCatching { pm.getPackageInfo(pack, 0).lastUpdateTime }.getOrNull() ?: return null + cached?.takeIf { it.pack == pack && it.updatedAt == updatedAt }?.let { return it } + val resources = resources(pm, pack) ?: return null + val filter = withXml(resources, pack, FILTER) { parse(it) } ?: return null + return Loaded(resources, pack, updatedAt, filter).also { cached = it } + } + + fun drawable(context: Context, pack: String, name: String, densityDpi: Int): Drawable? { + val resources = resources(context.packageManager, pack) ?: return null + return load(resources, pack, name, densityDpi) + } + + fun names(context: Context, pack: String): List { + val resources = resources(context.packageManager, pack) ?: return emptyList() + return withXml(resources, pack, DRAWABLES) { parseNames(it) }?.takeIf { it.isNotEmpty() } + ?: withXml(resources, pack, FILTER) { parse(it).icons.values.distinct().sorted() }.orEmpty() + } + + private fun resources(pm: PackageManager, pack: String): Resources? = + runCatching { pm.getResourcesForApplication(pack) }.getOrNull() + + private fun load(resources: Resources, pack: String, name: String, densityDpi: Int): Drawable? { + val id = resources.getIdentifier(name, "drawable", pack).takeIf { it != 0 } + ?: resources.getIdentifier(name, "mipmap", pack).takeIf { it != 0 } + ?: return null + return runCatching { ResourcesCompat.getDrawableForDensity(resources, id, densityDpi, null) }.getOrNull() + } + + internal fun parseNames(xml: XmlPullParser): List { + val names = LinkedHashSet() + forEachTag(xml) { if (xml.name == "item") xml.getAttributeValue(null, "drawable")?.trim()?.takeIf { it.isNotEmpty() }?.let { names.add(it) } } + return names.toList() + } + + internal fun parse(xml: XmlPullParser): Filter { + val icons = HashMap() + val calendars = HashMap() + var back: String? = null + var mask: String? = null + var upon: String? = null + var scale = 1f + fun image() = xml.getAttributeValue(null, "img1")?.trim()?.takeIf { it.isNotEmpty() } + forEachTag(xml) { + when (xml.name) { + "item" -> { + val key = componentKey(xml.getAttributeValue(null, "component")) + val drawable = xml.getAttributeValue(null, "drawable")?.trim() + if (key != null && !drawable.isNullOrEmpty()) icons.putIfAbsent(key, drawable) + } + "calendar" -> { + val key = componentKey(xml.getAttributeValue(null, "component")) + val prefix = xml.getAttributeValue(null, "prefix")?.trim() + if (key != null && !prefix.isNullOrEmpty()) calendars.putIfAbsent(key, prefix) + } + "iconback" -> back = back ?: image() + "iconmask" -> mask = mask ?: image() + "iconupon" -> upon = upon ?: image() + "scale" -> scale = xml.getAttributeValue(null, "factor")?.toFloatOrNull() ?: scale + } + } + return Filter(icons, calendars, if (back == null && mask == null && upon == null) null else Plate(back, mask, upon, scale)) + } + + internal fun compose(icon: Bitmap, back: Bitmap?, mask: Bitmap?, upon: Bitmap?, scale: Float, backColor: Int? = null): Bitmap { + val size = icon.width + val inset = (size * (1 - scale) / 2).roundToInt() + val result = createBitmap(size, size) + val canvas = Canvas(result) + val paint = Paint(Paint.ANTI_ALIAS_FLAG or Paint.FILTER_BITMAP_FLAG) + val full = Rect(0, 0, size, size) + canvas.drawBitmap(icon, null, Rect(inset, inset, size - inset, size - inset), paint) + mask?.let { + paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.DST_OUT) + canvas.drawBitmap(it, null, full, paint) + } + back?.let { + paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.DST_OVER) + paint.colorFilter = backColor?.let { color -> PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN) } + canvas.drawBitmap(it, null, full, paint) + } + paint.xfermode = null + paint.colorFilter = null + upon?.let { canvas.drawBitmap(it, null, full, paint) } + return result + } + + private inline fun forEachTag(xml: XmlPullParser, block: () -> Unit) { + var event = xml.eventType + while (event != XmlPullParser.END_DOCUMENT) { + if (event == XmlPullParser.START_TAG) block() + event = xml.next() + } + } + + internal fun componentKey(component: String?): String? = + component?.trim()?.removePrefix("ComponentInfo{")?.removeSuffix("}")?.let(ComponentName::unflattenFromString)?.flattenToString() + + private fun withXml(resources: Resources, pack: String, file: String, block: (XmlPullParser) -> T): T? = runCatching { + val xml = resources.getIdentifier(file, "xml", pack) + val raw = resources.getIdentifier(file, "raw", pack) + if (xml != 0) resources.getXml(xml).use(block) + else (if (raw != 0) resources.openRawResource(raw) else resources.assets.open("$file.xml")) + .use { stream -> block(Xml.newPullParser().also { it.setInput(stream, null) }) } + }.getOrNull() +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt index a7742c42ea..5c2dff86e3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt @@ -73,6 +73,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue +import androidx.compose.runtime.snapshotFlow import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip @@ -108,10 +109,13 @@ import androidx.compose.ui.zIndex import com.droiddeck.launcher.HomeApp import com.droiddeck.launcher.HomeFolders import com.droiddeck.launcher.HomeHidden +import com.droiddeck.launcher.HomeIcons import com.droiddeck.launcher.HomePins +import com.droiddeck.launcher.IconPack import android.content.pm.ShortcutInfo import android.graphics.Bitmap import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.drop import kotlinx.coroutines.withContext import com.droiddeck.launcher.HomeWidgets import com.droiddeck.launcher.R @@ -229,6 +233,48 @@ internal object AppsView { } } +internal object AppsGrid { + const val SMALL = 44 + const val MEDIUM = 52 + const val LARGE = 64 + private val ICON_SIZES = listOf(SMALL, MEDIUM, LARGE) + const val TIGHT = -12 + const val NORMAL = 0 + const val ROOMY = 16 + private val SPACINGS = listOf(TIGHT, NORMAL, ROOMY) + + var labels by mutableStateOf(true) + private set + var iconDp by mutableStateOf(MEDIUM) + private set + var spacing by mutableStateOf(NORMAL) + private set + + private fun prefs(context: Context) = context.getSharedPreferences("home_launcher", Context.MODE_PRIVATE) + + fun load(context: Context) { + val p = prefs(context) + labels = p.getBoolean("grid_labels", true) + iconDp = p.getInt("grid_icon", MEDIUM).takeIf { it in ICON_SIZES } ?: MEDIUM + spacing = p.getInt("grid_spacing", NORMAL).takeIf { it in SPACINGS } ?: NORMAL + } + + fun setLabels(context: Context, value: Boolean) { + labels = value + prefs(context).edit().putBoolean("grid_labels", value).apply() + } + + fun setIconDp(context: Context, value: Int) { + iconDp = value + prefs(context).edit().putInt("grid_icon", value).apply() + } + + fun setSpacing(context: Context, value: Int) { + spacing = value + prefs(context).edit().putInt("grid_spacing", value).apply() + } +} + internal interface AppEntryKey { val label: String val installedAt: Long @@ -237,9 +283,9 @@ internal interface AppEntryKey { @OptIn(ExperimentalLayoutApi::class) @Composable -internal fun AndroidAppsPage(s: FrontEndState, modifier: Modifier, onLaunch: (HomeApp.LaunchableApp) -> Unit) { +internal fun AndroidAppsPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier, onLaunch: (HomeApp.LaunchableApp) -> Unit) { val ctx = LocalContext.current - remember { HomeFolders.load(ctx); HomeWidgets.load(ctx); HomeHidden.load(ctx); AppsView.load(ctx); true } + remember { HomeFolders.load(ctx); HomeWidgets.load(ctx); HomeHidden.load(ctx); AppsView.load(ctx); AppsGrid.load(ctx); true } val colors = MaterialTheme.colorScheme val narrow = LocalNarrowPane.current val padH = if (narrow) 16.dp else 22.dp @@ -247,6 +293,10 @@ internal fun AndroidAppsPage(s: FrontEndState, modifier: Modifier, onLaunch: (Ho var openFolder by rememberSaveable { mutableStateOf(null) } var renameOnOpen by rememberSaveable { mutableStateOf(false) } var picking by rememberSaveable { mutableStateOf(false) } + var iconFor by remember { mutableStateOf(null) } + LaunchedEffect(Unit) { + snapshotFlow { HomeIcons.overrides }.drop(1).collect { a.onAppIconsChanged() } + } val folders = HomeFolders.folders val byKey = remember(s.androidApps) { s.androidApps.associateBy { it.key } } val byPkg = remember(s.androidApps) { s.androidApps.filterNot { it.work }.groupBy { it.packageName }.mapNotNull { (pkg, apps) -> apps.singleOrNull()?.let { pkg to it } }.toMap() } @@ -292,7 +342,7 @@ internal fun AndroidAppsPage(s: FrontEndState, modifier: Modifier, onLaunch: (Ho ModeHeader( stringResource(R.string.content_android_apps), query, { query = it }, placeholder = stringResource(R.string.apps_search_hint), - clearSearchFocus = openFolder != null || picking, + clearSearchFocus = openFolder != null || picking || iconFor != null, lead = { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(start = 2.dp, end = 4.dp)) { Text(stringResource(R.string.content_android_apps), fontSize = if (narrow) 20.sp else 24.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1) @@ -303,6 +353,7 @@ internal fun AndroidAppsPage(s: FrontEndState, modifier: Modifier, onLaunch: (Ho ) { AppsFilterButton() AppsSortButton() + AppsAppearanceButton(a) HeaderIconButton(stringResource(R.string.apps_add_widget), Icons.Filled.Widgets, "add-widget") { HomeWidgets.loadProviders(ctx) picking = true @@ -312,7 +363,7 @@ internal fun AndroidAppsPage(s: FrontEndState, modifier: Modifier, onLaunch: (Ho Box(Modifier.weight(1f).fillMaxWidth()) { val scroller = q.isEmpty() && byName && entries.size > 16 LazyVerticalGrid( - columns = GridCells.Adaptive(if (narrow) 84.dp else 96.dp), + columns = GridCells.Adaptive((if (narrow) 84 else 96).dp + AppsGrid.spacing.dp), state = grid, horizontalArrangement = Arrangement.spacedBy(10.dp), verticalArrangement = Arrangement.spacedBy(10.dp), @@ -343,7 +394,7 @@ internal fun AndroidAppsPage(s: FrontEndState, modifier: Modifier, onLaunch: (Ho items(entries, key = { it.key }) { entry -> when (entry) { is AppEntry.App -> AppTile( - entry.app, folderId = null, onLaunch = onLaunch, onNewFolder = newFolder, + entry.app, folderId = null, onLaunch = onLaunch, onNewFolder = newFolder, onChangeIcon = { iconFor = it }, first = entry === entries.first(), ) is AppEntry.Shortcut -> PinnedTile(entry.pinned, first = entry === entries.first()) @@ -367,7 +418,7 @@ internal fun AndroidAppsPage(s: FrontEndState, modifier: Modifier, onLaunch: (Ho var last by remember { mutableStateOf(folder) } if (folder != null) last = folder last?.let { f -> - FolderSheet(f, f.apps.mapNotNull(member).filter { it.key !in hidden }.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.label }), renameOnOpen, onLaunch, newFolder) { + FolderSheet(f, f.apps.mapNotNull(member).filter { it.key !in hidden }.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.label }), renameOnOpen, onLaunch, newFolder, { iconFor = it }) { openFolder = null renameOnOpen = false } @@ -377,11 +428,19 @@ internal fun AndroidAppsPage(s: FrontEndState, modifier: Modifier, onLaunch: (Ho picking, enter = fadeIn(Motion.tw(180)), exit = fadeOut(Motion.tw(160)), modifier = Modifier.fillMaxSize().zIndex(3f), ) { WidgetPicker(padH) { picking = false } } + AnimatedVisibility( + iconFor != null, enter = fadeIn(Motion.tw(180)), exit = fadeOut(Motion.tw(160)), + modifier = Modifier.fillMaxSize().zIndex(4f), + ) { + var last by remember { mutableStateOf(iconFor) } + iconFor?.let { last = it } + last?.let { app -> AppIconPicker(app, padH) { iconFor = null } } + } } } @Composable -private fun SwipeLock() { +internal fun SwipeLock() { DisposableEffect(Unit) { PageSwipe.locks++ onDispose { PageSwipe.locks-- } @@ -568,22 +627,22 @@ private fun AppIcon(app: HomeApp.LaunchableApp, size: androidx.compose.ui.unit.D private fun AppTile( app: HomeApp.LaunchableApp, folderId: String?, first: Boolean, onLaunch: (HomeApp.LaunchableApp) -> Unit, onNewFolder: (HomeApp.LaunchableApp) -> Unit, - modifier: Modifier = Modifier, + onChangeIcon: (HomeApp.LaunchableApp) -> Unit, modifier: Modifier = Modifier, ) { var menu by remember { mutableStateOf(false) } Box(modifier) { TileFrame(app.key, first, onClick = { onLaunch(app) }, onMenu = { menu = true }) { - AppIcon(app, 52.dp) - TileLabel(app.label) + AppIcon(app, AppsGrid.iconDp.dp) + if (AppsGrid.labels) TileLabel(app.label) } - AppMenu(app, folderId, menu, onDismiss = { menu = false }, onNewFolder = onNewFolder) + AppMenu(app, folderId, menu, onDismiss = { menu = false }, onNewFolder = onNewFolder, onChangeIcon = onChangeIcon) } } @Composable private fun AppMenu( app: HomeApp.LaunchableApp, folderId: String?, open: Boolean, - onDismiss: () -> Unit, onNewFolder: (HomeApp.LaunchableApp) -> Unit, + onDismiss: () -> Unit, onNewFolder: (HomeApp.LaunchableApp) -> Unit, onChangeIcon: (HomeApp.LaunchableApp) -> Unit, ) { val ctx = LocalContext.current var choosing by remember { mutableStateOf(false) } @@ -636,6 +695,14 @@ private fun AppMenu( onDismiss() HomeHidden.set(ctx, app.key, !isHidden) } + if (IconPack.active(ctx) != null) MenuItem(stringResource(R.string.apps_change_icon), checked = false) { + onDismiss() + onChangeIcon(app) + } + if (app.key in HomeIcons.overrides) MenuItem(stringResource(R.string.apps_reset_icon), checked = false) { + onDismiss() + HomeIcons.clear(ctx, app.key) + } MenuItem(stringResource(R.string.apps_app_info), checked = false) { onDismiss() runCatching { HomeApp.openAppInfo(ctx, app) } @@ -662,10 +729,10 @@ private fun PinnedTile(pinned: HomePins.Pinned, first: Boolean) { TileFrame(pinned.key, first, onClick = { runCatching { HomeApp.startShortcut(ctx, pinned.info) } }, onMenu = { menu = true }) { Box { val icon = pinned.icon - if (icon != null) Image(icon.asImageBitmap(), null, contentScale = ContentScale.Fit, modifier = Modifier.size(52.dp)) - else Box(Modifier.size(52.dp).clip(CircleShape).background(artBrush(hueOf(pinned.label)))) + if (icon != null) Image(icon.asImageBitmap(), null, contentScale = ContentScale.Fit, modifier = Modifier.size(AppsGrid.iconDp.dp)) + else Box(Modifier.size(AppsGrid.iconDp.dp).clip(CircleShape).background(artBrush(hueOf(pinned.label)))) } - TileLabel(pinned.label) + if (AppsGrid.labels) TileLabel(pinned.label) } AnchoredMenu(menu, onDismiss = { menu = false }, title = pinned.label, compact = true, minWidth = 180.dp) { firstItem -> MenuItem(stringResource(R.string.apps_shortcut_remove), checked = false, detail = pinned.appLabel, focusRequester = firstItem) { @@ -700,8 +767,8 @@ private fun FolderTile(entry: AppEntry.Folder, first: Boolean, onOpen: () -> Uni var menu by remember { mutableStateOf(false) } Box { TileFrame(entry.key, first, onClick = onOpen, onMenu = { menu = true }) { - FolderIcon(entry.apps, 52.dp) - TileLabel(entry.folder.name) + FolderIcon(entry.apps, AppsGrid.iconDp.dp) + if (AppsGrid.labels) TileLabel(entry.folder.name) } AnchoredMenu(menu, onDismiss = { menu = false }, title = entry.folder.name, compact = true, minWidth = 160.dp) { firstItem -> MenuItem(stringResource(R.string.apps_folder_rename), checked = false, focusRequester = firstItem) { @@ -720,7 +787,8 @@ private fun FolderTile(entry: AppEntry.Folder, first: Boolean, onOpen: () -> Uni @Composable private fun FolderSheet( folder: HomeFolders.Folder, apps: List, renameFirst: Boolean, - onLaunch: (HomeApp.LaunchableApp) -> Unit, onNewFolder: (HomeApp.LaunchableApp) -> Unit, onClose: () -> Unit, + onLaunch: (HomeApp.LaunchableApp) -> Unit, onNewFolder: (HomeApp.LaunchableApp) -> Unit, + onChangeIcon: (HomeApp.LaunchableApp) -> Unit, onClose: () -> Unit, ) { SwipeLock() val ctx = LocalContext.current @@ -803,14 +871,14 @@ private fun FolderSheet( } } LazyVerticalGrid( - columns = GridCells.Adaptive(92.dp), + columns = GridCells.Adaptive(92.dp + AppsGrid.spacing.dp), state = grid, horizontalArrangement = Arrangement.spacedBy(10.dp), verticalArrangement = Arrangement.spacedBy(10.dp), ) { items(apps, key = { it.key }) { app -> AppTile( - app, folderId = folder.id, first = false, onLaunch = { onClose(); onLaunch(it) }, onNewFolder = onNewFolder, + app, folderId = folder.id, first = false, onLaunch = { onClose(); onLaunch(it) }, onNewFolder = onNewFolder, onChangeIcon = onChangeIcon, modifier = if (app === apps.first()) Modifier.focusRequester(firstApp) else Modifier, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AppIconPicker.kt b/app/src/main/java/com/droiddeck/launcher/ui/AppIconPicker.kt new file mode 100644 index 0000000000..a438a09130 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/AppIconPicker.kt @@ -0,0 +1,188 @@ +package com.droiddeck.launcher.ui + +import android.graphics.Bitmap +import android.util.LruCache +import androidx.activity.compose.BackHandler +import androidx.compose.foundation.Image +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.focusGroup +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.imePadding +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.GridItemSpan +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.items +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.produceState +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.ExperimentalComposeUiApi +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.focus.FocusDirection +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusProperties +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.asImageBitmap +import androidx.compose.ui.input.InputMode +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.LocalInputModeManager +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.core.graphics.drawable.toBitmap +import com.droiddeck.launcher.HomeApp +import com.droiddeck.launcher.HomeIcons +import com.droiddeck.launcher.IconPack +import com.droiddeck.launcher.R +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +private val CELL_ICON = 44.dp + +@OptIn(ExperimentalComposeUiApi::class) +private fun Modifier.focusTrap(): Modifier = focusProperties { + exit = { dir -> + if (dir == FocusDirection.Up || dir == FocusDirection.Down || dir == FocusDirection.Left || dir == FocusDirection.Right) FocusRequester.Cancel + else FocusRequester.Default + } +}.focusGroup() + +private fun normalized(text: String) = text.lowercase().filter { it.isLetterOrDigit() } + +internal fun iconMatches(names: List, label: String, query: String): List { + val q = normalized(query) + if (q.isNotEmpty()) return names.filter { q in normalized(it) } + val hint = normalized(label) + val (likely, rest) = names.partition { hint in normalized(it) } + return likely + rest +} + +@Composable +internal fun AppIconPicker(app: HomeApp.LaunchableApp, padH: androidx.compose.ui.unit.Dp, onClose: () -> Unit) { + SwipeLock() + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pack = remember { IconPack.selected(ctx) } + val names by produceState?>(null, pack) { value = withContext(Dispatchers.IO) { IconPack.names(ctx, pack) } } + var query by remember { mutableStateOf("") } + val shown = remember(names, query) { names?.let { iconMatches(it, app.label, query) } } + val cache = remember { LruCache(256) } + val inputMode = LocalInputModeManager.current.inputMode + val ff = LocalFrontFocus.current + val first = remember { FocusRequester() } + var closing by remember { mutableStateOf(false) } + val close = { + closing = true + onClose() + if (inputMode == InputMode.Keyboard && ff != null) { + runCatching { ff.items.getValue("tile:${app.key}").requestFocus() } + .onFailure { runCatching { ff.firstTile.requestFocus() } } + } + } + LaunchedEffect(names != null, inputMode) { + if (names != null && !closing && inputMode == InputMode.Keyboard) { + repeat(2) { androidx.compose.runtime.withFrameNanos { } } + ff?.last = "icon:${shown?.firstOrNull()}" + if (!closing) runCatching { first.requestFocus() } + } + } + BackHandler { close() } + Column( + Modifier.fillMaxSize().imePadding().background(colors.background) + .blockTouches() + .focusTrap(), + ) { + val title = stringResource(R.string.touch_icon_for, app.label) + Box(Modifier.fillMaxWidth().padding(start = padH, end = padH, top = 8.dp)) { + ModeHeader( + title, query, { query = it }, placeholder = stringResource(R.string.apps_icons_search), + lead = { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp)) { + BackLink(stringResource(R.string.rail_apps), compact = true, onClick = close) + Text(title, fontSize = 15.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + }, + inlineWhenStacked = true, + ) { } + } + LazyVerticalGrid( + columns = GridCells.Adaptive(64.dp), + horizontalArrangement = Arrangement.spacedBy(4.dp), + verticalArrangement = Arrangement.spacedBy(4.dp), + contentPadding = PaddingValues(horizontal = padH, vertical = 8.dp), + modifier = Modifier.fillMaxSize(), + ) { + when { + shown == null -> item(key = "loading", span = { GridItemSpan(maxLineSpan) }) { Note(stringResource(R.string.apps_icons_loading)) } + shown.isEmpty() -> item(key = "none", span = { GridItemSpan(maxLineSpan) }) { Note(stringResource(R.string.apps_icons_none)) } + else -> items(shown, key = { it }) { name -> + PackIconCell( + pack, name, cache, + modifier = if (name == shown.first()) Modifier.focusRequester(first) else Modifier, + ) { + HomeIcons.set(ctx, app.key, pack, name) + close() + } + } + } + } + } +} + +@Composable +private fun PackIconCell( + pack: String, name: String, cache: LruCache, modifier: Modifier, onPick: () -> Unit, +) { + val ctx = LocalContext.current + val iconPx = with(LocalDensity.current) { CELL_ICON.roundToPx() } + val bitmap by produceState(cache.get(name), name) { + if (value == null) value = withContext(Dispatchers.IO) { + runCatching { IconPack.drawable(ctx, pack, name, ctx.resources.displayMetrics.densityDpi)?.toBitmap(iconPx, iconPx) }.getOrNull()?.also { cache.put(name, it) } + } + } + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + Box( + contentAlignment = Alignment.Center, + modifier = modifier.fillMaxWidth().paneItem("icon:$name").clip(Shape12) + .background(if (hot) pal.signal.copy(alpha = 0.14f) else Color.Transparent) + .glideBorder(hot, Shape12, pal.signal) + .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onPick) + .controllerConfirm(onClick = onPick) + .semantics { contentDescription = name.replace('_', ' ') } + .padding(10.dp), + ) { + val icon = bitmap + if (icon != null) Image(icon.asImageBitmap(), null, contentScale = ContentScale.Fit, modifier = Modifier.size(CELL_ICON)) + else Spacer(Modifier.size(CELL_ICON)) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AppsAppearance.kt b/app/src/main/java/com/droiddeck/launcher/ui/AppsAppearance.kt new file mode 100644 index 0000000000..e04ff0d613 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/AppsAppearance.kt @@ -0,0 +1,120 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Palette +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.produceState +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.geometry.Rect +import androidx.compose.ui.layout.boundsInRoot +import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.HomeIcons +import com.droiddeck.launcher.IconPack +import com.droiddeck.launcher.R +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +private val PanelWidth = 348.dp +private val PanelHeight = 316.dp +private val TabsWidth = 204.dp + +@Composable +internal fun AppsAppearanceButton(a: FrontEndActions) { + val pal = LocalPalette.current + val title = stringResource(R.string.apps_appearance) + var at by remember { mutableStateOf(null) } + Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) { + HeaderIconButton(title, Icons.Filled.Palette, "apps-appearance") { + val from = at ?: return@HeaderIconButton + Steps.ask(StepAsk( + anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = 2, maxWidth = PanelWidth, + handle = { Icon(Icons.Filled.Palette, null, tint = pal.signal, modifier = Modifier.size(18.dp)) }, + ) { + StepTitle(title) + Column( + Modifier.stepItem(1).fillMaxWidth().height(minOf(PanelHeight, (maxHeight - 64.dp).coerceAtLeast(44.dp))).verticalScroll(rememberScrollState()), + ) { AppearanceRows(a) } + }) + } + } +} + +@Composable +private fun StepOutScope.AppearanceRows(a: FrontEndActions) { + val ctx = LocalContext.current + val host = rememberMenuHost() + var packsOpen by remember { mutableStateOf(false) } + var selected by remember { mutableStateOf(IconPack.selected(ctx)) } + var appColors by remember { mutableStateOf(IconPack.appColors(ctx)) } + val installed by produceState(emptyList()) { + value = withContext(Dispatchers.IO) { runCatching { IconPack.installed(ctx) }.getOrDefault(emptyList()) } + } + val hasBack by produceState(false, selected) { value = withContext(Dispatchers.IO) { IconPack.active(ctx)?.hasBack == true } } + CompositionLocalProvider(LocalCompactSettings provides true) { + val packs = listOf(IconPack.Pack(IconPack.NONE, stringResource(R.string.apps_icon_pack_system))) + installed + val current = packs.find { it.packageName == selected } ?: packs.first() + Box(Modifier.focusRequester(first)) { + LinkRow( + stringResource(R.string.apps_icon_pack), current.label, "", "icon-pack", + arrow = if (packsOpen) "▴" else "▾", + ) { packsOpen = !packsOpen } + } + if (packsOpen) packs.forEach { (value, text) -> + MenuItem(text, checked = value == current.packageName) { + selected = value + IconPack.select(ctx, value) + a.onAppIconsChanged() + packsOpen = false + runCatching { first.requestFocus() } + } + } + SettingsRow(stringResource(R.string.apps_icon_size), null) { + SegmentedTabs( + listOf( + AppsGrid.SMALL to stringResource(R.string.apps_icon_small), + AppsGrid.MEDIUM to stringResource(R.string.apps_icon_medium), + AppsGrid.LARGE to stringResource(R.string.apps_icon_large), + ), + AppsGrid.iconDp, Modifier.width(TabsWidth), + ) { AppsGrid.setIconDp(ctx, it) } + } + SettingsRow(stringResource(R.string.apps_spacing), null) { + SegmentedTabs( + listOf( + AppsGrid.TIGHT to stringResource(R.string.apps_spacing_tight), + AppsGrid.NORMAL to stringResource(R.string.apps_spacing_normal), + AppsGrid.ROOMY to stringResource(R.string.apps_spacing_roomy), + ), + AppsGrid.spacing, Modifier.width(TabsWidth), + ) { AppsGrid.setSpacing(ctx, it) } + } + ToggleRow(host, "app-names", stringResource(R.string.apps_hide_names), null, !AppsGrid.labels) { AppsGrid.setLabels(ctx, !it) } + if (hasBack) ToggleRow(host, "app-colors", stringResource(R.string.apps_icon_app_colors), null, appColors) { + appColors = it + IconPack.setAppColors(ctx, it) + a.onAppIconsChanged() + } + if (HomeIcons.overrides.isNotEmpty()) ActionRow(stringResource(R.string.apps_icons_custom), null, stringResource(R.string.ctrl_reset), { + HomeIcons.clearAll(ctx) + runCatching { first.requestFocus() } + }) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt index 2259a2b34e..28b3dc33bb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt @@ -275,7 +275,7 @@ private fun Content( return } if (selected == "android-apps" && s.isHomeApp) { - AndroidAppsPage(s, modifier, onAndroidAppClick) + AndroidAppsPage(s, a, modifier, onAndroidAppClick) return } Column(modifier = modifier.verticalScroll(rememberScrollState()).padding(horizontal = padH, vertical = padV)) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 3cc28e1890..f9914d5a38 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -293,6 +293,7 @@ class FrontEndActions( val onLibraryChanged: () -> Unit = {}, val onHomeApp: () -> Unit = {}, val onHomeScreen: (Boolean) -> Unit = {}, + val onAppIconsChanged: () -> Unit = {}, val onSteamIntegration: (com.droiddeck.launcher.core.SteamIntegration.Feature?) -> Unit = {}, val onDismissIntegration: () -> Unit = {}, val onIntegration: (com.droiddeck.launcher.core.SteamIntegration.Feature) -> Unit = {}, diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index cc56dbb7a7..ad939d9696 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -3697,6 +3697,25 @@ نقل إلى الخلف إعدادات الأداة إزالة الأداة + المظهر + حزمة الرموز + الافتراضي للنظام + خلفية بلون التطبيق + حجم الرموز + صغير + متوسط + كبير + إخفاء أسماء التطبيقات + التباعد + ضيق + عادي + واسع + تغيير الرمز + إعادة ضبط الرمز + البحث في الرموز + جارٍ تحميل الرموز… + لم يتم العثور على رموز. + رموز مخصّصة إضافة إلى مجلد مجلد جديد إزالة من المجلد diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 46e5035656..d3c6e048aa 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -3556,6 +3556,25 @@ Mover después Configuración del widget Quitar widget + Apariencia + Paquete de iconos + Predeterminado del sistema + Fondo con color de la app + Tamaño de iconos + Pequeño + Mediano + Grande + Ocultar nombres de apps + Espaciado + Denso + Normal + Amplio + Cambiar icono + Restablecer icono + Buscar iconos + Cargando iconos… + No se encontraron iconos. + Iconos personalizados Agregar a carpeta Carpeta nueva Quitar de la carpeta diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index d3e14dd32c..6d9aaa5d32 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -3545,6 +3545,25 @@ Преместване по-късно Настройки на приспособлението Премахване на приспособлението + Външен вид + Пакет с икони + По подразбиране от системата + Фон в цвета на приложението + Размер на иконите + Малък + Среден + Голям + Скриване на имената + Разстояние + Плътно + Средно + Широко + Промяна на иконата + Нулиране на иконата + Търсене на икони + Иконите се зареждат… + Няма намерени икони. + Персонализирани икони Добавяне в папка Нова папка Премахване от папката diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index c318b3081b..302d2b5fd5 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -3621,6 +3621,25 @@ Posunout později Nastavení widgetu Odebrat widget + Vzhled + Balíček ikon + Výchozí systémový + Pozadí v barvě aplikace + Velikost ikon + Malé + Střední + Velké + Skrýt názvy aplikací + Rozestupy + Těsné + Běžné + Volné + Změnit ikonu + Obnovit ikonu + Hledat ikony + Načítání ikon… + Nebyly nalezeny žádné ikony. + Vlastní ikony Přidat do složky Nová složka Odebrat ze složky diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 0936040739..3c8fe48493 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -3545,6 +3545,25 @@ Flyt senere Widgetindstillinger Fjern widget + Udseende + Ikonpakke + Systemstandard + Baggrund i appens farve + Ikonstørrelse + Lille + Mellem + Stor + Skjul appnavne + Afstand + Tæt + Normal + Luftig + Skift ikon + Nulstil ikon + Søg efter ikoner + Indlæser ikoner… + Ingen ikoner fundet. + Brugerdefinerede ikoner Føj til mappe Ny mappe Fjern fra mappe diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1db47d2b34..a81afbdbd5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -3545,6 +3545,25 @@ Nach hinten Widget-Einstellungen Widget entfernen + Darstellung + Symbolpaket + Systemstandard + Hintergrund in App-Farbe + Symbolgröße + Klein + Mittel + Groß + App-Namen ausblenden + Abstand + Eng + Normal + Weit + Symbol ändern + Symbol zurücksetzen + Symbole suchen + Symbole werden geladen… + Keine Symbole gefunden. + Eigene Symbole Zu Ordner hinzufügen Neuer Ordner Aus Ordner entfernen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 4fe414040c..c6be6d3824 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -3545,6 +3545,25 @@ Μετακίνηση αργότερα Ρυθμίσεις γραφικού στοιχείου Αφαίρεση γραφικού στοιχείου + Εμφάνιση + Πακέτο εικονιδίων + Προεπιλογή συστήματος + Φόντο με χρώμα εφαρμογής + Μέγεθος εικονιδίων + Μικρό + Μεσαίο + Μεγάλο + Απόκρυψη ονομάτων εφαρμογών + Απόσταση + Στενή + Μέτρια + Ευρεία + Αλλαγή εικονιδίου + Επαναφορά εικονιδίου + Αναζήτηση εικονιδίων + Φόρτωση εικονιδίων… + Δεν βρέθηκαν εικονίδια. + Προσαρμοσμένα εικονίδια Προσθήκη σε φάκελο Νέος φάκελος Αφαίρεση από φάκελο diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8cff6535ff..f3632dce18 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -3583,6 +3583,25 @@ Mover después Ajustes del widget Quitar widget + Apariencia + Paquete de iconos + Predeterminado del sistema + Fondo con color de la app + Tamaño de iconos + Pequeño + Mediano + Grande + Ocultar nombres de aplicaciones + Espaciado + Denso + Normal + Amplio + Cambiar icono + Restablecer icono + Buscar iconos + Cargando iconos… + No se encontraron iconos. + Iconos personalizados Añadir a carpeta Carpeta nueva Quitar de la carpeta diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 71a1e78a74..49ef50fa3a 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -3545,6 +3545,25 @@ Siirrä myöhemmäksi Widgetin asetukset Poista widget + Ulkoasu + Kuvakepaketti + Järjestelmän oletus + Taustaväri sovelluksesta + Kuvakekoko + Pieni + Keski + Suuri + Piilota sovellusten nimet + Välit + Tiivis + Normaali + Väljä + Vaihda kuvake + Palauta kuvake + Hae kuvakkeita + Ladataan kuvakkeita… + Kuvakkeita ei löytynyt. + Mukautetut kuvakkeet Lisää kansioon Uusi kansio Poista kansiosta diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a182aeb39a..dd2043ac1e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -3583,6 +3583,25 @@ Reculer Paramètres du widget Retirer le widget + Apparence + Pack d\'icônes + Par défaut du système + Fond couleur de l\'appli + Taille des icônes + Petite + Moyenne + Grande + Masquer les noms des applications + Espacement + Serré + Normal + Aéré + Changer l\'icône + Réinitialiser l\'icône + Rechercher des icônes + Chargement des icônes… + Aucune icône trouvée. + Icônes personnalisées Ajouter à un dossier Nouveau dossier Retirer du dossier diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index ad96817016..5c39c28c16 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -3545,6 +3545,25 @@ बाद में ले जाएँ विजेट सेटिंग विजेट हटाएँ + दिखावट + आइकन पैक + सिस्टम डिफ़ॉल्ट + ऐप के रंग का बैकग्राउंड + आइकन का आकार + छोटा + मध्यम + बड़ा + ऐप के नाम छिपाएं + स्पेसिंग + कम + सामान्य + ज़्यादा + आइकन बदलें + आइकन रीसेट करें + आइकन खोजें + आइकन लोड हो रहे हैं… + कोई आइकन नहीं मिला। + कस्टम आइकन फ़ोल्डर में जोड़ें नया फ़ोल्डर फ़ोल्डर से हटाएँ diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 26fafb1bd2..383658e191 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -3545,6 +3545,25 @@ Hátrébb Modulbeállítások Modul eltávolítása + Megjelenés + Ikoncsomag + Rendszer alapértelmezett + Háttér az alkalmazás színével + Ikonméret + Kicsi + Közepes + Nagy + Alkalmazásnevek elrejtése + Térköz + Szűk + Normál + Tág + Ikon módosítása + Ikon visszaállítása + Ikonok keresése + Ikonok betöltése… + Nem található ikon. + Egyéni ikonok Hozzáadás mappához Új mappa Eltávolítás a mappából diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index fc440af4e9..7efa53767f 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -3516,6 +3516,25 @@ Pindahkan ke belakang Setelan widget Hapus widget + Tampilan + Paket ikon + Default sistem + Latar warna aplikasi + Ukuran ikon + Kecil + Sedang + Besar + Sembunyikan nama aplikasi + Jarak + Rapat + Normal + Longgar + Ubah ikon + Setel ulang ikon + Cari ikon + Memuat ikon… + Ikon tidak ditemukan. + Ikon khusus Tambahkan ke folder Folder baru Keluarkan dari folder diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6e2493bc4b..bff0619db4 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -3583,6 +3583,25 @@ Sposta dopo Impostazioni widget Rimuovi widget + Aspetto + Pacchetto icone + Predefinito di sistema + Sfondo col colore dell\'app + Dimensione icone + Piccole + Medie + Grandi + Nascondi nomi delle app + Spaziatura + Stretta + Normale + Ampia + Cambia icona + Ripristina icona + Cerca icone + Caricamento icone… + Nessuna icona trovata. + Icone personalizzate Aggiungi a cartella Nuova cartella Rimuovi dalla cartella diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 326f88634d..1c9b9d6f4e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -3516,6 +3516,25 @@ 後ろへ移動 ウィジェットの設定 ウィジェットを削除 + 外観 + アイコンパック + システムのデフォルト + アプリの色を背景に使用 + アイコンサイズ + 小 + 中 + 大 + アプリ名を非表示 + 間隔 + 狭い + 標準 + 広い + アイコンを変更 + アイコンをリセット + アイコンを検索 + アイコンを読み込み中… + アイコンが見つかりません。 + カスタムアイコン フォルダに追加 新しいフォルダ フォルダから削除 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index c93c5b0d20..f75ed9bf91 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -3516,6 +3516,25 @@ 뒤로 이동 위젯 설정 위젯 삭제 + 외관 + 아이콘 팩 + 시스템 기본값 + 앱 색상 배경 + 아이콘 크기 + 작게 + 보통 + 크게 + 앱 이름 숨기기 + 간격 + 좁게 + 보통 + 넓게 + 아이콘 변경 + 아이콘 초기화 + 아이콘 검색 + 아이콘 불러오는 중… + 아이콘을 찾을 수 없습니다. + 사용자 정의 아이콘 폴더에 추가 새 폴더 폴더에서 제거 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 6d0077c92e..006abdf4bf 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -3516,6 +3516,25 @@ Alih ke belakang Tetapan widget Alih keluar widget + Rupa + Pek ikon + Lalai sistem + Latar warna apl + Saiz ikon + Kecil + Sedang + Besar + Sembunyikan nama apl + Jarak + Rapat + Biasa + Luas + Tukar ikon + Set semula ikon + Cari ikon + Memuatkan ikon… + Tiada ikon ditemui. + Ikon tersuai Tambah pada folder Folder baharu Alih keluar daripada folder diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index b95bffcc69..c305b9387a 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -3545,6 +3545,25 @@ Flytt senere Modulinnstillinger Fjern modul + Utseende + Ikonpakke + Systemstandard + Bakgrunn i appens farge + Ikonstørrelse + Liten + Middels + Stor + Skjul appnavn + Avstand + Tett + Normal + Luftig + Endre ikon + Tilbakestill ikon + Søk etter ikoner + Laster inn ikoner… + Fant ingen ikoner. + Egendefinerte ikoner Legg til i mappe Ny mappe Fjern fra mappe diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index b9c476a349..625992011f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -3545,6 +3545,25 @@ Naar achteren Widgetinstellingen Widget verwijderen + Weergave + Pictogrampakket + Systeemstandaard + Achtergrond in app-kleur + Grootte van pictogrammen + Klein + Middel + Groot + App-namen verbergen + Afstand + Krap + Normaal + Ruim + Pictogram wijzigen + Pictogram resetten + Pictogrammen zoeken + Pictogrammen laden… + Geen pictogrammen gevonden. + Aangepaste pictogrammen Toevoegen aan map Nieuwe map Uit map verwijderen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index cba0b85efa..fa5dcd2c03 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -3621,6 +3621,25 @@ Przesuń później Ustawienia widżetu Usuń widżet + Wygląd + Pakiet ikon + Domyślny systemu + Tło w kolorze aplikacji + Rozmiar ikon + Mały + Średni + Duży + Ukryj nazwy aplikacji + Odstępy + Ciasne + Średnie + Luźne + Zmień ikonę + Resetuj ikonę + Szukaj ikon + Wczytywanie ikon… + Nie znaleziono ikon. + Własne ikony Dodaj do folderu Nowy folder Usuń z folderu diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 39b93f25b0..3c94b532eb 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -3583,6 +3583,25 @@ Mover para depois Definições do widget Remover widget + Aspeto + Pacote de ícones + Predefinição do sistema + Fundo na cor da app + Tamanho dos ícones + Pequeno + Médio + Grande + Ocultar nomes das aplicações + Espaçamento + Justo + Normal + Amplo + Alterar ícone + Repor ícone + Pesquisar ícones + A carregar ícones… + Nenhum ícone encontrado. + Ícones personalizados Adicionar a pasta Nova pasta Remover da pasta diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index b4d3cf7ddd..14bed70758 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -3583,6 +3583,25 @@ Mover para depois Configurações do widget Remover widget + Aparência + Pacote de ícones + Padrão do sistema + Fundo na cor do app + Tamanho dos ícones + Pequeno + Médio + Grande + Ocultar nomes dos apps + Espaçamento + Justo + Normal + Amplo + Alterar ícone + Redefinir ícone + Buscar ícones + Carregando ícones… + Nenhum ícone encontrado. + Ícones personalizados Adicionar à pasta Nova pasta Remover da pasta diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index bd8696e74a..672122d817 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -3583,6 +3583,25 @@ Mută mai târziu Setări widget Elimină widgetul + Aspect + Pachet de iconițe + Implicit de sistem + Fundal în culoarea aplicației + Dimensiune iconițe + Mică + Medie + Mare + Ascunde numele aplicațiilor + Spațiere + Strânsă + Normală + Largă + Schimbă iconița + Resetează iconița + Caută iconițe + Se încarcă iconițele… + Nu s-au găsit iconițe. + Iconițe personalizate Adaugă în dosar Dosar nou Elimină din dosar diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 8dee9e4c9e..1449384134 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -3704,6 +3704,25 @@ Переместить позже Настройки виджета Удалить виджет + Внешний вид + Набор иконок + Как в системе + Фон цвета приложения + Размер иконок + Мелкие + Средние + Крупные + Скрыть названия приложений + Отступы + Узко + Средне + Широко + Сменить иконку + Сбросить иконку + Поиск иконок + Загрузка иконок… + Иконки не найдены. + Свои иконки Добавить в папку Новая папка Убрать из папки diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 5a35123390..7a5120525c 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -3545,6 +3545,25 @@ Flytta senare Widgetinställningar Ta bort widget + Utseende + Ikonpaket + Systemstandard + Bakgrund i appens färg + Ikonstorlek + Liten + Mellan + Stor + Dölj appnamn + Avstånd + Tätt + Normalt + Luftigt + Ändra ikon + Återställ ikon + Sök ikoner + Läser in ikoner… + Inga ikoner hittades. + Anpassade ikoner Lägg till i mapp Ny mapp Ta bort från mapp diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 81017bbb02..38b62c9fce 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -3516,6 +3516,25 @@ ย้ายไปหลัง การตั้งค่าวิดเจ็ต นำวิดเจ็ตออก + รูปลักษณ์ + ชุดไอคอน + ค่าเริ่มต้นของระบบ + พื้นหลังสีของแอป + ขนาดไอคอน + เล็ก + ปานกลาง + ใหญ่ + ซ่อนชื่อแอป + ระยะห่าง + ชิด + ปกติ + กว้าง + เปลี่ยนไอคอน + รีเซ็ตไอคอน + ค้นหาไอคอน + กำลังโหลดไอคอน… + ไม่พบไอคอน + ไอคอนที่กำหนดเอง เพิ่มลงในโฟลเดอร์ โฟลเดอร์ใหม่ นำออกจากโฟลเดอร์ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index b65fc85813..df596656d4 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -3545,6 +3545,25 @@ Arkaya taşı Widget ayarları Widget’ı kaldır + Görünüm + Simge paketi + Sistem varsayılanı + Uygulama rengi arka plan + Simge boyutu + Küçük + Orta + Büyük + Uygulama adlarını gizle + Aralık + Dar + Normal + Geniş + Simgeyi değiştir + Simgeyi sıfırla + Simge ara + Simgeler yükleniyor… + Simge bulunamadı. + Özel simgeler Klasöre ekle Yeni klasör Klasörden çıkar diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index bd977f8e42..2ee9ab4e36 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -3621,6 +3621,25 @@ Перемістити пізніше Налаштування віджета Вилучити віджет + Вигляд + Набір значків + Як у системі + Фон кольору застосунку + Розмір значків + Малі + Середні + Великі + Сховати назви застосунків + Відступи + Вузькі + Середні + Широкі + Змінити значок + Скинути значок + Пошук значків + Завантаження значків… + Значків не знайдено. + Власні значки Додати до папки Нова папка Вилучити з папки diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a6411681d2..a4414e038f 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -3516,6 +3516,25 @@ Chuyển ra sau Cài đặt tiện ích Xóa tiện ích + Giao diện + Gói biểu tượng + Theo hệ thống + Nền theo màu ứng dụng + Kích thước biểu tượng + Nhỏ + Vừa + Lớn + Ẩn tên ứng dụng + Khoảng cách + Hẹp + Vừa + Rộng + Đổi biểu tượng + Đặt lại biểu tượng + Tìm biểu tượng + Đang tải biểu tượng… + Không tìm thấy biểu tượng. + Biểu tượng tùy chỉnh Thêm vào thư mục Thư mục mới Xóa khỏi thư mục diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e3263afcc6..100352717d 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -3520,6 +3520,25 @@ 后移 微件设置 移除微件 + 外观 + 图标包 + 系统默认 + 使用应用颜色作为背景 + 图标大小 + 小 + 中 + 大 + 隐藏应用名称 + 间距 + 紧凑 + 正常 + 宽松 + 更换图标 + 重置图标 + 搜索图标 + 正在加载图标… + 未找到图标。 + 自定义图标 添加到文件夹 新建文件夹 从文件夹中移除 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 6ea69859e5..729bf26c23 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -3516,6 +3516,25 @@ 向後移 小工具設定 移除小工具 + 外觀 + 圖示包 + 系統預設 + 使用應用程式顏色作為背景 + 圖示大小 + 小 + 中 + 大 + 隱藏應用程式名稱 + 間距 + 緊密 + 正常 + 寬鬆 + 更改圖示 + 重設圖示 + 搜尋圖示 + 正在載入圖示… + 找不到圖示。 + 自訂圖示 加入資料夾 新資料夾 從資料夾移除 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 6b34c26263..15d43fc4f0 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -3516,6 +3516,25 @@ 往後移 小工具設定 移除小工具 + 外觀 + 圖示套件 + 系統預設 + 使用應用程式顏色作為背景 + 圖示大小 + 小 + 中 + 大 + 隱藏應用程式名稱 + 間距 + 緊密 + 正常 + 寬鬆 + 變更圖示 + 重設圖示 + 搜尋圖示 + 正在載入圖示… + 找不到圖示。 + 自訂圖示 新增至資料夾 新資料夾 從資料夾移除 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3c6fb2b59e..87271de25e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1386,6 +1386,25 @@ Move later Widget settings Remove widget + Appearance + Icon pack + System default + App color background + Icon size + Small + Medium + Large + Hide app names + Spacing + Tight + Normal + Roomy + Change icon + Reset icon + Search icons + Loading icons… + No icons found. + Custom icons Add to folder New folder Remove from folder diff --git a/app/src/test/java/com/droiddeck/launcher/HomeIconsTest.kt b/app/src/test/java/com/droiddeck/launcher/HomeIconsTest.kt new file mode 100644 index 0000000000..fc3ba72d75 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/HomeIconsTest.kt @@ -0,0 +1,26 @@ +package com.droiddeck.launcher + +import com.droiddeck.launcher.ui.iconMatches +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class HomeIconsTest { + @Test fun aChoiceSurvivesEncoding() { + val choice = HomeIcons.Choice("com.pack", "chrome_alt") + assertEquals("com.app/.Main#10" to choice, HomeIcons.decode(HomeIcons.encode("com.app/.Main#10", choice))) + } + + @Test fun aDamagedEntryIsDropped() { + assertNull(HomeIcons.decode("com.app/.Main")) + assertNull(HomeIcons.decode("com.app/.Main\t\tchrome")) + } + + @Test fun iconsNamedLikeTheAppComeFirst() { + assertEquals(listOf("google_chrome", "alarm", "zoom"), iconMatches(listOf("alarm", "google_chrome", "zoom"), "Chrome", "")) + } + + @Test fun aSearchIgnoresCaseAndSeparators() { + assertEquals(listOf("google_chrome"), iconMatches(listOf("alarm", "google_chrome"), "Chrome", "Google Ch")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/IconPackTest.kt b/app/src/test/java/com/droiddeck/launcher/IconPackTest.kt new file mode 100644 index 0000000000..0c03ac3b7e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/IconPackTest.kt @@ -0,0 +1,127 @@ +package com.droiddeck.launcher + +import android.graphics.Color +import android.util.Xml +import androidx.core.graphics.createBitmap +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import org.robolectric.annotation.GraphicsMode +import java.io.StringReader + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +@GraphicsMode(GraphicsMode.Mode.NATIVE) +class IconPackTest { + private fun filter(xml: String) = IconPack.parse(Xml.newPullParser().also { it.setInput(StringReader(xml)) }) + + private fun parse(xml: String) = filter(xml).icons + + private fun plate(xml: String) = filter(xml).plate + + private fun solid(color: Int) = createBitmap(10, 10).also { it.eraseColor(color) } + + @Test fun plateTagsAreReadFromTheFilter() { + val xml = """ + + + + + + """ + assertEquals(IconPack.Plate("back", "mask", "upon", 0.75f), plate(xml)) + } + + @Test fun aPackWithoutPlateImagesHasNoPlateEvenWithAScale() { + assertNull(plate("""""")) + } + + @Test fun anInvalidScaleLeavesTheIconFullSize() { + assertEquals(1f, plate("""""")?.scale) + } + + @Test fun theMaskCutsTheIconWhereItIsOpaqueAndTheBackShowsThrough() { + val mask = createBitmap(10, 10).also { it.setPixel(0, 0, Color.BLACK) } + val out = IconPack.compose(solid(Color.RED), solid(Color.BLUE), mask, null, 1f) + assertEquals(Color.BLUE, out.getPixel(0, 0)) + assertEquals(Color.RED, out.getPixel(5, 5)) + } + + @Test fun theScaleShrinksTheIconOntoTheBack() { + val out = IconPack.compose(solid(Color.RED), solid(Color.BLUE), null, null, 0.5f) + assertEquals(Color.BLUE, out.getPixel(1, 1)) + assertEquals(Color.RED, out.getPixel(5, 5)) + } + + @Test fun anAppColorRepaintsTheBackInsideItsShape() { + val back = createBitmap(10, 10).also { it.setPixel(5, 5, Color.WHITE) } + val out = IconPack.compose(createBitmap(10, 10), back, null, null, 1f, Color.GREEN) + assertEquals(Color.GREEN, out.getPixel(5, 5)) + assertEquals(Color.TRANSPARENT, out.getPixel(0, 0)) + } + + @Test fun theUponImageDrawsOverEverything() { + val out = IconPack.compose(solid(Color.RED), solid(Color.BLUE), null, solid(Color.GREEN), 1f) + assertEquals(Color.GREEN, out.getPixel(5, 5)) + } + + @Test fun drawableXmlNamesAreDistinctAndInOrder() { + val xml = """""" + assertEquals(listOf("b", "a"), IconPack.parseNames(Xml.newPullParser().also { it.setInput(StringReader(xml)) })) + } + + @Test fun aClassNameStartingWithADotIsExpandedWithThePackage() { + assertEquals("com.example.app/com.example.app.Main", IconPack.componentKey("ComponentInfo{com.example.app/.Main}")) + } + + @Test fun entriesWithoutAUsableComponentOrDrawableAreSkipped() { + val icons = parse( + """ + + + + + + """, + ) + assertTrue(icons.toString(), icons.isEmpty()) + } + + @Test fun theFirstEntryForAComponentWins() { + val icons = parse( + """ + + + """, + ) + assertEquals("first", icons["com.example/com.example.Main"]) + } + + @Test fun aCalendarTriesTodaysIconBeforeItsStaticOne() { + val filter = filter( + """ + + + + """, + ) + assertEquals(listOf("calendar_7", "cal"), filter.names("com.example/com.example.Cal", 7)) + assertEquals(listOf("main"), filter.names("com.example/com.example.Main", 7)) + } + + @Test fun tagsThatAreNotItemsAreIgnored() { + val icons = parse( + """ + + + + + """, + ) + assertEquals(mapOf("com.example/com.example.Main" to "main"), icons) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/AppsGridTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/AppsGridTest.kt new file mode 100644 index 0000000000..6f09411ac1 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/AppsGridTest.kt @@ -0,0 +1,21 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import androidx.test.core.app.ApplicationProvider +import org.junit.Assert.assertEquals +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class AppsGridTest { + @Test fun anUnknownStoredGridValueFallsBackToTheDefault() { + val context: Context = ApplicationProvider.getApplicationContext() + context.getSharedPreferences("home_launcher", Context.MODE_PRIVATE).edit().putInt("grid_icon", 999).putInt("grid_spacing", 7).commit() + AppsGrid.load(context) + assertEquals(AppsGrid.MEDIUM, AppsGrid.iconDp) + assertEquals(AppsGrid.NORMAL, AppsGrid.spacing) + } +} From b52ce7e4c5095c565056d3e39226b931998f317c Mon Sep 17 00:00:00 2001 From: LunaDL <91587464+EnzoDLofi@users.noreply.github.com> Date: Thu, 12 Nov 2026 15:36:55 -0400 Subject: [PATCH 39/57] Feat:Add per-game frame generation profiles (#2473) --- .../cpp/waylandcomp/src/framegen_bridge.c | 26 +- .../main/cpp/waylandcomp/src/framegen_jni.c | 6 + .../com/droiddeck/launcher/SessionActivity.kt | 298 +++++++++++++++++- .../droiddeck/launcher/frontend/Library.kt | 38 ++- .../com/droiddeck/launcher/gpu/FrameGen.kt | 69 +++- .../launcher/hud/DroidDeckHudHost.kt | 10 +- .../launcher/session/SelectedGameProfile.kt | 10 +- .../com/droiddeck/launcher/ui/FrameGenMenu.kt | 9 + .../droiddeck/launcher/ui/FrontEndSetup.kt | 47 ++- .../droiddeck/launcher/ui/SessionOverlay.kt | 25 +- .../launcher/wayland/WaylandCompositor.java | 1 + app/src/main/res/values-ar/strings.xml | 2 + app/src/main/res/values-b+es+419/strings.xml | 2 + app/src/main/res/values-bg/strings.xml | 2 + app/src/main/res/values-cs/strings.xml | 2 + app/src/main/res/values-da/strings.xml | 2 + app/src/main/res/values-de/strings.xml | 2 + app/src/main/res/values-el/strings.xml | 2 + app/src/main/res/values-es/strings.xml | 2 + app/src/main/res/values-fi/strings.xml | 2 + app/src/main/res/values-fr/strings.xml | 2 + app/src/main/res/values-hi/strings.xml | 2 + app/src/main/res/values-hu/strings.xml | 2 + app/src/main/res/values-in/strings.xml | 2 + app/src/main/res/values-it/strings.xml | 2 + app/src/main/res/values-ja/strings.xml | 2 + app/src/main/res/values-ko/strings.xml | 2 + app/src/main/res/values-ms/strings.xml | 2 + app/src/main/res/values-nb/strings.xml | 2 + app/src/main/res/values-nl/strings.xml | 2 + app/src/main/res/values-pl/strings.xml | 2 + app/src/main/res/values-pt-rPT/strings.xml | 2 + app/src/main/res/values-pt/strings.xml | 2 + app/src/main/res/values-ro/strings.xml | 2 + app/src/main/res/values-ru/strings.xml | 2 + app/src/main/res/values-sv/strings.xml | 2 + app/src/main/res/values-th/strings.xml | 2 + app/src/main/res/values-tr/strings.xml | 2 + app/src/main/res/values-uk/strings.xml | 2 + app/src/main/res/values-vi/strings.xml | 2 + app/src/main/res/values-zh-rCN/strings.xml | 2 + app/src/main/res/values-zh-rHK/strings.xml | 2 + app/src/main/res/values-zh-rTW/strings.xml | 2 + app/src/main/res/values/strings.xml | 2 + .../droiddeck/launcher/gpu/FrameGenTest.kt | 20 ++ .../session/SelectedGameProfileTest.kt | 16 + 46 files changed, 598 insertions(+), 43 deletions(-) diff --git a/app/src/main/cpp/waylandcomp/src/framegen_bridge.c b/app/src/main/cpp/waylandcomp/src/framegen_bridge.c index eceb796398..d29b328a05 100644 --- a/app/src/main/cpp/waylandcomp/src/framegen_bridge.c +++ b/app/src/main/cpp/waylandcomp/src/framegen_bridge.c @@ -33,7 +33,9 @@ static PFN_vkGetInstanceProcAddr g_gipa; static VkPhysicalDevice g_pd; static VkQueue g_queue; static uint32_t g_qfam; -static int g_dev_ready, g_dev_lost, g_features_enabled; +static _Atomic int g_dev_ready, g_dev_lost; +static int g_features_enabled; +static _Atomic int g_caps_lsfg_ok, g_caps_ddfg_ok; static VkPhysicalDeviceMemoryProperties g_memprops; static struct { PFN_vkCreateImage CreateImage; @@ -141,9 +143,12 @@ static void mark_failed(int kind) { } int vkp_framegen_problem(void) { - if (!g_dev_ready) return -1; + if (!atomic_load(&g_dev_ready)) return -1; int kind = atomic_load(&g_kind); - if (!fge_caps_ok(kind)) return 1; + int caps_ok = kind == VKP_FG_ENGINE_DDFG + ? atomic_load(&g_caps_ddfg_ok) + : atomic_load(&g_caps_lsfg_ok); + if (!caps_ok) return 1; if (start_failed_for(kind)) return 2; if (g_engine_ok && g_engine_kind == kind && fge_unavailable()) return 2; return 0; @@ -179,13 +184,17 @@ void vkp_framegen_device_ready(VkDevice dev, VkQueue queue, uint32_t qfam, int f #undef R g_vk.GetPhysicalDeviceMemoryProperties(g_pd, &g_memprops); fge_device_ready(g_gipa, g_inst, g_pd, dev, queue, qfam, features_enabled); - g_dev_ready = vk.CreateImage && vk.CreateImageView && vk.CmdPipelineBarrier; + atomic_store(&g_caps_lsfg_ok, fge_caps_ok(VKP_FG_ENGINE_LSFG)); + atomic_store(&g_caps_ddfg_ok, fge_caps_ok(VKP_FG_ENGINE_DDFG)); + atomic_store(&g_dev_lost, 0); + atomic_store(&g_dev_ready, + vk.CreateImage && vk.CreateImageView && vk.CmdPipelineBarrier); FGLOG("engines ready on the compositor's device: LSFG Native %s (%s), DD-FG Native %s", fge_caps_ok(VKP_FG_ENGINE_LSFG) ? "available" : "unavailable", fge_caps_reason(), fge_caps_ok(VKP_FG_ENGINE_DDFG) ? "available" : "unavailable"); } -void vkp_framegen_device_lost(void) { g_dev_lost = 1; } +void vkp_framegen_device_lost(void) { atomic_store(&g_dev_lost, 1); } static void destroy_ring(void) { @@ -244,7 +253,12 @@ static int ensure_ring(uint32_t w, uint32_t h, VkFormat fmt, uint32_t n) { static int engine_usable(void) { int kind = atomic_load(&g_kind); - return g_dev_ready && !g_dev_lost && fge_caps_ok(kind) && !start_failed_for(kind); + int ready = atomic_load(&g_dev_ready); + int lost = atomic_load(&g_dev_lost); + int caps_ok = kind == VKP_FG_ENGINE_DDFG + ? atomic_load(&g_caps_ddfg_ok) + : atomic_load(&g_caps_lsfg_ok); + return ready && !lost && caps_ok && !start_failed_for(kind); } int vkp_framegen_format_ok(VkFormat fmt) { diff --git a/app/src/main/cpp/waylandcomp/src/framegen_jni.c b/app/src/main/cpp/waylandcomp/src/framegen_jni.c index 35c5a3de46..e5a51456ed 100644 --- a/app/src/main/cpp/waylandcomp/src/framegen_jni.c +++ b/app/src/main/cpp/waylandcomp/src/framegen_jni.c @@ -50,6 +50,12 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeFrameGenCapsReason(J return (*env)->NewStringUTF(env, r ? r : ""); } +JNIEXPORT jboolean JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeFrameGenActive(JNIEnv *env, jclass clazz) { + (void)env; (void)clazz; + return vkp_framegen_active() ? JNI_TRUE : JNI_FALSE; +} + JNIEXPORT jfloatArray JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeFrameGenStats(JNIEnv *env, jclass clazz) { (void)clazz; diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 5f39d03c6c..dc87e93d04 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -452,6 +452,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var drawerDefaultProton by mutableStateOf(null) private val drawerComponentMenu by lazy { ComponentsMenu(this, uiHandler) } private var drawerGameProfileId by mutableStateOf(null) + private var drawerGameProfileSelectionMade = false private var fpsLimit by mutableStateOf(SessionState.fpsLimit) private fun noSteamSession(): Boolean = (SessionState.mode == SessionService.MODE_RUN && @@ -460,7 +461,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { com.droiddeck.launcher.session.NoSteamLaunch.BATTLENET, )) || SessionState.mode == SessionService.MODE_DESKTOP private val drawerGameInventory = GameProfileInventoryCache() - private var drawerGameInventoryRevision = 0L + @Volatile private var drawerGameInventoryRevision = 0L private var drawerGameFexPresetSaving by mutableStateOf(false) private var drawerGameNoSteamSaving by mutableStateOf(false) private val drawerGameProfileFollowState = GameProfileFollowState() @@ -556,8 +557,25 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (r.resultCode == RESULT_OK) InAppFilePicker.pickedFile(r.data)?.let { importLossless(it) } } private var frameGen by mutableStateOf(FrameGen.Mode.OFF) + private var frameGenActiveGameId by mutableStateOf(null) + private var frameGenActiveGameName by mutableStateOf(null) + private var frameGenHasGameOverride by mutableStateOf(false) private var frameGenPip = false private val frameGenRequests = java.util.concurrent.atomic.AtomicInteger() + private val frameGenActivityGeneration = synchronized(frameGenGlobalLock) { + frameGenGlobalGeneration.incrementAndGet() + } + @Volatile private var frameGenActivityActive = true + private val frameGenForcePending = java.util.concurrent.atomic.AtomicBoolean() + @Volatile private var frameGenInventoryIds: Set? = null + @Volatile private var frameGenInventoryRevision = -1L + private val frameGenInventoryLock = Any() + @Volatile private var frameGenInventoryLastAttemptAt = 0L + private val frameGenInventoryRetryScheduled = java.util.concurrent.atomic.AtomicBoolean() + private val frameGenInventoryRefreshScheduled = java.util.concurrent.atomic.AtomicBoolean() + + @Volatile private var appliedFrameGenMode: FrameGen.Mode? = null + @Volatile private var appliedFrameGenHz: Float? = null private var fexPreset by mutableStateOf("") private var suspendPolicy by mutableStateOf(SessionPrefs.SUSPEND_MANUAL) private var steamDownloadsInBackground by mutableStateOf(false) @@ -859,7 +877,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { hud.attach(root, root.childCount) memoryHud = com.droiddeck.launcher.session.MemoryHud(this) hud.onPresentingWindowChanged = { - if (FrameGen.engine(this) != FrameGen.ENGINE_OFF) CompositorHost.rearmFrameGen { applyFrameGen() } + CompositorHost.rearmFrameGen { applyFrameGen(force = true) } } if (SessionState.running && SessionState.firstFrameSeen) { loading.visible = false @@ -892,8 +910,24 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } glassesScope.launch { com.droiddeck.launcher.handtracking.HandTracking.settings.collect { updateHandCamera() } } glassesScope.launch { + var lastRunGameId: String? = null while (true) { updateTrackingRecovery() + if (SessionState.mode == SessionService.MODE_RUN) { + val gameId = SessionState.gameId + ?.takeIf { it.toLongOrNull() != null } + ?: intent.getStringExtra(SessionService.EXTRA_GAME_ID) + ?.takeIf { it.toLongOrNull() != null } + if (gameId != lastRunGameId) { + lastRunGameId = gameId + if (drawerGameProfileFollowState.followsSteam) { + loadFrameGenFor(gameId?.toLongOrNull()) + } + applyFrameGen() + } + } else { + lastRunGameId = null + } kotlinx.coroutines.delay(100) } } @@ -956,7 +990,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { applyOutputPacing() if (pipUi != frameGenPip) { frameGenPip = pipUi - if (FrameGen.engine(this@SessionActivity) != FrameGen.ENGINE_OFF && ::surfaceView.isInitialized) applyFrameGen() + if (::surfaceView.isInitialized) applyFrameGen() } } androidx.compose.runtime.LaunchedEffect(AgentGuest.steamKeyboard) { updateOnScreenControls() } @@ -1032,7 +1066,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { window.setBackgroundDrawable(android.graphics.drawable.ColorDrawable(android.graphics.Color.BLACK)) }, ) - LaunchedEffect(AgentGuest.focusRevision, secondScreenDisplays.isNotEmpty()) { + LaunchedEffect(AgentGuest.focusRevision, secondScreenDisplays.isNotEmpty(), drawerGameInventoryRevision) { val nextGame = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { if (SessionState.mode == SessionService.MODE_RUN) SessionState.program?.let { "program:$it" } else { @@ -1045,11 +1079,40 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } } + if (SessionState.mode == SessionService.MODE_STEAM) { + val target = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { + val games = LibraryCache.load(this@SessionActivity) + val cachedIds = games.mapNotNull { it.profileKey.toLongOrNull() }.toSet() + val inventoryIds = synchronized(frameGenInventoryLock) { + frameGenInventoryIds + }.orEmpty() + val id = AgentGuest.activeSteamAppId( + this@SessionActivity, cachedIds + inventoryIds + ) + val name = id?.let { activeId -> + games.firstOrNull { it.profileKey == activeId.toString() }?.name + } + id to name + } + if (target.first != frameGenActiveGameId) { + frameGenActiveGameId = target.first + if (drawerGameProfileFollowState.followsSteam) { + loadFrameGenFor(target.first) + } + } + frameGenActiveGameName = target.second + } if (nextGame != gestureGame) { if (nextGame != null) gameStarts++ gestureGame = nextGame refreshGestureConfig() } + if ( + SessionState.mode == SessionService.MODE_STEAM && + CompositorHost.isStarted + ) { + applyFrameGen() + } if (secondScreenDisplays.isNotEmpty()) kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { runCatching { com.droiddeck.launcher.session.TelemetryOutput.applyAutomatic(this@SessionActivity, nextGame) } } @@ -1234,6 +1297,18 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { textureAnisotropy = if (drawerGameProfileId == null) textureAnisotropy else drawerTextureAnisotropy, textureLodBias = if (drawerGameProfileId == null) textureLodBias else drawerTextureLodBias, frameGen = frameGen, + frameGenTargetGameId = frameGenTargetGameId()?.toString(), + frameGenTargetGameName = when { + !drawerGameProfileFollowState.followsSteam -> + drawerGameProfileRefresh.data?.profiles + ?.firstOrNull { it.first == frameGenTargetGameId() }?.second + SessionState.mode == SessionService.MODE_STEAM -> frameGenActiveGameName + SessionState.mode == SessionService.MODE_RUN -> + com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) + else -> drawerGameProfileRefresh.data?.profiles + ?.firstOrNull { it.first == frameGenTargetGameId() }?.second + }, + hasGameOverride = frameGenHasGameOverride, lossless = lossless, oscMode = oscMode, suspendPolicy = suspendPolicy, steamDownloadsInBackground = steamDownloadsInBackground, touchMode = touchMode, @@ -1293,9 +1368,22 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { applyOutputPacing() }, onFrameGenPick = { mode -> - FrameGen.set(this@SessionActivity, mode) + val appId = frameGenTargetGameId() + + if (appId == null) FrameGen.set(this@SessionActivity, mode) + else FrameGen.setForGame(this@SessionActivity, appId.toString(), mode) + loadFrameGenFor(appId) readPrefs() - applyFrameGen() + applyFrameGen(force = true) + }, + onFrameGenReset = { + val appId = frameGenTargetGameId() + + if (appId == null) FrameGen.clearGlobal(this@SessionActivity) + else FrameGen.clearGame(this@SessionActivity, appId.toString()) + loadFrameGenFor(appId) + readPrefs() + applyFrameGen(force = true) }, onImportLossless = { pickLossless.launch(InAppFilePicker.buildIntent( @@ -1628,9 +1716,35 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { }, "drawer-components").start() } + private fun frameGenTargetGameId(): Long? { + if (!drawerGameProfileFollowState.followsSteam) { + return drawerGameProfileId + } + if (SessionState.mode == SessionService.MODE_RUN) { + return ( + SessionState.gameId?.toLongOrNull() + ?: intent.getStringExtra(SessionService.EXTRA_GAME_ID)?.toLongOrNull() + ) + } + if (SessionState.mode == SessionService.MODE_STEAM) { + return frameGenActiveGameId + } + return drawerGameProfileId + } + + private fun loadFrameGenFor(appId: Long?) { + val profileId = appId?.toString() + frameGen = FrameGen.mode(this, profileId) + frameGenHasGameOverride = appId?.let { + FrameGen.hasGameOverride(this, it.toString()) + } == true + } + private fun selectDrawerGameProfile(appId: Long?) { drawerGameProfileFollowState.selectManually() + drawerGameProfileSelectionMade = true drawerGameProfileId = appId + loadFrameGenFor(frameGenTargetGameId()) drawerGameProfileRefresh = drawerGameProfileRefresh.retrying() readDrawerTextureFiltering(appId) refreshDrawerGameProfile() @@ -1703,6 +1817,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (refresh.followsSteam) { if (drawerGameProfileFollowState.followsSteam) { drawerGameProfileId = result.selectedAppId + loadFrameGenFor(result.selectedAppId) readDrawerTextureFiltering(result.selectedAppId) } } @@ -1727,6 +1842,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { gameProtonId = ProtonDefault.gameSelectedId(this, game.profileKey, protons), gameComponents = ComponentsManager.gameComponents(this, game.profileKey), gameWindowsComponents = WinComponents.picks(this, game.profileKey), + frameGenMode = FrameGen.mode(this, game.profileKey), + frameGenInherited = !FrameGen.hasGameOverride(this, game.profileKey), ) } @@ -1970,7 +2087,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (routedTouchMode != nextRoutedTouchMode) gestureTouchStreamGate.reset() routedTouchMode = nextRoutedTouchMode requestRelativeMouse() - frameGen = FrameGen.mode(this) + loadFrameGenFor(frameGenTargetGameId()) fexPreset = SessionPrefs.fexPreset(this) suspendPolicy = SessionPrefs.suspendPolicy(this, SessionState.mode) steamDownloadsInBackground = SessionPrefs.steamDownloadsInBackground(this) @@ -2257,7 +2374,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (resized) { cancelTouchGestures() Log.i(TAG, "surface resized to ${width}x$height - rebinding the compositor") - CompositorHost.resize(holder.surface) { applyFrameGen() } + CompositorHost.resize(holder.surface) { applyFrameGen(force = true) } resizeOutputForWindow(width, height) } } @@ -2398,17 +2515,161 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } - private fun applyFrameGen() { + private fun frameGenModeForActiveGame(request: Int): FrameGen.Mode { + if (SessionState.mode == SessionService.MODE_RUN) { + val activeAppId = ( + SessionState.gameId?.takeIf { it.toLongOrNull() != null } + ?: intent.getStringExtra(SessionService.EXTRA_GAME_ID) + )?.toLongOrNull() + return FrameGen.mode(this, activeAppId?.toString()) + } + + val cachedIds = LibraryCache.load(this) + .mapNotNull { it.profileKey.toLongOrNull() } + .toSet() + + var inventoryRevision = drawerGameInventoryRevision + var ids = synchronized(frameGenInventoryLock) { + if (frameGenInventoryRevision != inventoryRevision) { + frameGenInventoryIds = null + frameGenInventoryRevision = inventoryRevision + frameGenInventoryLastAttemptAt = 0L + } + frameGenInventoryIds + } + if (ids == null) { + val now = SystemClock.elapsedRealtime() + val shouldScan = synchronized(frameGenInventoryLock) { + val currentRevision = drawerGameInventoryRevision + if (frameGenInventoryRevision != currentRevision) { + frameGenInventoryIds = null + frameGenInventoryRevision = currentRevision + frameGenInventoryLastAttemptAt = 0L + } + inventoryRevision = currentRevision + if (frameGenInventoryIds != null) { + false + } else if ( + frameGenInventoryLastAttemptAt != 0L && + now - frameGenInventoryLastAttemptAt < 15_000L + ) { + false + } else { + frameGenInventoryLastAttemptAt = now + true + } + } + + if (shouldScan) { + val currentIds = runCatching { + Library.launchableGames(this, strictRead = true) + .mapNotNull { it.profileKey.toLongOrNull() } + .toSet() + }.getOrNull() + + if (currentIds == null) { + if (frameGenInventoryRetryScheduled.compareAndSet(false, true)) { + uiHandler.postDelayed({ + frameGenInventoryRetryScheduled.set(false) + val retry = synchronized(frameGenInventoryLock) { + frameGenInventoryIds == null + } + if (retry && !isFinishing && !isDestroyed) { + applyFrameGen() + } + }, 15_000L) + } + } else { + var published = false + synchronized(frameGenInventoryLock) { + if (drawerGameInventoryRevision == inventoryRevision && + frameGenInventoryRevision == inventoryRevision + ) { + ids = cachedIds + currentIds + frameGenInventoryIds = ids + published = true + } + } + if (published) { + if (frameGenInventoryRefreshScheduled.compareAndSet(false, true)) { + uiHandler.postDelayed({ + frameGenInventoryRefreshScheduled.set(false) + if (frameGenActivityActive && !isFinishing && !isDestroyed) { + synchronized(frameGenInventoryLock) { + frameGenInventoryIds = null + frameGenInventoryLastAttemptAt = 0L + } + applyFrameGen() + } + }, 15_000L) + } + if (frameGenRequests.get() != request) { + applyFrameGen() + } + } + } + } + + if (ids == null) { + ids = synchronized(frameGenInventoryLock) { + frameGenInventoryIds + } ?: emptySet() + } + } + + val activeAppId = AgentGuest.activeSteamAppId( + this, cachedIds + (ids ?: emptySet()) + ) + if (activeAppId == null) return FrameGen.Mode.OFF + return FrameGen.mode(this, activeAppId.toString()) + } + + private fun applyFrameGen(force: Boolean = false) { + val request = synchronized(frameGenGlobalLock) { + if (force) frameGenForcePending.set(true) + frameGenRequests.incrementAndGet() + } val hz = refreshHz() val pip = pipUi && mirrorRefreshLimit() <= 0 - val request = frameGenRequests.incrementAndGet() Thread({ - val problem = synchronized(frameGenRequests) { + val mode = if (pip) FrameGen.Mode.OFF else frameGenModeForActiveGame(request) + val needsApply = synchronized(frameGenGlobalLock) { + if (frameGenActivityGeneration != frameGenGlobalGeneration.get()) return@Thread if (request != frameGenRequests.get()) return@Thread - if (pip) FrameGen.apply(this, FrameGen.Mode.OFF, hz) else FrameGen.apply(this, hz) + if (!frameGenActivityActive || isFinishing || isDestroyed) return@Thread + val lastAppliedHz = appliedFrameGenHz + frameGenForcePending.get() || appliedFrameGenMode == null || + mode != appliedFrameGenMode || lastAppliedHz == null || + kotlin.math.abs(lastAppliedHz - hz) > 0.1f + } + val prepared = if (needsApply) FrameGen.prepareApply(this, mode) else null + val problem = synchronized(frameGenGlobalLock) { + if (frameGenActivityGeneration != frameGenGlobalGeneration.get()) return@Thread + if (request != frameGenRequests.get()) return@Thread + if (!frameGenActivityActive || isFinishing || isDestroyed) return@Thread + val forcePending = frameGenForcePending.get() + val lastAppliedHz = appliedFrameGenHz + if (!forcePending && appliedFrameGenMode != null && mode == appliedFrameGenMode && + lastAppliedHz != null && kotlin.math.abs(lastAppliedHz - hz) <= 0.1f + ) { + null + } else { + val ready = prepared ?: return@Thread + frameGenForcePending.set(false) + FrameGen.applyPrepared(this, ready, hz).also { problem -> + if (problem == null) { + appliedFrameGenMode = mode + appliedFrameGenHz = hz + } else { + appliedFrameGenMode = null + appliedFrameGenHz = null + } + } + } } val state = Lossless.state(this) runOnUiThread { + if (frameGenActivityGeneration != frameGenGlobalGeneration.get()) return@runOnUiThread lossless = state if (problem != null) Toast.makeText(this, problem, Toast.LENGTH_LONG).show() } @@ -2425,12 +2686,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun importLossless(dll: File) { Thread({ - val message = Lossless.message(this, Lossless.import(this, dll)) + val result = Lossless.import(this, dll) + val message = Lossless.message(this, result) val state = Lossless.state(this) runOnUiThread { lossless = state Toast.makeText(this, message, Toast.LENGTH_LONG).show() - if (FrameGen.engine(this) == FrameGen.ENGINE_LSFG) applyFrameGen() + applyFrameGen(force = result == Lossless.ImportResult.UPDATED) } }, "lossless-import").start() } @@ -4708,12 +4970,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onResume() { super.onResume() + drawerGameInventoryRevision++ com.droiddeck.launcher.input.SystemKeyCapture.attach(this, { hasWindowFocus() && !appUiOwnsPointer() && CompositorHost.isStarted }) { event -> com.droiddeck.launcher.input.GuestKeys.send(event) { code, down -> sendGuestKey(code, down, 8) } } if (refreshActivityDisplayId() && started) { SessionService.setActivityDisplay(this, sessionActivityDisplayId) } + if (CompositorHost.isStarted) applyFrameGen(force = true) applyFollowOrientation(resources.configuration) if (runtimeRemovalBlocked) return if (!SessionState.suspended) pausedFrame = null @@ -5391,6 +5655,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } override fun onDestroy() { + synchronized(frameGenGlobalLock) { + frameGenActivityActive = false + frameGenRequests.incrementAndGet() + } if (AgentGuest.readyListener === agentReadyListener) AgentGuest.readyListener = null com.droiddeck.launcher.input.HomeButtonShortcuts.detach(this) relativeMouseRequests.shutdownNow() @@ -5505,6 +5773,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private const val BOTTOM_RECOVERY_MS = 1_000L private const val BOTTOM_RECOVERY_TRIES = 3 private const val TAG = "SessionActivity" + private val frameGenGlobalLock = Any() + private val frameGenGlobalGeneration = java.util.concurrent.atomic.AtomicLong(0L) private var startedScreens = 0 @Volatile private var activeInstallWorker: Any? = null private const val FEX_MISSING = "droiddeck-fex: x86 Linux programs need" diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt index b303ecc71e..99732653b6 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -126,6 +126,7 @@ object Library { fun steamGames( context: Context, strictRead: Boolean = false, arch: String = SessionPrefs.activeSteamClientArch(context), withShared: Boolean = true, + onlyAppIds: Set? = null, ): List { val root = SessionPrefs.steamRoot(context, arch) val cache = File(root, "appcache/librarycache") @@ -138,7 +139,9 @@ object Library { if (strictRead && steamapps.isDirectory) check(manifests != null) { context.getString(R.string.game_sync_err_manifests) } manifests?.sortedBy { it.name }?.forEach { manifest -> val appId = manifest.name.removePrefix("appmanifest_").removeSuffix(".acf").toIntOrNull() ?: return@forEach - if (appId in NOT_GAMES || out.containsKey(appId)) return@forEach + if (appId in NOT_GAMES || out.containsKey(appId) || + (onlyAppIds != null && appId !in onlyAppIds) + ) return@forEach val text = try { manifest.readText() } catch (e: Exception) { if (strictRead) throw e; return@forEach } val name = NAME.find(text)?.groupValues?.get(1)?.trim().orEmpty() val flags = STATE.find(text)?.groupValues?.get(1)?.toIntOrNull() ?: 0 @@ -161,16 +164,41 @@ object Library { } if (withShared) { val other = if (arch == "x86_64") "arm64" else "x86_64" - val shared = sharedApps(context, arch) - out.keys - if (shared.isNotEmpty()) runCatching { steamGames(context, arch = other, withShared = false) }.getOrDefault(emptyList()) - .filter { it.appId in shared }.forEach { out[it.appId] = it } + val shared = try { + sharedApps(context, arch) - out.keys + } catch (e: IllegalStateException) { + if (strictRead) throw e + emptySet() + } + if (shared.isNotEmpty()) { + val otherGames = try { + steamGames( + context, + strictRead = strictRead, + arch = other, + withShared = false, + onlyAppIds = shared, + ) + } catch (e: Exception) { + if (strictRead) throw e + emptyList() + } + otherGames.forEach { out[it.appId] = it } + } } return out.values.toList() } internal fun sharedApps(context: Context, arch: String): Set { val view = File(LinuxRuntime.rootDir(context), "root/.droiddeck-x64/shared/${if (arch == "x86_64") "arm64" else "x86-64"}/steamapps") - return view.list().orEmpty().mapNotNull { Regex("appmanifest_(\\d+)\\.acf").matchEntire(it)?.groupValues?.get(1)?.toIntOrNull() }.toSet() + val entries = view.list() + if (entries == null) { + if (!view.exists()) return emptySet() + throw IllegalStateException("Unable to read the shared Steam library.") + } + return entries.mapNotNull { + Regex("appmanifest_(\\d+)\\.acf").matchEntire(it)?.groupValues?.get(1)?.toIntOrNull() + }.toSet() } fun steamLibraryArt(context: Context): List> { diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt b/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt index c31cd348e8..1623c10106 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt @@ -28,12 +28,38 @@ object FrameGen { fun engine(context: Context): String = mode(context).engine - fun mode(context: Context): Mode { + fun mode(context: Context): Mode = mode(context, null) + + fun mode(context: Context, appId: String?): Mode { val prefs = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE) - val engine = prefs.getString("engine", ENGINE_OFF).let { if (it == LEGACY_ENGINE_WINFG) ENGINE_DDFG else it ?: ENGINE_OFF } - val target = prefs.getInt("target", 0) + val gamePrefix = appId?.takeIf { it.isNotBlank() }?.let { "game.$it." } + ?.takeIf { prefs.contains(it + "engine") } ?: "" + val engine = prefs.getString(gamePrefix + "engine", ENGINE_OFF) + .let { if (it == LEGACY_ENGINE_WINFG) ENGINE_DDFG else it ?: ENGINE_OFF } + val target = prefs.getInt(gamePrefix + "target", 0) if (engine == ENGINE_LSFG && target in ADAPTIVE_TARGETS) return Mode(engine, target = target) - return Mode(engine, prefs.getInt("multiplier", 2).coerceIn(2, 4)) + return Mode(engine, prefs.getInt(gamePrefix + "multiplier", 2).coerceIn(2, 4)) + } + + fun hasGameOverride(context: Context, appId: String): Boolean = + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).contains("game.$appId.engine") + + fun setForGame(context: Context, appId: String, mode: Mode) { + val prefix = "game.$appId." + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit() + .putString(prefix + "engine", mode.engine) + .putInt(prefix + "multiplier", mode.multiplier) + .putInt(prefix + "target", mode.target) + .apply() + } + + fun clearGame(context: Context, appId: String) { + val prefix = "game.$appId." + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit() + .remove(prefix + "engine") + .remove(prefix + "multiplier") + .remove(prefix + "target") + .apply() } fun set(context: Context, mode: Mode) { @@ -41,6 +67,11 @@ object FrameGen { .putString("engine", mode.engine).putInt("multiplier", mode.multiplier).putInt("target", mode.target).apply() } + fun clearGlobal(context: Context) { + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit() + .remove("engine").remove("multiplier").remove("target").apply() + } + fun label(context: Context): String = label(context, mode(context)) fun label(context: Context, mode: Mode): String = when { @@ -50,14 +81,32 @@ object FrameGen { else -> context.getString(R.string.frame_gen_off) } - fun apply(context: Context, refreshHz: Float): String? = apply(context, mode(context), refreshHz) + data class PreparedApply internal constructor( + val mode: Mode, + internal val lsfgStatus: Int? = null, + internal val lsfgCachePath: String? = null, + ) - fun apply(context: Context, mode: Mode, refreshHz: Float): String? { + fun prepareApply(context: Context, mode: Mode): PreparedApply { + if (mode.engine != ENGINE_LSFG) return PreparedApply(mode) + val status = Lossless.sync(context) + val cachePath = Lossless.cacheFile(context)?.absolutePath + return PreparedApply(mode, status, cachePath) + } + + fun apply(context: Context, refreshHz: Float): String? = + apply(context, mode(context), refreshHz) + + fun apply(context: Context, mode: Mode, refreshHz: Float): String? = + applyPrepared(context, prepareApply(context, mode), refreshHz) + + fun applyPrepared(context: Context, prepared: PreparedApply, refreshHz: Float): String? { + val mode = prepared.mode when (mode.engine) { ENGINE_LSFG -> { - val status = Lossless.sync(context) - val cache = Lossless.cacheFile(context) - if (status != LsfgNative.STATUS_OK || cache == null) { + val status = prepared.lsfgStatus ?: LsfgNative.STATUS_NOT_INSTALLED + val cachePath = prepared.lsfgCachePath + if (status != LsfgNative.STATUS_OK || cachePath == null) { WaylandCompositor.nativeSetFrameGenArmed(false, 0, 0) val problem = context.getString( if (status == LsfgNative.STATUS_NOT_INSTALLED) R.string.lsfg_problem_missing else R.string.lsfg_problem_failed, @@ -66,7 +115,7 @@ object FrameGen { return problem } WaylandCompositor.nativeSetFrameGenEngine(WaylandCompositor.FG_ENGINE_LSFG) - WaylandCompositor.nativeSetLsfgCachePath(cache.absolutePath) + WaylandCompositor.nativeSetLsfgCachePath(cachePath) WaylandCompositor.nativeSetFrameGenTuning(FLOW_SCALE_LSFG, refreshHz) WaylandCompositor.nativeSetFrameGenArmed(true, mode.multiplier, mode.target) } diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt index f612477f33..014fc0b4e7 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt @@ -10,7 +10,6 @@ import android.view.View import android.view.animation.PathInterpolator import android.view.ViewGroup import android.widget.FrameLayout -import com.droiddeck.launcher.gpu.FrameGen import com.droiddeck.launcher.gpu.GpuInfo import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.session.SessionPrefs @@ -238,8 +237,13 @@ class DroidDeckHudHost(context: Context) { } private fun presentedFps(): Float { - if (FrameGen.mode(context).engine == FrameGen.ENGINE_OFF) return 0f - val stats = runCatching { WaylandCompositor.nativeFrameGenStats() }.getOrNull() ?: return 0f + if (!runCatching { WaylandCompositor.nativeFrameGenActive() } + .getOrDefault(false)) return 0f + + val stats = runCatching { + WaylandCompositor.nativeFrameGenStats() + }.getOrNull() ?: return 0f + return if (stats.size > 3 && stats[3] > 1f) stats[3] else 0f } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SelectedGameProfile.kt b/app/src/main/java/com/droiddeck/launcher/session/SelectedGameProfile.kt index 41eeac38f6..cdcc617a61 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SelectedGameProfile.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SelectedGameProfile.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.session import com.droiddeck.launcher.core.FexPreset import com.droiddeck.launcher.core.GameEnvironment import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.gpu.FrameGen data class ProfileValue(val value: String, val inherited: Boolean) @@ -17,6 +18,8 @@ data class SelectedGameProfile( val environmentOverrides: Int, val windowsComponentNames: List, val startWithoutSteam: Boolean = false, + val frameGen: FrameGen.Mode = FrameGen.Mode.OFF, + val frameGenInherited: Boolean = true, ) { val hasOverrides: Boolean get() = !fexPreset.inherited || @@ -24,7 +27,8 @@ data class SelectedGameProfile( components.values.any { !it.inherited } || environmentOverrides > 0 || windowsComponentNames.isNotEmpty() || - startWithoutSteam + startWithoutSteam || + !frameGenInherited companion object { fun resolve( @@ -38,6 +42,8 @@ data class SelectedGameProfile( gameProtonId: String?, gameComponents: Map, gameWindowsComponents: List, + frameGenMode: FrameGen.Mode = FrameGen.Mode.OFF, + frameGenInherited: Boolean = true, ): SelectedGameProfile? { val game = games.firstOrNull { it.profileKey == selectedAppId.toString() } ?: return null val fexOverride = GameEnvironment.gameFexPreset(environment, game.profileKey) @@ -68,6 +74,8 @@ data class SelectedGameProfile( environmentOverrides = otherEnvironment.size, windowsComponentNames = gameWindowsComponents.map(WinComponentNames::of), startWithoutSteam = GameEnvironment.gameNoSteam(environment, game.profileKey), + frameGen = frameGenMode, + frameGenInherited = frameGenInherited, ) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrameGenMenu.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrameGenMenu.kt index bac30bd3b8..83f2e05436 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrameGenMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrameGenMenu.kt @@ -13,6 +13,9 @@ internal fun FrameGenMenu( host: MenuHost, mode: FrameGen.Mode, lossless: Lossless.State, onPick: (FrameGen.Mode) -> Unit, onImportLossless: () -> Unit, + gameProfileId: String? = null, + hasGameOverride: Boolean = false, + onResetGame: () -> Unit = {}, ) { val context = LocalContext.current AnchoredMenu(host.open == "fg", onDismiss = { if (host.open == "fg") host.open = null }, title = stringResource(R.string.frame_gen_title)) { firstItemFocus -> @@ -27,6 +30,12 @@ internal fun FrameGenMenu( onPick(m); host.open = null } item(FrameGen.Mode.OFF, focus = firstItemFocus) + if (gameProfileId != null) { + MenuItem(stringResource(R.string.comp_game_use_general), checked = !hasGameOverride) { + onResetGame() + host.open = null + } + } for (m in 2..4) item(FrameGen.Mode(FrameGen.ENGINE_DDFG, m)) val lsfg = (2..4).map { FrameGen.Mode(FrameGen.ENGINE_LSFG, it) } + FrameGen.ADAPTIVE_TARGETS.map { FrameGen.Mode(FrameGen.ENGINE_LSFG, target = it) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index bfdbd7ecef..3354839a7d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -749,6 +749,17 @@ internal fun LaunchSettings(s: FrontEndState, a: FrontEndActions, host: MenuHost val context = androidx.compose.ui.platform.LocalContext.current val inputMode = androidx.compose.ui.platform.LocalInputModeManager.current val wincompKey = game?.takeIf { it.library == com.droiddeck.launcher.frontend.Library.ADDED || it.appId > 0 }?.profileKey + val frameGenProfileKey = game?.profileKey?.takeIf { it.isNotBlank() } + var gameFrameGenMode by remember(frameGenProfileKey) { + mutableStateOf(frameGenProfileKey?.let { + com.droiddeck.launcher.gpu.FrameGen.mode(context, it) + } ?: s.frameGen) + } + var gameFrameGenOverride by remember(frameGenProfileKey) { + mutableStateOf(frameGenProfileKey?.let { + com.droiddeck.launcher.gpu.FrameGen.hasGameOverride(context, it) + } ?: false) + } var wincompOpen by remember(wincompKey) { mutableStateOf(null) } val wincompPicks = remember(wincompKey, wincompOpen) { wincompKey?.let { com.droiddeck.launcher.session.WinComponents.picks(context, it) }.orEmpty() } val steamScope = game?.let { com.droiddeck.launcher.session.NoSteamLaunch.scope(it) } @@ -767,10 +778,42 @@ internal fun LaunchSettings(s: FrontEndState, a: FrontEndActions, host: MenuHost } add { m -> Box(m) { - SettingCard(stringResource(R.string.frame_gen_title), s.frameGenLabel, "card:fg", Modifier.fillMaxSize()) { + SettingCard( + stringResource(R.string.frame_gen_title), + if (frameGenProfileKey != null) + com.droiddeck.launcher.gpu.FrameGen.label(context, gameFrameGenMode) + else s.frameGenLabel, + "card:fg", Modifier.fillMaxSize() + ) { host.open = if (host.open == "fg") null else "fg" } - FrameGenMenu(s, a, host) + FrameGenMenu( + host = host, + mode = if (frameGenProfileKey != null) gameFrameGenMode else s.frameGen, + lossless = s.lossless, + onPick = { mode -> + val key = frameGenProfileKey + if (key == null) { + a.onFrameGenPick(mode) + } else { + com.droiddeck.launcher.gpu.FrameGen.setForGame(context, key, mode) + gameFrameGenMode = mode + gameFrameGenOverride = true + } + }, + onImportLossless = a.onImportLossless, + gameProfileId = frameGenProfileKey, + hasGameOverride = gameFrameGenOverride, + onResetGame = { + val key = frameGenProfileKey + if (key != null) { + com.droiddeck.launcher.gpu.FrameGen.clearGame(context, key) + gameFrameGenMode = + com.droiddeck.launcher.gpu.FrameGen.mode(context) + gameFrameGenOverride = false + } + } + ) } } if (controller != null) add { m -> SettingCard(stringResource(R.string.setup_card_controls), stringResource(R.string.setup_card_controls_hint), "card:controls", m, controller.onMapping) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index e140ffa1ad..94f4ff1a3c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -220,6 +220,9 @@ class DrawerActions( val hudOn: Boolean, val hudConfig: Map = emptyMap(), val frameGen: FrameGen.Mode, + val frameGenTargetGameId: String? = null, + val frameGenTargetGameName: String? = null, + val hasGameOverride: Boolean = false, val lossless: Lossless.State, val oscMode: String, val suspendPolicy: String, @@ -262,6 +265,7 @@ class DrawerActions( val onHudReset: () -> Unit = {}, val onHudExport: () -> Unit = {}, val onFrameGenPick: (FrameGen.Mode) -> Unit, + val onFrameGenReset: () -> Unit = {}, val fpsLimit: Int = 0, val onFpsLimit: (Int) -> Unit = {}, val onImportLossless: () -> Unit, @@ -569,10 +573,21 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont val fgOpen = host.open == "fg" val offLabel = stringResource(R.string.frame_gen_off) val fgLabel = FrameGen.label(LocalContext.current, a.frameGen) - SettingsRow(stringResource(R.string.frame_gen_title), null, highlighted = fgOpen) { + SettingsRow( + stringResource(R.string.frame_gen_title), + if (a.frameGenTargetGameId != null) + "${stringResource(R.string.frame_gen_scope_game)} · ${a.frameGenTargetGameName ?: "ID ${a.frameGenTargetGameId}"}" + else stringResource(R.string.frame_gen_scope_global), + highlighted = fgOpen + ) { Box { ValueChip(fgLabel, fgOpen, modifier = focus.track(page, "fg")) { host.open = if (fgOpen) null else "fg" } - FrameGenMenu(host, a.frameGen, a.lossless, a.onFrameGenPick, a.onImportLossless) + FrameGenMenu( + host, a.frameGen, a.lossless, a.onFrameGenPick, a.onImportLossless, + gameProfileId = a.frameGenTargetGameId, + hasGameOverride = a.hasGameOverride, + onResetGame = a.onFrameGenReset, + ) } } if (a.direct) SliderRow( @@ -1352,6 +1367,12 @@ private fun SelectedGameProfileGroup(host: MenuHost, a: DrawerActions, track: (S if (!profile.fexPreset.inherited) { ProfileSummaryRow(stringResource(R.string.comp_game_fex), fexProfileLabel(profile.fexPreset)) } + if (!profile.frameGenInherited) { + ProfileSummaryRow( + stringResource(R.string.frame_gen_title), + FrameGen.label(LocalContext.current, profile.frameGen), + ) + } if (!profile.proton.inherited) { ProfileSummaryRow(stringResource(R.string.comp_proton), profileValueLabel(profile.proton)) } diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java index 995f512471..10735a1710 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java +++ b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java @@ -340,6 +340,7 @@ public final class WaylandCompositor { public static native int nativeFrameGenProblem(); public static native String nativeFrameGenCapsReason(); + public static native boolean nativeFrameGenActive(); public static native float[] nativeFrameGenStats(); public static native long nativeHudFrameTimes(float[] out); diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index ad939d9696..e6cb1ab87c 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -28,6 +28,8 @@ تعليق الآن إيقاف الجلسة توليد الإطارات + إعدادات هذه اللعبة + الإعدادات الافتراضية اختر وضع توليد الإطارات إيقاف DD-FG %1$d× diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index d3c6e048aa..6f98b6bff0 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -28,6 +28,8 @@ Suspender ahora Detener sesión Generación de fotogramas + Ajustes para este juego + Ajustes predeterminados Elige el modo de generación de fotogramas Desactivada DD-FG %1$d× diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 6d9aaa5d32..5aeb1e2e9a 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -28,6 +28,8 @@ Приспи сега Спри сесията Генериране на кадри + Настройки за тази игра + Настройки по подразбиране Изберете режима на генериране на кадри Изключено DD-FG %1$d× diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 302d2b5fd5..6011f2fe39 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -28,6 +28,8 @@ Pozastavit teď Ukončit relaci Generování snímků + Nastavení pro tuto hru + Výchozí nastavení Vyberte režim generování snímků Vypnuto DD-FG %1$d× diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 3c8fe48493..f443c3346e 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -28,6 +28,8 @@ Sæt på pause nu Afslut session Billedgenerering + Indstillinger for dette spil + Standardindstillinger Vælg metode til billedgenerering Fra DD-FG %1$d× diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index a81afbdbd5..d16437026e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -28,6 +28,8 @@ Jetzt anhalten Sitzung beenden Frame-Generierung + Einstellungen für dieses Spiel + Standardeinstellungen Modus der Frame-Generierung auswählen Aus DD-FG %1$d× diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index c6be6d3824..e64a289085 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -28,6 +28,8 @@ Αναστολή τώρα Διακοπή συνεδρίας Δημιουργία καρέ + Ρυθμίσεις για αυτό το παιχνίδι + Προεπιλεγμένες ρυθμίσεις Επιλέξτε τη λειτουργία δημιουργίας καρέ Ανενεργό DD-FG %1$d× diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f3632dce18..c9fbd09fa9 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -28,6 +28,8 @@ Suspender ahora Detener sesión Generación de fotogramas + Ajustes para este juego + Ajustes predeterminados Elige el modo de generación de fotogramas Desactivada DD-FG %1$d× diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 49ef50fa3a..27acadee4a 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -28,6 +28,8 @@ Keskeytä nyt Lopeta istunto Kehysten generointi + Tämän pelin asetukset + Oletusasetukset Valitse kehysten generoinnin tila Pois DD-FG %1$d× diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index dd2043ac1e..fd6bd7a654 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -28,6 +28,8 @@ Mettre en pause maintenant Terminer cette session Génération d\'images + Paramètres pour ce jeu + Paramètres par défaut Sélectionnez le mode de génération d\'images à utiliser Désactivé DD-FG %1$d× diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 5c39c28c16..1f48a5adef 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -28,6 +28,8 @@ अभी सस्पेंड करें सेशन बंद करें फ़्रेम जनरेशन + इस गेम की सेटिंग + डिफ़ॉल्ट सेटिंग फ़्रेम जनरेशन मोड चुनें बंद DD-FG %1$d× diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 383658e191..b855f4a1ca 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -28,6 +28,8 @@ Felfüggesztés most Munkamenet leállítása Képkocka-generálás + A játék beállításai + Alapértelmezett beállítások Válassza ki a képkocka-generálás módját Ki DD-FG %1$d× diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 7efa53767f..7920ebc122 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -28,6 +28,8 @@ Jeda sekarang Hentikan sesi Pembuatan frame + Pengaturan untuk game ini + Pengaturan bawaan Pilih mode pembuatan frame Nonaktif DD-FG %1$d× diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index bff0619db4..dfcf569d61 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -28,6 +28,8 @@ Sospendi ora Termina sessione Generazione di frame + Impostazioni per questo gioco + Impostazioni predefinite Seleziona la modalità di generazione di frame Disattivata DD-FG %1$d× diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 1c9b9d6f4e..3dee08d37a 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -28,6 +28,8 @@ 今すぐ一時停止 セッションを終了 フレーム生成 + このゲームの設定 + デフォルト設定 使用するフレーム生成モードを選択してください オフ DD-FG %1$d× diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index f75ed9bf91..b0b023b482 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -28,6 +28,8 @@ 지금 일시 중지 세션 종료 프레임 생성 + 이 게임의 설정 + 기본 설정 사용할 프레임 생성 모드를 선택하세요 끔 DD-FG %1$d× diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 006abdf4bf..89a213972f 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -28,6 +28,8 @@ Gantung sekarang Hentikan sesi Penjanaan bingkai + Tetapan untuk permainan ini + Tetapan lalai Pilih mod penjanaan bingkai Mati DD-FG %1$d× diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index c305b9387a..7a67d2317b 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -28,6 +28,8 @@ Sett på pause nå Avslutt sesjon Bildegenerering + Innstillinger for dette spillet + Standardinnstillinger Velg modus for bildegenerering Av DD-FG %1$d× diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 625992011f..2aa326714f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -28,6 +28,8 @@ Nu onderbreken Sessie stoppen Framegeneratie + Instellingen voor dit spel + Standaardinstellingen Kies de modus voor framegeneratie Uit DD-FG %1$d× diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index fa5dcd2c03..fbca1d88dd 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -28,6 +28,8 @@ Wstrzymaj teraz Zatrzymaj sesję Generowanie klatek + Ustawienia tej gry + Ustawienia domyślne Wybierz tryb generowania klatek Wył. DD-FG %1$d× diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 3c94b532eb..2d09f7127a 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -28,6 +28,8 @@ Suspender agora Terminar sessão Geração de fotogramas + Definições para este jogo + Definições predefinidas Selecione o modo de geração de fotogramas Desligado DD-FG %1$d× diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 14bed70758..768753c6e6 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -28,6 +28,8 @@ Suspender agora Encerrar sessão Geração de quadros + Configurações para este jogo + Configurações padrão Selecione o modo de geração de quadros Desativada DD-FG %1$d× diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 672122d817..fac1699e94 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -28,6 +28,8 @@ Suspendă acum Oprește sesiunea Generare de cadre + Setări pentru acest joc + Setări implicite Selectează modul de generare a cadrelor Dezactivat DD-FG %1$d× diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1449384134..cf3266525b 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -28,6 +28,8 @@ Приостановить сейчас Остановить сессию Генерация кадров + Настройки этой игры + Настройки по умолчанию Выберите режим генерации кадров Выкл. DD-FG %1$d× diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 7a5120525c..e64a59dc88 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -28,6 +28,8 @@ Pausa nu Stoppa sessionen Bildrutegenerering + Inställningar för det här spelet + Standardinställningar Välj läge för bildrutegenerering Av DD-FG %1$d× diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 38b62c9fce..1a778803c1 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -28,6 +28,8 @@ หยุดชั่วคราวตอนนี้ หยุดเซสชัน การสร้างเฟรม + การตั้งค่าสำหรับเกมนี้ + การตั้งค่าเริ่มต้น เลือกโหมดการสร้างเฟรม ปิด DD-FG %1$d× diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index df596656d4..d4495911e0 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -28,6 +28,8 @@ Şimdi askıya al Oturumu durdur Kare oluşturma + Bu oyunun ayarları + Varsayılan ayarlar Kare oluşturma modunu seçin Kapalı DD-FG %1$d× diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 2ee9ab4e36..77c5b4067e 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -28,6 +28,8 @@ Призупинити зараз Завершити сеанс Генерація кадрів + Налаштування цієї гри + Типові налаштування Виберіть режим генерації кадрів Вимк. DD-FG %1$d× diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a4414e038f..2ebccba807 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -28,6 +28,8 @@ Tạm dừng ngay Dừng phiên Tạo khung hình + Cài đặt cho trò chơi này + Cài đặt mặc định Chọn chế độ tạo khung hình Tắt DD-FG %1$d× diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 100352717d..358546b076 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -28,6 +28,8 @@ 立即暂停 停止会话 帧生成 + 此游戏的设置 + 默认设置 选择帧生成模式 关闭 DD-FG %1$d× diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 729bf26c23..8510ce17d0 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -28,6 +28,8 @@ 立即暫停 結束會話 幀生成 + 此遊戲的設定 + 預設設定 選擇幀生成模式 關閉 DD-FG %1$d× diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 15d43fc4f0..dc2ebfe803 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -28,6 +28,8 @@ 立即暫停 結束此工作階段 影格生成 + 此遊戲的設定 + 預設設定 請選擇你要使用的影格生成模式 關閉 DD-FG %1$d× diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 87271de25e..cc7c632ddb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -55,6 +55,8 @@ Suspend now Stop session Frame generation + Settings for this game + Default settings Select the frame generation mode Off DD-FG %1$d× diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/FrameGenTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/FrameGenTest.kt index f4c3b79ea0..5afd7f83a9 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/FrameGenTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/FrameGenTest.kt @@ -2,6 +2,8 @@ package com.droiddeck.launcher.gpu import android.content.Context import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -45,4 +47,22 @@ class FrameGenTest { .putString("engine", "winfg").putInt("multiplier", 2).commit() assertEquals(FrameGen.Mode(FrameGen.ENGINE_DDFG, 2), FrameGen.mode(context)) } + + @Test fun perGameOverrideIsIsolatedFromGlobalMode() { + val global = FrameGen.Mode(FrameGen.ENGINE_LSFG, target = 90) + val game = FrameGen.Mode(FrameGen.ENGINE_DDFG, 3) + + FrameGen.set(context, global) + FrameGen.setForGame(context, "12345", game) + + assertEquals(global, FrameGen.mode(context)) + assertEquals(game, FrameGen.mode(context, "12345")) + assertTrue(FrameGen.hasGameOverride(context, "12345")) + + FrameGen.clearGame(context, "12345") + + assertFalse(FrameGen.hasGameOverride(context, "12345")) + assertEquals(global, FrameGen.mode(context, "12345")) + } + } diff --git a/app/src/test/java/com/droiddeck/launcher/session/SelectedGameProfileTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SelectedGameProfileTest.kt index 7955fde23b..d02d76d3db 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SelectedGameProfileTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SelectedGameProfileTest.kt @@ -2,6 +2,7 @@ package com.droiddeck.launcher.session import com.droiddeck.launcher.core.GameEnvironment import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.gpu.FrameGen import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertNull @@ -116,6 +117,17 @@ class SelectedGameProfileTest { assertEquals(ProfileValue("PERFORMANCE_TSO", true), resolve(environment = inherited)!!.fexPreset) } + @Test fun frameGenOverrideMakesProfileCustom() { + val profile = resolve( + frameGenMode = FrameGen.Mode.OFF, + frameGenInherited = false, + ) + + assertEquals(FrameGen.Mode.OFF, profile!!.frameGen) + assertFalse(profile.frameGenInherited) + assertTrue(profile.hasOverrides) + } + private fun resolve( selectedAppId: Long = 3180310, games: List = listOf(game), @@ -123,6 +135,8 @@ class SelectedGameProfileTest { gameChoice: ProtonDefault.GameChoice? = null, gameComponents: Map = emptyMap(), gameWindowsComponents: List = emptyList(), + frameGenMode: FrameGen.Mode = FrameGen.Mode.OFF, + frameGenInherited: Boolean = true, ) = SelectedGameProfile.resolve( selectedAppId = selectedAppId, games = games, @@ -134,6 +148,8 @@ class SelectedGameProfileTest { gameProtonId = "p1", gameComponents = gameComponents, gameWindowsComponents = gameWindowsComponents, + frameGenMode = frameGenMode, + frameGenInherited = frameGenInherited, ) private fun component(label: String) = From 39a4a1b60cca6722086c495f0a7cd5cb196d9b79 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 15:07:58 -0500 Subject: [PATCH 40/57] feat(agent): DeeDee, a floating pet that opens the agent's chat; chat-head flings for the pet and HUD (#2536) * feat(agent): DeeDee, a pet that floats over any app and opens the agent's chat * feat(agent): DeeDee docks and opens its chat like a chat head; throws pick their side by velocity, for the pet and the HUD * fix(hud): the strip tucks into its fps tab with a shorter pull, and a throw toward an edge counts * fix(hud): the HUD shows in desktop sessions again * feat(agent): DeeDee rests tucked past the screen edge like a chat head * fix(agent): DeeDee opens its own chat in every window, themed, and a fling across no longer tucks the HUD away * fix(agent): the chat grows from wherever DeeDee is as it hops to its corner * fix(agent): DeeDee hides with the PC keyboard, falls back if it cannot float, can be opened by accessibility, and settles when a drag is cancelled * fix(agent): B and Back close DeeDee's in-window chat before the window acts on them * fix(agent): Back closes only the chat open in that window --- app/src/main/AndroidManifest.xml | 1 + .../main/java/com/droiddeck/launcher/App.kt | 1 + .../droiddeck/launcher/FrontEndActivity.kt | 5 +- .../com/droiddeck/launcher/SessionActivity.kt | 5 +- .../launcher/hud/DroidDeckHudHost.kt | 59 +- .../launcher/hud/HudLockController.java | 17 +- .../com/droiddeck/launcher/ui/AgentPage.kt | 11 +- .../com/droiddeck/launcher/ui/AgentPet.kt | 319 ++++++++++ .../droiddeck/launcher/ui/AgentPetWindows.kt | 559 ++++++++++++++++++ .../java/com/droiddeck/launcher/ui/DeeDee.kt | 381 ++++++++++++ .../com/droiddeck/launcher/ui/EdgeFling.kt | 92 +++ .../droiddeck/launcher/ui/FrontEndSetup.kt | 7 + app/src/main/res/values/strings.xml | 7 + .../droiddeck/launcher/ui/EdgeFlingTest.kt | 27 + 14 files changed, 1455 insertions(+), 36 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/AgentPet.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/DeeDee.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/EdgeFling.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/EdgeFlingTest.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 01d980059d..80c9312fe6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,6 +26,7 @@ + diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index ac9995412b..9f74aa4e59 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -44,6 +44,7 @@ class App : Application() { CrashHandler.install(this) com.droiddeck.launcher.agent.AgentHost.refresh(this) com.droiddeck.launcher.agent.AgentTab.load(this) + com.droiddeck.launcher.ui.AgentPet.install(this) if (com.droiddeck.launcher.agent.AgentTab.visible) com.droiddeck.launcher.lab.LabNotice.openOnInstall = "agent" com.droiddeck.launcher.lab.LabNotice.started(this) com.droiddeck.launcher.core.SteamIntegration.syncShortcutsListing(this) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index b2f45bc4ed..26dae4858d 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -84,7 +84,7 @@ import com.droiddeck.launcher.session.SteamLibraries import com.droiddeck.launcher.input.SecondScreenDisplay import com.droiddeck.launcher.input.SecondScreenDisplays -class FrontEndActivity : ComponentActivity() { +class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPetHost { override fun attachBaseContext(newBase: android.content.Context) { super.attachBaseContext(newBase) com.droiddeck.launcher.core.AppLanguage.applyTo(this, newBase) @@ -1782,6 +1782,8 @@ class FrontEndActivity : ComponentActivity() { }, "finish-abandoned").start() } + override val petBlocked: Boolean get() = false + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) setIntent(intent) @@ -1875,6 +1877,7 @@ class FrontEndActivity : ComponentActivity() { } override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (com.droiddeck.launcher.ui.AgentPet.handleBack(this, event)) return true if (compatLaunch != null) { if (event.keyCode == KeyEvent.KEYCODE_BACK || event.keyCode == KeyEvent.KEYCODE_BUTTON_B) { if (event.action == KeyEvent.ACTION_UP) cancelCompatLaunch() diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index dc87e93d04..5e7a39b639 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -151,7 +151,7 @@ import com.droiddeck.launcher.ui.sessionDrawerPages import com.droiddeck.launcher.ui.step import kotlin.math.abs -class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { +class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droiddeck.launcher.ui.AgentPetHost { override fun attachBaseContext(newBase: android.content.Context) { super.attachBaseContext(newBase) com.droiddeck.launcher.core.AppLanguage.applyTo(this, newBase) @@ -159,6 +159,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private lateinit var pip: com.droiddeck.launcher.session.SessionPipController private var pipUi by mutableStateOf(false) + + override val petBlocked: Boolean get() = drawerOpenState || pipUi || pcKeyboardOpen private var pipAutoEnter by mutableStateOf(false) private var unfoldedControls by mutableStateOf(false) private var unfoldedControlsWithController by mutableStateOf(false) @@ -2899,6 +2901,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (com.droiddeck.launcher.ui.AgentPet.handleBack(this, event)) return true when (event.keyCode) { KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE -> { val steamVolume = diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt index 014fc0b4e7..492d626c5b 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt @@ -13,7 +13,6 @@ import android.widget.FrameLayout import com.droiddeck.launcher.gpu.GpuInfo import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.session.SessionPrefs -import com.droiddeck.launcher.session.SessionService import com.droiddeck.launcher.session.SessionState import com.droiddeck.launcher.ui.Motion import com.droiddeck.launcher.wayland.WaylandCompositor @@ -38,6 +37,8 @@ class DroidDeckHudHost(context: Context) { private var snapping = false private var previewFade: ValueAnimator? = null private var flingX = 0f + private var flingY = 0f + private var throwSpring: com.droiddeck.launcher.ui.FlingSpring? = null private var engine = "" private var gpuName = "" private var protonPid = 0 @@ -94,18 +95,22 @@ class DroidDeckHudHost(context: Context) { stopMotion(hud) shrinkPastEdge(hud, rawX, rawY) } - hud.setOnFlungListener { vx, _ -> flingX = vx } + hud.setOnFlungListener { vx, vy -> flingX = vx; flingY = vy } hud.setOnTabDraggedListener { x, y -> dragTab(hud, x, y) } hud.setOnTabDroppedListener { dropTab(hud) } hud.setOnTabDragCancelledListener { snapping = false; keepOnScreen(hud) } hud.setOnMovedListener { x, y -> wantX = x; wantY = y val vx = flingX + val vy = flingY flingX = 0f - dockEdgeFor(hud)?.let { edge -> setDock(hud, edge); return@setOnMovedListener } + flingY = 0f + // A throw only carries the strip into its tab; a floating HUD flung across goes to the other side. + val coast = hud.isStrip + dockEdgeFor(hud, if (coast) vx else 0f, if (coast) vy else 0f)?.let { edge -> setDock(hud, edge); return@setOnMovedListener } stopMotion(hud) fadeDockPreview(hud) - if (snaps && !hud.isStrip) { snapToAnchor(hud, vx); return@setOnMovedListener } + if (snaps && !hud.isStrip) { snapToAnchor(hud, vx, vy); return@setOnMovedListener } val fromX = hud.x; val fromY = hud.y keepOnScreen(hud) wantX = hud.x; wantY = hud.y @@ -178,9 +183,8 @@ class DroidDeckHudHost(context: Context) { private fun applyShown() { if (!running) return val show = !hidden && !backgrounded - val visible = show && SessionState.mode != SessionService.MODE_DESKTOP - view?.visibility = if (visible) View.VISIBLE else View.GONE - showing = visible + view?.visibility = if (show) View.VISIBLE else View.GONE + showing = show if (show != polling) { polling = show if (show) Choreographer.getInstance().postFrameCallback(frameCallback) @@ -247,23 +251,26 @@ class DroidDeckHudHost(context: Context) { return if (stats.size > 3 && stats[3] > 1f) stats[3] else 0f } - private fun dockEdgeFor(v: View): DroidDeckHudDock? { - val over = overhang(v) ?: return null + /** The edge the HUD tucks into: one it hangs far enough over, or would once a throw at [vx], [vy] coasts out. */ + private fun dockEdgeFor(v: View, vx: Float = 0f, vy: Float = 0f): DroidDeckHudDock? { + val over = overhang(v, vx * com.droiddeck.launcher.ui.EdgeFling.COAST_S, vy * com.droiddeck.launcher.ui.EdgeFling.COAST_S) ?: return null return over.key.takeIf { over.value >= DOCK_OVERHANG } } - private fun overhang(v: View): Map.Entry? { + private fun overhang(v: View, dx: Float = 0f, dy: Float = 0f): Map.Entry? { val p = v.parent as? View ?: return null if (p.width <= 0 || p.height <= 0 || v.width <= 0 || v.height <= 0) return null val strip = (v as? DroidDeckHudView)?.isStrip == true val density = v.resources.displayMetrics.density val w = if (strip) minOf(v.width.toFloat(), STRIP_PULL_ACROSS_DP * density) else v.width.toFloat() val h = if (strip) maxOf(v.height.toFloat(), STRIP_PULL_OFF_DP * density) else v.height.toFloat() + val x = v.x + dx + val y = v.y + dy return mapOf( - DroidDeckHudDock.LEFT to -v.x / w, - DroidDeckHudDock.RIGHT to (v.x + v.width - p.width) / w, - DroidDeckHudDock.TOP to -v.y / h, - DroidDeckHudDock.BOTTOM to (v.y + v.height - p.height) / h, + DroidDeckHudDock.LEFT to -x / w, + DroidDeckHudDock.RIGHT to (x + v.width - p.width) / w, + DroidDeckHudDock.TOP to -y / h, + DroidDeckHudDock.BOTTOM to (y + v.height - p.height) / h, ).maxByOrNull { it.value } } @@ -298,6 +305,7 @@ class DroidDeckHudHost(context: Context) { } private fun stopMotion(hud: DroidDeckHudView) { + throwSpring?.cancel() hud.animate().setUpdateListener(null) hud.animate().cancel() } @@ -327,23 +335,21 @@ class DroidDeckHudHost(context: Context) { } } - private fun snapToAnchor(hud: DroidDeckHudView, vx: Float) { + /** Sends the HUD to a side the way a chat head goes: by where the throw would carry it, springing on from its speed. */ + private fun snapToAnchor(hud: DroidDeckHudView, vx: Float, vy: Float) { val p = hud.parent as? View ?: return val maxX = (p.width - hud.width).toFloat().coerceAtLeast(0f) val maxY = (p.height - hud.height).toFloat().coerceAtLeast(0f) - anchorX = if (hud.x + vx * FLING_REACH_S < maxX / 2f) 0f else 1f + val right = com.droiddeck.launcher.ui.EdgeFling.toRight(hud.x + hud.width / 2f, p.width.toFloat(), vx, context.resources.displayMetrics.density) + anchorX = if (right) 1f else 0f wantX = anchorX * maxX - wantY = hud.y.coerceIn(0f, maxY) + wantY = com.droiddeck.launcher.ui.EdgeFling.restY(hud.y, vy, 0f, maxY) SessionPrefs.setDroidDeckHudPosition(context, wantX, wantY) stopMotion(hud) - if (Motion.scale == 0f) { - hud.scaleX = 1f; hud.scaleY = 1f - hud.x = wantX; hud.y = wantY - return - } + hud.scaleX = 1f; hud.scaleY = 1f snapping = true - hud.animate().x(wantX).y(wantY).scaleX(1f).scaleY(1f).setDuration(Motion.ms(260).toLong()).setInterpolator(EASE) - .withEndAction { snapping = false; keepOnScreen(hud) }.start() + val spring = throwSpring ?: com.droiddeck.launcher.ui.FlingSpring { sx, sy -> hud.x = sx; hud.y = sy }.also { throwSpring = it } + spring.start(hud.x, hud.y, vx, vy, wantX, wantY) { snapping = false; keepOnScreen(hud) } } private fun shrinkPastEdge(hud: DroidDeckHudView, rawX: Float, rawY: Float) { @@ -500,10 +506,9 @@ class DroidDeckHudHost(context: Context) { companion object { private const val DOCK_OVERHANG = 0.4f - private const val FLING_REACH_S = 0.18f private const val PREVIEW_FROM = 0.55f - private const val STRIP_PULL_ACROSS_DP = 600f - private const val STRIP_PULL_OFF_DP = 150f + private const val STRIP_PULL_ACROSS_DP = 360f + private const val STRIP_PULL_OFF_DP = 100f private const val EXPAND_FADE = 0.5f private val EASE = PathInterpolator(0.2f, 0.8f, 0.2f, 1f) diff --git a/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java b/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java index 98c34df7ce..b4c1cfc7ea 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java +++ b/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java @@ -50,6 +50,7 @@ public class HudLockController { private final Callbacks cb; private final GestureDetector detector; private final ScaleGestureDetector scaleDetector; + private final android.view.VelocityTracker velocity = android.view.VelocityTracker.obtain(); private boolean locked = false; @@ -86,8 +87,18 @@ public class HudLockController { public boolean onTouchEvent(MotionEvent event) { scaleDetector.onTouchEvent(event); detector.onTouchEvent(event); + // The HUD moves under the finger, so the throw is measured on the screen, not in the HUD. + MotionEvent onScreen = MotionEvent.obtain(event); + onScreen.setLocation(event.getRawX(), event.getRawY()); + if (event.getActionMasked() == MotionEvent.ACTION_DOWN) velocity.clear(); + velocity.addMovement(onScreen); + onScreen.recycle(); int action = event.getActionMasked(); if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) { + if (dragging && !locked && !pinched && action == MotionEvent.ACTION_UP) { + velocity.computeCurrentVelocity(1000); + cb.onFlung(velocity.getXVelocity(), velocity.getYVelocity()); + } if (dragging && !locked) cb.onMoved(view.getX(), view.getY()); dragging = false; } @@ -124,12 +135,6 @@ public class HudLockController { return true; } - @Override - public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) { - if (dragging && !locked && !pinched) cb.onFlung(velocityX, velocityY); - return true; - } - @Override public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) { if (pinched) return true; diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt index 868cf4fbf0..ed036a4933 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -51,6 +51,7 @@ import androidx.compose.material.icons.outlined.ExpandMore import androidx.compose.material.icons.outlined.History import androidx.compose.material.icons.outlined.Memory import androidx.compose.material.icons.outlined.MoreHoriz +import androidx.compose.material.icons.outlined.Pets import androidx.compose.material.icons.outlined.Settings import androidx.compose.material.icons.outlined.Stop import androidx.compose.material3.CircularProgressIndicator @@ -127,7 +128,7 @@ private const val COMPOSER_SLIDE_MS = 350L */ @Composable internal fun AgentPage( - modifier: Modifier, inputModifier: Modifier = Modifier, visible: Boolean = true, startTyping: Boolean = true, + modifier: Modifier, inputModifier: Modifier = Modifier, visible: Boolean = true, startTyping: Boolean = true, hidesPet: Boolean = true, ) { val context = LocalContext.current val view = LocalView.current @@ -143,6 +144,11 @@ internal fun AgentPage( } remember { AgentHost.refresh(context) } LaunchedEffect(AgentHost.unseen, visible) { if (visible) AgentHost.seen() } + DisposableEffect(visible, hidesPet) { + val counts = visible && hidesPet + if (counts) AgentPet.agentOnScreen++ + onDispose { if (counts) AgentPet.agentOnScreen-- } + } remember { AgentSetup.check(context) } var setup by rememberSaveable { mutableStateOf(false) } val draft = rememberSaveable { mutableStateOf("") } @@ -631,6 +637,9 @@ private fun AgentEditor( menu = false AgentHost.forget(context) } + HeaderAction(Icons.Outlined.Pets, stringResource(R.string.setup_agent_pet), selected = AgentPet.enabled, size = 32.dp, tag = "agent-pet-toggle") { + AgentPet.set(context, !AgentPet.enabled) + } HeaderAction(Icons.Outlined.Settings, stringResource(R.string.agent_setup_title), enabled = !working, size = 32.dp, tag = "agent-settings") { menu = false onSetup() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPet.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPet.kt new file mode 100644 index 0000000000..f154295450 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPet.kt @@ -0,0 +1,319 @@ +package com.droiddeck.launcher.ui + +import android.app.Activity +import android.app.Application +import android.content.Context +import android.content.Intent +import android.net.Uri +import android.os.Bundle +import android.os.Handler +import android.os.Looper +import android.os.SystemClock +import android.provider.Settings +import android.view.View +import android.view.ViewGroup +import android.widget.FrameLayout +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.gestures.detectDragGestures +import androidx.compose.foundation.gestures.detectTapGestures +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableLongStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.runtime.snapshotFlow +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.layout.onSizeChanged +import androidx.compose.ui.platform.ComposeView +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.onClick +import androidx.compose.ui.semantics.role +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.IntOffset +import androidx.compose.ui.unit.IntSize +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.agent.AgentHost +import kotlinx.coroutines.MainScope +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import kotlin.math.roundToInt + +/** A DroidDeck window the pet can live in when it may not float over other apps. */ +internal interface AgentPetHost { + /** Something already covers the pet's place, such as the session drawer. */ + val petBlocked: Boolean +} + +/** + * DeeDee, the agent's pet: shows what the agent is doing and opens a chat with it. With the + * "display over other apps" permission it floats over every app in windows of its own + * ([PetWindows]); without it, it lives in DroidDeck's own windows. Either way it opens the same + * chat, growing out of it. + */ +internal object AgentPet { + var enabled by mutableStateOf(false) + private set + /** May draw over other apps. */ + var allowed by mutableStateOf(false) + private set + /** Agent pages on screen; the pet steps aside while the conversation itself is in view. */ + var agentOnScreen by mutableIntStateOf(0) + var now by mutableLongStateOf(SystemClock.elapsedRealtime()) + private set + /** When the agent last changed what it was doing. */ + var since by mutableLongStateOf(SystemClock.elapsedRealtime()) + private set + /** The floating windows could not be made, so the pet stays in DroidDeck's own windows instead. */ + private var floatFailed by mutableStateOf(false) + val floating get() = enabled && allowed && !floatFailed + /** How to close the chat open inside each DroidDeck window that has one. */ + private val closeInWindow = java.util.WeakHashMap Unit>() + + /** + * B and Back close a chat open inside [host] before the window acts on them, since the window's + * own keys (leaving a session, going back a page) would otherwise run under it. + */ + fun handleBack(host: AgentPetHost, event: android.view.KeyEvent): Boolean { + val close = closeInWindow[host] ?: return false + if (event.keyCode != android.view.KeyEvent.KEYCODE_BACK && event.keyCode != android.view.KeyEvent.KEYCODE_BUTTON_B) return false + if (event.action == android.view.KeyEvent.ACTION_UP) close() + return true + } + + internal fun chatOpenInWindow(host: AgentPetHost, close: (() -> Unit)?) { + if (close == null) closeInWindow.remove(host) else closeInWindow[host] = close + } + private var windows: PetWindows? = null + private val main = Handler(Looper.getMainLooper()) + private const val TAG = "agent-pet" + private const val KEY = "pet" + private const val SIDE = "pet_side" + private const val HEIGHT = "pet_y" + + fun set(context: Context, on: Boolean) { + enabled = on + AgentHost.prefs(context).edit().putBoolean(KEY, on).apply() + } + + /** Opens the system page where the user lets DroidDeck draw over other apps. */ + fun requestFloating(context: Context) { + val intent = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:${context.packageName}")) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + runCatching { context.startActivity(intent) } + } + + internal fun place(context: Context) = AgentHost.prefs(context).let { it.getBoolean(SIDE, true) to it.getFloat(HEIGHT, 0.3f) } + + internal fun save(context: Context, right: Boolean, height: Float) { + AgentHost.prefs(context).edit().putBoolean(SIDE, right).putFloat(HEIGHT, height).apply() + } + + fun install(app: Application) { + enabled = AgentHost.prefs(app).getBoolean(KEY, false) + allowed = PetWindows.allowed(app) + val scope = MainScope() + scope.launch { + snapshotFlow { Triple(AgentHost.state, AgentHost.entries.size, AgentHost.lab?.running) }.collect { since = SystemClock.elapsedRealtime() } + } + scope.launch { + snapshotFlow { floating && AgentHost.installed }.collect { show -> + if (show && windows == null) windows = runCatching { PetWindows(app) }.onFailure { + android.util.Log.w("AgentPet", "could not float the pet", it) + floatFailed = true + }.getOrNull() + if (!show) windows?.close()?.also { windows = null } + } + } + tick(app) + app.registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks { + override fun onActivityResumed(activity: Activity) { + allowed = PetWindows.allowed(activity) + attach(activity) + } + override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) = Unit + override fun onActivityStarted(activity: Activity) = Unit + override fun onActivityPaused(activity: Activity) = Unit + override fun onActivityStopped(activity: Activity) = Unit + override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit + override fun onActivityDestroyed(activity: Activity) = Unit + }) + } + + private fun tick(app: Application) { + now = SystemClock.elapsedRealtime() + // The permission can be granted or taken back in Settings while DroidDeck is away. + if (enabled) allowed = PetWindows.allowed(app) + main.postDelayed({ tick(app) }, 1_000) + } + + private fun attach(activity: Activity) { + val host = activity as? AgentPetHost ?: return + val decor = activity.window.decorView as? ViewGroup ?: return + if (decor.findViewWithTag(TAG) != null) return + val layer = ComposeView(activity).apply { + tag = TAG + isFocusable = false + importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO + setContent { DroidDeckTheme(appScale = com.droiddeck.launcher.core.AppUiPrefs.scale(activity)) { PetLayer(host) } } + } + decor.addView(layer, FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) + } +} + +private const val SLEEP_AFTER_MS = 5 * 60_000L +private const val CHEER_MS = 10_000L +internal const val PREVIEW_MS = 6_000L + +/** What the agent is up to, as the pet shows it; [since] is when the agent last changed what it was doing. */ +internal fun petState(now: Long, since: Long): PetState { + if (AgentHost.state == AgentHost.State.WORKING || AgentHost.lab?.running == true) return PetState.WORKING + val last = AgentHost.entries.lastOrNull { it is AgentHost.Entry.Finished } as? AgentHost.Entry.Finished + if (AgentHost.unseen && last != null && !last.stopped) { + if (last.error != null) return PetState.ERROR + val said = (AgentHost.entries.lastOrNull { it is AgentHost.Entry.Said } as? AgentHost.Entry.Said)?.text?.trimEnd().orEmpty() + if (last.planned || said.endsWith("?")) return PetState.QUESTION + if (now - since < CHEER_MS) return PetState.DONE + } + return if (now - since > SLEEP_AFTER_MS) PetState.SLEEP else PetState.IDLE +} + +internal fun petStateNow() = petState(AgentPet.now, AgentPet.since) + +/** The line the preview bubble shows while the pet has news, or null when it has none. */ +internal fun petBubbleText(): String? { + if (!AgentHost.unseen) return null + val state = petStateNow() + if (state != PetState.DONE && state != PetState.QUESTION && state != PetState.ERROR) return null + val last = AgentHost.entries.lastOrNull { it is AgentHost.Entry.Finished } as? AgentHost.Entry.Finished + last?.error?.let { return it } + val said = AgentHost.entries.lastOrNull { it is AgentHost.Entry.Said } as? AgentHost.Entry.Said ?: return null + return said.text.lineSequence().map { it.trim().trimStart('#', '*', '-', ' ') }.firstOrNull { it.isNotEmpty() } +} + +/** DeeDee in [state], with a dot while a reply waits to be read. */ +@Composable +internal fun PetFigure(state: PetState, modifier: Modifier) { + Box(modifier.testTag("agent-pet")) { + Box(Modifier.fillMaxSize().padding(4.dp).clip(CircleShape).background(Color(0xEB0E141B)).border(1.dp, Color(0x29FFFFFF), CircleShape)) + DeeDee(state, Modifier.fillMaxSize().padding(6.dp)) + if (AgentHost.unseen && (state == PetState.IDLE || state == PetState.SLEEP)) Box( + Modifier.align(Alignment.TopEnd).padding(8.dp).size(14.dp).clip(CircleShape).background(Color(0xFF1A9FFF)).border(2.dp, Color(0xFF0E141B), CircleShape), + ) + } +} + +@Composable +internal fun PetPreview(text: String, modifier: Modifier, onTap: () -> Unit) { + val shape = RoundedCornerShape(16.dp) + Text( + text, fontSize = 14.sp, color = Color.White, maxLines = 2, overflow = TextOverflow.Ellipsis, + modifier = modifier.widthIn(max = 260.dp).clip(shape).background(Color(0xF0171D25)).border(1.dp, Color(0x33FFFFFF), shape) + .pointerInput(Unit) { detectTapGestures { onTap() } }.padding(horizontal = 14.dp, vertical = 10.dp), + ) +} + +/** The pet inside one DroidDeck window, for when it may not float over other apps. */ +@Composable +private fun PetLayer(host: AgentPetHost) { + var chatOpen by remember { mutableStateOf(false) } + var chatShown by remember { mutableStateOf(false) } + val shown = AgentPet.enabled && !AgentPet.floating && AgentHost.installed && (chatShown || AgentPet.agentOnScreen == 0) && !host.petBlocked + if (!shown) return + val context = LocalContext.current + val motion = remember { PetMotion(context) } + val density = LocalDensity.current + val openLabel = androidx.compose.ui.res.stringResource(com.droiddeck.launcher.R.string.agent_pet_open) + val openChat = { + motion.dock() + chatShown = true + chatOpen = true + } + val closeChat = { + chatOpen = false + motion.undock() + } + BoxWithConstraints(Modifier.fillMaxSize()) { + motion.fit(constraints.maxWidth.toFloat(), constraints.maxHeight.toFloat()) + if (chatShown) PetChat(chatOpen, motion, closeChat) { chatShown = false } + androidx.compose.runtime.DisposableEffect(host, chatOpen) { + AgentPet.chatOpenInWindow(host, if (chatOpen) closeChat else null) + onDispose { AgentPet.chatOpenInWindow(host, null) } + } + var bubble by remember { mutableStateOf(null) } + val news = petBubbleText() + LaunchedEffect(news) { + bubble = news + if (news != null) { + delay(PREVIEW_MS) + bubble = null + } + } + if (motion.dragging) Box(Modifier.offset { + val (tx, ty) = motion.target + IntOffset((tx - motion.size / 2).roundToInt(), (ty - motion.size / 2).roundToInt()) + }) { PetCloseTarget(motion.overTarget) } + val text = bubble + if (text != null && !motion.dragging) { + var size by remember { mutableStateOf(IntSize.Zero) } + val gap = with(density) { 10.dp.toPx() } + PetPreview(text, Modifier.onSizeChanged { size = it }.offset { + val x = if (motion.right) motion.x - gap - size.width else motion.x + motion.size + gap + IntOffset(x.roundToInt(), (motion.y + motion.size / 2 - size.height / 2).roundToInt()) + }) { + bubble = null + openChat() + } + } + PetFigure( + petStateNow(), + Modifier.offset { IntOffset(motion.x.roundToInt(), motion.y.roundToInt()) } + .size(with(density) { motion.size.toDp() }) + .semantics { + contentDescription = openLabel + role = androidx.compose.ui.semantics.Role.Button + onClick { if (chatOpen) closeChat() else openChat(); true } + } + .pointerInput(Unit) { detectTapGestures { bubble = null; if (chatOpen) closeChat() else openChat() } } + .pointerInput(Unit) { + // The pet moves under the finger, so its velocity is measured where it is on the screen. + val tracker = androidx.compose.ui.input.pointer.util.VelocityTracker() + detectDragGestures( + onDragStart = { bubble = null; if (chatOpen) closeChat(); tracker.resetTracking(); motion.start() }, + onDrag = { change, amount -> + change.consume() + motion.move(amount.x, amount.y) + tracker.addPosition(change.uptimeMillis, androidx.compose.ui.geometry.Offset(motion.x + change.position.x, motion.y + change.position.y)) + }, + onDragEnd = { + val v = tracker.calculateVelocity() + if (motion.end(v.x, v.y)) AgentPet.set(context, false) + }, + onDragCancel = { motion.cancel() }, + ) + }, + ) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt new file mode 100644 index 0000000000..c8d3aba8c9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt @@ -0,0 +1,559 @@ +package com.droiddeck.launcher.ui + +import android.animation.ValueAnimator +import android.annotation.SuppressLint +import android.content.Context +import android.graphics.PixelFormat +import android.os.Build +import android.provider.Settings +import android.view.Gravity +import android.view.KeyEvent +import android.view.MotionEvent +import android.view.View +import android.view.ViewConfiguration +import android.view.WindowManager +import android.view.animation.OvershootInterpolator +import android.widget.FrameLayout +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.width +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Close +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableFloatStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.runtime.snapshotFlow +import androidx.compose.animation.core.Animatable +import androidx.compose.foundation.Canvas +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.ui.Alignment +import androidx.compose.ui.geometry.CornerRadius +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Rect +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.unit.IntOffset +import kotlinx.coroutines.coroutineScope +import kotlinx.coroutines.delay +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.input.key.onPreviewKeyEvent +import androidx.compose.ui.platform.ComposeView +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.LifecycleRegistry +import androidx.lifecycle.setViewTreeLifecycleOwner +import androidx.savedstate.SavedStateRegistry +import androidx.savedstate.SavedStateRegistryController +import androidx.savedstate.SavedStateRegistryOwner +import androidx.savedstate.setViewTreeSavedStateRegistryOwner +import com.droiddeck.launcher.R +import com.droiddeck.launcher.agent.AgentHost +import kotlinx.coroutines.MainScope +import kotlinx.coroutines.cancel +import kotlinx.coroutines.flow.collectLatest +import kotlinx.coroutines.launch +import kotlin.math.abs +import kotlin.math.hypot +import kotlin.math.roundToInt + +/** + * Where the pet is on the screen and how it moves: dragged anywhere, then settling against the + * nearer side edge, or dropped on the close target to turn it off. While its chat is open it is + * docked at the top corner, the way a chat head hops up when its conversation opens, and goes home + * when the chat closes. Positions are screen pixels. + */ +internal class PetMotion(private val context: Context) { + var x by mutableFloatStateOf(0f) + private set + var y by mutableFloatStateOf(0f) + private set + var right by mutableStateOf(true) + private set + var dragging by mutableStateOf(false) + private set + var width by mutableFloatStateOf(0f) + private set + var height by mutableFloatStateOf(0f) + private set + /** Docked for the chat; where to go back to is kept as a side and a relative height. */ + var docked by mutableStateOf(false) + private set + private val density = context.resources.displayMetrics.density + val size = 76 * density + private val margin = 6 * density + private val inset = 24 * density + private var settle: ValueAnimator? = null + private val spring = FlingSpring { sx, sy -> x = sx; y = sy } + + val dockX get() = width - size - margin + + private companion object { + /** The share of the pet that hangs past the edge it rests against. */ + const val TUCK = 0.2f + } + val dockY get() = inset + val target get() = Pair(width / 2, height - 72 * density) + val overTarget get() = dragging && hypot(x + size / 2 - target.first, y + size / 2 - target.second) < size + + /** Fits the pet into a [w] by [h] screen, keeping its side and relative height, as after a rotation. */ + fun fit(w: Float, h: Float) { + if (w <= 0 || h <= 0 || (w == width && h == height)) return + val first = width == 0f + val fraction = if (first) AgentPet.place(context).also { right = it.first }.second else if (docked) home else fractionOf(y) + settle?.cancel() + spring.cancel() + width = w + height = h + home = fraction + if (docked) { + x = dockX + y = dockY + } else { + x = edge(right) + y = inset + travel() * fraction + } + } + + private var home = 0f + private fun travel() = (height - size - inset * 2).coerceAtLeast(0f) + private fun fractionOf(at: Float) = if (travel() > 0) ((at - inset) / travel()).coerceIn(0f, 1f) else 0f + /** At rest the pet tucks part of itself past the screen edge, as a chat head does. */ + private fun edge(side: Boolean) = if (side) width - size * (1f - TUCK) else -size * TUCK + + /** Hops up to the top corner for the chat. */ + fun dock() { + if (docked) return + home = fractionOf(y) + docked = true + glide(dockX, dockY, 260, OvershootInterpolator(0.9f)) + } + + /** Goes back to where it was before the chat opened. */ + fun undock() { + if (!docked) return + docked = false + glide(edge(right), inset + travel() * home, 320, android.view.animation.DecelerateInterpolator(1.6f)) + } + + fun start() { + settle?.cancel() + spring.cancel() + docked = false + dragging = true + } + + fun move(dx: Float, dy: Float) { + x += dx + y += dy + } + + /** A drag the system took away: the pet goes back to an edge, never to the close target. */ + fun cancel() { + if (!dragging) return + dragging = false + right = x + size / 2 > width / 2 + val toY = y.coerceIn(inset, (height - size - inset).coerceAtLeast(inset)) + home = fractionOf(toY) + spring.start(x, y, 0f, 0f, edge(right), toY) + } + + /** Ends a drag let go at [vx], [vy] pixels per second; true when the pet was dropped on the close target. */ + fun end(vx: Float = 0f, vy: Float = 0f): Boolean { + val dismissed = overTarget + dragging = false + if (dismissed) return true + right = EdgeFling.toRight(x + size / 2, width, vx, density) + val toY = EdgeFling.restY(y, vy, inset, height - size - inset) + home = fractionOf(toY) + AgentPet.save(context, right, home) + spring.start(x, y, vx, vy, edge(right), toY) + return false + } + + private fun glide(toX: Float, toY: Float, ms: Long, curve: android.animation.TimeInterpolator) { + settle?.cancel() + spring.cancel() + val fromX = x + val fromY = y + settle = ValueAnimator.ofFloat(0f, 1f).apply { + duration = (ms * Motion.scale).toLong().coerceAtLeast(0) + interpolator = curve + addUpdateListener { + val f = it.animatedValue as Float + x = fromX + (toX - fromX) * f + y = fromY + (toY - fromY) * f + } + start() + } + } +} + +/** Lets a ComposeView live in a window no activity owns. */ +private class OverlayOwner : LifecycleOwner, SavedStateRegistryOwner { + private val registry = LifecycleRegistry(this) + private val saved = SavedStateRegistryController.create(this) + override val lifecycle: Lifecycle get() = registry + override val savedStateRegistry: SavedStateRegistry get() = saved.savedStateRegistry + + init { + saved.performRestore(null) + registry.currentState = Lifecycle.State.RESUMED + } + + fun destroy() { + registry.currentState = Lifecycle.State.DESTROYED + } +} + +/** + * The pet over every app, in windows of its own: the pet, its message preview, the close target + * while it is dragged, and the chat it opens. Needs the "display over other apps" permission. + */ +@SuppressLint("ClickableViewAccessibility") +internal class PetWindows(private val context: Context) { + private val windows = context.getSystemService(WindowManager::class.java) + private val owner = OverlayOwner() + private val motion = PetMotion(context) + private val scope = MainScope() + /** The chat is open, or opening; its window stays up until it has shrunk back into the pet. */ + private var chatOpen by mutableStateOf(false) + private var bubble by mutableStateOf(null) + private var bubbleWidth by mutableFloatStateOf(0f) + private var bubbleHeight by mutableFloatStateOf(0f) + /** The windows are in the window manager, so moving one goes through it. */ + private var added = false + private val turns = object : android.content.ComponentCallbacks { + override fun onConfigurationChanged(newConfig: android.content.res.Configuration) = fitScreen() + @Deprecated("Deprecated in Java") + override fun onLowMemory() = Unit + } + + // A window emptied to no size keeps showing its last frame, so each is hidden as a whole instead. + private val head = window(touchable = true, focusable = false) { + PetFigure(petStateNow(), Modifier.size(76.dp)) + } + private val preview = window(touchable = true, focusable = false, onSize = { w, h -> bubbleWidth = w.toFloat(); bubbleHeight = h.toFloat() }) { + bubble?.let { PetPreview(it, Modifier.padding(2.dp)) { openChat() } } + } + private val target = window(touchable = false, focusable = false) { + PetCloseTarget(motion.overTarget) + } + private val chat: Window = window(touchable = true, focusable = true, full = true) { + PetChat(chatOpen, motion, ::closeChat) { showChat(false) } + } + + init { + head.view.setOnTouchListener(DragTouch()) + head.view.contentDescription = context.getString(R.string.agent_pet_open) + head.view.setOnClickListener { if (chatOpen) closeChat() else openChat() } + scope.launch { snapshotFlow { Triple(motion.x, motion.y, motion.right) }.collectLatest { place() } } + scope.launch { snapshotFlow { bubbleWidth to bubbleHeight }.collectLatest { place() } } + scope.launch { snapshotFlow { AgentPet.agentOnScreen == 0 }.collectLatest { setVisible(head, it) } } + scope.launch { snapshotFlow { motion.dragging }.collectLatest { setVisible(target, it) } } + scope.launch { + snapshotFlow { bubble != null && !chatOpen && !motion.dragging && AgentPet.agentOnScreen == 0 }.collectLatest { setVisible(preview, it) } + } + scope.launch { + snapshotFlow { petBubbleText() }.collectLatest { text -> + bubble = text + if (text != null) { + kotlinx.coroutines.delay(PREVIEW_MS) + bubble = null + } + } + } + fitScreen() + context.registerComponentCallbacks(turns) + place() + listOf(target, preview).forEach { setVisible(it, false) } + showChat(false) + listOf(chat, target, preview, head).forEach { windows.addView(it.view, it.params) } + added = true + } + + private class Window(val view: FrameLayout, val params: WindowManager.LayoutParams, val touchable: Boolean) + + private fun window( + touchable: Boolean, focusable: Boolean, full: Boolean = false, onSize: ((Int, Int) -> Unit)? = null, content: @Composable () -> Unit, + ): Window { + val compose = ComposeView(context).apply { + setViewTreeLifecycleOwner(owner) + setViewTreeSavedStateRegistryOwner(owner) + setContent { DroidDeckTheme(appScale = com.droiddeck.launcher.core.AppUiPrefs.scale(context)) { content() } } + } + val frame = object : FrameLayout(context) { + override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (full && event.keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP && chatOpen) { + closeChat() + return true + } + return super.dispatchKeyEvent(event) + } + }.apply { + addView(compose) + setViewTreeLifecycleOwner(owner) + setViewTreeSavedStateRegistryOwner(owner) + } + val size = if (full) WindowManager.LayoutParams.MATCH_PARENT else WindowManager.LayoutParams.WRAP_CONTENT + val params = WindowManager.LayoutParams( + size, size, WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY, + (if (focusable) 0 else WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) or + (if (touchable) 0 else WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE) or + WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN or + (if (full) 0 else WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS), + PixelFormat.TRANSLUCENT, + ).apply { + gravity = Gravity.TOP or Gravity.START + if (full) softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES + } + if (onSize != null) compose.addOnLayoutChangeListener { v, _, _, _, _, _, _, _, _ -> onSize(v.width, v.height) } + return Window(frame, params, touchable) + } + + /** A hidden overlay window still owns its frame, which the system can stretch over the screen, so it also stops taking touches. */ + private fun setVisible(window: Window, shown: Boolean) { + window.view.visibility = if (shown) View.VISIBLE else View.GONE + setTouchable(window, shown && window.touchable) + } + + private fun setTouchable(window: Window, on: Boolean) { + val flags = if (on) window.params.flags and WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE.inv() + else window.params.flags or WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE + if (flags == window.params.flags) return + window.params.flags = flags + if (added) runCatching { windows.updateViewLayout(window.view, window.params) } + } + + private fun place() { + val gap = 10 * context.resources.displayMetrics.density + update(head, motion.x, motion.y) + val bx = if (motion.right) motion.x - gap - bubbleWidth else motion.x + motion.size + gap + update(preview, bx, motion.y + motion.size / 2 - bubbleHeight / 2) + val (tx, ty) = motion.target + update(target, tx - motion.size / 2, ty - motion.size / 2) + } + + private fun update(window: Window, x: Float, y: Float) { + if (window.params.x == x.roundToInt() && window.params.y == y.roundToInt()) return + window.params.x = x.roundToInt() + window.params.y = y.roundToInt() + if (added) runCatching { windows.updateViewLayout(window.view, window.params) } + } + + private fun openChat() { + bubble = null + if (chatOpen) return + motion.dock() + showChat(true) + chatOpen = true + } + + private fun closeChat() { + if (!chatOpen) return + chatOpen = false + motion.undock() + } + + /** + * The chat window is always drawn; closed, it waits off the screen and takes neither touches nor + * keys, so opening it is a move and not a first layout. + */ + private fun showChat(on: Boolean) { + chat.params.x = if (on) 0 else OFFSCREEN + val quiet = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE + chat.params.flags = if (on) chat.params.flags and quiet.inv() else chat.params.flags or quiet + if (added) runCatching { windows.updateViewLayout(chat.view, chat.params) } + } + + /** The whole screen, the status and navigation bars included, since overlay windows can cover them. */ + private fun fitScreen() { + val bounds = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) windows.maximumWindowMetrics.bounds + else android.graphics.Point().also { @Suppress("DEPRECATION") windows.defaultDisplay.getRealSize(it) }.let { android.graphics.Rect(0, 0, it.x, it.y) } + motion.fit(bounds.width().toFloat(), bounds.height().toFloat()) + } + + fun close() { + runCatching { context.unregisterComponentCallbacks(turns) } + scope.cancel() + listOf(head, preview, target, chat).forEach { runCatching { windows.removeView(it.view) } } + owner.destroy() + } + + /** Drags and taps on the pet, in screen coordinates, since its window moves under the finger. */ + private inner class DragTouch : View.OnTouchListener { + private val slop = ViewConfiguration.get(context).scaledTouchSlop + private var downX = 0f + private var downY = 0f + private var lastX = 0f + private var lastY = 0f + private var moved = false + private var tracker: android.view.VelocityTracker? = null + + /** The window moves under the finger, so velocity is measured on the screen. */ + private fun track(e: MotionEvent) { + val onScreen = MotionEvent.obtain(e).apply { setLocation(e.rawX, e.rawY) } + (tracker ?: android.view.VelocityTracker.obtain().also { tracker = it }).addMovement(onScreen) + onScreen.recycle() + } + + private fun release(): Pair { + val t = tracker ?: return 0f to 0f + t.computeCurrentVelocity(1000) + val v = t.xVelocity to t.yVelocity + t.recycle() + tracker = null + return v + } + + override fun onTouch(v: View, e: MotionEvent): Boolean { + track(e) + when (e.actionMasked) { + MotionEvent.ACTION_DOWN -> { + downX = e.rawX; downY = e.rawY; lastX = e.rawX; lastY = e.rawY + moved = false + } + MotionEvent.ACTION_MOVE -> { + if (!moved && (abs(e.rawX - downX) > slop || abs(e.rawY - downY) > slop)) { + moved = true + bubble = null + closeChat() + motion.start() + } + if (moved) motion.move(e.rawX - lastX, e.rawY - lastY) + lastX = e.rawX; lastY = e.rawY + } + MotionEvent.ACTION_UP -> { + val (vx, vy) = release() + if (moved) { + if (motion.end(vx, vy)) AgentPet.set(context, false) + } else v.performClick() + } + MotionEvent.ACTION_CANCEL -> { + release() + if (moved) motion.cancel() + } + } + return true + } + } + + companion object { + private const val OFFSCREEN = 10_000 + fun allowed(context: Context) = Settings.canDrawOverlays(context) + } +} + +/** + * The floating chat, opened the way a chat head opens its conversation: the pet hops into the top + * corner while the whole conversation scales up out of it and fades in, and closing shrinks it back + * into the pet as the pet glides home. In landscape it sits beside the docked pet, in portrait + * under it. Its contents are built while it is closed, so opening only animates. + */ +@Composable +internal fun PetChat(open: Boolean, motion: PetMotion, onClose: () -> Unit, onClosed: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val density = androidx.compose.ui.platform.LocalDensity.current + BoxWithConstraints( + Modifier.fillMaxSize().onPreviewKeyEvent { e -> + val k = e.nativeKeyEvent + if (k.keyCode != KeyEvent.KEYCODE_BUTTON_B || k.action != KeyEvent.ACTION_UP) return@onPreviewKeyEvent false + onClose() + true + }, + ) { + val w = constraints.maxWidth.toFloat() + val h = constraints.maxHeight.toFloat() + val margin = with(density) { 8.dp.toPx() } + val gap = with(density) { 6.dp.toPx() } + val wide = w > h + val panel = if (wide) { + val right = motion.dockX - gap + Rect((right - with(density) { 900.dp.toPx() }).coerceAtLeast(margin), motion.dockY, right, h - margin) + } else { + Rect(margin, motion.dockY + motion.size + gap, w - margin, h - margin) + } + val grow = remember { Animatable(0f) } + val fade = remember { Animatable(0f) } + LaunchedEffect(open) { + if (open) coroutineScope { + launch { grow.animateTo(1f, Motion.sp(0.82f, 520f)) } + launch { fade.animateTo(1f, Motion.tw(140)) } + } else if (fade.value > 0f) { + coroutineScope { + launch { grow.animateTo(0f, Motion.tw(170, easing = androidx.compose.animation.core.FastOutLinearInEasing)) } + launch { delay(Motion.ms(40).toLong()); fade.animateTo(0f, Motion.tw(130)) } + } + onClosed() + } + } + Box( + Modifier.fillMaxSize().graphicsLayer { alpha = fade.value }.background(Color(0x8C000000)) + .clickable(remember { MutableInteractionSource() }, null, enabled = open) { onClose() }, + ) + Column( + Modifier.offset { IntOffset(panel.left.roundToInt(), panel.top.roundToInt()) } + .size(with(density) { panel.width.toDp() }, with(density) { panel.height.toDp() }) + .graphicsLayer { + // Grows from where the pet is right now, so the two travel together while the pet hops to its corner. + transformOrigin = androidx.compose.ui.graphics.TransformOrigin( + ((motion.x + motion.size / 2 - panel.left) / panel.width.coerceAtLeast(1f)).coerceIn(0f, 1f), + ((motion.y + motion.size / 2 - panel.top) / panel.height.coerceAtLeast(1f)).coerceIn(0f, 1f), + ) + val s = 0.12f + 0.88f * grow.value + scaleX = s + scaleY = s + alpha = fade.value + } + .clip(Shape16).background(colors.background).border(1.dp, pal.line, Shape16) + .clickable(remember { MutableInteractionSource() }, null, enabled = open) {} + .padding(start = 12.dp, end = 12.dp, top = 6.dp), + ) { + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(bottom = 2.dp)) { + Text(stringResource(R.string.agent_pet_name), fontSize = 16.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + modifier = Modifier.padding(start = 4.dp)) + Spacer(Modifier.weight(1f)) + HeaderAction(Icons.Outlined.Close, stringResource(R.string.agent_close), size = 34.dp, tag = "agent-pet-close", onClick = onClose) + } + AgentPage(Modifier.weight(1f).fillMaxWidth(), visible = open, startTyping = AgentHost.entries.isEmpty(), hidesPet = false) + } + } +} + +@Composable +internal fun PetCloseTarget(over: Boolean) { + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.padding(4.dp).size(if (over) 84.dp else 68.dp).clip(androidx.compose.foundation.shape.CircleShape) + .background(Color(0xCC0E141B)) + .border(2.dp, if (over) Color(0xFFFF5A5F) else Color(0x66FFFFFF), androidx.compose.foundation.shape.CircleShape), + ) { Icon(Icons.Outlined.Close, null, tint = Color.White, modifier = Modifier.size(30.dp)) } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DeeDee.kt b/app/src/main/java/com/droiddeck/launcher/ui/DeeDee.kt new file mode 100644 index 0000000000..c2632915fc --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/DeeDee.kt @@ -0,0 +1,381 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.animation.core.CubicBezierEasing +import androidx.compose.animation.core.Easing +import androidx.compose.foundation.Canvas +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.produceState +import androidx.compose.runtime.withFrameNanos +import androidx.compose.ui.Modifier +import androidx.compose.ui.geometry.CornerRadius +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Rect +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.PathOperation +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.drawscope.DrawScope +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.graphics.drawscope.rotate +import androidx.compose.ui.graphics.drawscope.scale +import androidx.compose.ui.graphics.drawscope.translate +import androidx.compose.ui.graphics.drawscope.withTransform +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.drawText +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.rememberTextMeasurer +import kotlin.math.PI + +internal enum class PetState { IDLE, WORKING, QUESTION, DONE, ERROR, SLEEP } + +private val White = Color(0xFFFFFFFF) +private val Blue = Color(0xFF1A9FFF) +private val Ink = Color(0xFF0E141B) +private val Amber = Color(0xFFFFB627) +private val Red = Color(0xFFFF5A5F) +private val Slate = Color(0xFF3A4A5A) +private val Term = Color(0xFF26303B) +private val TermLine = Color(0xFF8FA3B6) + +private val EaseInOut: Easing = CubicBezierEasing(0.42f, 0f, 0.58f, 1f) +private val EaseOut: Easing = CubicBezierEasing(0f, 0f, 0.58f, 1f) +private val Hop: Easing = CubicBezierEasing(0.3f, 0f, 0.4f, 1f) +private val Pop: Easing = CubicBezierEasing(0.3f, 1.6f, 0.5f, 1f) +private val Linear = Easing { it } +private val Step = Easing { 0f } + +/** Where 0..1 of a loop [period] seconds long is at [time]; [lead] starts it that many seconds early. */ +private fun loop(time: Float, period: Float, lead: Float = 0f): Float { + val t = (time + lead) % period + return (if (t < 0) t + period else t) / period +} + +/** A CSS-style keyframe track: [stops] holds (position, value) pairs, eased per segment. */ +private fun track(p: Float, easing: Easing, vararg stops: Float): Float { + if (p <= stops[0]) return stops[1] + var i = 0 + while (i + 2 < stops.size) { + val a = stops[i] + val b = stops[i + 2] + if (p <= b) { + val t = if (b > a) (p - a) / (b - a) else 1f + return stops[i + 1] + (stops[i + 3] - stops[i + 1]) * easing.transform(t) + } + i += 2 + } + return stops[stops.size - 1] +} + +private fun mix(a: Color, b: Color, t: Float) = Color( + a.red + (b.red - a.red) * t, a.green + (b.green - a.green) * t, a.blue + (b.blue - a.blue) * t, a.alpha + (b.alpha - a.alpha) * t, +) + +/** The DroidDeck mark the head is drawn from, in its own 128 by 223.72 space. */ +private val headMark: Path by lazy { + val d = Path().apply { + moveTo(-31.98f, 0f) + lineTo(63.97f, 0f) + cubicTo(125.81f, 0f, 175.93f, 50.08f, 175.93f, 111.86f) + cubicTo(175.93f, 173.64f, 125.81f, 223.72f, 63.97f, 223.72f) + lineTo(-31.98f, 223.72f) + close() + } + val cut = Path().apply { + addOval(Rect(Offset(63.98f, 111.86f), 71.81f)) + addRect(Rect(56.055f, 0f, 56.055f + 15.83f, 45f)) + addRect(Rect(56.055f, 178.72f, 56.055f + 15.83f, 223.72f)) + } + Path.combine(PathOperation.Difference, d, cut) +} + +private fun star(x: Float, y: Float, a: Float) = Path().apply { + moveTo(x, y - a) + quadraticBezierTo(x, y, x + a, y) + quadraticBezierTo(x, y, x, y + a) + quadraticBezierTo(x, y, x - a, y) + quadraticBezierTo(x, y, x, y - a) + close() +} + +private class Spark(val x: Float, val y: Float, val size: Float, val color: Color, val lead: Float) + +private val sparks = listOf( + Spark(90f, 120f, 14f, White, 0f), Spark(318f, 110f, 12f, Blue, 0.4f), Spark(104f, 210f, 9f, Blue, 0.8f), + Spark(312f, 200f, 10f, White, 0.4f), Spark(250f, 40f, 8f, White, 0f), +).map { it to star(it.x, it.y, it.size) } + +/** The rig of the DeeDee mock (a 400 by 360 view box) looping through [state]; [crop] is the part of the view box shown. */ +@Composable +internal fun DeeDee(state: PetState, modifier: Modifier, crop: Rect = Rect(35f, 15f, 365f, 345f)) { + val time by produceState(0f) { + val start = withFrameNanos { it } + while (true) withFrameNanos { value = (it - start) / 1_000_000_000f } + } + val text = rememberTextMeasurer() + Canvas(modifier) { + val k = minOf(size.width / crop.width, size.height / crop.height) + withTransform({ + translate((size.width - crop.width * k) / 2, (size.height - crop.height * k) / 2) + scale(k, k, Offset.Zero) + translate(-crop.left, -crop.top) + }) { rig(state, time, text) } + } +} + +private fun DrawScope.rig(state: PetState, t: Float, text: androidx.compose.ui.text.TextMeasurer) { + // Shadow under the feet. + var shadowX = 1f + var shadowAlpha = 0.4f + when (state) { + PetState.IDLE -> shadowX = track(loop(t, 3f), EaseInOut, 0f, 1f, 0.5f, 0.9f, 1f, 1f) + PetState.DONE -> { + val p = loop(t, 1.2f) + shadowX = track(p, Hop, 0f, 1f, 0.15f, 1f, 0.45f, 0.7f, 0.75f, 1f, 1f, 1f) + shadowAlpha = track(p, Hop, 0f, 0.4f, 0.15f, 0.4f, 0.45f, 0.2f, 0.75f, 0.4f, 1f, 0.4f) + } + else -> Unit + } + scale(shadowX, 1f, Offset(200f, 336f)) { + drawOval(Color.Black.copy(alpha = shadowAlpha), Offset(130f, 327f), Size(140f, 18f)) + } + + // The whole body moves together. + var dx = 0f + var dy = 0f + var sx = 1f + var sy = 1f + when (state) { + PetState.IDLE -> dy = track(loop(t, 3f), EaseInOut, 0f, 0f, 0.5f, -6f, 1f, 0f) + PetState.WORKING -> dy = track(loop(t, 1.6f), EaseInOut, 0f, 0f, 0.5f, -2f, 1f, 0f) + PetState.QUESTION -> dy = track(loop(t, 2.4f), EaseInOut, 0f, 0f, 0.5f, -4f, 1f, 0f) + PetState.DONE -> { + val p = loop(t, 1.2f) + dy = track(p, Hop, 0f, 0f, 0.15f, 0f, 0.45f, -30f, 0.75f, 0f, 1f, 0f) + sx = track(p, Hop, 0f, 1.03f, 0.15f, 1f, 0.75f, 1f, 0.85f, 1.04f, 1f, 1.03f) + sy = track(p, Hop, 0f, 0.96f, 0.15f, 1f, 0.75f, 1f, 0.85f, 0.95f, 1f, 0.96f) + } + PetState.ERROR -> dx = track(loop(t, 2f), EaseInOut, 0f, 0f, 0.04f, -7f, 0.08f, 7f, 0.12f, -5f, 0.16f, 5f, 0.2f, -2f, 0.24f, 2f, 0.3f, 0f, 1f, 0f) + PetState.SLEEP -> { + val p = loop(t, 4f) + sx = track(p, EaseInOut, 0f, 1f, 0.5f, 1.02f, 1f, 1f) + sy = track(p, EaseInOut, 0f, 1f, 0.5f, 0.97f, 1f, 1f) + } + } + val alarm = if (state == PetState.ERROR) track(loop(t, 2f), EaseInOut, 0f, 0f, 0.04f, 1f, 0.24f, 1f, 0.3f, 0f, 1f, 0f) else 0f + withTransform({ + translate(dx, dy) + scale(sx, sy, Offset(200f, 317f)) + }) { + legs() + body(state, t, alarm) + if (state == PetState.WORKING) terminal(t) + arms(state, t) + head(state, t, alarm) + } + extras(state, t, text) +} + +private fun DrawScope.legs() { + for ((x, y, w, h, r) in listOf( + floatArrayOf(166f, 283f, 18f, 30f, 8f), floatArrayOf(216f, 283f, 18f, 30f, 8f), + floatArrayOf(158f, 305f, 30f, 12f, 6f), floatArrayOf(212f, 305f, 30f, 12f, 6f), + )) drawRoundRect(White, Offset(x, y), Size(w, h), CornerRadius(r)) +} + +private operator fun FloatArray.component5() = this[4] + +private fun DrawScope.body(state: PetState, t: Float, alarm: Float) { + drawRect(White, Offset(194f, 200f), Size(12f, 20f)) + drawRoundRect(White, Offset(148f, 215f), Size(104f, 72f), CornerRadius(22f)) + val glow = when (state) { + PetState.WORKING -> track(loop(t, 0.8f), EaseInOut, 0f, 1f, 0.5f, 0.5f, 1f, 1f) + PetState.SLEEP -> track(loop(t, 4f), EaseInOut, 0f, 0.35f, 0.5f, 0.8f, 1f, 0.35f) + else -> 1f + } + drawCircle(mix(Blue, Red, alarm).copy(alpha = glow), 11f, Offset(200f, 251f)) +} + +private fun DrawScope.terminal(t: Float) { + drawRoundRect(Term, Offset(150f, 256f), Size(100f, 40f), CornerRadius(8f)) + drawRoundRect(Blue, Offset(150f, 256f), Size(100f, 40f), CornerRadius(8f), style = Stroke(3f)) + drawRoundRect(Blue, Offset(160f, 266f), Size(44f, 5f), CornerRadius(2.5f)) + val grow = track(loop(t, 1.6f), EaseOut, 0f, 0.1f, 0.7f, 1f, 1f, 1f) + scale(grow, 1f, Offset(160f, 278f)) { drawRoundRect(TermLine, Offset(160f, 276f), Size(60f, 5f), CornerRadius(2.5f)) } + val cursor = track(loop(t, 0.7f), Step, 0f, 1f, 0.5f, 0.2f, 1f, 0.2f) + drawRoundRect(White.copy(alpha = cursor), Offset(224f, 276f), Size(10f, 5f), CornerRadius(2f)) +} + +/** One arm: from the shoulder through a curve to the hand, turned about the shoulder. */ +private fun DrawScope.arm(shoulder: Offset, control: Offset, hand: Offset, degrees: Float) { + rotate(degrees, shoulder) { + val path = Path().apply { + moveTo(shoulder.x, shoulder.y) + quadraticBezierTo(control.x, control.y, hand.x, hand.y) + } + drawPath(path, White, style = Stroke(10f, cap = StrokeCap.Round)) + drawCircle(White, 9f, hand) + } +} + +private fun DrawScope.arms(state: PetState, t: Float) { + val l = Offset(151f, 236f) + val r = Offset(249f, 236f) + when (state) { + PetState.IDLE -> { + val sway = track(loop(t, 3f), EaseInOut, 0f, 0f, 0.5f, 4f, 1f, 0f) + arm(l, Offset(127f, 246f), Offset(123f, 276f), sway) + arm(r, Offset(273f, 246f), Offset(277f, 276f), sway) + } + PetState.WORKING -> { + val p = loop(t, 0.32f) + arm(l, Offset(133f, 258f), Offset(157f, 270f), track(p, EaseInOut, 0f, 0f, 0.5f, -6f, 1f, 0f)) + arm(r, Offset(267f, 258f), Offset(243f, 270f), track(p, EaseInOut, 0f, -5f, 0.5f, 1f, 1f, -5f)) + } + PetState.QUESTION -> { + arm(l, Offset(127f, 246f), Offset(123f, 276f), 0f) + arm(r, Offset(279f, 230f), Offset(287f, 198f), track(loop(t, 0.9f), EaseInOut, 0f, -8f, 0.5f, 14f, 1f, -8f)) + } + PetState.DONE -> { + val p = loop(t, 1.2f) + arm(l, Offset(121f, 230f), Offset(115f, 196f), track(p, EaseInOut, 0f, 0f, 0.45f, 12f, 1f, 0f)) + arm(r, Offset(279f, 230f), Offset(285f, 196f), track(p, EaseInOut, 0f, 0f, 0.45f, -12f, 1f, 0f)) + } + PetState.ERROR, PetState.SLEEP -> { + arm(Offset(151f, 238f), Offset(137f, 254f), Offset(135f, 284f), 0f) + arm(Offset(249f, 238f), Offset(263f, 254f), Offset(265f, 284f), 0f) + } + } +} + +private fun DrawScope.head(state: PetState, t: Float, alarm: Float) { + val tilt = when (state) { + PetState.QUESTION -> track(loop(t, 2.4f), EaseInOut, 0f, -9f, 0.5f, -5f, 1f, -9f) + PetState.SLEEP -> 6f + else -> 0f + } + withTransform({ + rotate(tilt, Offset(200f, 215f)) + if (state == PetState.SLEEP) translate(0f, 6f) + }) { + antenna(state, t) + withTransform({ + translate(200f, 150f) + scale(0.62f, 0.62f, Offset.Zero) + translate(-64f, -111.86f) + }) { + drawPath(headMark, White) + drawCircle(mix(Blue, Red, alarm).copy(alpha = if (state == PetState.SLEEP) 0.6f else 1f), 55.98f, Offset(63.98f, 111.86f)) + } + eye(state, t) + if (state == PetState.WORKING) { + val sweep = 46f / (2f * PI.toFloat() * 39.6f) * 360f + rotate(360f * loop(t, 1.1f), Offset(200f, 150f)) { + drawArc(Blue, 0f, sweep, false, Offset(160.4f, 110.4f), Size(79.2f, 79.2f), style = Stroke(5f, cap = StrokeCap.Round)) + } + } + } +} + +private fun DrawScope.antenna(state: PetState, t: Float) { + val lean = when (state) { + PetState.ERROR -> 22f + PetState.SLEEP -> -28f + else -> 0f + } + rotate(lean, Offset(200f, 100f)) { + drawLine(White, Offset(200f, 100f), Offset(200f, 52f), 7f, StrokeCap.Round) + var radius = 10f + val (color, alpha) = when (state) { + PetState.IDLE -> Blue to track(loop(t, 3f), EaseInOut, 0f, 1f, 0.5f, 0.45f, 1f, 1f) + PetState.WORKING -> Blue to track(loop(t, 0.5f), Step, 0f, 1f, 0.5f, 0.2f, 1f, 0.2f) + PetState.QUESTION -> { + val p = loop(t, 1f) + radius = track(p, EaseInOut, 0f, 10f, 0.5f, 13f, 1f, 10f) + Amber to track(p, EaseInOut, 0f, 1f, 0.5f, 0.5f, 1f, 1f) + } + PetState.DONE -> Blue to 1f + PetState.ERROR -> Red to track(loop(t, 1f), Step, 0f, 1f, 0.5f, 0.25f, 1f, 0.25f) + PetState.SLEEP -> Slate to 1f + } + drawCircle(color.copy(alpha = alpha), radius, Offset(200f, 45f)) + } +} + +private fun DrawScope.eye(state: PetState, t: Float) { + when (state) { + PetState.DONE -> drawPath(Path().apply { moveTo(186f, 156f); quadraticBezierTo(203f, 136f, 220f, 156f) }, Ink, style = Stroke(7f, cap = StrokeCap.Round)) + PetState.SLEEP -> drawPath(Path().apply { moveTo(186f, 152f); quadraticBezierTo(203f, 162f, 220f, 152f) }, Ink, style = Stroke(6f, cap = StrokeCap.Round)) + PetState.ERROR -> { + val stroke = 6f + drawLine(Ink, Offset(193f, 139f), Offset(215f, 161f), stroke, StrokeCap.Round) + drawLine(Ink, Offset(215f, 139f), Offset(193f, 161f), stroke, StrokeCap.Round) + } + else -> { + val blink = if (state == PetState.IDLE) track(loop(t, 4.5f), EaseInOut, 0f, 1f, 0.44f, 1f, 0.47f, 0.1f, 0.5f, 1f, 1f, 1f) else 1f + val (px, py) = when (state) { + PetState.IDLE -> track(loop(t, 9f), EaseInOut, 0f, 0f, 0.3f, 0f, 0.36f, -7f, 0.52f, -7f, 0.58f, 5f, 0.8f, 5f, 0.86f, 0f, 1f, 0f) to 0f + PetState.WORKING -> track(loop(t, 1.6f), EaseInOut, 0f, -7f, 0.5f, 6f, 1f, -7f) to 0f + else -> 5f to -5f + } + scale(1f, blink, Offset(204f, 149f)) { + translate(px, py) { + drawCircle(Ink, 16f, Offset(204f, 149f)) + drawCircle(White, 5f, Offset(210f, 143f)) + drawCircle(White.copy(alpha = 0.7f), 2.2f, Offset(199f, 155f)) + } + } + } + } +} + +private fun DrawScope.speechTail(color: Color) { + drawPath(Path().apply { moveTo(264f, 82f); lineTo(254f, 100f); lineTo(278f, 86f); close() }, color) +} + +private fun DrawScope.extras(state: PetState, t: Float, text: androidx.compose.ui.text.TextMeasurer) { + when (state) { + PetState.QUESTION -> { + val p = loop(t, 2.4f) + val s = track(p, Pop, 0f, 0.4f, 0.12f, 1f, 0.88f, 1f, 1f, 0.9f) + val a = track(p, Pop, 0f, 0f, 0.12f, 1f, 0.88f, 1f, 1f, 0f).coerceIn(0f, 1f) + scale(s, s, Offset(262f, 96f)) { + drawRoundRect(Amber.copy(alpha = a), Offset(254f, 30f), Size(62f, 58f), CornerRadius(18f)) + speechTail(Amber.copy(alpha = a)) + val mark = text.measure("?", TextStyle(color = Ink.copy(alpha = a), fontSize = 42f.toSp(), fontWeight = FontWeight.Bold)) + drawText(mark, topLeft = Offset(285f - mark.size.width / 2f, 74f - mark.firstBaseline)) + } + } + PetState.ERROR -> { + val nudge = track(loop(t, 2f), EaseInOut, 0f, 0f, 0.06f, -10f, 0.14f, 8f, 0.22f, -4f, 0.3f, 0f, 1f, 0f) + rotate(nudge, Offset(262f, 96f)) { + drawRoundRect(Red, Offset(254f, 34f), Size(54f, 54f), CornerRadius(16f)) + speechTail(Red) + drawRoundRect(White, Offset(277f, 44f), Size(8f, 24f), CornerRadius(4f)) + drawCircle(White, 5f, Offset(281f, 77f)) + } + } + PetState.DONE -> for ((spark, path) in sparks) { + val p = loop(t, 1.2f, spark.lead) + val s = track(p, EaseInOut, 0f, 0f, 0.4f, 1f, 0.7f, 0.6f, 1f, 0f) + val turn = track(p, EaseInOut, 0f, 0f, 0.4f, 45f, 0.7f, 90f, 1f, 0f) + val a = track(p, EaseInOut, 0f, 0f, 0.4f, 1f, 0.7f, 0.8f, 1f, 0f) + if (s <= 0.01f) continue + withTransform({ + rotate(turn, Offset(spark.x, spark.y)) + scale(s, s, Offset(spark.x, spark.y)) + }) { drawPath(path, spark.color.copy(alpha = a)) } + } + PetState.SLEEP -> for ((i, z) in listOf(Triple(250f, 96f, 22f), Triple(268f, 74f, 30f), Triple(286f, 52f, 38f)).withIndex()) { + val p = loop(t, 4f, -1.3f * i) + val a = track(p, EaseOut, 0f, 0f, 0.2f, 1f, 1f, 0f) + val zx = track(p, EaseOut, 0f, -10f, 1f, 14f) + val zy = track(p, EaseOut, 0f, 16f, 1f, -22f) + val glyph = text.measure("z", TextStyle(color = White.copy(alpha = a), fontSize = z.third.toSp(), fontWeight = FontWeight.Bold)) + // The view box places a glyph by its baseline. + drawText(glyph, topLeft = Offset(z.first + zx, z.second + zy - glyph.firstBaseline)) + } + else -> Unit + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/EdgeFling.kt b/app/src/main/java/com/droiddeck/launcher/ui/EdgeFling.kt new file mode 100644 index 0000000000..700d031776 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/EdgeFling.kt @@ -0,0 +1,92 @@ +package com.droiddeck.launcher.ui + +import android.view.Choreographer +import kotlin.math.abs +import kotlin.math.sqrt + +/** + * Where something dragged and let go against the side edges, like a chat head, comes to rest: + * a quick sideways flick sends it to the side it was thrown toward from wherever it is; a slower + * release goes to the side its coasting would carry it to; and its height carries on with the + * throw. Velocities are pixels per second. + */ +internal object EdgeFling { + /** How far a throw coasts, in seconds of its release velocity. */ + const val COAST_S = 0.18f + /** A sideways speed past this many dp per second picks its side outright. */ + private const val FLICK_DP_S = 600f + + fun toRight(centerX: Float, span: Float, vx: Float, density: Float): Boolean { + if (abs(vx) > FLICK_DP_S * density) return vx > 0 + return centerX + vx * COAST_S > span / 2 + } + + fun restY(y: Float, vy: Float, min: Float, max: Float) = (y + vy * COAST_S).coerceIn(min, max.coerceAtLeast(min)) +} + +/** + * A spring in two dimensions that starts with the velocity it was let go with, stepped on each + * display frame, so a throw flows into its settle instead of starting over from rest. + */ +internal class FlingSpring( + private val stiffness: Float = 340f, + dampingRatio: Float = 0.74f, + private val onFrame: (Float, Float) -> Unit, +) : Choreographer.FrameCallback { + private val damping = 2f * dampingRatio * sqrt(stiffness) + private var x = 0f + private var y = 0f + private var vx = 0f + private var vy = 0f + private var toX = 0f + private var toY = 0f + private var last = 0L + private var onEnd: (() -> Unit)? = null + var running = false + private set + + fun start(fromX: Float, fromY: Float, velocityX: Float, velocityY: Float, targetX: Float, targetY: Float, end: (() -> Unit)? = null) { + cancel() + x = fromX; y = fromY; vx = velocityX; vy = velocityY; toX = targetX; toY = targetY + onEnd = end + if (Motion.scale == 0f) { + onFrame(toX, toY) + end?.invoke() + return + } + running = true + last = 0L + Choreographer.getInstance().postFrameCallback(this) + } + + fun cancel() { + if (!running) return + running = false + Choreographer.getInstance().removeFrameCallback(this) + } + + override fun doFrame(frameTimeNanos: Long) { + if (!running) return + val dt = if (last == 0L) 1f / 120f else ((frameTimeNanos - last) / 1e9f).coerceIn(0f, 1f / 20f) + last = frameTimeNanos + // Small fixed steps keep the spring stable however long a frame took. + var left = dt / Motion.scale.coerceAtLeast(0.1f) + while (left > 0f) { + val h = minOf(left, 1f / 480f) + vx += (-stiffness * (x - toX) - damping * vx) * h + vy += (-stiffness * (y - toY) - damping * vy) * h + x += vx * h + y += vy * h + left -= h + } + val settled = abs(x - toX) < 0.5f && abs(y - toY) < 0.5f && abs(vx) < 20f && abs(vy) < 20f + if (settled) { + running = false + onFrame(toX, toY) + onEnd?.invoke() + return + } + onFrame(x, y) + Choreographer.getInstance().postFrameCallback(this) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 3354839a7d..c3a5bb3784 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -459,6 +459,13 @@ internal fun SetupPanel( ToggleRow(host, "agent-tab", stringResource(R.string.setup_agent_tab), null, com.droiddeck.launcher.agent.AgentTab.shown) { com.droiddeck.launcher.agent.AgentTab.set(railContext, it) } + ToggleRow(host, "agent-pet", stringResource(R.string.setup_agent_pet), stringResource(R.string.setup_agent_pet_hint), AgentPet.enabled) { + AgentPet.set(railContext, it) + } + if (AgentPet.enabled && !AgentPet.allowed) ActionRow( + stringResource(R.string.setup_agent_pet_float), stringResource(R.string.setup_agent_pet_float_hint), + stringResource(R.string.setup_agent_pet_allow), onClick = { AgentPet.requestFloating(railContext) }, + ) } LanguageRow(host, s.language, a.onLanguage) ToggleRow(host, "show-stores", stringResource(R.string.setup_stores), null, s.gameStoresEnabled, onChange = a.onGameStoresEnabled) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cc7c632ddb..d98d3e6462 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2689,6 +2689,13 @@ Sidebar labels Show names under the sidebar icons. Turn off for a slimmer sidebar. Agent tab + Agent pet + DeeDee floats over the launcher and games and shows what the agent is doing. + Over other apps + Let DeeDee float over every app and open its chat there + Allow + DeeDee + Chat with DeeDee Display Larger cards Smaller cards diff --git a/app/src/test/java/com/droiddeck/launcher/ui/EdgeFlingTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/EdgeFlingTest.kt new file mode 100644 index 0000000000..5a0e298541 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/EdgeFlingTest.kt @@ -0,0 +1,27 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class EdgeFlingTest { + private val density = 2f + + @Test fun aQuickFlickGoesTheWayItWasThrownFromAnywhere() { + assertFalse(EdgeFling.toRight(centerX = 1800f, span = 1920f, vx = -1500f, density = density)) + assertTrue(EdgeFling.toRight(centerX = 100f, span = 1920f, vx = 1500f, density = density)) + } + + @Test fun aSlowReleaseGoesWhereItWouldCoast() { + assertTrue(EdgeFling.toRight(centerX = 1000f, span = 1920f, vx = 0f, density = density)) + assertFalse(EdgeFling.toRight(centerX = 900f, span = 1920f, vx = 0f, density = density)) + assertFalse(EdgeFling.toRight(centerX = 1100f, span = 1920f, vx = -1100f, density = density)) + } + + @Test fun theHeightCarriesOnWithTheThrowAndStaysOnScreen() { + assertEquals(436f, EdgeFling.restY(400f, 200f, 0f, 1000f), 0.01f) + assertEquals(1000f, EdgeFling.restY(900f, 5000f, 0f, 1000f), 0.01f) + assertEquals(24f, EdgeFling.restY(100f, -5000f, 24f, 1000f), 0.01f) + } +} From b5f6122d49a29ee07f889ce05695e59e4d8af3d6 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Thu, 12 Nov 2026 16:03:41 -0500 Subject: [PATCH 41/57] Stop walking SD card libraries on every session start and game launch (#2533) * Stop searching whole libraries on every game launch and session start The install script search ran over every library whenever any game's manifest changed, and again on each launch. It now runs per game, only when that game's build changes, and a launch that names its scripts does no search at all. A store game's shortcut walked its install folder on every scan instead of reusing the ranking the scan keeps. * Search a library for install scripts after the session has started, not before * fix(session): keep deferred seeding off a running prefix and recheck old folder caches * test(session): bound the held library search in the deferred seeding test * fix(session): search a game again when its install script search failed --- .../droiddeck/launcher/frontend/AddedGames.kt | 2 +- .../droiddeck/launcher/runtime/BattleNet.kt | 2 +- .../launcher/runtime/BattleNetTest.kt | 14 +++ .../usr/local/bin/droiddeck-seed-redists | 79 ++++++++++-- .../overlay/usr/local/bin/droiddeck-session | 4 +- tools/tests/test_seed_redists.py | 118 ++++++++++++++++++ 6 files changed, 204 insertions(+), 15 deletions(-) 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 c7d774bf2e..02edb1bcf8 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -97,7 +97,7 @@ object AddedGames { return File(LinuxRuntime.rootDir(context), guest.removePrefix("/")) } - fun candidates(folder: File): List = rank(folder).exes + fun candidates(folder: File, reuse: Boolean = false): List = rank(folder, reuse).exes fun rank(folder: File, reuse: Boolean = false): GameExePicker.Ranking { val key = "${folder.path}|${folder.lastModified()}" 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 e1dd1fff21..eeab317afe 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt @@ -374,7 +374,7 @@ object BattleNet { val guestPrefix = added.guestPath(context, prefix(context)) ?: return null val crc = java.util.zip.CRC32().apply { update("\"$guestExe\"${game.name}".toByteArray()) }.value val appId = com.droiddeck.launcher.session.SessionPrefs.addedGameAppId(context, game.folder.path, crc or 0x80000000L) - val exe = added.candidates(game.folder).firstOrNull() ?: client + val exe = added.candidates(game.folder, reuse = true).firstOrNull() ?: client return com.droiddeck.launcher.frontend.AddedGames.Game( game.folder, game.name, exe, guestExe, guestDir, appId, (appId shl 32) or 0x02000000L, listOf(exe), source = com.droiddeck.launcher.stores.Store.BATTLENET.id, storeId = game.uid, 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 c9a3fcb9e4..f74528c725 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt @@ -374,6 +374,20 @@ class BattleNetTest { } + @Test fun aScannedGamesShortcutReusesTheKeptRankingInsteadOfWalkingItsFolder() { + val added = com.droiddeck.launcher.frontend.AddedGames + val folder = File(BattleNet.prefix(context), "pfx/drive_c/Program Files (x86)/Kept Game").apply { mkdirs() } + File(folder, "Game.exe").writeBytes(byteArrayOf(0x4d, 0x5a)) + val kept = File(folder, "Other.exe").apply { writeBytes(byteArrayOf(0x4d, 0x5a)) } + com.droiddeck.launcher.frontend.AddedGamesCache(File(context.filesDir, com.droiddeck.launcher.frontend.AddedGamesCache.FILE)).apply { + keepRank(folder, com.droiddeck.launcher.frontend.GameExePicker.Ranking(listOf(kept), listOf(10), false)) + save() + } + added.scan(context) + assertEquals(kept, BattleNet.shortcut(context, BattleNet.Game("fenris", "Kept Game", "Fen", folder))!!.exe) + assertEquals("Game.exe", added.candidates(folder).first().name) + } + @Test fun aGamesShortcutHasBattleNetLaunchItInItsPrefix() { val folder = File(BattleNet.prefix(context), "pfx/drive_c/Program Files (x86)/Diablo IV").apply { mkdirs() } File(folder, "Diablo IV Launcher.exe").writeBytes(byteArrayOf(0x4d, 0x5a)) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists index babcb86d3d..d2d2809bd3 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists @@ -56,18 +56,75 @@ libraries="$steam_root" for library in $LIBRARIES; do libraries="$libraries $library"; done libraries=$(printf '%s\n%s\n' "$libraries" "$(sed -n 's/^[[:space:]]*"path"[[:space:]]*"\(.*\)"[[:space:]]*$/\1/p' "$steam_root/steamapps/libraryfolders.vdf" 2>/dev/null)" | awk 'NF && !seen[$0]++') -sig=$(while IFS= read -r library; do ls -l --time-style=+%s "$library"/steamapps/appmanifest_*.acf 2>/dev/null; done <<<"$libraries" | cksum) -if [ "$(head -n 1 "$cache" 2>/dev/null)" != "$sig" ]; then - { - printf '%s\n' "$sig" - while IFS= read -r library; do - [ -d "$library/steamapps/common" ] || continue - find "$library/steamapps/common" -mindepth 2 -maxdepth 5 -iname 'installscript*.vdf' \ - -not -path '*/Steamworks Shared/*' 2>/dev/null - done <<<"$libraries" | sort -u - } >"$cache.tmp" && mv -f "$cache.tmp" "$cache" +games=$(while IFS= read -r library; do + library="$library" awk ' + function flush() { if (dir != "") printf "%s|%s|%s|%s\t%s/steamapps/common/%s\n", file, build, updated, size, ENVIRON["library"], dir } + FNR == 1 { flush(); file = FILENAME; dir = build = updated = size = "" } + { + n = split($0, part, "\"") + for (i = 2; i + 2 <= n; i += 2) { + name = tolower(part[i]) + if (name == "installdir" && dir == "") dir = part[i + 2] + else if (name == "buildid" && build == "") build = part[i + 2] + else if (name == "lastupdated" && updated == "") updated = part[i + 2] + else if (name == "sizeondisk" && size == "") size = part[i + 2] + else continue + i += 2 + } + } + END { flush() } + ' "$library"/steamapps/appmanifest_*.acf 2>/dev/null +done <<<"$libraries") +legacy= +[ -s "$cache" ] && ! grep -q $'\t' "$cache" && legacy=$(tail -n +2 "$cache"; echo .) +declare -A scanned=() current=() +read_scanned() { + scanned=() + while IFS=$'\t' read -r key _; do + [ -n "$key" ] && scanned[$key]=1 + done < <(grep $'\t' "$cache" 2>/dev/null) +} +read_scanned +later= +fresh=() +while IFS=$'\t' read -r key dir; do + [ -n "$key" ] || continue + current[$key]=1 + [ -z "${scanned[$key]:-}" ] || continue + if [ -z "$legacy" ] && [ -n "${DROIDDECK_SEED_SCRIPTS:-}${DROIDDECK_SEED_LATER:-}" ]; then + [ -z "${DROIDDECK_SEED_LATER:-}" ] || later=1 + continue + fi + [ -d "$dir" ] || continue + scanned[$key]=1 + if [ -n "$legacy" ] && [ "$cache" -nt "${key%%|*}" ]; then + found=$(printf '%s\n' "${legacy%.}" | dir="$dir" awk 'index($0, ENVIRON["dir"] "/") == 1') + else + found=$(find "$dir" -mindepth 1 -maxdepth 4 -iname 'installscript*.vdf' \ + -not -path '*/Steamworks Shared/*' 2>/dev/null) || continue + found=$(printf '%s\n' "$found" | sort -u) + fi + fresh+=("$key" "$found") +done <<<"$games" +exec 9>"$cache.lock" && command -v flock >/dev/null 2>&1 && flock 9 +if [ ${#fresh[@]} -gt 0 ]; then + read_scanned + for ((i = 0; i < ${#fresh[@]}; i += 2)); do + [ -z "${scanned[${fresh[i]}]:-}" ] || continue + printf '%s\n' "${fresh[i + 1]}" | key="${fresh[i]}" awk '{ print ENVIRON["key"] "\t" $0 }' >>"$cache" + done fi -game_scripts() { { tail -n +2 "$cache" 2>/dev/null; printf '%s\n' "${DROIDDECK_SEED_SCRIPTS:-}"; } | sed '/^$/d' | tr '\n' '\0'; } +if [ -n "$later" ]; then + (DROIDDECK_SEED_LATER= DROIDDECK_SEED_SCRIPTS= DROIDDECK_SEED_DEFERRED=1 setsid "$0" "$steam_root" >/dev/null 2>&1 9>&- &) +fi +if [ -e "$cache" ]; then + keys=$(printf '%s\n' "${!current[@]}") awk -F'\t' ' + BEGIN { n = split(ENVIRON["keys"], key, "\n"); for (i = 1; i <= n; i++) want[key[i]] = 1 } + NF > 1 && ($1 in want) + ' "$cache" >"$cache.tmp" && { cmp -s "$cache.tmp" "$cache" && rm -f "$cache.tmp" || mv -f "$cache.tmp" "$cache"; } +fi +[ -z "${DROIDDECK_SEED_DEFERRED:-}" ] || ! pgrep -x wineserver >/dev/null 2>&1 || exit 0 +game_scripts() { { cut -s -f2- "$cache" 2>/dev/null; printf '%s\n' "${DROIDDECK_SEED_SCRIPTS:-}"; } | sed '/^$/d' | tr '\n' '\0'; } game_pairs=$(game_scripts | read_scripts) [ -n "$(printf '%s' "$game_pairs" | tr -d '[:space:]')" ] && pairs=$(printf '%s\n%s\n' "$pairs" "$game_pairs" | sort -u | sed '/^$/d') declare -A vulkan=() diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 9ec12398f4..8bb519db52 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -1190,7 +1190,7 @@ case $mode in step "adding the app's own games to the client's library" droiddeck-steam-shortcuts "$steam_root" "$BL_ADDED_GAMES" || true fi - droiddeck-seed-redists "$steam_root" || true + DROIDDECK_SEED_LATER=1 droiddeck-seed-redists "$steam_root" || true else _bl_x64_tool=$(droiddeck-steam-x64 --default-tool) if [ -n "$_bl_x64_tool" ]; then @@ -1204,7 +1204,7 @@ case $mode in if [ -z "${BL_DESKTOP:-}" ] && [ "${BL_STEAM_UI:-}" != desktop ]; then droiddeck-steam-ui-scale "$steam_root" "${BL_WIDTH:-1280}" "${BL_HEIGHT:-720}" || true fi - droiddeck-seed-redists "$steam_root" || true + DROIDDECK_SEED_LATER=1 droiddeck-seed-redists "$steam_root" || true fi if [ -n "${BL_SHADER_PRECACHE:-}" ]; then droiddeck-steam-shaders "$BL_SHADER_PRECACHE" "$XDG_DATA_HOME/Steam" \ diff --git a/tools/tests/test_seed_redists.py b/tools/tests/test_seed_redists.py index 1440b41b0f..f00dc1ae26 100644 --- a/tools/tests/test_seed_redists.py +++ b/tools/tests/test_seed_redists.py @@ -2,6 +2,7 @@ import os import shutil import subprocess import tempfile +import time import unittest from pathlib import Path @@ -128,6 +129,67 @@ class SeedRedistsTest(unittest.TestCase): self.run_seed(str(sd)) self.assertIn('"VCRedist2022"=dword:00000001', self.reg.read_text()) + def manifest(self, name, build): + path = self.steam / "steamapps/appmanifest_77.acf" + path.write_text('"AppState"\n{\n\t"installdir"\t\t"%s"\n\t"buildid"\t\t"%s"\n}\n' % (name, build)) + return path + + def test_a_game_is_searched_again_only_when_its_build_changes(self): + late = self.steam / "steamapps/common/Late Game/installscript.vdf" + late.parent.mkdir(parents=True) + manifest = self.manifest("Late Game", "1") + self.run_seed() + late.write_text(GAME_SCRIPT) + manifest.write_text(manifest.read_text() + "\n") + self.run_seed() + self.assertNotIn("VCRedist2022", self.reg.read_text()) + self.manifest("Late Game", "2") + self.run_seed() + self.assertIn('"VCRedist2022"=dword:00000001', self.reg.read_text()) + + def test_one_changed_game_leaves_the_other_games_unsearched(self): + other = self.game("Other Game").parent / "installscript_extra.vdf" + self.manifest("Late Game", "1") + self.run_seed() + other.write_text(GAME_SCRIPT.replace("VCRedist2022", "Unsearched")) + self.manifest("Late Game", "2") + self.run_seed() + self.assertNotIn("Unsearched", self.reg.read_text()) + + def test_a_call_that_names_its_scripts_does_not_search_the_libraries(self): + script = self.game() + named = self.tmp / "legacycompat/evaluatorscript_1.vdf" + named.parent.mkdir(parents=True) + named.write_text(GAME_SCRIPT.replace("VCRedist2022", "Named")) + env = dict(os.environ, DROIDDECK_LIBRARIES="", DROIDDECK_SEED_SCRIPTS=str(named)) + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, capture_output=True, text=True, check=True) + reg = self.reg.read_text() + self.assertIn('"Named"=dword:00000001', reg) + self.assertNotIn("VCRedist2022", reg) + self.run_seed() + self.assertIn('"VCRedist2022"=dword:00000001', self.reg.read_text()) + self.assertIn(str(script), (self.steam / ".droiddeck-game-scripts").read_text()) + + def test_a_removed_game_leaves_the_list(self): + script = self.game() + self.run_seed() + cache = self.steam / ".droiddeck-game-scripts" + self.assertIn(str(script), cache.read_text()) + for manifest in (self.steam / "steamapps").glob("appmanifest_*.acf"): + manifest.unlink() + self.run_seed() + self.assertEqual("", cache.read_text()) + + def test_a_list_from_an_earlier_version_is_taken_over_without_a_search(self): + script = self.steam / "steamapps/common/Old Game/a/b/c/d/e/installscript.vdf" + script.parent.mkdir(parents=True) + script.write_text(GAME_SCRIPT) + self.manifest("Old Game", "1") + (self.steam / ".droiddeck-game-scripts").write_text("123 456\n%s\n" % script) + self.run_seed() + self.assertIn('"VCRedist2022"=dword:00000001', self.reg.read_text()) + self.assertIn("\t%s\n" % script, (self.steam / ".droiddeck-game-scripts").read_text()) + def test_current_user_and_machine_markers_go_to_their_own_registries(self): self.game(script=GAME_SCRIPT + GAME_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER").replace("VCRedist2022", "UserRedist")) with self.reg.open("a") as out: @@ -398,6 +460,62 @@ class SeedRedistsTest(unittest.TestCase): self.assertEqual(self.reg.read_text().count('"Vulkan111080"'), 2) + def test_a_session_start_leaves_the_library_search_to_a_later_run(self): + self.game(script=GAME_SCRIPT.replace("Software\\\\Valve\\\\Steam\\\\Apps\\\\CommonRedist\\\\vcredist\\\\2022", "SOFTWARE\\\\AGEIA Technologies").replace("VCRedist2022", "PhysX Version")) + shim = self.tmp / "bin" + shim.mkdir() + go = self.tmp / "go" + (shim / "find").write_text('#!/bin/sh\ncase "$*" in *"installscript*"*) n=0; while [ ! -e "%s" ] && [ $n -lt 600 ]; do sleep 0.1; n=$((n + 1)); done;; esac\nexec %s "$@"\n' % (go, shutil.which("find"))) + (shim / "find").chmod(0o755) + env = dict(os.environ, DROIDDECK_LIBRARIES="", DROIDDECK_SEED_LATER="1", PATH="%s:%s" % (shim, os.environ["PATH"])) + marker = '"PhysX Version"=dword:00000001' + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True) + self.assertNotIn(marker, self.reg.read_text()) + go.touch() + deadline = time.monotonic() + 30 + while marker not in self.reg.read_text() and time.monotonic() < deadline: + time.sleep(0.2) + self.assertIn(marker, self.reg.read_text()) + before = self.reg.read_text() + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True) + time.sleep(0.5) + self.assertEqual(before, self.reg.read_text()) + + def test_a_game_whose_search_failed_is_searched_again(self): + self.game() + broken = self.tmp / "broken" + broken.touch() + shim = self.tmp / "bin" + shim.mkdir() + (shim / "find").write_text('#!/bin/sh\n%s "$@"\n[ ! -e "%s" ]\n' % (shutil.which("find"), broken)) + (shim / "find").chmod(0o755) + env = dict(os.environ, DROIDDECK_LIBRARIES="", PATH="%s:%s" % (shim, os.environ["PATH"])) + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, capture_output=True, check=True) + self.assertNotIn("VCRedist2022", self.reg.read_text()) + broken.unlink() + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, capture_output=True, check=True) + self.assertIn('"VCRedist2022"=dword:00000001', self.reg.read_text()) + + def test_a_later_run_leaves_the_registry_alone_while_a_wine_server_runs(self): + self.game(script=GAME_SCRIPT.replace("Software\\\\Valve\\\\Steam\\\\Apps\\\\CommonRedist\\\\vcredist\\\\2022", "SOFTWARE\\\\AGEIA Technologies").replace("VCRedist2022", "PhysX Version")) + shim = self.tmp / "bin" + shim.mkdir() + (shim / "pgrep").write_text("#!/bin/sh\nexit 0\n") + (shim / "pgrep").chmod(0o755) + env = dict(os.environ, DROIDDECK_LIBRARIES="", DROIDDECK_SEED_LATER="1", PATH="%s:%s" % (shim, os.environ["PATH"])) + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True) + cache = self.steam / ".droiddeck-game-scripts" + deadline = time.monotonic() + 30 + while not (cache.exists() and "installscript" in cache.read_text().lower()) and time.monotonic() < deadline: + time.sleep(0.2) + self.assertIn("installscript", cache.read_text().lower()) + time.sleep(1) + self.assertNotIn("PhysX Version", self.reg.read_text()) + env.pop("DROIDDECK_SEED_LATER") + env["PATH"] = os.environ["PATH"] + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True) + self.assertIn('"PhysX Version"=dword:00000001', self.reg.read_text()) + def evaluator(self, appid, install_script): script = self.tmp / ("legacycompat/evaluatorscript_%s.vdf" % appid) script.parent.mkdir(parents=True) From 60098d4a1b989720ad34a0e385964ece65813bac Mon Sep 17 00:00:00 2001 From: KeegantheVeganat0r <58369898+KeegantheVeganat0r@users.noreply.github.com> Date: Fri, 13 Nov 2026 01:08:07 +0000 Subject: [PATCH 42/57] Render Agent Markdown and open web links in an external browser (#2546) * Render Agent Markdown with clickable links in an external browser * Preserve Markdown selection and expose table text to copy and accessibility --- app/build.gradle | 5 + .../com/droiddeck/launcher/ui/AgentEntries.kt | 82 -------- .../droiddeck/launcher/ui/AgentMarkdown.kt | 154 +++++++++++++++ app/src/main/res/values/strings.xml | 1 + .../launcher/ui/AgentMarkdownTest.kt | 185 ++++++++++++++++-- 5 files changed, 327 insertions(+), 100 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/AgentMarkdown.kt diff --git a/app/build.gradle b/app/build.gradle index d493877cc2..57b14a87fc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -382,6 +382,11 @@ dependencies { implementation 'androidx.activity:activity-compose:1.8.2' implementation 'androidx.compose.material:material-icons-extended' implementation 'io.coil-kt:coil-compose:2.6.0' + implementation 'io.noties.markwon:core:4.6.2' + implementation 'io.noties.markwon:ext-strikethrough:4.6.2' + implementation 'io.noties.markwon:ext-tables:4.6.2' + implementation 'io.noties.markwon:ext-tasklist:4.6.2' + implementation 'com.atlassian.commonmark:commonmark-ext-autolink:0.13.0' implementation 'com.caverock:androidsvg-aar:1.4' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3' implementation 'com.flyfishxu:kadb-android:1.2.1' diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt index d651aec3a5..3300b7f8a7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt @@ -42,14 +42,10 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.AnnotatedString -import androidx.compose.ui.text.SpanStyle -import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow -import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.AsyncImage @@ -329,81 +325,3 @@ internal fun AttachmentChip(path: String, onRemove: (() -> Unit)?) { } } } - -/** The Markdown agents write: headings, lists, fenced code, `code` and **bold**. */ -@Composable -internal fun AgentMarkdown(text: String, modifier: Modifier) { - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - Column(modifier, verticalArrangement = Arrangement.spacedBy(6.dp)) { - for (block in markdownBlocks(text)) when (block) { - is MdBlock.Code -> Text(block.text, fontSize = 13.sp, fontFamily = FontFamily.Monospace, color = colors.onSurface, - modifier = Modifier.fillMaxWidth().clip(Shape12).background(pal.surfaceVariant).padding(12.dp)) - is MdBlock.Line -> Text( - inlineMarkdown(block.text, pal.primary2, pal.surfaceVariant), - fontSize = if (block.heading) 17.sp else 15.sp, - fontWeight = if (block.heading) FontWeight.Bold else null, - lineHeight = 22.sp, color = colors.onSurface, - modifier = if (block.bullet) Modifier.padding(start = 12.dp) else Modifier, - ) - } - } -} - -internal sealed interface MdBlock { - data class Line(val text: String, val heading: Boolean = false, val bullet: Boolean = false) : MdBlock - data class Code(val text: String) : MdBlock -} - -private val HEADING = Regex("^#{1,6}\\s+") -private val BULLET = Regex("^\\s*[-*+]\\s+") - -internal fun markdownBlocks(text: String): List { - val out = mutableListOf() - val code = StringBuilder() - var inCode = false - for (raw in text.lines()) { - if (raw.trimStart().startsWith("```")) { - if (inCode) { - out += MdBlock.Code(code.toString().trimEnd('\n')) - code.clear() - } - inCode = !inCode - continue - } - if (inCode) { - code.append(raw).append('\n') - continue - } - val line = raw.trimEnd() - if (line.isBlank()) continue - val heading = HEADING.find(line) - val bullet = BULLET.find(line) - out += when { - heading != null -> MdBlock.Line(line.substring(heading.range.last + 1), heading = true) - bullet != null -> MdBlock.Line("• " + line.substring(bullet.range.last + 1), bullet = true) - else -> MdBlock.Line(line) - } - } - if (inCode && code.isNotEmpty()) out += MdBlock.Code(code.toString().trimEnd('\n')) - return out -} - -internal fun inlineMarkdown(text: String, codeColor: Color, codeBackground: Color): AnnotatedString = buildAnnotatedString { - var i = 0 - while (i < text.length) { - val boldEnd = if (text.startsWith("**", i)) text.indexOf("**", i + 2) else -1 - val tickEnd = if (text[i] == '`') text.indexOf('`', i + 1) else -1 - when { - boldEnd > i + 2 -> { - withStyle(SpanStyle(fontWeight = FontWeight.Bold)) { append(text, i + 2, boldEnd) } - i = boldEnd + 2 - } - tickEnd > i + 1 -> { - withStyle(SpanStyle(fontFamily = FontFamily.Monospace, color = codeColor, background = codeBackground)) { append(text, i + 1, tickEnd) } - i = tickEnd + 1 - } - else -> append(text[i++]) - } - } -} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentMarkdown.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentMarkdown.kt new file mode 100644 index 0000000000..0d85087f85 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentMarkdown.kt @@ -0,0 +1,154 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import android.content.Intent +import android.net.Uri +import android.text.Selection +import android.text.Spannable +import android.text.SpannableStringBuilder +import android.text.Spanned +import android.widget.TextView +import android.widget.Toast +import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.unit.sp +import androidx.compose.ui.viewinterop.AndroidView +import com.droiddeck.launcher.R +import io.noties.markwon.AbstractMarkwonPlugin +import io.noties.markwon.Markwon +import io.noties.markwon.MarkwonConfiguration +import io.noties.markwon.MarkwonVisitor +import io.noties.markwon.core.MarkwonTheme +import io.noties.markwon.ext.strikethrough.StrikethroughPlugin +import io.noties.markwon.ext.tables.TableAwareMovementMethod +import io.noties.markwon.ext.tables.TablePlugin +import io.noties.markwon.ext.tables.TableRowSpan +import io.noties.markwon.ext.tasklist.TaskListPlugin +import org.commonmark.ext.autolink.AutolinkExtension +import org.commonmark.parser.Parser +import org.commonmark.ext.gfm.tables.TableCell +import org.commonmark.ext.gfm.tables.TableHead +import org.commonmark.ext.gfm.tables.TableRow +import org.commonmark.node.AbstractVisitor +import org.commonmark.node.CustomNode +import org.commonmark.node.Node + +@Composable +internal fun AgentMarkdown(text: String, modifier: Modifier) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val density = LocalDensity.current + val textSize = with(density) { 15.sp.toPx() } + val lineSpacing = with(density) { 3.sp.toPx() } + val renderer = remember(context, pal.primary2, pal.surfaceVariant, density) { + agentMarkdownRenderer(context, pal.primary2.toArgb(), pal.surfaceVariant.toArgb()) + } + val rendered = remember(renderer, text) { renderer.toMarkdown(text) } + AndroidView( + modifier = modifier, + factory = { TextView(it).apply { + setTextIsSelectable(true) + movementMethod = TableAwareMovementMethod.create() + includeFontPadding = false + } }, + update = { view -> + view.setTextColor(colors.onSurface.toArgb()) + view.setLinkTextColor(pal.primary2.toArgb()) + view.setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, textSize) + view.setLineSpacing(lineSpacing, 1f) + setAgentMarkdown(view, renderer, rendered) + }, + ) +} + +internal fun agentMarkdownRenderer(context: Context, linkColor: Int, codeBackground: Int): Markwon = + Markwon.builder(context) + .usePlugin(StrikethroughPlugin.create()) + .usePlugin(TablePlugin.create(context)) + .usePlugin(TaskListPlugin.create(context)) + .usePlugin(object : AbstractMarkwonPlugin() { + override fun configureParser(builder: Parser.Builder) { + builder.extensions(listOf(AutolinkExtension.create())) + } + + override fun afterRender(node: Node, visitor: MarkwonVisitor) { + val rows = mutableListOf() + node.accept(object : AbstractVisitor() { + override fun visit(customNode: CustomNode) { + if (customNode is TableHead || customNode is TableRow) { + val cells = generateSequence(customNode.firstChild) { it.next }.filterIsInstance().toList() + if (cells.isNotEmpty()) rows += cells.joinToString(" | ") { markdownCellText(it) } + else visitChildren(customNode) + } else visitChildren(customNode) + } + }) + if (rows.isEmpty()) return + // Markwon keeps table cells outside the text buffer; expose them for copy and accessibility. + val builder = visitor.builder() + val text = SpannableStringBuilder(builder.removeFromEnd(0)) + val spans = text.getSpans(0, text.length, TableRowSpan::class.java).sortedBy { text.getSpanStart(it) } + for ((row, span) in spans.withIndex().reversed()) { + val start = text.getSpanStart(span) + val end = text.getSpanEnd(span) + val content = rows[row].ifEmpty { "\u00a0" } + text.removeSpan(span) + text.replace(start, end, content) + text.setSpan(span, start, start + content.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) + } + builder.append(text) + } + + override fun configureTheme(builder: MarkwonTheme.Builder) { + builder.linkColor(linkColor).codeBackgroundColor(codeBackground) + } + + override fun configureConfiguration(builder: MarkwonConfiguration.Builder) { + builder.linkResolver { view, link -> + val intent = agentBrowserIntent(link) ?: return@linkResolver + try { + view.context.startActivity(intent) + } catch (_: android.content.ActivityNotFoundException) { + Toast.makeText(view.context, R.string.agent_browser_unavailable, Toast.LENGTH_SHORT).show() + } + } + } + }) + .build() + +private fun markdownCellText(node: Node): String = buildString { + node.accept(object : AbstractVisitor() { + override fun visit(text: org.commonmark.node.Text) { append(text.literal) } + override fun visit(code: org.commonmark.node.Code) { append(code.literal) } + override fun visit(lineBreak: org.commonmark.node.SoftLineBreak) { append(' ') } + override fun visit(lineBreak: org.commonmark.node.HardLineBreak) { append('\n') } + override fun visit(html: org.commonmark.node.HtmlInline) { append(html.literal) } + }) +} + +internal fun setAgentMarkdown(view: TextView, renderer: Markwon, rendered: Spanned) { + if (view.tag === rendered) return + val start = view.selectionStart + val end = view.selectionEnd + val sameText = view.text.toString() == rendered.toString() + renderer.setParsedMarkdown(view, rendered) + view.tag = rendered + if (sameText && start in 0..rendered.length && end in 0..rendered.length) { + (view.text as? Spannable)?.let { Selection.setSelection(it, start, end) } + } +} + +internal fun agentBrowserIntent(link: String): Intent? { + val uri = Uri.parse(link) + if (uri.scheme?.lowercase() !in listOf("http", "https") || uri.host.isNullOrBlank()) return null + return Intent(Intent.ACTION_VIEW, uri).apply { + addCategory(Intent.CATEGORY_BROWSABLE) + addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + selector = Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_APP_BROWSER) + } +} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d98d3e6462..4d2e7cfe52 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3998,4 +3998,5 @@ Scarlet Snow White surfaces with red accents. + No web browser is available to open this link. diff --git a/app/src/test/java/com/droiddeck/launcher/ui/AgentMarkdownTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/AgentMarkdownTest.kt index c7ad34d894..171fe16f9f 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/AgentMarkdownTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/AgentMarkdownTest.kt @@ -1,27 +1,176 @@ package com.droiddeck.launcher.ui -import androidx.compose.ui.graphics.Color -import org.junit.Assert.assertEquals +import android.content.Intent +import android.content.ClipboardManager +import android.text.Selection +import android.text.Spannable +import io.noties.markwon.ext.tables.TableRowSpan +import android.graphics.Color +import android.text.Spanned +import android.text.style.ClickableSpan +import android.widget.TextView +import org.junit.Assert.* import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.ConscryptMode +import org.robolectric.annotation.Config +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +@ConscryptMode(ConscryptMode.Mode.OFF) class AgentMarkdownTest { - @Test fun blocksSplitHeadingsBulletsAndCode() { - val blocks = markdownBlocks("## Done\n\n- one\n* two\n```kotlin\nval a = 1\n\nval b = 2\n```\nplain") - assertEquals( - listOf( - MdBlock.Line("Done", heading = true), - MdBlock.Line("• one", bullet = true), - MdBlock.Line("• two", bullet = true), - MdBlock.Code("val a = 1\n\nval b = 2"), - MdBlock.Line("plain"), - ), - blocks, - ) + private val context get() = RuntimeEnvironment.getApplication() + private val renderer get() = agentMarkdownRenderer(context, Color.BLUE, Color.DKGRAY) + private fun Spanned.links() = getSpans(0, length, ClickableSpan::class.java).toList() + + @Test fun namedPullRequestLinksKeepTheirLabelsAndOpenAnExternalBrowser() { + val text = renderer.toMarkdown("Created [**PR #2540**](https://github.com/Droid-Deck/DroidDeck/pull/2540).") + assertEquals("Created PR #2540.", text.toString()) + val link = text.links().single() + assertEquals("PR #2540", text.subSequence(text.getSpanStart(link), text.getSpanEnd(link)).toString()) + link.onClick(TextView(context)) + val intent = shadowOf(context).nextStartedActivity + assertEquals(Intent.ACTION_VIEW, intent.action) + assertEquals("https://github.com/Droid-Deck/DroidDeck/pull/2540", intent.dataString) + val browser = requireNotNull(intent.selector) + assertEquals(Intent.ACTION_MAIN, browser.action) + assertTrue(browser.hasCategory(Intent.CATEGORY_APP_BROWSER)) + assertTrue(intent.flags and Intent.FLAG_ACTIVITY_NEW_TASK != 0) } - @Test fun inlineMarkersAreDroppedAndUnclosedOnesKept() { - val text = inlineMarkdown("a **b** `c` d ** e ` f", Color.Red, Color.Black) - assertEquals("a b c d ** e ` f", text.text) - assertEquals(2, text.spanStyles.size) + @Test fun bareUrlsAndAutolinksAreClickableWithoutTrailingPunctuation() { + val text = renderer.toMarkdown("Visit https://github.com/Droid-Deck/DroidDeck/pull/2540. Also .") + assertEquals(2, text.links().size) + val labels = text.links().map { text.subSequence(text.getSpanStart(it), text.getSpanEnd(it)).toString() } + assertTrue(labels.contains("https://github.com/Droid-Deck/DroidDeck/pull/2540")) + assertTrue(labels.contains("https://example.org/help")) + } + + @Test fun referenceLinksAndEscapedParenthesesAreParsed() { + val text = renderer.toMarkdown("[Docs][guide] and [details](https://example.org/a\\(b\\)).\n\n[guide]: https://example.org/docs") + assertEquals("Docs and details.", text.toString().trimEnd()) + assertEquals(2, text.links().size) + } + + @Test fun codeStaysLiteralAndDoesNotBecomeClickable() { + val text = renderer.toMarkdown("`[PR](https://example.org)`\n\n~~~kotlin\nval url = \"https://example.org\"\n~~~") + assertTrue(text.toString().contains("[PR](https://example.org)")) + assertTrue(text.toString().contains("val url = \"https://example.org\"")) + assertTrue(text.links().isEmpty()) + } + + @Test fun commonMarkdownBlocksAndNestedFormattingRenderWithoutMarkers() { + val text = renderer.toMarkdown("# Heading\n\n> A **bold and *italic*** quote\n\n1. First\n - Nested\n2. Second\n\n~~Removed~~\n\n- [x] Done\n- [ ] Pending") + val result = text.toString() + for (word in listOf("Heading", "A bold and italic quote", "First", "Nested", "Second", "Removed", "Done", "Pending")) { + assertTrue(result, result.contains(word)) + } + for (marker in listOf("# Heading", "**", "~~", "[x]", "[ ]")) assertFalse(result, result.contains(marker)) + } + + @Test fun tablesAreParsedWithLinksInsideCells() { + val root = renderer.parse("| Result | Link |\n| --- | --- |\n| Ready | [PR](https://github.com/owner/repo/pull/1) |") + assertEquals("TableBlock", root.firstChild.javaClass.simpleName) + var links = 0 + root.accept(object : org.commonmark.node.AbstractVisitor() { + override fun visit(link: org.commonmark.node.Link) { + links++ + assertEquals("https://github.com/owner/repo/pull/1", link.destination) + } + }) + assertEquals(1, links) + renderer.render(root) + } + + @Test fun colorChangesPreserveSelectionAndRefreshLinkSpans() { + val source = "Read [the PR](https://github.com/owner/repo/pull/1)" + val view = TextView(context).apply { setTextIsSelectable(true) } + val original = renderer + setAgentMarkdown(view, original, original.toMarkdown(source)) + Selection.setSelection(view.text as Spannable, 5, 11) + val updated = agentMarkdownRenderer(context, Color.RED, Color.LTGRAY) + val rendered = updated.toMarkdown(source) + setAgentMarkdown(view, updated, rendered) + assertEquals(5, view.selectionStart) + assertEquals(11, view.selectionEnd) + assertSame(rendered, view.tag) + val paint = android.text.TextPaint() + (view.text as Spanned).links().single().updateDrawState(paint) + assertEquals(Color.RED, paint.color) + } + + @Test fun reversedSelectionsAndCursorsSurviveColorChangesButNotContentChanges() { + val view = TextView(context).apply { setTextIsSelectable(true) } + val original = renderer + val updated = agentMarkdownRenderer(context, Color.RED, Color.LTGRAY) + setAgentMarkdown(view, original, original.toMarkdown("A long reply")) + for ((start, end) in listOf(8 to 2, 4 to 4)) { + Selection.setSelection(view.text as Spannable, start, end) + setAgentMarkdown(view, updated, updated.toMarkdown("A long reply")) + assertEquals(start, view.selectionStart) + assertEquals(end, view.selectionEnd) + } + setAgentMarkdown(view, updated, updated.toMarkdown("New")) + assertFalse(view.selectionStart == 4 && view.selectionEnd == 4) + } + + @Test fun tableCellsRemainInNativeCopyAndAccessibilityTextOnAndroid28() { + val source = "Before\n\n| Result | Link |\n| --- | --- |\n| **Ready** | [PR](https://github.com/owner/repo/pull/1) |\n| Pending | `code` |\n\nAfter" + val markwon = renderer + val rendered = markwon.toMarkdown(source) + val view = TextView(context).apply { setTextIsSelectable(true) } + setAgentMarkdown(view, markwon, rendered) + val expected = "Result | Link\nReady | PR\nPending | code" + assertTrue(rendered.toString(), rendered.toString().contains(expected)) + assertTrue(view.createAccessibilityNodeInfo().text.toString().contains(expected)) + Selection.setSelection(view.text as Spannable, 0, view.text.length) + assertTrue(view.onTextContextMenuItem(android.R.id.copy)) + val copied = context.getSystemService(ClipboardManager::class.java).primaryClip!!.getItemAt(0).text.toString() + assertEquals(rendered.toString(), copied) + val rows = rendered.getSpans(0, rendered.length, TableRowSpan::class.java) + assertEquals(3, rows.size) + assertTrue(rows.all { rendered.getSpanEnd(it) > rendered.getSpanStart(it) }) + } + + @Test fun tableLinksStillOpenTheBrowserAfterExposingCellText() { + val markwon = renderer + val rendered = markwon.toMarkdown("| Result | Link |\n| --- | --- |\n| Ready | [PR](https://github.com/owner/repo/pull/1) |") + val view = TextView(context).apply { setTextIsSelectable(true) } + setAgentMarkdown(view, markwon, rendered) + view.measure(android.view.View.MeasureSpec.makeMeasureSpec(900, android.view.View.MeasureSpec.EXACTLY), + android.view.View.MeasureSpec.makeMeasureSpec(2000, android.view.View.MeasureSpec.AT_MOST)) + view.layout(0, 0, 900, view.measuredHeight) + val canvas = android.graphics.Canvas(android.graphics.Bitmap.createBitmap(900, 2000, android.graphics.Bitmap.Config.ARGB_8888)) + view.draw(canvas) + val row = rendered.getSpans(0, rendered.length, TableRowSpan::class.java).maxBy { rendered.getSpanStart(it) } + val cell = requireNotNull(row.findLayoutForHorizontalOffset(row.cellWidth() + 1)) + (cell.text as Spanned).links().single().onClick(view) + assertEquals("https://github.com/owner/repo/pull/1", shadowOf(context).nextStartedActivity.dataString) + } + + @Test fun multipleTablesAndEmptyCellsKeepTheirOwnTextAndRowSpans() { + val rendered = renderer.toMarkdown("| One | Two |\n| --- | --- |\n| | X |\n\nBetween\n\n| Three | Four |\n| --- | --- |\n| Y | |") + val text = rendered.toString() + assertTrue(text, text.contains("One | Two\n | X")) + assertTrue(text, text.contains("Three | Four\nY | ")) + assertTrue(text, text.contains("Between")) + assertEquals(4, rendered.getSpans(0, rendered.length, TableRowSpan::class.java).size) + } + + @Test fun unfinishedStreamingMarkdownDoesNotLoseTextOrCrash() { + val source = "Read [the PR](https://github.com/owner/repo/pull/1)\n\n```kotlin\nval x = 1" + for (end in 1..source.length) renderer.toMarkdown(source.take(end)) + assertTrue(renderer.toMarkdown(source).toString().contains("val x = 1")) + } + + @Test fun browserIntentsOnlyAcceptAbsoluteWebLinks() { + for (link in listOf("javascript:alert(1)", "file:///etc/passwd", "intent://open", "content://private", "/local/file", "https:")) { + assertNull(link, agentBrowserIntent(link)) + } + assertNotNull(agentBrowserIntent("http://example.org")) + assertNotNull(agentBrowserIntent("https://github.com/owner/repo/pull/1?diff=split#discussion")) } } From bd4bfce3af08be4d496a7a5e52f98b2e318355d6 Mon Sep 17 00:00:00 2001 From: DeathKhan Date: Thu, 12 Nov 2026 19:10:03 -0600 Subject: [PATCH 43/57] fix(apps): move straight down into a short last row (#2544) Down from the row above a short last row landed on a tile further left, because the grid's own search only sees the tiles laid out so far. Down now goes to the tile directly below, or to the last tile when there is none below, and scrolls the next row in first when it is not laid out yet. Widgets record focus too, so the grid knows when focus is not on a tile. --- .../droiddeck/launcher/ui/AndroidAppsPage.kt | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt index 5c2dff86e3..dce70549b2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt @@ -22,6 +22,7 @@ import androidx.compose.foundation.focusGroup import androidx.compose.foundation.focusable import androidx.compose.foundation.gestures.awaitEachGesture import androidx.compose.foundation.gestures.awaitFirstDown +import androidx.compose.foundation.gestures.scrollBy import androidx.compose.foundation.hoverable import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.collectIsPressedAsState @@ -91,6 +92,7 @@ import androidx.compose.ui.focus.FocusDirection import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.input.InputMode import androidx.compose.ui.platform.LocalInputModeManager import androidx.compose.ui.platform.LocalContext @@ -147,6 +149,9 @@ private sealed interface AppEntry : AppEntryKey { } } +/** The focus id of the tile an entry is shown as. */ +private fun tileId(entry: AppEntry): String = "tile:" + if (entry is AppEntry.App) entry.app.key else entry.key + private fun indexLetter(label: String): String { val c = label.trim().firstOrNull()?.uppercaseChar() ?: return "#" return if (c in 'A'..'Z') c.toString() else if (c.isLetter()) c.toString() else "#" @@ -360,7 +365,27 @@ internal fun AndroidAppsPage(s: FrontEndState, a: FrontEndActions, modifier: Mod } } } - Box(Modifier.weight(1f).fillMaxWidth()) { + val front = LocalFrontFocus.current + val steer = rememberCoroutineScope() + // Down goes to the tile straight below. The grid's own search only sees the tiles laid out so far, so above a short or + // unseen last row it lands on a tile further left; above a gap in a short last row the row's last tile takes it. + Box(Modifier.weight(1f).fillMaxWidth().onPreviewKeyEvent { event -> + val k = event.nativeKeyEvent + if (k.keyCode != KeyEvent.KEYCODE_DPAD_DOWN || front == null) return@onPreviewKeyEvent false + val from = entries.indexOfFirst { tileId(it) == front.last } + val columns = (grid.layoutInfo.visibleItemsInfo.maxOfOrNull { it.column } ?: 0) + 1 + if (from < 0 || from / columns == entries.lastIndex / columns) return@onPreviewKeyEvent false + if (k.action == KeyEvent.ACTION_DOWN) { + val id = tileId(entries[minOf(from + columns, entries.lastIndex)]) + val shown = (front.attached[id] ?: 0) > 0 + if (!shown || runCatching { front.items.getValue(id).requestFocus() }.isFailure) steer.launch { + // The row below is not laid out yet: bring it in, then take it. + if (!shown) grid.scrollBy((grid.layoutInfo.visibleItemsInfo.firstOrNull { it.index == from + leadItems }?.size?.height ?: 0).toFloat()) + focusSoon { front.items.getValue(id) } + } + } + true + }) { val scroller = q.isEmpty() && byName && entries.size > 16 LazyVerticalGrid( columns = GridCells.Adaptive((if (narrow) 84 else 96).dp + AppsGrid.spacing.dp), @@ -900,7 +925,7 @@ private fun WidgetCard(w: HomeWidgets.Placed, maxWidthDp: Int) { val activity = remember(ctx) { ctx.findActivity() } Box { Box( - Modifier.size(width.dp, w.heightDp.dp) + Modifier.paneItem("widget:${w.id}").size(width.dp, w.heightDp.dp) .clip(Shape16) .background(colors.surface.copy(alpha = 0.35f)) .glideBorder(hot || menu, Shape16, pal.signal) From 9cc37d0a123bc8a6bd7ccad5827c96d2316688d4 Mon Sep 17 00:00:00 2001 From: DeathKhan Date: Thu, 12 Nov 2026 19:11:34 -0600 Subject: [PATCH 44/57] fix(ui): header search keeps the header height and returns focus when it closes (#2543) * fix(ui): keep the header height when search opens The search field in the page header reserved a line for its empty label, which made the open field taller than the header row and pushed the page down. * fix(ui): return focus to the search button when search closes Closing the header search with Back removed the field while it held focus, so the highlight was lost. The search button takes focus once it is back on screen. --- .../java/com/droiddeck/launcher/ui/StoresPage.kt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index 7bc7c186d0..4e2c210b62 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -13,6 +13,7 @@ import androidx.compose.material.icons.outlined.Folder import androidx.compose.material.icons.outlined.SdCard import androidx.compose.material.icons.outlined.Smartphone import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.focus.onFocusChanged @@ -1072,12 +1073,20 @@ internal fun ModeHeader( var searching by remember { mutableStateOf(query.isNotEmpty()) } var focusOnOpen by remember { mutableStateOf(false) } val open by animateFloatAsState(if (searching) 1f else 0f, Motion.sp(0.75f, 420f), label = "searchOpen") + // Closing takes the field away with focus still in it; the search button gets it once it is back on screen. + val searchIcon = remember { FocusRequester() } + var toIcon by remember { mutableStateOf(false) } val close = { searching = false focusOnOpen = false + toIcon = true if (query.isNotEmpty()) onQuery("") } BackHandler(enabled = searching && !clearSearchFocus) { close() } + LaunchedEffect(toIcon, searching, open <= 0.01f) { + if (searching) toIcon = false + else if (toIcon && open <= 0.01f) { focusSoon { searchIcon }; toIcon = false } + } val heading: @Composable () -> Unit = { if (lead != null) lead() else Text( @@ -1093,7 +1102,7 @@ internal fun ModeHeader( Box(Modifier.width(w).graphicsLayer { alpha = (open * 1.6f).coerceAtMost(1f) }) { AdbTextField( value = query, onValueChange = onQuery, label = "", keyboardType = KeyboardType.Text, imeAction = ImeAction.Search, - placeholder = placeholder, compact = true, focusOnShow = focusOnOpen, + placeholder = placeholder, compact = true, showLabel = false, focusOnShow = focusOnOpen, clearFocus = clearSearchFocus || !searching, onFocusChange = { focused -> if (!focused && query.isEmpty()) { searching = false; focusOnOpen = false } }, ) @@ -1103,7 +1112,7 @@ internal fun ModeHeader( } } val searchButton: @Composable () -> Unit = { - SearchIcon(stringResource(R.string.stores_search_open)) { searching = true; focusOnOpen = true } + Box(Modifier.focusRequester(searchIcon)) { SearchIcon(stringResource(R.string.stores_search_open)) { searching = true; focusOnOpen = true } } } BoxWithConstraints(Modifier.fillMaxWidth()) { val stacked = maxWidth < NarrowPaneWidth From b841b232b42defcf40ae6d527e3c9c463c3f1a08 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 20:24:13 -0500 Subject: [PATCH 45/57] feat(stores): add Rockstar store and classic GTA launches --- .github/workflows/build.yml | 12 +- .gitignore | 1 + .../main/java/com/droiddeck/launcher/App.kt | 1 + .../droiddeck/launcher/frontend/AddedGames.kt | 2 + .../launcher/session/SessionFiles.kt | 4 +- .../droiddeck/launcher/stores/CloudSaves.kt | 6 +- .../droiddeck/launcher/stores/LoginFlows.kt | 2 + .../com/droiddeck/launcher/stores/Store.kt | 3 +- .../launcher/stores/StoreAccounts.kt | 4 +- .../droiddeck/launcher/stores/StoreLaunch.kt | 19 +- .../launcher/stores/StoreLaunchRequests.kt | 8 + .../launcher/stores/StoreLoginActivity.kt | 2 + .../droiddeck/launcher/stores/StoreSizes.kt | 4 +- .../launcher/stores/rockstar/RockstarAuth.kt | 198 +++++++++ .../stores/rockstar/RockstarBackend.kt | 206 +++++++++ .../stores/rockstar/RockstarInstaller.kt | 263 ++++++++++++ .../stores/rockstar/RockstarLaunch.kt | 56 +++ .../stores/rockstar/RockstarLaunchCipher.kt | 66 +++ .../launcher/stores/rockstar/RockstarRos.kt | 96 +++++ .../stores/rockstar/RockstarTitles.kt | 84 ++++ .../com/droiddeck/launcher/ui/GameDetail.kt | 5 +- .../com/droiddeck/launcher/ui/StoreChips.kt | 2 + .../droiddeck/launcher/ui/StoresDownloads.kt | 5 +- .../com/droiddeck/launcher/ui/StoresPage.kt | 1 + app/src/main/res/values/strings.xml | 1 + .../main/resources/rockstar/legacy-cipher.bin | Bin 0 -> 86852 bytes .../stores/StoreAccountsCipherTest.kt | 11 + .../rockstar/RockstarLaunchCipherTest.kt | 35 ++ .../launcher/stores/rockstar/RockstarTest.kt | 299 +++++++++++++ tools/build_local.sh | 7 + .../usr/local/bin/droiddeck-store-launch | 113 +++++ tools/release/runtime_inputs.py | 4 +- tools/rockstar-launcher/.gitignore | 1 + tools/rockstar-launcher/Cargo.lock | 105 +++++ tools/rockstar-launcher/Cargo.toml | 19 + tools/rockstar-launcher/README.md | 30 ++ tools/rockstar-launcher/build.sh | 12 + tools/rockstar-launcher/examples/capture.rs | 65 +++ tools/rockstar-launcher/src/lib.rs | 333 +++++++++++++++ tools/rockstar-launcher/src/main.rs | 152 +++++++ tools/rockstar-launcher/src/pipe.rs | 403 ++++++++++++++++++ tools/tests/test_store_launch_rockstar.py | 90 ++++ 42 files changed, 2708 insertions(+), 22 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarAuth.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarBackend.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarInstaller.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunch.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunchCipher.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarRos.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarTitles.kt create mode 100644 app/src/main/resources/rockstar/legacy-cipher.bin create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunchCipherTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarTest.kt create mode 100644 tools/rockstar-launcher/.gitignore create mode 100644 tools/rockstar-launcher/Cargo.lock create mode 100644 tools/rockstar-launcher/Cargo.toml create mode 100644 tools/rockstar-launcher/README.md create mode 100644 tools/rockstar-launcher/build.sh create mode 100644 tools/rockstar-launcher/examples/capture.rs create mode 100644 tools/rockstar-launcher/src/lib.rs create mode 100644 tools/rockstar-launcher/src/main.rs create mode 100644 tools/rockstar-launcher/src/pipe.rs create mode 100644 tools/tests/test_store_launch_rockstar.py diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 57a2075145..15f68eb87c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -562,6 +562,12 @@ jobs: command -v x86_64-w64-mingw32-gcc >/dev/null || { sudo apt-get update -qq && sudo apt-get install -y -qq gcc-mingw-w64-x86-64; } bash tools/ubisoft-launcher/build.sh + - name: Rockstar launcher service (32-bit and 64-bit) + run: | + set -euo pipefail + command -v i686-w64-mingw32-gcc >/dev/null || { sudo apt-get update -qq && sudo apt-get install -y -qq gcc-mingw-w64-i686; } + bash tools/rockstar-launcher/build.sh + - uses: actions/download-artifact@v4 with: name: xbox-arm64 @@ -797,9 +803,11 @@ jobs: set -o pipefail cd app/src/main/rust/stores cargo test --locked 2>&1 | tail -60 - - name: Ubisoft launcher service host unit tests + - name: Windows launcher service host unit tests timeout-minutes: 10 - run: cargo test --locked --manifest-path tools/ubisoft-launcher/Cargo.toml + run: | + cargo test --locked --manifest-path tools/ubisoft-launcher/Cargo.toml + cargo test --locked --manifest-path tools/rockstar-launcher/Cargo.toml python-tests: name: Python and native regression tests diff --git a/.gitignore b/.gitignore index 0a404ef667..d0fe3ea9ea 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ __pycache__/ app/src/main/assets/directaudio/ app/src/main/assets/hybris/ /tools/vr/out/ +app/src/main/resources/rockstar/helpers/ diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index 9f74aa4e59..1801f34b5a 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -72,6 +72,7 @@ class App : Application() { com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.ubisoft.UbisoftBackend) com.droiddeck.launcher.stores.ea.EaBackend.app = this com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.ea.EaBackend) + com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.rockstar.RockstarBackend) } private fun prefetchAddonPacks() { 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 02edb1bcf8..d9db3374e9 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -418,6 +418,7 @@ object AddedGames { private fun scanGame(context: Context, folder: File, out: MutableList, single: AddedExes.Entry? = null, reuse: Boolean = false) { run { val sidecar = StoreGameSidecar.read(folder)?.let { com.droiddeck.launcher.stores.StoreLaunch.adopt(folder, it) } + if (sidecar?.store == Store.ROCKSTAR && (!com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(sidecar.id) || sidecar.launcher != com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER)) return sidecar?.takeIf { it.id.isNotEmpty() }?.let { SessionPrefs.followStoreGame(context, "${it.store.id}:${it.id}", folder.path) { old -> !File(old).exists() } } val ranking = rank(folder, reuse) val candidates = ranking.exes @@ -433,6 +434,7 @@ object AddedGames { val autoName = sidecar?.title ?: identifiedName(folder, found) ?: folder.name val crc = CRC32().apply { update(("\"${foundGuest.replaceFirst(Regex("^$LIBRARY/"), "$LEGACY_LIBRARY/")}\"" + autoName).toByteArray()) }.value val appId = SessionPrefs.addedGameAppId(context, folder.path, crc or 0x80000000L) + if (sidecar?.store == Store.ROCKSTAR) com.droiddeck.launcher.stores.rockstar.RockstarLaunch.applyDefaults(context, sidecar.id, appId) val config = accountConfig(SessionPrefs.activeSteamRoot(context)) val record = config?.let { shortcutRecord(it, appId) } val rev = record?.optInt("rev", 0) ?: 0 diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt index 8c5e7431b1..13348cef74 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -70,6 +70,8 @@ object SessionFiles { GameEnvironmentStore.publish(context) WinComponents.publish(context) val files = arrayOf( + "rockstar/helpers/Launcher32.exe" to "usr/local/lib/droiddeck-rockstar/Launcher32.exe", + "rockstar/helpers/Launcher64.exe" to "usr/local/lib/droiddeck-rockstar/Launcher64.exe", "usr/local/bin/droiddeck-game-env" to "usr/local/bin/droiddeck-game-env", "usr/local/bin/droiddeck-game-gpu" to "usr/local/bin/droiddeck-game-gpu", "usr/local/bin/droiddeck-diagnostic-inventory" to "usr/local/bin/droiddeck-diagnostic-inventory", @@ -241,7 +243,7 @@ object SessionFiles { var installed = false try { target.parentFile?.mkdirs() - context.assets.open("linuxfs/$asset").use { input -> + (if (asset.startsWith("rockstar/")) requireNotNull(javaClass.getResourceAsStream("/$asset")) else context.assets.open("linuxfs/$asset")).use { input -> staged.outputStream().use { output -> FileUtils.copy(input, output) } } installed = staged.setExecutable(true, false) && staged.renameTo(target) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt index f68ab0ce62..106719d559 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt @@ -87,7 +87,7 @@ object CloudSaves { val item = sidecar.extra["catalogItemId"].orEmpty() if (ns.isEmpty() || item.isEmpty()) "" else EpicApiClient.getCustomAttribute(token, ns, item, "CloudSaveFolder") } - Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT -> "" + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT, Store.ROCKSTAR -> "" } ?: return null p.edit() .putString("cloud_template_$id", fetched.ifEmpty { TEMPLATE_NONE }) @@ -148,7 +148,7 @@ object CloudSaves { val dir = when (store) { Store.GOG -> CloudSavePaths.gog(template, pfx, folder) Store.EPIC -> CloudSavePaths.epic(template, pfx, folder, EpicCredentialStore.load(context)?.accountId.orEmpty(), id) - Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT -> null + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT, Store.ROCKSTAR -> null } return dir to (if (dir == null) "unresolved" else "ok") } @@ -173,7 +173,7 @@ object CloudSaves { val account = EpicCredentialStore.load(context)?.accountId.orEmpty() if (token == null || account.isEmpty()) null else EpicCloud(account, id, token) } - Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT -> null + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT, Store.ROCKSTAR -> null } private fun gogScopedToken(context: Context, id: String, clientId: String): String? { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt index 980f496b26..a1b54088eb 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt @@ -15,6 +15,7 @@ internal object LoginFlows { Store.GAMEJOLT -> gameJoltFlow(browserUserAgent) Store.UBISOFT -> ubisoftFlow(browserUserAgent) Store.EA -> eaFlow(browserUserAgent) + Store.ROCKSTAR -> rockstarFlow(browserUserAgent) Store.ITCH, Store.XBOX, Store.BATTLENET -> null } @@ -22,6 +23,7 @@ internal object LoginFlows { @Volatile var amazonFlow: () -> StoreLoginActivity.Flow? = { null } @Volatile var ubisoftFlow: (String) -> StoreLoginActivity.Flow? = { null } @Volatile var eaFlow: (String) -> StoreLoginActivity.Flow? = { null } + @Volatile var rockstarFlow: (String) -> StoreLoginActivity.Flow? = { null } @Volatile var gameJoltFlow: (String) -> StoreLoginActivity.Flow? = { null } private class GogFlow(private val state: String, override val userAgent: String) : StoreLoginActivity.Flow { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/Store.kt b/app/src/main/java/com/droiddeck/launcher/stores/Store.kt index b8a6e8931e..b48530fbea 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/Store.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/Store.kt @@ -9,7 +9,8 @@ enum class Store(val id: String, val label: String, val shortLabel: String) { GAMEJOLT("gamejolt", "Game Jolt", "Game Jolt"), BATTLENET("battlenet", "Battle.net", "Battle.net"), UBISOFT("ubisoft", "Ubisoft Connect", "Ubisoft"), - EA("ea", "EA", "EA"); + EA("ea", "EA", "EA"), + ROCKSTAR("rockstar", "Rockstar Games", "Rockstar"); val folder: String get() = if (this == ITCH) "itch" else shortLabel diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt index 5de9b5e1ab..5e30fb7a5d 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt @@ -67,8 +67,8 @@ object StoreAccounts { fun write(context: Context, store: Store, json: JSONObject) { unavailable.remove(store) val f = credentialsFile(context, store) - if (seal(f, json, retry = store == Store.XBOX) == null) { - check(store != Store.XBOX) { "Android Keystore is unavailable for Xbox credentials" } + if (seal(f, json, retry = store == Store.XBOX || store == Store.ROCKSTAR) == null) { + check(store != Store.XBOX && store != Store.ROCKSTAR) { "Android Keystore is unavailable for ${store.label} credentials" } put(f, json.toString()) } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt index 222b53702e..37d731a2f7 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt @@ -18,8 +18,13 @@ object StoreLaunch { const val EA_ORIGIN = "C:\\Program Files (x86)\\Origin\\Origin.exe" fun writeLauncher(folder: File, sidecar: StoreGameSidecar): StoreGameSidecar { - val needs = sidecar.args.isNotEmpty() || sidecar.env.isNotEmpty() || sidecar.store == Store.EPIC || sidecar.store == Store.EA || sidecar.store == Store.UBISOFT + val needs = sidecar.args.isNotEmpty() || sidecar.env.isNotEmpty() || sidecar.store == Store.EPIC || sidecar.store == Store.EA || sidecar.store == Store.UBISOFT || sidecar.store == Store.ROCKSTAR val file = File(folder, LAUNCHER) + if (sidecar.store == Store.ROCKSTAR && java.nio.file.Files.isSymbolicLink(file.toPath())) return sidecar.copy(launcher = null) + if (sidecar.store == Store.ROCKSTAR && !com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(sidecar.id)) { + file.delete() + return sidecar.copy(launcher = null) + } if (!needs) { file.delete(); return sidecar.copy(launcher = null) } file.writeText(launcherText(sidecar)) return sidecar.copy(launcher = LAUNCHER) @@ -32,7 +37,7 @@ object StoreLaunch { val lines = ArrayList() lines += "@echo off" lines += "setlocal" - lines += "rem Written by DroidDeck for ${sidecar.store.label}: ${sidecar.title}. Steam's shortcut runs this file." + if (sidecar.store != Store.ROCKSTAR) lines += "rem Written by DroidDeck for ${sidecar.store.label}: ${sidecar.title}. Steam's shortcut runs this file." lines += "cd /d \"%~dp0$dir\"" for ((k, v) in sidecar.env) if (ENV_NAME.matches(k)) lines += "set \"$k=${v.replace("\"", "")}\"" val args = sidecar.args.joinToString(" ") { quoteArg(it) } @@ -54,6 +59,9 @@ object StoreLaunch { lines += "del \"%~dp0$EPIC_ARGS\"" lines += "if exist \"%~dp0$EPIC_CODE\" del \"%~dp0$EPIC_CODE\"" lines += "set \"$CLIENT_VAR=\" & \"%~dp0$exe\" %$CLIENT_VAR%" + } else if (sidecar.store == Store.ROCKSTAR) { + lines += "\"C:\\Program Files\\Rockstar Games\\Launcher\\Launcher.exe\"" + lines += "exit /b %errorlevel%" } else if (sidecar.store == Store.UBISOFT) { lines += "if not exist \"%~dp0$UBISOFT_LAUNCH\" goto direct" lines += "if not exist \"$UBISOFT_SERVICE\" goto direct" @@ -93,11 +101,12 @@ object StoreLaunch { return Library.addedGame(context, game) } - /** Gives a Ubisoft game installed before it needed one the launcher that starts the launcher service. */ fun adopt(folder: File, sidecar: StoreGameSidecar): StoreGameSidecar { - if (sidecar.store != Store.UBISOFT || !sidecar.isInstalled) return sidecar + if (sidecar.store !in listOf(Store.UBISOFT, Store.ROCKSTAR) || !sidecar.isInstalled) return sidecar + if (sidecar.store == Store.ROCKSTAR && !com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(sidecar.id)) return sidecar + if (sidecar.store == Store.ROCKSTAR && java.nio.file.Files.isSymbolicLink(File(folder, LAUNCHER).toPath())) return sidecar.copy(launcher = null) val wrongExe = !sidecar.exeFile(folder).isFile || sidecar.exe.contains("installer", ignoreCase = true) || sidecar.exe.contains("autorun", ignoreCase = true) - if (sidecar.launcher == LAUNCHER && !wrongExe) return sidecar + if (sidecar.store == Store.UBISOFT && sidecar.launcher == LAUNCHER && !wrongExe) return sidecar val exe = if (wrongExe) StoreExe.pick(folder, null, sidecar.title).ifEmpty { sidecar.exe } else sidecar.exe if (exe == sidecar.exe && sidecar.launcher == LAUNCHER && runCatching { File(folder, LAUNCHER).readText() }.getOrNull() == launcherText(sidecar)) return sidecar diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt index 18f5a161e3..c89ada3f93 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt @@ -76,6 +76,14 @@ object StoreLaunchRequests { JSONObject().put("ok", true).put("code", code.written).put("reason", code.reason) } } + "rockstar-launch" -> runCatching { + lastLaunched = Store.ROCKSTAR to request.optString("id") + com.droiddeck.launcher.stores.rockstar.RockstarLaunch.prepare(app, request.optString("id")) + }.getOrElse { JSONObject().put("ok", false).put("reason", "error-" + it.javaClass.simpleName) } + "rockstar-exited" -> { + if (lastLaunched == (Store.ROCKSTAR to request.optString("id"))) lastLaunched = null + JSONObject().put("ok", true) + } "ubisoft-launch" -> { val id = request.optString("id") if (id.isEmpty()) JSONObject().put("ok", false).put("reason", "no-id") diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt index a07e0be855..54571ab172 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt @@ -66,6 +66,7 @@ class StoreLoginActivity : ComponentActivity() { val pageScript: String get() = "(function(){ try { return document.body.innerText; } catch(e){ return ''; } })()" fun pageReady(result: String): Boolean = true fun forgetSignIn(done: () -> Unit) = done() + fun pageFinished(view: WebView, url: String) {} } private var store: Store? = null @@ -283,6 +284,7 @@ class StoreLoginActivity : ComponentActivity() { } override fun onPageFinished(view: WebView?, url: String?) { + if (!isPopup && url != null && view != null) flow?.pageFinished(view, url) if (url != null && view != null && flow?.readsPage == true && flow?.isRedirect(url) == true) complete(view, url) } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt index b102c8114c..21969dfbe7 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt @@ -56,7 +56,7 @@ object StoreSizes { Store.AMAZON -> AmazonPrefs.get(app).edit().putLong("size_${item.id}", it).apply() Store.ITCH, Store.GAMEJOLT -> {} Store.EA -> com.droiddeck.launcher.stores.ea.EaPrefs.get(app).edit().putLong("size_${item.id}", it).apply() - Store.GOG, Store.XBOX, Store.BATTLENET, Store.UBISOFT -> {} + Store.GOG, Store.XBOX, Store.BATTLENET, Store.UBISOFT, Store.ROCKSTAR -> {} } } }, pool).exceptionally { error -> @@ -132,7 +132,7 @@ object StoreSizes { AmazonManifest.parse(bytes).totalInstallSize } Store.EA -> com.droiddeck.launcher.stores.ea.EaSizes.size(context, item) - Store.GOG, Store.XBOX, Store.BATTLENET, Store.UBISOFT -> 0L + Store.GOG, Store.XBOX, Store.BATTLENET, Store.UBISOFT, Store.ROCKSTAR -> 0L Store.ITCH -> com.droiddeck.launcher.stores.itch.ItchLibrary.size(context, item) Store.GAMEJOLT -> com.droiddeck.launcher.stores.gamejolt.GameJoltBuilds.size(context, item) } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarAuth.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarAuth.kt new file mode 100644 index 0000000000..781eddbe3f --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarAuth.kt @@ -0,0 +1,198 @@ +package com.droiddeck.launcher.stores.rockstar + +import android.content.Context +import android.os.Build +import android.util.Log +import android.webkit.CookieManager +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreAccounts +import org.json.JSONObject +import java.net.HttpURLConnection +import java.net.URL +import java.net.URLEncoder +import java.security.SecureRandom + +object RockstarAuth { + private const val TAG = "RockstarAuth" + const val SIGN_IN_HOST = "https://signin.rockstargames.com" + private const val LAUNCHER_SITE = "https://rgl.rockstargames.com" + private const val GATEWAY = "$LAUNCHER_SITE/api/connect/gateway" + + const val START_URL = "$SIGN_IN_HOST/robots.txt" + + const val CODE_URL = "$SIGN_IN_HOST/droiddeck/auth-code" + val SIGN_IN_URLS = listOf(SIGN_IN_HOST, LAUNCHER_SITE, "https://www.rockstargames.com", "https://socialclub.rockstargames.com") + const val COOKIE_DOMAIN = ".rockstargames.com" + + const val USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" + private const val PREFS = "stores.rockstar" + private const val TICKET_MARGIN_MS = 15 * 60 * 1000L + private val lock = Any() + + class Ticket(val ticket: String, val sessionKey: String, val sessionTicket: String, val rockstarId: String, val nickname: String, val expiresAt: Long) + + internal fun fingerprint(context: Context): JSONObject { + val p = context.applicationContext.getSharedPreferences(PREFS, Context.MODE_PRIVATE) + fun stable(key: String, bytes: Int): String = p.getString(key, null) ?: ByteArray(bytes).also { SecureRandom().nextBytes(it) } + .joinToString("") { "%02x".format(it) }.also { p.edit().putString(key, it).apply() } + val device = "DROIDDECK-" + (Build.MODEL ?: "ANDROID").uppercase().replace(Regex("[^A-Z0-9]"), "").take(12) + return fingerprintOf(device, stable("volume_serial", 4), stable("cpu_info", 8)) + } + + internal fun fingerprintOf(device: String, volume: String, cpu: String): JSONObject = JSONObject() + .put("device_name", device) + .put("machine_name", device) + .put("os_version", "10.0.19045") + .put("volume_serial", volume) + .put("cpu_info", cpu) + + internal fun state(fingerprint: JSONObject) = "{\"fp\": $fingerprint}" + + internal fun bridgeScript(fingerprint: JSONObject, title: String, codeUrl: String = CODE_URL): String = """ +(function(){ + if (window.__droiddeckRgsc) return 'again'; + window.__droiddeckRgsc = true; + var fp = $fingerprint, title = ${JSONObject.quote(title)}, back = ${JSONObject.quote(codeUrl)}, seq = 0; + function later(cb, v){ setTimeout(function(){ try { if (cb) cb(v); } catch (e) {} }, 0); } + var answers = { + GetWindowConfig: { serviceInfo: { rosPlatform: 'pc' }, platformInfo: {} }, + GetDeviceId: { fingerprintKvp: fp }, + GetVersionInfo: { isDebugSdk: false }, + GetProfileList: { profiles: [] }, + GetCommandLineArguments: { arguments: [] } + }; + window.rgscQueryCancel = function(){}; + window.rgscQuery = function(q){ + q = q || {}; + var p = q.params || {}; + if (q.method === 'CallAuthResult' && p.authCode) { + later(q.onSuccess, {}); + setTimeout(function(){ location.replace(back + '?code=' + encodeURIComponent(p.authCode)); }, 50); + } else if ((q.method === 'CallAuthResult' && p.result === 3) || (q.method === 'CallSetWindowState' && p.state === 3)) { + later(q.onSuccess, {}); + setTimeout(function(){ location.replace(back + '?cancel=1'); }, 50); + } else if (q.method === 'CallLaunchExternalBrowser' && p.url) { + window.open(p.url, '_blank'); + later(q.onSuccess, {}); + } else { + later(q.onSuccess, Object.prototype.hasOwnProperty.call(answers, q.method) ? answers[q.method] : {}); + } + return ++seq; + }; + window.rgscAddSubscription = function(s){ + s = s || {}; + if (s.method === 'OnStartAuth') later(s.onSuccess, { launchPlatform: 0, titleLaunchInfo: { activeTitleName: title, externalPlatformInfo: {} }, profile: null, errorMessage: null }); + return ++seq; + }; + var form = '/signin/user-form?cid=launcher&lang=en-US'; + fetch(form, { credentials: 'include' }) + .then(function(r){ return r.text(); }) + .then(function(h){ + history.replaceState(null, '', form); document.open(); document.write(h); document.close(); + var css = document.createElement('style'); + css.textContent = '[data-ui-name="launcherSettings"]{display:none!important}'; + (document.head || document.documentElement).appendChild(css); + }); + return 'ok'; +})() +""".trimIndent() + + fun isCodeUrl(url: String) = url.startsWith(CODE_URL) + + internal fun cancelled(url: String): Boolean = android.net.Uri.parse(url).getQueryParameter("cancel") == "1" + + internal fun codeFrom(url: String): String? = android.net.Uri.parse(url).getQueryParameter("code")?.takeIf { it.isNotBlank() } + + fun completeSignIn(context: Context, url: String): String? { + val code = codeFrom(url) ?: return "no auth code" + val fp = fingerprint(context) + val gateway = "$GATEWAY?code=" + URLEncoder.encode(code, "UTF-8") + "&fingerprint=" + URLEncoder.encode(state(fp), "UTF-8") + val c = URL(gateway).openConnection() as HttpURLConnection + c.connectTimeout = 20_000 + c.readTimeout = 25_000 + c.instanceFollowRedirects = false + c.setRequestProperty("User-Agent", USER_AGENT) + c.setRequestProperty("Accept", "application/json") + c.setRequestProperty("X-Requested-With", "XMLHttpRequest") + c.setRequestProperty("Origin", LAUNCHER_SITE) + c.setRequestProperty("Referer", "$LAUNCHER_SITE/") + runCatching { CookieManager.getInstance().getCookie(LAUNCHER_SITE) }.getOrNull()?.takeIf { it.isNotEmpty() }?.let { c.setRequestProperty("Cookie", it) } + val (status, body) = try { + val s = c.responseCode + s to ((if (s in 200..299) c.inputStream else c.errorStream)?.use { it.readBytes().toString(Charsets.UTF_8) }.orEmpty()) + } finally { + c.disconnect() + } + val o = runCatching { JSONObject(body) }.getOrNull() + val token = o?.optString("ScAuthToken")?.takeIf { it.isNotEmpty() && it != "null" } + if (token == null) { + Log.w(TAG, "gateway $status; fields ${o?.keys()?.asSequence()?.toList() ?: "not json"}") + return "gateway $status" + } + val account = JSONObject() + .put("access_token", token) + .put("remembered_machine_token", o.optString("RememberedMachineToken").takeIf { it != "null" }.orEmpty()) + .put("login_guid", o.optString("LoginGuid").takeIf { it != "null" }.orEmpty()) + .put("display_name", "Rockstar Games") + .put("signed_in_at", System.currentTimeMillis()) + StoreAccounts.write(context.applicationContext, Store.ROCKSTAR, account) + val t = runCatching { mint(context) }.onFailure { Log.w(TAG, "first ticket: ${it.message}") }.getOrNull() + if (t == null) { + StoreAccounts.clear(context.applicationContext, Store.ROCKSTAR) + return "ticket" + } + return null + } + + fun ticket(context: Context, fresh: Boolean = false): Ticket? = synchronized(lock) { + val o = StoreAccounts.read(context.applicationContext, Store.ROCKSTAR) ?: return null + if (!fresh) { + val current = stored(o) + if (com.droiddeck.launcher.session.SessionState.running && + com.droiddeck.launcher.stores.StoreLaunchRequests.lastLaunched?.first == Store.ROCKSTAR) { + return current?.takeIf { it.expiresAt > System.currentTimeMillis() } + } + current?.takeIf { it.expiresAt - System.currentTimeMillis() > TICKET_MARGIN_MS }?.let { return it } + } + runCatching { mint(context) }.onFailure { Log.w(TAG, "ticket: ${it.message}") }.getOrNull() + } + + private fun stored(o: JSONObject): Ticket? { + val t = o.optString("ticket").takeIf { it.isNotEmpty() } ?: return null + return Ticket(t, o.optString("session_key"), o.optString("session_ticket"), o.optString("rockstar_id"), o.optString("display_name"), o.optLong("ticket_expires_at")) + } + + private fun mint(context: Context): Ticket { + val app = context.applicationContext + val o = StoreAccounts.read(app, Store.ROCKSTAR) ?: throw IllegalStateException("not signed in") + val root = try { + RockstarRos.result("auth.asmx/CreateTicketScAuthToken2", listOf( + "ticket" to "", "platformName" to "pcros", "scAuthToken" to o.optString("access_token"), + "rememberedMachineToken" to o.optString("remembered_machine_token"), + ), headers = mapOf("SCS-MFAMachineFingerPrint" to state(fingerprint(app)))) + } catch (e: RockstarRos.RosException) { + if (e.code.startsWith("AuthenticationFailed")) com.droiddeck.launcher.stores.StoresState.markSignInExpired(Store.ROCKSTAR) + throw e + } + val t = parseTicket(root) ?: throw IllegalStateException("no ticket in the answer") + o.put("ticket", t.ticket).put("session_key", t.sessionKey).put("session_ticket", t.sessionTicket) + .put("rockstar_id", t.rockstarId).put("ticket_expires_at", t.expiresAt) + if (t.nickname.isNotEmpty()) o.put("display_name", t.nickname) + StoreAccounts.write(app, Store.ROCKSTAR, o) + return t + } + + internal fun parseTicket(root: org.w3c.dom.Element, now: Long = System.currentTimeMillis()): Ticket? { + val ticket = RockstarRos.text(root, "Ticket")?.takeIf { it.isNotEmpty() } ?: return null + val account = RockstarRos.first(root, "RockstarAccount") + val secs = RockstarRos.text(root, "SecsUntilExpiration")?.toLongOrNull() ?: 3600L + return Ticket( + ticket, RockstarRos.text(root, "SessionKey").orEmpty(), RockstarRos.text(root, "SessionTicket").orEmpty(), + (account?.let { RockstarRos.text(it, "RockstarId") } ?: RockstarRos.text(root, "RockstarId")).orEmpty(), + account?.let { RockstarRos.text(it, "Nickname") }.orEmpty(), + now + secs * 1000L, + ) + } + + fun signOut(context: Context) = synchronized(lock) { StoreAccounts.clear(context.applicationContext, Store.ROCKSTAR) } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarBackend.kt new file mode 100644 index 0000000000..3e878d3290 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarBackend.kt @@ -0,0 +1,206 @@ +package com.droiddeck.launcher.stores.rockstar + +import android.content.Context +import android.content.Intent +import android.util.Log +import android.webkit.WebView +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.LoginFlows +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreBackend +import com.droiddeck.launcher.stores.StoreFront +import com.droiddeck.launcher.stores.StoreInstallRoot +import com.droiddeck.launcher.stores.StoreLoginActivity +import com.droiddeck.launcher.stores.StoreShelves +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.WebCookies +import com.droiddeck.launcher.stores.download.DownloadEntry +import com.droiddeck.launcher.stores.download.DownloadQueue +import org.w3c.dom.Element + +object RockstarBackend : StoreBackend { + override val store: Store = Store.ROCKSTAR + + init { + LoginFlows.rockstarFlow = { ua -> RockstarLogin(ua) } + } + + override fun signIn(context: Context) { + context.startActivity( + Intent(context, StoreLoginActivity::class.java) + .putExtra(StoreLoginActivity.EXTRA_STORE, store.id) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK), + ) + } + + override fun signOut(context: Context) { + RockstarAuth.signOut(context.applicationContext) + RockstarLibrary.reset() + runCatching { WebCookies.expire(RockstarAuth.SIGN_IN_URLS, RockstarAuth.COOKIE_DOMAIN, listOf("/")) {} } + } + + override fun syncLibrary(context: Context, force: Boolean) { + val app = context.applicationContext + Thread({ RockstarLibrary.sync(app) }, "rockstar-sync").start() + } + + override fun loadShelves(context: Context, force: Boolean) { + StoresState.post { StoresState.shelves[store] = StoreFront.markOwned(RockstarCatalog.shelves(), StoresState.library[store], RockstarCatalog::sameGame) } + } + + override fun search(context: Context, query: String): List = + StoreFront.markOwned(RockstarCatalog.search(query), StoresState.library[store], RockstarCatalog::sameGame) + + override fun install(context: Context, item: CatalogItem, root: java.io.File) { + val app = context.applicationContext + val folder = StoreInstallRoot.folderFor(app, store, item.id, item.title, root) + val entry = DownloadEntry(store, item.id, item.title, cover = item.tallImageUrl ?: item.imageUrl, + bytesTotal = item.sizeBytes, location = StoreInstallRoot.labelFor(app, folder)) + DownloadQueue.enqueue(app, entry) { RockstarInstaller(app, item, folder) } + } + + override fun uninstall(context: Context, game: InstalledStoreGame) {} +} + +internal class RockstarLogin(override val userAgent: String) : StoreLoginActivity.Flow { + override val startUrl: String get() = RockstarAuth.START_URL + override fun isRedirect(url: String): Boolean = RockstarAuth.isCodeUrl(url) + + override fun pageFinished(view: WebView, url: String) { + if (!url.startsWith(RockstarAuth.START_URL)) return + val title = "launcher" + view.evaluateJavascript(RockstarAuth.bridgeScript(RockstarAuth.fingerprint(view.context), title)) { Log.d("RockstarLogin", "bridge: $it") } + } + + override fun forgetSignIn(done: () -> Unit) { + runCatching { WebCookies.expire(RockstarAuth.SIGN_IN_URLS, RockstarAuth.COOKIE_DOMAIN, listOf("/")) { done() } }.onFailure { done() } + } + + override fun finish(activity: StoreLoginActivity, view: WebView, url: String): String? = if (RockstarAuth.cancelled(url)) null else try { + RockstarAuth.completeSignIn(activity, url)?.let { + Log.w("RockstarLogin", "sign-in incomplete: $it") + activity.getString(R.string.stores_login_error_verification) + } + } catch (e: Exception) { + Log.w("RockstarLogin", "sign-in failed: ${e.javaClass.simpleName}") + activity.getString(R.string.stores_login_error_generic) + } +} + +internal data class RockstarApp(val id: String, val name: String, val titleId: String, val branches: List, val parent: String = "") + +internal data class RockstarBranch(val id: String, val name: String, val buildId: String, val isDefault: Boolean, val accessToken: String) { + val hasBuild: Boolean get() = (buildId.toLongOrNull() ?: 0L) > 0 && accessToken.isNotEmpty() +} + +internal data class RockstarPackage(val title: String, val featured: Boolean) + +internal class RockstarAccountApps(val apps: List, val packages: List) + +internal object RockstarApps { + fun parse(root: Element): List = RockstarRos.all(root, "App").map { a -> + val branches = RockstarRos.first(a, "Branches")?.let { RockstarRos.children(it, "Branch") }.orEmpty().map { b -> + RockstarBranch(b.getAttribute("Id"), b.getAttribute("Name"), b.getAttribute("BuildId"), + b.getAttribute("IsDefault").equals("true", true), RockstarRos.text(b, "AccessToken").orEmpty()) + } + val parent = (a.parentNode?.parentNode as? Element)?.takeIf { it.tagName == "App" }?.getAttribute("Name").orEmpty() + RockstarApp(a.getAttribute("Id"), a.getAttribute("Name"), a.getAttribute("TitleId"), branches, parent) + } + + fun packages(root: Element): List = RockstarRos.all(root, "PackageJson").mapNotNull { p -> + val o = runCatching { org.json.JSONObject(p.textContent) }.getOrNull() ?: return@mapNotNull null + o.optString("title").takeIf { it.isNotEmpty() }?.let { RockstarPackage(it, o.optBoolean("isFeatured")) } + } + + fun fetch(ticket: String, log: (String) -> Unit): RockstarAccountApps { + val root = RockstarRos.result("app.asmx/GetAppsAndPackages", listOf("ticket" to ticket)) + val out = RockstarAccountApps(parse(root), packages(root)) + log("Rockstar: packages " + out.packages.joinToString(", ") { it.title + if (it.featured) " (featured)" else "" }.ifEmpty { "none" } + + "; builds " + out.apps.filter { a -> a.branches.any { it.hasBuild } }.joinToString(", ") { it.name }.ifEmpty { "none" }) + return out + } + + fun branch(app: RockstarApp): RockstarBranch? = app.branches.firstOrNull { it.isDefault && it.hasBuild } ?: app.branches.firstOrNull { it.hasBuild } + + fun deliverer(apps: List, title: RockstarTitle): RockstarApp? = apps + .filter { RockstarTitles.byId(it.name) == title && !it.name.endsWith("_steam") && !it.name.endsWith("_epic") } + .sortedBy { if (it.name == title.id) 0 else 1 } + .firstOrNull { branch(it) != null } +} + +object RockstarLibrary { + private val generation = java.util.concurrent.atomic.AtomicInteger() + private val running = java.util.concurrent.atomic.AtomicReference(null) + + fun reset() { + generation.incrementAndGet() + StoresState.post { + StoresState.library.remove(Store.ROCKSTAR) + StoresState.shelves.remove(Store.ROCKSTAR) + } + } + + private fun post(gen: Int, block: () -> Unit) = StoresState.post { if (generation.get() == gen) block() } + + internal fun owned(account: RockstarAccountApps): List = + account.packages.filter { !it.featured }.flatMap { RockstarTitles.forName(it.title) }.distinct() + + internal fun games(account: RockstarAccountApps): List = owned(account).mapNotNull { t -> + RockstarApps.deliverer(account.apps, t)?.let { RockstarTitles.item(t, owned = true, extra = mapOf("app" to it.name, "appId" to it.id)) } + }.sortedBy { it.title.lowercase() } + + fun sync(app: Context) { + val gen = generation.get() + if (running.getAndSet(gen) == gen) return + try { + val t = RockstarAuth.ticket(app) + if (t == null) { + post(gen) { StoresState.status.remove(Store.ROCKSTAR); StoresState.problems[Store.ROCKSTAR] = app.getString(R.string.stores_sync_sign_in) } + return + } + if (StoresState.library[Store.ROCKSTAR].isNullOrEmpty()) post(gen) { StoresState.status[Store.ROCKSTAR] = app.getString(R.string.stores_sync_game_list) } + val account = RockstarApps.fetch(t.ticket) { StoresState.logLine(it) } + val games = games(account) + owned(account).filter { o -> games.none { it.id == o.id } }.takeIf { it.isNotEmpty() }?.let { elsewhere -> + StoresState.logLine("Rockstar: owned through another store, installs from there: " + elsewhere.joinToString(", ") { it.name }) + } + post(gen) { + StoresState.status.remove(Store.ROCKSTAR) + StoresState.problems.remove(Store.ROCKSTAR) + StoresState.library[Store.ROCKSTAR] = games + StoresState.shelves[Store.ROCKSTAR]?.let { StoresState.shelves[Store.ROCKSTAR] = StoreFront.markOwned(it, games, RockstarCatalog::sameGame) } + } + StoresState.logLine("Rockstar: ${games.size} owned games") + } catch (e: Exception) { + StoresState.logLine("Rockstar: library sync failed: ${e.javaClass.simpleName} ${e.message.orEmpty().take(300)}") + post(gen) { StoresState.status.remove(Store.ROCKSTAR); StoresState.problems[Store.ROCKSTAR] = app.getString(R.string.stores_sync_failed) } + } finally { + running.compareAndSet(gen, null) + } + } +} + +internal object RockstarCatalog { + fun all(): List = RockstarTitles.all.map { RockstarTitles.item(it) } + + fun shelves(): StoreShelves { + val all = all() + val newest = all.sortedByDescending { it.releaseDate } + val headline = listOf("gta5_gen9", "rdr2", "rdr", "gta4", "gtasaunreal", "lanoire", "mp3") + return StoreShelves( + whatsNew = newest, + trending = headline.mapNotNull { id -> all.firstOrNull { it.id == id } } + all.filter { it.id !in headline }, + art = all.mapNotNull { it.imageUrl }, + ) + } + + fun search(query: String): List { + val q = StoreFront.titleKey(query) + if (q.length < 2) return emptyList() + return all().filter { StoreFront.titleKey(it.title).contains(q) } + } + + fun sameGame(shelf: CatalogItem, owned: CatalogItem): Boolean = shelf.id == owned.id +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarInstaller.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarInstaller.kt new file mode 100644 index 0000000000..ac039d95f9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarInstaller.kt @@ -0,0 +1,263 @@ +package com.droiddeck.launcher.stores.rockstar + +import android.content.Context +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreExe +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreInstalls +import com.droiddeck.launcher.stores.download.DownloadQueue +import com.droiddeck.launcher.stores.download.DownloadStage +import org.w3c.dom.Element +import java.io.File +import java.io.RandomAccessFile +import java.net.HttpURLConnection +import java.net.URL +import java.nio.file.Files +import java.security.MessageDigest +import java.util.concurrent.ConcurrentLinkedQueue +import java.util.concurrent.Executors +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicBoolean +import java.util.concurrent.atomic.AtomicLong +import java.util.concurrent.atomic.AtomicReference + +internal data class RockstarChunk(val fileEntryId: String, val chunkId: String, val sha256: String, val offset: Long, val size: Long) + +internal data class RockstarFile(val entryId: String, val versionId: String, val path: String, val size: Long, val sha256: String, val chunks: List) + +internal data class RockstarBuild(val buildId: String, val version: String, val preload: Boolean, val files: List) { + val bytes: Long get() = files.sumOf { it.size } +} + +internal object RockstarManifest { + fun inside(root: File, relative: String): File { + require(safePath(relative) == relative) { "Unsafe Rockstar install path" } + val base = root.canonicalFile + var target = base + for (part in relative.split('/')) { + target = File(target, part) + require(!Files.isSymbolicLink(target.toPath())) { "Rockstar install path is a symbolic link" } + } + require(target.canonicalFile.toPath().startsWith(base.toPath())) { "Rockstar install path leaves its folder" } + return target + } + + fun verified(target: File, chunk: RockstarChunk, cancelled: () -> Boolean = { false }): Boolean { + if (cancelled()) return false + if (!target.isFile || chunk.offset < 0 || chunk.size < 0 || chunk.offset > target.length() || chunk.size > target.length() - chunk.offset) return false + return RandomAccessFile(target, "r").use { input -> + input.seek(chunk.offset) + val digest = MessageDigest.getInstance("SHA-256") + val buffer = ByteArray(256 * 1024) + var remaining = chunk.size + while (remaining > 0) { + if (cancelled()) return false + val count = input.read(buffer, 0, minOf(buffer.size.toLong(), remaining).toInt()) + if (count <= 0) return false + digest.update(buffer, 0, count) + remaining -= count + } + digest.digest().joinToString("") { "%02x".format(it) }.equals(chunk.sha256, true) + } + } + + fun safePath(raw: String): String? { + val parts = raw.replace('\\', '/').split('/').filter { it.isNotEmpty() && it != "." } + if (parts.isEmpty() || parts.any { it == ".." || it.contains(':') }) return null + return parts.joinToString("/") + } + + fun parse(root: Element): RockstarBuild { + val result = RockstarRos.first(root, "Result") ?: throw IllegalStateException("manifest without a result") + val files = RockstarRos.all(result, "FileDetails").map { f -> + val entry = f.getAttribute("FileEntryId") + val path = safePath(RockstarRos.text(f, "RelativePath").orEmpty()) ?: throw IllegalStateException("unsafe path in the manifest") + val chunks = RockstarRos.first(f, "FileChunks")?.let { RockstarRos.children(it, "Chunk") }.orEmpty().map { c -> + RockstarChunk(entry, c.getAttribute("FileChunkId"), c.getAttribute("SHA256Hash").lowercase(), + c.getAttribute("StartByteOffset").toLong(), c.getAttribute("Size").toLong()) + } + val whole = RockstarRos.children(f, "SHA256Hash").firstOrNull()?.textContent?.trim()?.lowercase().orEmpty() + RockstarFile(entry, f.getAttribute("FileEntryVersionId"), path, f.getAttribute("FileSize").toLong(), whole, chunks) + } + return RockstarBuild(result.getAttribute("BuildId"), result.getAttribute("VersionNumber"), + RockstarRos.text(result, "IsPreload").equals("true", true), files) + } + + fun batches(chunks: List, maxBytes: Long = 48L * 1024 * 1024, maxCount: Int = 16): List> { + val out = ArrayList>() + var cur = ArrayList() + var bytes = 0L + for (c in chunks) { + if (cur.isNotEmpty() && (bytes + c.size > maxBytes || cur.size >= maxCount)) { out += cur; cur = ArrayList(); bytes = 0 } + cur += c + bytes += c.size + } + if (cur.isNotEmpty()) out += cur + return out + } + + fun key(file: RockstarFile, chunk: RockstarChunk) = "${file.versionId}:${chunk.chunkId}" +} + +internal class RockstarInstaller( + private val app: Context, + private val item: CatalogItem, + private val folder: File, +) : DownloadQueue.DownloadJob { + private val cancelled = AtomicBoolean(false) + + override fun run(handle: DownloadQueue.JobHandle): String? { + handle.stage(DownloadStage.MANIFEST, app.getString(R.string.stores_sync_sign_in)) + val ticket = RockstarAuth.ticket(app)?.ticket ?: throw IllegalStateException("Not signed in to Rockstar Games") + val title = RockstarTitles.byId(item.id) ?: throw IllegalStateException("Rockstar has no PC build of ${item.title}") + val account = RockstarApps.fetch(ticket) { handle.log(it) } + if (title !in RockstarLibrary.owned(account)) throw IllegalStateException("${item.title} is not in this Rockstar account's library") + val owned = RockstarApps.deliverer(account.apps, title) + ?: throw IllegalStateException("${item.title} is owned through another store and installs from there") + val branch = RockstarApps.branch(owned)!! + handle.log("rockstar: ${owned.name} branch ${branch.name} build ${branch.buildId}") + val build = RockstarManifest.parse(RockstarRos.result("app.asmx/GetBuildManifestFull", listOf("ticket" to ticket, "branchAccessToken" to branch.accessToken))) + if (build.preload) throw IllegalStateException("${item.title} is a preload Rockstar has not unlocked yet") + handle.log("rockstar: build ${build.buildId} ${build.version}, ${build.files.size} files, ${build.bytes} bytes") + handle.diskSize(build.bytes) + val cover = item.tallImageUrl ?: item.imageUrl + StoreInstalls.begin(folder, Store.ROCKSTAR, item.id, item.title, cover, item.imageUrl) + if (cancelled.get()) return null + + val ledger = RockstarManifest.inside(folder, LEDGER) + val done = HashSet().apply { if (ledger.isFile) ledger.readLines().filterTo(this) { it.isNotBlank() } } + val pending = ArrayList>() + var have = 0L + for (f in build.files) { + if (cancelled.get()) return null + val target = RockstarManifest.inside(folder, f.path) + target.parentFile?.mkdirs() + for (c in f.chunks) { + if (cancelled.get()) return null + if (RockstarManifest.key(f, c) in done && RockstarManifest.verified(target, c, cancelled::get)) have += c.size else pending += f to c + } + if (cancelled.get()) return null + RandomAccessFile(target, "rw").use { if (it.length() != f.size) it.setLength(f.size) } + } + val fileOf = pending.associate { (f, c) -> "${c.fileEntryId}:${c.chunkId}" to f } + val total = build.bytes + val progress = AtomicLong(have) + handle.stage(DownloadStage.DOWNLOAD) + handle.progress(have, total, "Downloading (${build.files.size} files)") + + val queue = ConcurrentLinkedQueue(RockstarManifest.batches(pending.map { it.second })) + val failure = AtomicReference(null) + val pool = Executors.newFixedThreadPool(WORKERS, DownloadQueue.workerFactory("rockstar-dl")) + val ledgerLock = Any() + repeat(WORKERS) { + pool.execute { + while (!cancelled.get() && failure.get() == null) { + val batch = queue.poll() ?: break + try { + val urls = chunkUrls(ticket, branch.accessToken, batch) + for (c in batch) { + if (cancelled.get()) break + val f = fileOf.getValue("${c.fileEntryId}:${c.chunkId}") + fetch({ retry -> (if (retry) null else urls[c.chunkId]) ?: chunkUrls(ticket, branch.accessToken, listOf(c)).getValue(c.chunkId) }, RockstarManifest.inside(folder, f.path), c, progress) { + handle.progress(progress.get(), total, "Downloading (${build.files.size} files)") + } + synchronized(ledgerLock) { ledger.appendText(RockstarManifest.key(f, c) + "\n") } + } + } catch (t: Throwable) { + failure.compareAndSet(null, t) + } + } + } + } + pool.shutdown() + while (!pool.awaitTermination(250, TimeUnit.MILLISECONDS)) Unit + if (cancelled.get()) return null + failure.get()?.let { throw it } + + handle.interruptible(false) + handle.stage(DownloadStage.INSTALL, app.getString(R.string.stores_registering)) + val exe = resolve(folder, title.exe) ?: StoreExe.pick(folder, null, item.title).ifEmpty { title.exe.replace('\\', '/') } + handle.log("rockstar: exe=$exe") + val sidecar = StoreGameSidecar( + Store.ROCKSTAR, item.id, item.title, exe = exe, + installVersion = build.version.ifEmpty { build.buildId }, installedAt = System.currentTimeMillis(), + cover = cover, hero = item.imageUrl, cloud = false, + extra = mapOf("rosTitleId" to title.rosTitleId.toString(), "app" to owned.name, "buildId" to build.buildId, "platform" to title.platform), + ) + StoreInstalls.complete(app, folder, sidecar, onStep = { d, steps -> handle.stageProgress(d.toLong(), steps.toLong()) }) + ledger.delete() + return folder.path + } + + private fun chunkUrls(ticket: String, branchToken: String, batch: List): Map { + val csv = batch.joinToString(",") { "${it.fileEntryId}:${it.chunkId}" } + val root = RockstarRos.result("app.asmx/RetrieveFileChunkMulti", listOf("ticket" to ticket, "branchAccessToken" to branchToken, "fileEntryAndChunkIdCsv" to csv)) + return RockstarRos.all(root, "Chunk").mapNotNull { c -> RockstarRos.text(c, "RedirectUrl")?.let { c.getAttribute("FileChunkId") to it } }.toMap() + } + + private fun fetch(url: (Boolean) -> String, target: File, chunk: RockstarChunk, progress: AtomicLong, report: () -> Unit) { + var lastError: Exception? = null + for (attempt in 0 until 3) { + if (cancelled.get()) return + val written = AtomicLong(0) + try { + val c = URL(url(attempt > 0)).openConnection() as HttpURLConnection + c.connectTimeout = 20_000 + c.readTimeout = 60_000 + try { + if (c.responseCode != 200) throw java.io.IOException("chunk ${chunk.chunkId}: HTTP ${c.responseCode}") + val digest = MessageDigest.getInstance("SHA-256") + RandomAccessFile(target, "rw").use { out -> + out.seek(chunk.offset) + c.inputStream.use { input -> + val buf = ByteArray(256 * 1024) + var last = 0L + while (true) { + if (cancelled.get()) { progress.addAndGet(-written.get()); return } + val n = input.read(buf) + if (n < 0) break + if (written.get() + n > chunk.size) throw java.io.IOException("chunk ${chunk.chunkId} is longer than the manifest says") + out.write(buf, 0, n) + digest.update(buf, 0, n) + written.addAndGet(n.toLong()) + progress.addAndGet(n.toLong()) + val now = System.currentTimeMillis() + if (now - last > 400) { last = now; report() } + } + } + } + val hex = digest.digest().joinToString("") { "%02x".format(it) } + if (written.get() != chunk.size || hex != chunk.sha256) throw java.io.IOException("chunk ${chunk.chunkId} failed its check") + report() + return + } finally { + c.disconnect() + } + } catch (e: Exception) { + progress.addAndGet(-written.get()) + lastError = e + } + } + throw lastError ?: java.io.IOException("chunk ${chunk.chunkId} failed") + } + + override fun cancel(deleteFiles: Boolean) { + cancelled.set(true) + if (deleteFiles) StoreInstalls.discard(app, folder, emptyList()) + } + + internal companion object { + const val LEDGER = ".droiddeck-rockstar-chunks" + private const val WORKERS = 4 + + fun resolve(folder: File, configured: String): String? { + var at = folder + for (part in configured.replace('\\', '/').split('/').filter { it.isNotEmpty() }) { + at = at.listFiles()?.firstOrNull { it.name.equals(part, ignoreCase = true) } ?: return null + } + return if (at.isFile) at.relativeTo(folder).invariantSeparatorsPath else null + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunch.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunch.kt new file mode 100644 index 0000000000..c83b6548d8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunch.kt @@ -0,0 +1,56 @@ +package com.droiddeck.launcher.stores.rockstar + +import android.content.Context +import com.droiddeck.launcher.session.GameEnvironmentStore +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreInstallRoot +import org.json.JSONObject +import java.security.MessageDigest +import java.util.Base64 + +object RockstarLaunch { + internal val pipes = mapOf("gta3" to "GTA3_Pipe", "gtavc" to "GTA-VC_Pipe", "gtasa" to "GTA_SA_Pipe") + + fun supports(id: String?) = id != null && id in pipes + + fun applyDefaults(app: Context, id: String, appId: Long) { + val scope = (appId and 0xffffffffL).toString() + when (id) { + "gta3" -> GameEnvironmentStore.setDefault(app, scope, "FEX_X87REDUCEDPRECISION", "0") + "gtasa" -> GameEnvironmentStore.setDefault(app, scope, "PROTON_USE_WINED3D", "1") + } + } + + fun prepare(app: Context, id: String): JSONObject { + val pipe = pipes[id] ?: return failure("unsupported-title") + val title = RockstarTitles.byId(id) ?: return failure("unknown-title") + val folder = StoreInstallRoot.gameFolders(app).firstOrNull { folder -> + StoreGameSidecar.read(folder)?.let { it.store == Store.ROCKSTAR && it.id == id && it.isInstalled } == true + } ?: return failure("not-installed") + val installed = StoreGameSidecar.read(folder) ?: return failure("not-installed") + val exe = installed.exeFile(folder).canonicalFile + if (!exe.path.startsWith(folder.canonicalPath + java.io.File.separator) || !exe.isFile || + !java.io.File(folder, "MTLX.dll").isFile) return failure("missing-game-files") + var ticket = RockstarAuth.ticket(app) ?: RockstarAuth.ticket(app, fresh = true) ?: return failure("signed-out") + val account = try { + RockstarApps.fetch(ticket.ticket) {} + } catch (e: RockstarRos.RosException) { + if (!(e.code.contains("Ticket", true) || e.code.contains("Sign", true) || e.code.contains("Auth", true))) throw e + ticket = RockstarAuth.ticket(app, fresh = true) ?: return failure("signed-out") + RockstarApps.fetch(ticket.ticket) {} + } + if (RockstarLibrary.owned(account).none { it.id == id } || RockstarApps.deliverer(account.apps, title) == null) return failure("not-owned") + val tokenRoot = RockstarRos.result("app.asmx/GetTitleAccessToken2", listOf("ticket" to ticket.ticket, "titleId" to title.rosTitleId.toString(), "platformId" to "8")) + val token = RockstarRos.text(tokenRoot, "Result")?.takeIf { it.isNotEmpty() } ?: return failure("no-title-token") + val hash = MessageDigest.getInstance("SHA-256").digest(RockstarAuth.fingerprint(app).toString().toByteArray()).copyOf(16) + val launch = RockstarRos.result("app.asmx/GetTitleLaunchData", listOf("ticket" to ticket.ticket, "titleAccessToken" to token, + "machineHash" to Base64.getEncoder().encodeToString(hash))) + val encoded = RockstarRos.text(launch, "Data") ?: return failure("no-launch-data") + val iv = RockstarRos.text(launch, "EndpointIV") ?: return failure("no-launch-iv") + val material = RockstarLaunchCipher.decode(encoded, iv) + return JSONObject().put("ok", true).put("pipe", pipe).put("material", material).put("expiresAt", System.currentTimeMillis() + 90_000) + } + + private fun failure(reason: String) = JSONObject().put("ok", false).put("reason", reason) +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunchCipher.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunchCipher.kt new file mode 100644 index 0000000000..dd65b40b7c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunchCipher.kt @@ -0,0 +1,66 @@ +package com.droiddeck.launcher.stores.rockstar + +import java.nio.ByteBuffer +import java.nio.ByteOrder +import java.util.Base64 + +internal object RockstarLaunchCipher { + private val data by lazy { + val bytes = requireNotNull(javaClass.getResourceAsStream("/rockstar/legacy-cipher.bin")).use { it.readBytes() } + require(bytes.size == 86852 && bytes.copyOfRange(0, 8).contentEquals("DDRGLC01".toByteArray())) + bytes + } + private val tables by lazy { + ByteBuffer.wrap(data, 8, 86016).order(ByteOrder.LITTLE_ENDIAN).asIntBuffer().let { buffer -> IntArray(buffer.remaining()).also { buffer.get(it) } } + } + private val order = intArrayOf(0, 7, 10, 13, 1, 4, 11, 14, 2, 5, 8, 15, 3, 6, 9, 12) + + internal fun decrypt(cipher: ByteArray, iv: ByteArray, inner: Boolean): ByteArray { + require(cipher.isNotEmpty() && cipher.size <= 65536 && cipher.size % 16 == 0 && iv.size == 16) + val map = 86024 + val key = map + 272 + if (inner) 272 else 0 + val keys = ByteBuffer.wrap(data, key, 272).order(ByteOrder.LITTLE_ENDIAN).asIntBuffer().let { buffer -> IntArray(68).also { buffer.get(it) } } + val output = ByteArray(cipher.size) + var previous = iv + for (offset in cipher.indices step 16) { + var state = cipher.copyOfRange(offset, offset + 16) + for (round in 0..16) { + val next = ByteBuffer.allocate(16).order(ByteOrder.LITTLE_ENDIAN) + for (column in 0..3) { + var word = keys[round * 4 + column] + for (slot in column * 4 until column * 4 + 4) { + val index = if (round == 0 || round == 1 || round == 16) slot else order[slot] + val table = data[map + round * 16 + index].toInt() and 255 + require(table < 84) + word = word xor tables[table * 256 + (state[index].toInt() and 255)] + } + next.putInt(word) + } + state = next.array() + } + for (i in 0..15) output[offset + i] = (state[i].toInt() xor previous[i].toInt()).toByte() + previous = cipher.copyOfRange(offset, offset + 16) + } + val padding = output.last().toInt() and 255 + require(padding in 1..16 && output.takeLast(padding).all { (it.toInt() and 255) == padding }) + return output.copyOf(output.size - padding) + } + + fun decode(encoded: String, endpointIv: String): String { + require(encoded.length <= 90000 && endpointIv.length <= 32) + val clear = decrypt(Base64.getDecoder().decode(encoded), Base64.getDecoder().decode(endpointIv), false) + require(clear.size > 128) + val xml = clear.copyOf(clear.size - 128).toString(Charsets.UTF_8) + val root = RockstarRos.parse(xml) + require(root.tagName == "EncryptedResponse") + val date = requireNotNull(RockstarRos.text(root, "CreationDate")).toLong() + require(date in 0..0xffffffffL) + val text = requireNotNull(RockstarRos.text(root, "Data")) + require(text.length == 672 && text.all { it.digitToIntOrNull(16) != null }) + val cipher = ByteArray(text.length / 2) { i -> text.substring(i * 2, i * 2 + 2).toInt(16).toByte() } + val iv = ByteBuffer.allocate(16).order(ByteOrder.LITTLE_ENDIAN).put(data, data.size - 12, 12).putInt(date.toInt()).array() + val material = decrypt(cipher, iv, true) + require(material.size == 320) + return material.joinToString("") { "%02X".format(it) } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarRos.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarRos.kt new file mode 100644 index 0000000000..88217aed08 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarRos.kt @@ -0,0 +1,96 @@ +package com.droiddeck.launcher.stores.rockstar + +import org.w3c.dom.Element +import java.io.ByteArrayInputStream +import java.net.HttpURLConnection +import java.net.URL +import java.net.URLEncoder +import javax.xml.XMLConstants +import javax.xml.parsers.DocumentBuilderFactory + +internal object RockstarRos { + const val HOST = "https://rgl-prod.ros.rockstargames.com" + const val PUBLIC_HOST = "https://prod.ros.rockstargames.com" + const val SERVICES = "/launcher/11/launcherservices/" + private const val MAX_BYTES = 32 * 1024 * 1024 + + class RosException(message: String, val code: String = "", val status: Int = 0) : Exception(message) + + class Reply(val status: Int, val body: String) + + fun form(fields: List>): String = + fields.joinToString("&") { (k, v) -> "$k=" + URLEncoder.encode(v, "UTF-8") } + + fun call(method: String, fields: List>, host: String = HOST, headers: Map = emptyMap()): Reply { + val c = URL(host + SERVICES + method).openConnection() as HttpURLConnection + c.requestMethod = "POST" + c.connectTimeout = 20_000 + c.readTimeout = 60_000 + c.instanceFollowRedirects = false + c.doOutput = true + c.setRequestProperty("Content-Type", "application/x-www-form-urlencoded; charset=utf-8") + c.setRequestProperty("User-Agent", RockstarAuth.USER_AGENT) + for ((k, v) in headers) c.setRequestProperty(k, v) + try { + c.outputStream.use { it.write(form(fields).toByteArray(Charsets.UTF_8)) } + val status = c.responseCode + val stream = (if (status in 200..299) c.inputStream else c.errorStream) + val bytes = stream?.use { input -> + val out = java.io.ByteArrayOutputStream() + val buf = ByteArray(64 * 1024) + while (true) { + val n = input.read(buf) + if (n < 0) break + out.write(buf, 0, n) + if (out.size() > MAX_BYTES) throw RosException("$method: answer too large", status = status) + } + out.toByteArray() + } ?: ByteArray(0) + return Reply(status, bytes.toString(Charsets.UTF_8)) + } finally { + c.disconnect() + } + } + + fun result(method: String, fields: List>, host: String = HOST, headers: Map = emptyMap()): Element { + val reply = call(method, fields, host, headers) + if (reply.status !in 200..299) throw RosException("$method: HTTP ${reply.status}", status = reply.status) + val root = runCatching { parse(reply.body) }.getOrNull() + ?: throw RosException("$method: HTTP ${reply.status} invalid response", status = reply.status) + if (text(root, "Status") != "1") { + val error = first(root, "Error") + val code = listOfNotNull(error?.getAttribute("Code")?.takeIf { it.isNotEmpty() }, error?.getAttribute("CodeEx")?.takeIf { it.isNotEmpty() }).joinToString("/") + throw RosException("$method: ${code.ifEmpty { "HTTP ${reply.status}" }}", code, reply.status) + } + return root + } + + fun parse(xml: String): Element { + require(!xml.contains(" 0) it.item(0) as Element else null } + + fun all(root: Element, tag: String): List = root.getElementsByTagName(tag).let { l -> (0 until l.length).map { l.item(it) as Element } } + + fun text(root: Element, tag: String): String? = first(root, tag)?.textContent?.trim() + + fun children(parent: Element, tag: String): List { + val out = ArrayList() + var n = parent.firstChild + while (n != null) { + if (n is Element && n.tagName == tag) out += n + n = n.nextSibling + } + return out + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarTitles.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarTitles.kt new file mode 100644 index 0000000000..bbbc0e69dd --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarTitles.kt @@ -0,0 +1,84 @@ +package com.droiddeck.launcher.stores.rockstar + +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store + +internal data class RockstarTitle( + val id: String, + val rosTitleId: Int, + val name: String, + val exe: String, + val registryKey: String, + val steamAppId: Int, + val released: String, + val platform: String = "pcros", + val description: String = "", + val page: String = "", +) + +internal object RockstarTitles { + private const val ART = "https://cdn.cloudflare.steamstatic.com/steam/apps/" + + val all = listOf( + RockstarTitle("gta5_gen9", 11, "Grand Theft Auto V Enhanced", "GTA5_Enhanced.exe", "Rockstar Games\\GTAV Enhanced", 3240220, "2025-03-04", platform = "pcrosalt", + description = "Story mode and GTA Online with ray-traced visuals, faster loading and DualSense support.", + page = "https://www.rockstargames.com/gta-v"), + RockstarTitle("gta5", 11, "Grand Theft Auto V Legacy", "GTA5.exe", "Rockstar Games\\Grand Theft Auto V", 271590, "2015-04-14", + description = "Three criminals, one city: the original PC release of Grand Theft Auto V.", + page = "https://www.rockstargames.com/gta-v"), + RockstarTitle("rdr2", 13, "Red Dead Redemption 2", "RDR2.exe", "Rockstar Games\\Red Dead Redemption 2", 1174180, "2019-11-05", + description = "Arthur Morgan and the Van der Linde gang on the run at the end of the outlaw era.", + page = "https://www.rockstargames.com/reddeadredemption2"), + RockstarTitle("rdr", 8, "Red Dead Redemption", "RDR.exe", "Rockstar Games\\Red Dead Redemption", 2668510, "2024-10-29", + description = "John Marston's story, with the Undead Nightmare expansion.", + page = "https://www.rockstargames.com/reddeadredemption"), + RockstarTitle("gta4", 1, "Grand Theft Auto IV: The Complete Edition", "GTAIV.exe", "Rockstar Games\\Grand Theft Auto IV", 12210, "2008-12-02", + description = "Niko Bellic's Liberty City, with The Lost and Damned and The Ballad of Gay Tony.", + page = "https://www.rockstargames.com/games/IV"), + RockstarTitle("lanoire", 9, "L.A. Noire", "LANoire.exe", "Rockstar Games\\LANoireMTL", 110800, "2011-11-08", + description = "A detective story in 1947 Los Angeles.", + page = "https://www.rockstargames.com/games/lanoire"), + RockstarTitle("lanoirevr", 24, "L.A. Noire: The VR Case Files", "LANoireVR.exe", "Rockstar Games\\LANoireVR", 722230, "2017-12-15", + description = "Seven cases from L.A. Noire rebuilt for virtual reality."), + RockstarTitle("mp3", 10, "Max Payne 3", "MaxPayne3.exe", "Rockstar Games\\MP3MTL", 204100, "2012-05-29", + description = "Max Payne, years after New York, working private security in São Paulo.", + page = "https://www.rockstargames.com/games/maxpayne3"), + RockstarTitle("bully", 23, "Bully: Scholarship Edition", "Bully.exe", "Rockstar Games\\Bully", 12200, "2008-10-21", + description = "Jimmy Hopkins against the bullies, teachers and cliques of Bullworth Academy.", page = "https://www.rockstargames.com/bully"), + RockstarTitle("gta3unreal", 28, "Grand Theft Auto III – The Definitive Edition", "Gameface\\Binaries\\Win64\\LibertyCity.exe", "Rockstar Games\\GTA III - DE", 1546970, "2021-11-11", + description = "Liberty City, remastered with new lighting, controls and visual detail."), + RockstarTitle("gtavcunreal", 29, "Grand Theft Auto: Vice City – The Definitive Edition", "Gameface\\Binaries\\Win64\\ViceCity.exe", "Rockstar Games\\GTA Vice City - DE", 1546990, "2021-11-11", + description = "Tommy Vercetti's 1980s Vice City, remastered with new lighting, controls and visual detail."), + RockstarTitle("gtasaunreal", 30, "Grand Theft Auto: San Andreas – The Definitive Edition", "Gameface\\Binaries\\Win64\\SanAndreas.exe", "Rockstar Games\\GTA San Andreas - DE", 1547000, "2021-11-11", + description = "CJ's return to San Andreas, remastered with new lighting, controls and visual detail."), + RockstarTitle("gtasa", 18, "Grand Theft Auto: San Andreas", "gta_sa.exe", "Rockstar Games\\GTA: San Andreas", 12120, "2005-06-07", + description = "Carl Johnson's return to Los Santos and the state of San Andreas.", page = "https://www.rockstargames.com/games/sanandreas"), + RockstarTitle("gtavc", 27, "Grand Theft Auto: Vice City", "gta-vc.exe", "Rockstar Games\\Grand Theft Auto: Vice City", 12110, "2003-05-12", + description = "Tommy Vercetti's rise through 1980s Vice City.", page = "https://www.rockstargames.com/games/vicecity"), + RockstarTitle("gta3", 26, "Grand Theft Auto III", "gta3.exe", "Rockstar Games\\Grand Theft Auto III", 12100, "2002-05-20", + description = "Claude's revenge in Liberty City, the game that took the series into 3D.", page = "https://www.rockstargames.com/games/grandtheftauto3"), + ) + + private val byId = all.associateBy { it.id } + + private val PARENTS = mapOf( + "rdr2_sp" to "rdr2", "rdr2_rdo" to "rdr2", "rdr2_sp_rgl" to "rdr2", "rdr2_sp_steam" to "rdr2", "rdr2_sp_epic" to "rdr2", + "gtatrilogy" to "gtasaunreal", + ) + + fun forName(name: String): List = + if (name.equals("gtatrilogy", true)) listOf("gta3unreal", "gtavcunreal", "gtasaunreal").mapNotNull { byId[it] } else listOfNotNull(byId(name)) + + fun byId(id: String?): RockstarTitle? = id?.lowercase()?.let { byId[it] ?: byId[PARENTS[it]] } + + fun cover(t: RockstarTitle) = "$ART${t.steamAppId}/library_600x900.jpg" + fun hero(t: RockstarTitle) = "$ART${t.steamAppId}/library_hero.jpg" + fun wide(t: RockstarTitle) = "$ART${t.steamAppId}/header.jpg" + + fun item(t: RockstarTitle, owned: Boolean = false, extra: Map = emptyMap()) = CatalogItem( + store = Store.ROCKSTAR, id = t.id, title = t.name, imageUrl = hero(t), tallImageUrl = cover(t), + storeUrl = t.page.ifEmpty { "https://store.rockstargames.com" }, developer = "Rockstar Games", publisher = "Rockstar Games", + releaseDate = t.released, description = t.description, owned = owned, mature = true, + extra = mapOf("rosTitleId" to t.rosTitleId.toString()) + extra, + ) +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index bee82bbd2c..729fc5ad19 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -400,6 +400,7 @@ internal fun GameActions( val failed = rawDownload?.takeIf { it.state == DownloadState.FAILED } val cloud = game?.library == Library.XBOX_CLOUD && installed == null val downloadBytes = catalogSize(item) + val launchSupported = store != Store.ROCKSTAR || com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(id) Actions { when { s.shortcutPicker && game != null -> { @@ -411,8 +412,8 @@ internal fun GameActions( val xboxBusy = store == Store.XBOX && id != null && XboxContent.busy(id) val preparing = (game?.launchKey ?: storeKey)?.let { it in s.preparingGames } == true PrimaryButton( - stringResource(if (preparing) R.string.store_starting else R.string.stores_play), - enabled = !s.busy && !preparing && gone == null && download == null && !xboxBusy && (store != Store.GOG || installed?.sidecar?.isInstalled != false), + stringResource(if (!launchSupported) R.string.stores_rockstar_launch_unavailable else if (preparing) R.string.store_starting else R.string.stores_play), + enabled = launchSupported && !s.busy && !preparing && gone == null && download == null && !xboxBusy && (store != Store.GOG || installed?.sidecar?.isInstalled != false), main = true, icon = Icons.Filled.PlayArrow, modifier = leadOn, ) { if (game != null) a.onSteamGame(game) else if (store != null && id != null) launchStoreGame(store, id, s, a) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt index 2fea8fc891..f1afd42c0d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt @@ -35,6 +35,7 @@ internal fun sourceColours(source: String): SourceColours = when (source) { Store.BATTLENET.id -> SourceColours(Color(0xFF0A2440), Color(0xFF9DD1FF), Color(0xFF148EFF)) Store.UBISOFT.id -> SourceColours(Color(0xFF0B1E44), Color(0xFFA8C6FF), Color(0xFF2E7DFF)) Store.EA.id -> SourceColours(Color(0xFF3A0E12), Color(0xFFFF9A9A), Color(0xFFFF4747)) + Store.ROCKSTAR.id -> SourceColours(Color(0xFF3A2A06), Color(0xFFFFD780), Color(0xFFFCAF17)) Library.SOURCE_STEAM -> SourceColours(Color(0xFF16293D), Color(0xFF7CC4FF), Color(0xFF1A9FFF)) FLATHUB -> SourceColours(Color(0xFF0B2E2B), Color(0xFF9FE3DD), FlathubTeal) else -> SourceColours(Color(0xFF1A1D22), Color(0xFF9AA3AF), Color(0xFF9AA3AF)) @@ -52,6 +53,7 @@ internal fun sourceLabel(source: String): String = when (source) { Store.BATTLENET.id -> Store.BATTLENET.label Store.UBISOFT.id -> Store.UBISOFT.shortLabel Store.EA.id -> Store.EA.label + Store.ROCKSTAR.id -> Store.ROCKSTAR.shortLabel else -> stringResource(R.string.source_added) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt index 8988e16a17..d8daa53d58 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt @@ -85,6 +85,7 @@ import com.droiddeck.launcher.R import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.stores.CatalogItem import com.droiddeck.launcher.stores.StoreLanguage +import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoresState import com.droiddeck.launcher.stores.download.DownloadEntry import com.droiddeck.launcher.stores.download.DownloadQueue @@ -220,7 +221,7 @@ private fun FinishedRow(d: DownloadEntry, s: FrontEndState, a: FrontEndActions, val ctx = LocalContext.current ArtStrip(d.cover, d.name) { StripLabel(d.name, d.store.id, stringResource(if (d.state == DownloadState.INSTALLED) R.string.stores_installed_chip else R.string.stores_dl_cancelled), Color.White.copy(alpha = 0.72f)) - if (d.state == DownloadState.INSTALLED) Box(Modifier.bloomIn(bloom, GATHER_HOLD_MS + 150)) { + if (d.state == DownloadState.INSTALLED && (d.store != Store.ROCKSTAR || com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(d.id))) Box(Modifier.bloomIn(bloom, GATHER_HOLD_MS + 150)) { RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else if (d.key == com.droiddeck.launcher.stores.battlenet.BattleNetClient.DOWNLOAD_KEY) a.onBattleNet() else launchStoreGame(d.store, d.id, s, a) } } } @@ -373,7 +374,7 @@ private fun DownloadCard(d: DownloadEntry, s: FrontEndState, a: FrontEndActions) RoundAction(Icons.Filled.Refresh, stringResource(R.string.stores_dl_resume), primary = true) { DownloadQueue.retry(ctx, d.key) } CancelAction { DownloadQueue.clear(ctx, d.key) } } - DownloadState.INSTALLED -> Box(Modifier.bloomIn(true, 420)) { + DownloadState.INSTALLED -> if (d.store != Store.ROCKSTAR || com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(d.id)) Box(Modifier.bloomIn(true, 420)) { RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else if (d.key == com.droiddeck.launcher.stores.battlenet.BattleNetClient.DOWNLOAD_KEY) a.onBattleNet() else launchStoreGame(d.store, d.id, s, a) } } DownloadState.CANCELLED -> {} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index 4e2c210b62..e5005a018e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -1168,6 +1168,7 @@ internal fun storePalette(base: Palette, store: Store?): Palette { Store.BATTLENET -> Color(0xFF148EFF) to Color(0xFF0B6BD3) Store.UBISOFT -> Color(0xFF2E7DFF) to Color(0xFF1A5BD6) Store.EA -> Color(0xFFFF4747) to Color(0xFFE03030) + Store.ROCKSTAR -> Color(0xFFFCAF17) to Color(0xFFD98E00) null -> return base } val on = if (accent.luminance() > 0.18f) Color(0xFF0B0B0D) else Color.White diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4d2e7cfe52..b543ff3d78 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3998,5 +3998,6 @@ Scarlet Snow White surfaces with red accents. + Launch unavailable No web browser is available to open this link. diff --git a/app/src/main/resources/rockstar/legacy-cipher.bin b/app/src/main/resources/rockstar/legacy-cipher.bin new file mode 100644 index 0000000000000000000000000000000000000000..b70beb43ed5c0622878ac36997fa03c338535a53 GIT binary patch literal 86852 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
itKpDzo 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 v!5-cVGQbI+XCGwH9MKQ$gK2$%") + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarTest.kt new file mode 100644 index 0000000000..e356683511 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarTest.kt @@ -0,0 +1,299 @@ +package com.droiddeck.launcher.stores.rockstar + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], application = android.app.Application::class) +class RockstarTest { + @Test fun launcherAdoptionDoesNotFollowSymbolicLinks() { + val folder = java.nio.file.Files.createTempDirectory("rockstar-launch-link").toFile() + val outside = java.io.File.createTempFile("rockstar-keep", ".txt").apply { writeText("keep") } + val link = java.io.File(folder, com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER) + try { + try { + java.nio.file.Files.createSymbolicLink(link.toPath(), outside.toPath()) + } catch (e: java.nio.file.FileSystemException) { + org.junit.Assume.assumeNoException(e) + } + java.io.File(folder, "gta3.exe").writeText("game") + val game = com.droiddeck.launcher.stores.StoreGameSidecar(com.droiddeck.launcher.stores.Store.ROCKSTAR, "gta3", "GTA III", "gta3.exe", launcher = com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER) + assertNull(com.droiddeck.launcher.stores.StoreLaunch.adopt(folder, game).launcher) + assertNull(com.droiddeck.launcher.stores.StoreLaunch.writeLauncher(folder, game).launcher) + assertEquals("keep", outside.readText()) + assertTrue(java.nio.file.Files.isSymbolicLink(link.toPath())) + } finally { + java.nio.file.Files.deleteIfExists(link.toPath()) + folder.deleteRecursively() + outside.delete() + } + } + + @Test fun resumeHashingStopsWhenCancelled() { + val file = java.io.File.createTempFile("rockstar-hash", ".bin") + try { + val bytes = ByteArray(1024 * 1024) + file.writeBytes(bytes) + val hash = java.security.MessageDigest.getInstance("SHA-256").digest(bytes).joinToString("") { "%02x".format(it) } + val chunk = RockstarChunk("1", "1", hash, 0, bytes.size.toLong()) + var checks = 0 + assertFalse(RockstarManifest.verified(file, chunk) { ++checks >= 3 }) + assertEquals(3, checks) + assertTrue(RockstarManifest.verified(file, chunk)) + } finally { + file.delete() + } + } + + @Test fun unsupportedGamesKeepTheirFilesWithoutRegisteringALauncher() { + val app = org.robolectric.RuntimeEnvironment.getApplication() + com.droiddeck.launcher.session.SessionPrefs.setGameStorage(app, com.droiddeck.launcher.session.SessionPrefs.GAME_STORAGE_OFF, "") + val folder = java.io.File(com.droiddeck.launcher.stores.StoreInstallRoot.storeDir(com.droiddeck.launcher.stores.StoreInstallRoot.installRoot(app), com.droiddeck.launcher.stores.Store.ROCKSTAR), "RDR2").apply { mkdirs() } + try { + val game = com.droiddeck.launcher.stores.StoreGameSidecar(com.droiddeck.launcher.stores.Store.ROCKSTAR, "rdr2", "RDR2", "RDR2.exe") + java.io.File(folder, game.exe).writeText("installed game") + val script = java.io.File(folder, com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER) + script.writeText("old launcher") + val finished = com.droiddeck.launcher.stores.StoreLaunch.writeLauncher(folder, game) + finished.write(folder) + assertFalse(RockstarLaunch.supports(game.id)) + assertNull(finished.launcher) + assertFalse(script.exists()) + assertTrue(java.io.File(folder, game.exe).isFile) + assertNull(com.droiddeck.launcher.frontend.AddedGames.single(app, folder.path)) + } finally { + folder.deleteRecursively() + } + } + + @Test fun existingRockstarLaunchScriptsAreRefreshed() { + val folder = java.nio.file.Files.createTempDirectory("rockstar-launch").toFile() + try { + java.io.File(folder, "gta3.exe").writeBytes(byteArrayOf(1)) + val game = com.droiddeck.launcher.stores.StoreGameSidecar(com.droiddeck.launcher.stores.Store.ROCKSTAR, "gta3", "GTA III", "gta3.exe", launcher = com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER) + val script = java.io.File(folder, com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER) + script.writeText("old launch script") + com.droiddeck.launcher.stores.StoreLaunch.adopt(folder, game) + assertTrue(script.readText().contains("Rockstar Games\\Launcher\\Launcher.exe")) + assertFalse(script.readText().contains("old launch script")) + } finally { + folder.deleteRecursively() + } + } + + @Test + @Config(sdk = [28]) + fun classicLaunchDefaultsAreSetBeforeWineAndKeepExplicitSettings() { + val app = org.robolectric.RuntimeEnvironment.getApplication() + val explicit = com.droiddeck.launcher.core.GameEnvironment.Config(games = mapOf( + "100" to mapOf("FEX_X87REDUCEDPRECISION" to "1"), + "104" to mapOf("PROTON_USE_WINED3D" to "0"), + )) + com.droiddeck.launcher.session.GameEnvironmentStore.save(app, explicit) + RockstarLaunch.applyDefaults(app, "gta3", 100) + RockstarLaunch.applyDefaults(app, "gta3", 101) + RockstarLaunch.applyDefaults(app, "gtasa", 102) + RockstarLaunch.applyDefaults(app, "gtavc", 103) + RockstarLaunch.applyDefaults(app, "gtasa", 104) + val config = com.droiddeck.launcher.session.GameEnvironmentStore.read(app) + assertEquals("1", config.games["100"]?.get("FEX_X87REDUCEDPRECISION")) + assertEquals("0", config.games["101"]?.get("FEX_X87REDUCEDPRECISION")) + assertEquals(mapOf("PROTON_USE_WINED3D" to "1"), config.games["102"]) + assertEquals("0", config.games["104"]?.get("PROTON_USE_WINED3D")) + assertFalse(config.games.containsKey("103")) + } + + @Test fun classicTitlesUseTheirObservedPipeNames() { + assertEquals(mapOf("gta3" to "GTA3_Pipe", "gtavc" to "GTA-VC_Pipe", "gtasa" to "GTA_SA_Pipe"), RockstarLaunch.pipes) + } + + @Test fun signingOutClearsOwnedShelfCards() { + val store = com.droiddeck.launcher.stores.Store.ROCKSTAR + com.droiddeck.launcher.stores.StoresState.library[store] = emptyList() + com.droiddeck.launcher.stores.StoresState.shelves[store] = com.droiddeck.launcher.stores.StoreShelves() + RockstarLibrary.reset() + org.robolectric.shadows.ShadowLooper.idleMainLooper() + assertFalse(com.droiddeck.launcher.stores.StoresState.library.containsKey(store)) + assertFalse(com.droiddeck.launcher.stores.StoresState.shelves.containsKey(store)) + } + + @Test fun resumedChunksMustStillMatchTheirFiles() { + val folder = java.nio.file.Files.createTempDirectory("rockstar-resume").toFile() + try { + val file = java.io.File(folder, "game.bin") + val bytes = "verified chunk".toByteArray() + val hash = java.security.MessageDigest.getInstance("SHA-256").digest(bytes).joinToString("") { "%02x".format(it) } + val chunk = RockstarChunk("1", "2", hash, 2, bytes.size.toLong()) + assertFalse(RockstarManifest.verified(file, chunk)) + file.writeBytes(byteArrayOf(0, 0) + bytes) + assertTrue(RockstarManifest.verified(file, chunk)) + java.io.RandomAccessFile(file, "rw").use { it.setLength(4) } + assertFalse(RockstarManifest.verified(file, chunk)) + file.writeBytes(ByteArray(bytes.size + 2)) + assertFalse(RockstarManifest.verified(file, chunk)) + } finally { + folder.deleteRecursively() + } + } + + @Test fun manifestWritesRejectSymbolicLinks() { + val folder = java.nio.file.Files.createTempDirectory("rockstar-path").toFile() + val outside = java.nio.file.Files.createTempDirectory("rockstar-outside").toFile() + try { + val link = java.io.File(folder, "linked") + try { + java.nio.file.Files.createSymbolicLink(link.toPath(), outside.toPath()) + } catch (e: java.nio.file.FileSystemException) { + org.junit.Assume.assumeNoException(e) + } + assertTrue(runCatching { RockstarManifest.inside(folder, "linked/game.bin") }.isFailure) + assertEquals(java.io.File(folder.canonicalFile, "normal/game.bin"), RockstarManifest.inside(folder, "normal/game.bin")) + java.nio.file.Files.deleteIfExists(link.toPath()) + } finally { + folder.deleteRecursively() + outside.deleteRecursively() + } + } + + @Test + fun classicGamesStartTheirParentLauncherWithoutEmbeddingCredentials() { + val sidecar = com.droiddeck.launcher.stores.StoreGameSidecar( + com.droiddeck.launcher.stores.Store.ROCKSTAR, "gtavc", "Vice City", "gta-vc.exe", + ) + val text = com.droiddeck.launcher.stores.StoreLaunch.launcherText(sidecar) + assertTrue(text.contains("\"C:\\Program Files\\Rockstar Games\\Launcher\\Launcher.exe\"")) + assertTrue(text.contains("exit /b %errorlevel%")) + assertFalse(text.contains("gta-vc.exe")) + assertFalse(text.contains("ticket", true)) + assertFalse(text.contains("rem ", true)) + } + + private val apps = """ +1 + + BRANCHACCESS token="L" + + + + + BRANCHACCESS token="S" + + + BRANCHACCESS token="B" + BRANCHACCESS token="D" + + + + {"title":"gta4","isFeatured":false,"packageType":"title"} + {"title":"rdr2","isFeatured":false,"packageType":"title"} + {"title":"gtatrilogy","isFeatured":true,"packageType":"bundle"} + {"title":"gta5","isFeatured":false,"packageType":"title"} +""" + + private fun account(xml: String = apps) = RockstarRos.parse(xml).let { RockstarAccountApps(RockstarApps.parse(it), RockstarApps.packages(it)) } + + private val manifest = """ +1 + + + Launcher.exe + + FF + + + ThirdParty\Steam\steam_api64.dll + + ee + + false""" + + @Test fun branchesNeedARealBuild() { + val parsed = account().apps + val gta4 = parsed.first { it.name == "gta4" } + assertEquals("31", RockstarApps.branch(gta4)!!.id) + assertNull(RockstarApps.branch(parsed.first { it.name == "rdr2_sp_steam" })) + assertNull(RockstarApps.branch(parsed.first { it.name == "gta5" })) + } + + @Test fun ownedTitlesAreTheAccountsOwnPackagesNotTheFeaturedOnes() { + assertEquals(listOf("gta4", "rdr2", "gta5"), RockstarLibrary.owned(account()).map { it.id }) + } + + @Test fun libraryListsOnlyOwnedTitlesRockstarDelivers() { + val games = RockstarLibrary.games(account()) + assertEquals(listOf("gta4"), games.map { it.id }) + assertEquals("gta4", games[0].extra["app"]) + assertTrue(games.all { it.owned }) + } + + @Test fun anOwnedTrilogyBundleIsAllThreeDefinitiveEditions() { + val owned = RockstarLibrary.owned(account(apps.replace("\"isFeatured\":true,\"packageType\":\"bundle\"", "\"isFeatured\":false,\"packageType\":\"bundle\""))) + assertTrue(owned.map { it.id }.containsAll(listOf("gta3unreal", "gtavcunreal", "gtasaunreal"))) + } + + @Test fun manifestFilesCarryTheirChunksAndWindowsPathsBecomeRelative() { + val build = RockstarManifest.parse(RockstarRos.parse(manifest)) + assertEquals("1311", build.buildId) + assertFalse(build.preload) + assertEquals(34L, build.bytes) + val exe = build.files[0] + assertEquals(listOf("46859", "46860"), exe.chunks.map { it.chunkId }) + assertEquals("ab", exe.chunks[0].sha256) + assertEquals("ff", exe.sha256) + assertEquals("ThirdParty/Steam/steam_api64.dll", build.files[1].path) + } + + @Test fun pathsThatLeaveTheInstallAreRefused() { + assertNull(RockstarManifest.safePath("..\\..\\Windows\\x.dll")) + assertNull(RockstarManifest.safePath("C:\\x.dll")) + assertEquals("a/b.rpf", RockstarManifest.safePath("\\a\\.\\b.rpf")) + } + + @Test fun urlBatchesStayWithinTheirByteAndCountLimits() { + val chunks = (1..5).map { RockstarChunk("1", "$it", "", 0, if (it == 3) 100 else 10) } + val batches = RockstarManifest.batches(chunks, maxBytes = 30, maxCount = 2) + assertEquals(listOf(listOf("1", "2"), listOf("3"), listOf("4", "5")), batches.map { b -> b.map { it.chunkId } }) + } + + @Test fun rosErrorsNameTheirCode() { + val root = RockstarRos.parse("0") + assertEquals("AuthenticationFailed", RockstarRos.first(root, "Error")!!.getAttribute("Code")) + } + + @Test fun ticketAnswerGivesTheAccountAndExpiry() { + val root = RockstarRos.parse("""1TK + S86399 + 42player""") + val t = RockstarAuth.parseTicket(root, now = 1000L)!! + assertEquals("T", t.ticket) + assertEquals("42", t.rockstarId) + assertEquals("player", t.nickname) + assertEquals(1000L + 86_399_000L, t.expiresAt) + } + + @Test fun gatewayStateIsWrittenAsThePageWritesIt() { + val fp = RockstarAuth.fingerprintOf("DROIDDECK-DUO", "0a0b0c0d", "0011223344556677") + assertEquals("{\"fp\": {\"device_name\":\"DROIDDECK-DUO\",\"machine_name\":\"DROIDDECK-DUO\",\"os_version\":\"10.0.19045\",\"volume_serial\":\"0a0b0c0d\",\"cpu_info\":\"0011223344556677\"}}", + RockstarAuth.state(fp)) + } + + @Test fun bridgeAnswersTheLauncherQueriesAndHandsBackTheCode() { + val js = RockstarAuth.bridgeScript(RockstarAuth.fingerprintOf("D", "1", "2"), "launcher") + for (m in listOf("GetWindowConfig", "GetDeviceId", "GetVersionInfo", "GetProfileList", "OnStartAuth", "CallAuthResult", "rgscQueryCancel", "/signin/user-form?cid=launcher")) + assertTrue(m, m in js) + assertTrue(RockstarAuth.isCodeUrl(RockstarAuth.CODE_URL + "?code=abc")) + assertEquals("a+b/c", RockstarAuth.codeFrom(RockstarAuth.CODE_URL + "?code=a%2Bb%2Fc")) + } + + @Test fun subAppsResolveToTheirGame() { + assertEquals("rdr2", RockstarTitles.byId("rdr2_sp_rgl")!!.id) + assertEquals("gtasaunreal", RockstarTitles.byId("gtatrilogy")!!.id) + assertNull(RockstarTitles.byId("launcher")) + } +} diff --git a/tools/build_local.sh b/tools/build_local.sh index d564f1e3c0..ee891aee97 100755 --- a/tools/build_local.sh +++ b/tools/build_local.sh @@ -433,6 +433,13 @@ if [[ "${DROIDDECK_SKIP_RUST:-0}" != 1 ]]; then CARGO_TARGET_DIR="${cache_dir}/ubisoft-target" bash tools/ubisoft-launcher/build.sh "${upc_out}" save_step ubisoft "${upc_key}" "${upc_out}" fi + rockstar_out="${repo_root}/app/src/main/resources/rockstar/helpers" + rockstar_key=$(inputs_hash "windows-gnu" tools/rockstar-launcher/src tools/rockstar-launcher/Cargo.toml tools/rockstar-launcher/Cargo.lock tools/rockstar-launcher/build.sh) + if ! restore_step rockstar "${rockstar_key}" "${rockstar_out}"; then + command -v i686-w64-mingw32-gcc >/dev/null 2>&1 || { echo "i686-w64-mingw32-gcc is required for the Rockstar launcher service." >&2; exit 1; } + CARGO_TARGET_DIR="${cache_dir}/rockstar-target" bash tools/rockstar-launcher/build.sh "${rockstar_out}" + save_step rockstar "${rockstar_key}" "${rockstar_out}" + fi fi python3 tools/powervr/fetch.py bash tools/packs/build.sh app/build/packs diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch index 939504835c..ebb9718942 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch @@ -286,6 +286,12 @@ def cloud_on(sidecar): def exited(argv, code=0): found = find_store_game(argv) launch_dir = os.environ.get("BL_LAUNCH_DIR", "") + if found is not None and launch_dir and str(found[1].get("store")) == "rockstar": + ask(Path(launch_dir) / "stores", {"op": "rockstar-exited", "store": "rockstar", "id": str(found[1].get("id"))}, timeout=1.0) + compat_data = os.environ.get("STEAM_COMPAT_DATA_PATH") + if compat_data: + (Path(compat_data) / "pfx" / ROCKSTAR_FOLDER / "launch.json").unlink(missing_ok=True) + return 0 if found is not None and str(found[1].get("store")) == "epic" and os.environ.get(EPIC_HANDLED) != "1" \ and os.access(EPIC_CLIENT, os.X_OK): try: @@ -307,6 +313,104 @@ def exited(argv, code=0): UBISOFT_DIR = "drive_c/Program Files (x86)/Ubisoft/Ubisoft Game Launcher" UBISOFT_WINDOWS_DIR = "C:\\Program Files (x86)\\Ubisoft\\Ubisoft Game Launcher\\" UBISOFT_INSTALLER_URL = "https://static3.cdn.ubi.com/orbit/launcher_installer/UbisoftConnectInstaller.exe" +ROCKSTAR_SERVICE = Path("/usr/local/lib/droiddeck-rockstar") +ROCKSTAR_FOLDER = "drive_c/Program Files/Rockstar Games/Launcher" +ROCKSTAR_TITLES = {"gta3": "Grand Theft Auto III", "gtavc": "Grand Theft Auto: Vice City", "gtasa": "GTA: San Andreas"} + + +def rockstar_registry(folder, title, compat_data, proton): + pfx = Path(compat_data) / "pfx" + launcher = r"C:\Program Files\Rockstar Games\Launcher" + values = [(r"Rockstar Games\Launcher", launcher), ("Rockstar Games\\" + title, windows_path(str(folder)))] + entries = [("Software\\" + view + key, value) for view in ("", "Wow6432Node\\") for key, value in values] + reg = pfx / "system.reg" + if all(has_value(reg, "[" + key.replace("\\", "\\\\") + "]", "InstallFolder", value) for key, value in entries): + return True + if wait_for_server(pfx, 2): + return all(set_value(reg, "[" + key.replace("\\", "\\\\") + "]", "InstallFolder", value) for key, value in entries) + with tempfile.TemporaryDirectory(prefix="droiddeck-rockstar-") as temp: + path = Path(temp) / "install.reg" + text = "Windows Registry Editor Version 5.00\r\n\r\n" + text += "\r\n".join('[HKEY_LOCAL_MACHINE\\%s]\r\n"InstallFolder"="%s"\r\n' % (key, reg_escape(value)) for key, value in entries) + path.write_text(text, encoding="utf-16") + result = subprocess.run([proton, "run", "reg.exe", "import", windows_path(str(path))], + stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=45) + return result.returncode == 0 + + +def prepare_rockstar(folder, sidecar, compat_data, launch_dir, proton="", ask_app=None): + if not compat_data: + return "no-prefix" + target = Path(compat_data) / "pfx" / ROCKSTAR_FOLDER + config = target / "launch.json" + config.unlink(missing_ok=True) + title = ROCKSTAR_TITLES.get(str(sidecar.get("id"))) + if not title: + return "unsupported-title" + if not launch_dir: + return "no-channel" + root = folder.resolve() + exe = (folder / str(sidecar.get("exe") or "").replace("\\", "/")).resolve() + if not exe.is_relative_to(root): + return "invalid-game-path" + workdir = (folder / str(sidecar["workdir"])).resolve() if sidecar.get("workdir") is not None else exe.parent + if not workdir.is_relative_to(root) or not exe.is_file() or not (folder / "MTLX.dll").is_file(): + return "invalid-game-path" + args = sidecar.get("args") or [] + if not isinstance(args, list) or any(not isinstance(arg, str) or "\0" in arg for arg in args): + return "invalid-game-arguments" + with exe.open("rb") as source: + if source.read(2) != b"MZ": + return "invalid-game-exe" + source.seek(0x3c) + raw = source.read(4) + if len(raw) != 4: + return "invalid-game-exe" + source.seek(int.from_bytes(raw, "little")) + signature = source.read(6) + if len(signature) != 6 or signature[:4] != b"PE\0\0" or signature[4:] not in (b"\x4c\x01", b"\x64\x86"): + return "invalid-game-exe" + service = ROCKSTAR_SERVICE / ("Launcher32.exe" if signature[4:] == b"\x4c\x01" else "Launcher64.exe") + if not service.is_file(): + return "no-service" + made = "present" if (Path(compat_data) / "pfx/user.reg").is_file() else create_prefix(compat_data, proton) + if made not in ("created", "present"): + return "prefix-" + made + if not rockstar_registry(folder, title, compat_data, proton): + return "registry-unavailable" + target.mkdir(parents=True, exist_ok=True) + with tempfile.NamedTemporaryFile(prefix="Launcher-", suffix=".exe", dir=target, delete=False) as temporary: + temporary_path = Path(temporary.name) + try: + with service.open("rb") as source: + shutil.copyfileobj(source, temporary) + except BaseException: + temporary_path.unlink(missing_ok=True) + raise + os.replace(temporary_path, target / "Launcher.exe") + answer = (ask_app or ask)(Path(launch_dir) / "stores", {"op": "rockstar-launch", "store": "rockstar", "id": str(sidecar.get("id"))}, timeout=120.0) + if not isinstance(answer, dict) or not answer.get("ok"): + return "session-" + (str(answer.get("reason") or "refused") if isinstance(answer, dict) else "timeout") + if not isinstance(answer.get("material"), str) or not re.fullmatch(r"[0-9A-Fa-f]{640}", answer["material"]): + return "invalid-material" + expires = answer.get("expiresAt") + if not isinstance(expires, int) or not time.time() * 1000 < expires <= time.time() * 1000 + 120_000: + return "invalid-expiry" + launch = {"folder": windows_path(str(root)), "exe": windows_path(str(exe)), "workdir": windows_path(str(workdir)), + "args": args, "pipe": answer.get("pipe"), "material": answer["material"], "expiresAt": expires} + if len(json.dumps(launch).encode("utf-8")) > 16384: + return "handoff-too-large" + with tempfile.NamedTemporaryFile(mode="w", prefix="launch-", suffix=".json", dir=target, delete=False) as temporary: + temporary_path = Path(temporary.name) + try: + json.dump(launch, temporary) + except BaseException: + temporary_path.unlink(missing_ok=True) + raise + os.replace(temporary_path, config) + return "ready" + + UBISOFT_CACHE = Path("/root/.cache/droiddeck/ubisoft") UBISOFT_LAUNCH = ".droiddeck-ubisoft.json" UBISOFT_SERVICE = Path("/usr/local/lib/droiddeck-ubisoft/droiddeck-upc.exe") @@ -1341,6 +1445,15 @@ def main(argv): prepare_gog(sidecar, compat_data, launch_dir) log("gog registry: " + apply_gog_registry(folder, compat_data, os.environ.get("BL_STORE_PROTON", ""))) log("gog support data: " + gog_support_data(folder, compat_data, os.environ.get("BL_STORE_PROTON", ""))) + if store == "rockstar": + try: + state = prepare_rockstar(folder, sidecar, compat_data, launch_dir, os.environ.get("BL_STORE_PROTON", "")) + except (OSError, ValueError, subprocess.TimeoutExpired): + state = "preparation-failed" + log("rockstar %s: %s" % (game, state)) + if state != "ready" and launch_dir: + ask(Path(launch_dir) / "stores", {"op": "rockstar-exited", "store": "rockstar", "id": game}, timeout=1.0) + return STORE_GAME if state == "ready" else RAN_FAILED if store == "ubisoft": try: log("ubisoft %s: %s" % (game, prepare_ubisoft(folder, sidecar, compat_data, launch_dir, os.environ.get("BL_STORE_PROTON", "")))) diff --git a/tools/release/runtime_inputs.py b/tools/release/runtime_inputs.py index 57fe792465..12ac22eabb 100644 --- a/tools/release/runtime_inputs.py +++ b/tools/release/runtime_inputs.py @@ -23,11 +23,11 @@ PACK_NAMES = ['proot', 'directaudio', 'tracking', 'xbox', 'comet', 'butler', 'po SOURCE_PATHS = ['app/build.gradle', 'app/src/main/cpp/fakeinput_steam.cpp', 'app/src/main/assets/pulseaudio.tzst', 'tools/linuxfs', 'tools/proot', 'tools/aaudio-sink', 'tools/directaudio', 'tools/packs', 'tools/gamescope/release.env', 'tools/droiddeck-esync/release.env', - 'tools/mangoapp', 'tools/msitools', 'tools/pipewire', 'tools/comet', 'tools/xbox', 'tools/dirt-ws2', 'tools/ubisoft-launcher', 'tools/components', 'tools/ci', 'tools/build_local.sh', + 'tools/mangoapp', 'tools/msitools', 'tools/pipewire', 'tools/comet', 'tools/xbox', 'tools/dirt-ws2', 'tools/ubisoft-launcher', 'tools/rockstar-launcher', 'tools/components', 'tools/ci', 'tools/build_local.sh', 'tools/powervr', 'tools/hybris', 'tools/dxvk', 'tools/vulkan-wsi', 'tools/release/runtime_inputs.py', 'app/src/main/assets/desktop-removal', 'tools/quest', 'tools/vr/src', 'tools/vr/driver_droiddeck', 'tools/vr/layer', 'tools/vr/build.sh', - 'tools/gpuload', + 'tools/gpuload', 'app/src/main/resources/rockstar/legacy-cipher.bin', 'app/src/main/cpp/waylandcomp/src/headpose_shm.h', 'app/src/main/cpp/venc/venc_proto.h', 'app/src/main/cpp/waylandcomp/src/spatialpose_shm.h', diff --git a/tools/rockstar-launcher/.gitignore b/tools/rockstar-launcher/.gitignore new file mode 100644 index 0000000000..b83d22266a --- /dev/null +++ b/tools/rockstar-launcher/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/tools/rockstar-launcher/Cargo.lock b/tools/rockstar-launcher/Cargo.lock new file mode 100644 index 0000000000..f73866571d --- /dev/null +++ b/tools/rockstar-launcher/Cargo.lock @@ -0,0 +1,105 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "droiddeck-rockstar-launcher" +version = "0.1.0" +dependencies = [ + "serde_json", +] + +[[package]] +name = "itoa" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bd1574e617a9a6c1f8f8181bd7e841e1f20e4277607ef28945765188d6284d4" + +[[package]] +name = "memchr" +version = "2.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" + +[[package]] +name = "proc-macro2" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "serde" +version = "1.0.229" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba" +dependencies = [ + "serde_core", +] + +[[package]] +name = "serde_core" +version = "1.0.229" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.229" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.154" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6" +dependencies = [ + "itoa", + "memchr", + "serde", + "serde_core", + "zmij", +] + +[[package]] +name = "syn" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954" + +[[package]] +name = "zmij" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" diff --git a/tools/rockstar-launcher/Cargo.toml b/tools/rockstar-launcher/Cargo.toml new file mode 100644 index 0000000000..4b5ec1f37b --- /dev/null +++ b/tools/rockstar-launcher/Cargo.toml @@ -0,0 +1,19 @@ +[package] +name = "droiddeck-rockstar-launcher" +version = "0.1.0" +edition = "2021" +license = "GPL-3.0-only" +publish = false + +[[bin]] +name = "Launcher" +path = "src/main.rs" + +[dependencies] +serde_json = "1" + +[profile.release] +opt-level = "s" +lto = true +panic = "abort" +strip = true diff --git a/tools/rockstar-launcher/README.md b/tools/rockstar-launcher/README.md new file mode 100644 index 0000000000..e22a4183c8 --- /dev/null +++ b/tools/rockstar-launcher/README.md @@ -0,0 +1,30 @@ +# Rockstar launcher service + +`Launcher.exe` starts the selected installed game and serves its launcher pipe. The Android app checks ownership and retrieves the launch response from Rockstar. Account credentials and ROS tickets stay in the app. + +The handoff is deleted before starting the game. It expires after 90 seconds. The pipe accepts the child process's greeting and returns the server-issued launch material. No game files are patched. + +GTA III defaults to full x87 precision for FEX before Wine starts, because reduced precision crashed new-game initialization on the test device. San Andreas defaults to WineD3D, because DXVK intermittently corrupted its textures; full precision and conservative memory ordering did not prevent that corruption. These defaults use DroidDeck's per-game settings and preserve explicit per-game overrides. + +`build.sh` builds 32-bit and 64-bit executables with the GNU Windows targets and stages them as APK resources. `legacy-cipher.bin` contains the fixed client protocol tables, not account credentials or APK signing keys. + +Run the protocol tests with: + +```sh +cargo test --locked --manifest-path tools/rockstar-launcher/Cargo.toml +``` + +The optional `capture` example records a first-party launcher reply to a new local file. Run it on Windows or Wine while launching the corresponding game in Rockstar's launcher: + +```powershell +cargo run --release --example capture --manifest-path tools/rockstar-launcher/Cargo.toml -- --pipe GTA-VC_Pipe --output 'C:\captures\reply.bin' +``` + +On Linux, cross-compile the example and run it in the same Wine prefix as Rockstar's launcher: + +```sh +cargo build --release --locked --example capture --target x86_64-pc-windows-gnu --manifest-path tools/rockstar-launcher/Cargo.toml +WINEPREFIX=/path/to/launcher-prefix wine tools/rockstar-launcher/target/x86_64-pc-windows-gnu/release/examples/capture.exe --pipe GTA-VC_Pipe --output 'Z:\tmp\reply.bin' +``` + +Captures contain live launch material. Keep them outside source control; the tool prints only the message tag and payload length. diff --git a/tools/rockstar-launcher/build.sh b/tools/rockstar-launcher/build.sh new file mode 100644 index 0000000000..1f7360f741 --- /dev/null +++ b/tools/rockstar-launcher/build.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +set -euo pipefail +here=$(cd "$(dirname "$0")" && pwd) +out=${1:-"$here/../../app/src/main/resources/rockstar/helpers"} +mkdir -p "$out" +for target in i686-pc-windows-gnu x86_64-pc-windows-gnu; do + rustup target add "$target" >/dev/null 2>&1 || true + cargo build --manifest-path "$here/Cargo.toml" --release --locked --target "$target" + name=Launcher64.exe + [[ "$target" == i686-* ]] && name=Launcher32.exe + install -m644 "${CARGO_TARGET_DIR:-$here/target}/$target/release/Launcher.exe" "$out/$name" +done diff --git a/tools/rockstar-launcher/examples/capture.rs b/tools/rockstar-launcher/examples/capture.rs new file mode 100644 index 0000000000..8516cbca17 --- /dev/null +++ b/tools/rockstar-launcher/examples/capture.rs @@ -0,0 +1,65 @@ +#[cfg(windows)] +fn main() -> std::io::Result<()> { + use droiddeck_rockstar_launcher::{pipe::Pipe, Frame, Length}; + use std::fs::OpenOptions; + use std::io::{self, Read, Write}; + use std::time::Duration; + + struct Recording<'a> { + source: &'a mut Pipe, + output: &'a mut std::fs::File, + } + + impl Read for Recording<'_> { + fn read(&mut self, buffer: &mut [u8]) -> io::Result { + let size = self.source.read(buffer)?; + self.output.write_all(&buffer[..size])?; + Ok(size) + } + } + + let args: Vec<_> = std::env::args_os().collect(); + let output = args + .windows(2) + .find(|pair| pair[0] == "--output") + .map(|pair| pair[1].clone()) + .map(std::path::PathBuf::from) + .unwrap_or(std::env::current_exe()?.with_file_name("reference-reply.bin")); + let mut file = OpenOptions::new() + .create_new(true) + .write(true) + .open(output)?; + let pipe_name = args + .windows(2) + .find(|pair| pair[0] == "--pipe") + .map(|pair| pair[1].to_string_lossy().into_owned()) + .unwrap_or_else(|| "GTA-VC_Pipe".to_owned()); + let mut pipe = Pipe::connect(&pipe_name, Duration::from_secs(90))?; + Frame { + tag: *b"COLE", + payload: Vec::new(), + nul_terminated: true, + } + .write(&mut pipe, Length::Total)?; + let reply = Frame::read( + &mut Recording { + source: &mut pipe, + output: &mut file, + }, + Length::Body, + ); + file.sync_all()?; + let reply = reply?; + println!( + "Received {} ({} payload bytes)", + String::from_utf8_lossy(&reply.tag), + reply.payload.len() + ); + Ok(()) +} + +#[cfg(not(windows))] +fn main() { + eprintln!("The reference pipe client runs on Windows or Wine."); + std::process::exit(1); +} diff --git a/tools/rockstar-launcher/src/lib.rs b/tools/rockstar-launcher/src/lib.rs new file mode 100644 index 0000000000..e08b2bc92b --- /dev/null +++ b/tools/rockstar-launcher/src/lib.rs @@ -0,0 +1,333 @@ +use std::io::{self, Read, Write}; + +#[cfg(windows)] +pub mod pipe; + +pub const MAX_FRAME_BYTES: usize = 64 * 1024; +const OVERHEAD: usize = 4 + 4 + 1; + +pub fn wait_for_game( + child: &mut std::process::Child, + handshake: std::sync::mpsc::Receiver>, +) -> io::Result { + use std::sync::mpsc::RecvTimeoutError; + loop { + match handshake.recv_timeout(std::time::Duration::from_millis(10)) { + Ok(Ok(())) => return child.wait(), + result @ (Ok(Err(_)) | Err(RecvTimeoutError::Disconnected)) => { + let error = match result { + Ok(Err(error)) => error, + _ => io::Error::new( + io::ErrorKind::BrokenPipe, + "Rockstar handshake worker stopped", + ), + }; + let _ = child.kill(); + child.wait()?; + return Err(error); + } + Err(RecvTimeoutError::Timeout) => { + if let Some(status) = child.try_wait()? { + return Ok(status); + } + } + } + } +} + +#[derive(Clone, Copy)] +pub enum Length { + Total, + Body, +} + +impl Length { + fn header_bytes(self) -> usize { + match self { + Self::Total => 0, + Self::Body => 4, + } + } +} + +#[derive(Debug, PartialEq, Eq)] +pub struct Frame { + pub tag: [u8; 4], + pub payload: Vec, + pub nul_terminated: bool, +} + +fn invalid(message: &'static str) -> io::Error { + io::Error::new(io::ErrorKind::InvalidData, message) +} + +impl Frame { + pub fn read(reader: &mut impl Read, length: Length) -> io::Result { + let mut header = [0; 4]; + reader.read_exact(&mut header)?; + let size = (u32::from_le_bytes(header) as usize) + .checked_add(length.header_bytes()) + .ok_or_else(|| invalid("invalid Rockstar pipe frame length"))?; + if !(OVERHEAD..=MAX_FRAME_BYTES).contains(&size) { + return Err(invalid("invalid Rockstar pipe frame length")); + } + let mut body = vec![0; size - header.len()]; + reader.read_exact(&mut body)?; + let nul_terminated = body.last() == Some(&0); + let end = body.len() - usize::from(nul_terminated); + if body[4] != b':' || body[..4].contains(&b':') || body[..end].contains(&0) { + return Err(invalid("invalid Rockstar pipe frame envelope")); + } + Ok(Self { + tag: body[..4].try_into().unwrap(), + payload: body[5..end].to_vec(), + nul_terminated, + }) + } + + pub fn write(&self, writer: &mut impl Write, length: Length) -> io::Result<()> { + let size = self + .payload + .len() + .checked_add(OVERHEAD + usize::from(self.nul_terminated)) + .filter(|size| *size <= MAX_FRAME_BYTES) + .ok_or_else(|| invalid("Rockstar pipe frame exceeds size limit"))?; + if self.tag.contains(&0) || self.tag.contains(&b':') || self.payload.contains(&0) { + return Err(invalid("Rockstar pipe frame contains a delimiter")); + } + let mut encoded = Vec::with_capacity(size); + encoded.extend_from_slice(&((size - length.header_bytes()) as u32).to_le_bytes()); + encoded.extend_from_slice(&self.tag); + encoded.push(b':'); + encoded.extend_from_slice(&self.payload); + if self.nul_terminated { + encoded.push(0); + } + writer.write_all(&encoded)?; + writer.flush() + } +} + +#[cfg(test)] +mod tests { + use super::*; + use std::io::Cursor; + + #[test] + #[ignore] + fn sleeping_game() { + std::thread::sleep(std::time::Duration::from_secs(30)); + } + + fn sleeping_child() -> std::process::Child { + std::process::Command::new(std::env::current_exe().unwrap()) + .args(["--exact", "tests::sleeping_game", "--ignored"]) + .stdout(std::process::Stdio::null()) + .stderr(std::process::Stdio::null()) + .spawn() + .unwrap() + } + + #[test] + fn failed_handshake_terminates_and_reaps_the_game() { + let mut child = sleeping_child(); + let (sender, receiver) = std::sync::mpsc::channel(); + sender + .send(Err(io::Error::new(io::ErrorKind::TimedOut, "test timeout"))) + .unwrap(); + let start = std::time::Instant::now(); + assert_eq!( + wait_for_game(&mut child, receiver).unwrap_err().kind(), + io::ErrorKind::TimedOut + ); + assert!(start.elapsed() < std::time::Duration::from_secs(3)); + assert!(child.try_wait().unwrap().is_some()); + } + + #[test] + fn stopped_handshake_worker_terminates_and_reaps_the_game() { + let mut child = sleeping_child(); + let (sender, receiver) = std::sync::mpsc::channel(); + drop(sender); + assert_eq!( + wait_for_game(&mut child, receiver).unwrap_err().kind(), + io::ErrorKind::BrokenPipe + ); + assert!(child.try_wait().unwrap().is_some()); + } + + #[test] + fn an_exited_game_does_not_wait_for_its_handshake() { + let mut child = std::process::Command::new(std::env::current_exe().unwrap()) + .args(["--exact", "no_test_with_this_name"]) + .stdout(std::process::Stdio::null()) + .stderr(std::process::Stdio::null()) + .spawn() + .unwrap(); + let (_sender, receiver) = std::sync::mpsc::channel(); + assert!(wait_for_game(&mut child, receiver).unwrap().success()); + } + + struct Fragmented(T); + + impl Read for Fragmented { + fn read(&mut self, buffer: &mut [u8]) -> io::Result { + let size = buffer.len().min(1); + self.0.read(&mut buffer[..size]) + } + } + + impl Write for Fragmented { + fn write(&mut self, buffer: &[u8]) -> io::Result { + self.0.write(&buffer[..buffer.len().min(1)]) + } + + fn flush(&mut self) -> io::Result<()> { + self.0.flush() + } + } + + #[test] + fn reads_observed_greeting_across_partial_reads() { + let bytes = b"\x0a\0\0\0COLE:\0"; + assert_eq!( + Frame::read(&mut Fragmented(&bytes[..]), Length::Total).unwrap(), + Frame { + tag: *b"COLE", + payload: Vec::new(), + nul_terminated: true, + } + ); + } + + #[test] + fn writes_the_observed_total_length_even_with_partial_writes() { + let mut bytes = Fragmented(Vec::new()); + Frame { + tag: *b"COLE", + payload: Vec::new(), + nul_terminated: true, + } + .write(&mut bytes, Length::Total) + .unwrap(); + assert_eq!(bytes.0, b"\x0a\0\0\0COLE:\0"); + } + + #[test] + fn keeps_colons_in_payload_and_leaves_the_next_frame_unread() { + let frame = Frame { + tag: *b"DUNN", + payload: b"one:two".to_vec(), + nul_terminated: false, + }; + let mut bytes = Vec::new(); + frame.write(&mut bytes, Length::Total).unwrap(); + bytes.extend_from_slice(b"\x0a\0\0\0COLE:\0"); + let mut reader = Cursor::new(bytes); + assert_eq!(Frame::read(&mut reader, Length::Total).unwrap(), frame); + assert_eq!( + Frame::read(&mut reader, Length::Total).unwrap().tag, + *b"COLE" + ); + } + + #[test] + fn rejects_invalid_lengths_before_reading_a_body() { + for size in [0u32, 4, 8, MAX_FRAME_BYTES as u32 + 1, u32::MAX] { + let mut reader = Cursor::new(size.to_le_bytes()); + assert_eq!( + Frame::read(&mut reader, Length::Total).unwrap_err().kind(), + io::ErrorKind::InvalidData + ); + assert_eq!(reader.position(), 4); + } + } + + #[test] + fn rejects_truncated_or_malformed_frames() { + for bytes in [&b"\x0a\0\0"[..], &b"\x0a\0\0\0COLE:"[..]] { + assert_eq!( + Frame::read(&mut &bytes[..], Length::Total) + .unwrap_err() + .kind(), + io::ErrorKind::UnexpectedEof + ); + } + for bytes in [ + b"\x0a\0\0\0COLE=\0", + b"\x0a\0\0\0CO:E:x", + b"\x0a\0\0\0CO\0E:\0", + ] { + assert_eq!( + Frame::read(&mut &bytes[..], Length::Total) + .unwrap_err() + .kind(), + io::ErrorKind::InvalidData + ); + } + } + + #[test] + fn rejects_invalid_output_before_writing_any_bytes() { + let mut bytes = Vec::new(); + for frame in [ + Frame { + tag: *b"DUNN", + payload: vec![b'x'; MAX_FRAME_BYTES], + nul_terminated: false, + }, + Frame { + tag: *b"DUNN", + payload: b"one\0two".to_vec(), + nul_terminated: false, + }, + Frame { + tag: *b"CO:E", + payload: Vec::new(), + nul_terminated: false, + }, + ] { + assert!(frame.write(&mut bytes, Length::Total).is_err()); + assert!(bytes.is_empty()); + } + } + + #[test] + fn accepts_the_observed_unterminated_launch_reply_shape() { + let payload = vec![b'A'; 640]; + let mut bytes = 645u32.to_le_bytes().to_vec(); + bytes.extend_from_slice(b"DUNN:"); + bytes.extend_from_slice(&payload); + let frame = Frame::read(&mut Fragmented(&bytes[..]), Length::Body).unwrap(); + assert_eq!(bytes.len(), 649); + assert_eq!(frame.tag, *b"DUNN"); + assert_eq!(frame.payload, payload); + assert!(!frame.nul_terminated); + let mut encoded = Vec::new(); + frame.write(&mut encoded, Length::Body).unwrap(); + assert_eq!(encoded, bytes); + } + + #[test] + fn presents_a_complete_reply_to_the_pipe_in_one_write() { + struct Writes(Vec); + impl Write for Writes { + fn write(&mut self, bytes: &[u8]) -> io::Result { + self.0.push(bytes.len()); + Ok(bytes.len()) + } + fn flush(&mut self) -> io::Result<()> { + Ok(()) + } + } + let mut writer = Writes(Vec::new()); + Frame { + tag: *b"DUNN", + payload: vec![b'A'; 640], + nul_terminated: false, + } + .write(&mut writer, Length::Body) + .unwrap(); + assert_eq!(writer.0, vec![649]); + } +} diff --git a/tools/rockstar-launcher/src/main.rs b/tools/rockstar-launcher/src/main.rs new file mode 100644 index 0000000000..fe5923ab37 --- /dev/null +++ b/tools/rockstar-launcher/src/main.rs @@ -0,0 +1,152 @@ +#![cfg_attr(windows, windows_subsystem = "windows")] + +#[cfg(windows)] +fn log(message: &str) { + use std::io::Write; + let Ok(exe) = std::env::current_exe() else { + return; + }; + let path = exe.with_file_name("launcher.log"); + if let Ok(metadata) = std::fs::symlink_metadata(&path) { + if !metadata.is_file() || metadata.len() > 65536 { + return; + } + } + if let Ok(mut file) = std::fs::OpenOptions::new() + .create(true) + .append(true) + .open(path) + { + let _ = writeln!(file, "{message}"); + } +} + +#[cfg(windows)] +fn run() -> Result> { + use droiddeck_rockstar_launcher::{pipe::Listener, wait_for_game, Frame, Length}; + use std::io::Read; + use std::time::{Duration, SystemTime, UNIX_EPOCH}; + + let config_path = std::env::current_exe()?.with_file_name("launch.json"); + let mut data = Vec::new(); + std::fs::File::open(&config_path)? + .take(16385) + .read_to_end(&mut data)?; + std::fs::remove_file(&config_path)?; + if data.len() > 16384 { + return Err("launch handoff exceeds size limit".into()); + } + let config: serde_json::Value = serde_json::from_slice(&data)?; + let text = |key| { + config + .get(key) + .and_then(|value| value.as_str()) + .ok_or("missing launch field") + }; + let expires = config + .get("expiresAt") + .and_then(|value| value.as_u64()) + .ok_or("missing launch expiry")?; + let now = SystemTime::now().duration_since(UNIX_EPOCH)?.as_millis() as u64; + if expires <= now || expires - now > 120_000 { + return Err("launch handoff expired".into()); + } + let material = text("material")?.as_bytes().to_vec(); + if material.len() != 640 || !material.iter().all(u8::is_ascii_hexdigit) { + return Err("invalid launch material".into()); + } + let pipe_name = text("pipe")?.to_owned(); + if !matches!( + pipe_name.as_str(), + "GTA3_Pipe" | "GTA-VC_Pipe" | "GTA_SA_Pipe" + ) { + return Err("unsupported Rockstar launch pipe".into()); + } + let root = std::fs::canonicalize(text("folder")?)?; + let exe = std::fs::canonicalize(text("exe")?)?; + let workdir = std::fs::canonicalize(text("workdir")?)?; + if !exe.is_file() + || !exe.starts_with(&root) + || !workdir.starts_with(&root) + || !root.join("MTLX.dll").is_file() + { + return Err("invalid Rockstar game path".into()); + } + if let Some(index) = + std::env::args().position(|arg| arg.eq_ignore_ascii_case("-launchTitleInFolder")) + { + let folder = std::env::args() + .nth(index + 1) + .ok_or("missing game folder")?; + if std::fs::canonicalize(folder)? != root { + return Err("Rockstar launch folder mismatch".into()); + } + } + let args = config + .get("args") + .and_then(|value| value.as_array()) + .ok_or("missing game arguments")?; + let args: Result, _> = args + .iter() + .map(|value| value.as_str().ok_or("invalid game argument")) + .collect(); + log("launch handoff accepted"); + let listener = Listener::new(&pipe_name, Duration::from_secs(30))?; + log("launcher pipe created"); + let mut child = std::process::Command::new(exe) + .current_dir(workdir) + .args(args?) + .spawn()?; + let pid = child.id(); + log("game process started"); + let (result, handshake) = std::sync::mpsc::sync_channel(1); + std::thread::spawn(move || { + let serve = || -> std::io::Result<()> { + let mut pipe = listener.accept()?; + log("launcher pipe connected"); + if pipe.client_pid()? != pid { + return Err(std::io::Error::new( + std::io::ErrorKind::PermissionDenied, + "unexpected Rockstar pipe client", + )); + } + let request = Frame::read(&mut pipe, Length::Total)?; + log("game greeting received"); + if request.tag != *b"COLE" || !request.payload.is_empty() { + return Err(std::io::Error::new( + std::io::ErrorKind::InvalidData, + "unexpected Rockstar greeting", + )); + } + Frame { + tag: *b"DUNN", + payload: material, + nul_terminated: false, + } + .write(&mut pipe, Length::Body)?; + log("launcher handshake complete"); + Ok(()) + }; + let outcome = serve(); + if let Err(error) = &outcome { + log(&format!("launcher handshake failed: {error}")); + } + let _ = result.send(outcome); + }); + Ok(wait_for_game(&mut child, handshake)?.code().unwrap_or(1)) +} + +fn main() { + #[cfg(windows)] + let code = match run() { + Ok(code) => code, + Err(error) => { + log(&format!("launch failed: {error}")); + eprintln!("Rockstar launch failed: {error}"); + 1 + } + }; + #[cfg(not(windows))] + let code = 1; + std::process::exit(code); +} diff --git a/tools/rockstar-launcher/src/pipe.rs b/tools/rockstar-launcher/src/pipe.rs new file mode 100644 index 0000000000..79ab4d9e42 --- /dev/null +++ b/tools/rockstar-launcher/src/pipe.rs @@ -0,0 +1,403 @@ +use std::ffi::c_void; +use std::io::{self, Read, Write}; +use std::os::windows::ffi::OsStrExt; +use std::ptr::{null, null_mut}; +use std::time::{Duration, Instant}; + +type Handle = *mut c_void; +const INVALID_HANDLE: Handle = -1isize as Handle; +const ERROR_IO_PENDING: i32 = 997; +const ERROR_MORE_DATA: i32 = 234; + +#[repr(C)] +struct Overlapped { + internal: usize, + internal_high: usize, + offset: u32, + offset_high: u32, + event: Handle, +} + +#[link(name = "kernel32")] +extern "system" { + fn CreateNamedPipeW( + name: *const u16, + open: u32, + mode: u32, + max: u32, + output: u32, + input: u32, + timeout: u32, + security: *const c_void, + ) -> Handle; + fn ConnectNamedPipe(handle: Handle, overlapped: *mut Overlapped) -> i32; + fn GetNamedPipeClientProcessId(handle: Handle, pid: *mut u32) -> i32; + fn CreateFileW( + name: *const u16, + access: u32, + share: u32, + security: *const c_void, + creation: u32, + flags: u32, + template: Handle, + ) -> Handle; + fn WaitNamedPipeW(name: *const u16, timeout: u32) -> i32; + fn CreateEventW(security: *const c_void, manual: i32, initial: i32, name: *const u16) + -> Handle; + fn CloseHandle(handle: Handle) -> i32; + fn ReadFile( + handle: Handle, + buffer: *mut u8, + size: u32, + read: *mut u32, + overlapped: *mut Overlapped, + ) -> i32; + fn WriteFile( + handle: Handle, + buffer: *const u8, + size: u32, + written: *mut u32, + overlapped: *mut Overlapped, + ) -> i32; + fn WaitForSingleObject(handle: Handle, timeout: u32) -> u32; + fn CancelIoEx(handle: Handle, overlapped: *mut Overlapped) -> i32; + fn GetOverlappedResult( + handle: Handle, + overlapped: *mut Overlapped, + transferred: *mut u32, + wait: i32, + ) -> i32; +} + +struct OwnedHandle(Handle); + +unsafe impl Send for OwnedHandle {} + +impl Drop for OwnedHandle { + fn drop(&mut self) { + unsafe { + CloseHandle(self.0); + } + } +} + +pub struct Pipe { + handle: OwnedHandle, + timeout: Duration, +} + +pub struct Listener(Pipe); + +impl Listener { + pub fn new(name: &str, timeout: Duration) -> io::Result { + if name.is_empty() || name.contains(['\\', '/', '\0']) { + return Err(io::Error::new( + io::ErrorKind::InvalidInput, + "invalid pipe name", + )); + } + let path = format!(r"\\.\pipe\{name}"); + let wide: Vec<_> = std::ffi::OsStr::new(&path) + .encode_wide() + .chain(Some(0)) + .collect(); + let handle = unsafe { + CreateNamedPipeW( + wide.as_ptr(), + 3 | 0x4000_0000 | 0x0008_0000, + 8, + 1, + 65536, + 65536, + 0, + null(), + ) + }; + if handle == INVALID_HANDLE { + return Err(io::Error::last_os_error()); + } + Ok(Self(Pipe { + handle: OwnedHandle(handle), + timeout, + })) + } + + pub fn accept(self) -> io::Result { + let event = unsafe { CreateEventW(null(), 1, 0, null()) }; + if event.is_null() { + return Err(io::Error::last_os_error()); + } + let event = OwnedHandle(event); + let mut overlapped = Overlapped { + internal: 0, + internal_high: 0, + offset: 0, + offset_high: 0, + event: event.0, + }; + if unsafe { ConnectNamedPipe(self.0.handle.0, &mut overlapped) } != 0 { + return Ok(self.0); + } + let error = io::Error::last_os_error(); + if error.raw_os_error() == Some(535) { + return Ok(self.0); + } + if error.raw_os_error() != Some(ERROR_IO_PENDING) { + return Err(error); + } + let wait = unsafe { + WaitForSingleObject( + event.0, + self.0.timeout.as_millis().min(u32::MAX as u128 - 1) as u32, + ) + }; + let mut transferred = 0; + if wait != 0 { + let error = if wait == 258 { + io::Error::new(io::ErrorKind::TimedOut, "waiting for Rockstar game") + } else { + io::Error::last_os_error() + }; + unsafe { + CancelIoEx(self.0.handle.0, &mut overlapped); + GetOverlappedResult(self.0.handle.0, &mut overlapped, &mut transferred, 1); + } + return Err(error); + } + if unsafe { GetOverlappedResult(self.0.handle.0, &mut overlapped, &mut transferred, 0) } + == 0 + { + return Err(io::Error::last_os_error()); + } + Ok(self.0) + } +} + +impl Pipe { + pub fn client_pid(&self) -> io::Result { + let mut pid = 0; + if unsafe { GetNamedPipeClientProcessId(self.handle.0, &mut pid) } == 0 || pid == 0 { + return Err(io::Error::last_os_error()); + } + Ok(pid) + } + pub fn connect(name: &str, timeout: Duration) -> io::Result { + if name.is_empty() || name.contains(['\\', '/', '\0']) { + return Err(io::Error::new( + io::ErrorKind::InvalidInput, + "invalid pipe name", + )); + } + let path = format!(r"\\.\pipe\{name}"); + let wide: Vec<_> = std::ffi::OsStr::new(&path) + .encode_wide() + .chain(Some(0)) + .collect(); + let deadline = Instant::now() + timeout; + loop { + let handle = unsafe { + CreateFileW( + wide.as_ptr(), + 0xc000_0000, + 0, + null(), + 3, + 0x4000_0000, + null_mut(), + ) + }; + if handle != INVALID_HANDLE { + return Ok(Self { + handle: OwnedHandle(handle), + timeout, + }); + } + let error = io::Error::last_os_error(); + if !matches!(error.raw_os_error(), Some(2 | 231)) { + return Err(error); + } + let remaining = deadline.saturating_duration_since(Instant::now()); + if remaining.is_zero() { + return Err(io::Error::new( + io::ErrorKind::TimedOut, + "waiting for Rockstar pipe", + )); + } + unsafe { + WaitNamedPipeW(wide.as_ptr(), remaining.as_millis().min(50) as u32); + } + std::thread::sleep(remaining.min(Duration::from_millis(2))); + } + } + + fn transfer(&self, buffer: *mut u8, size: usize, writing: bool) -> io::Result { + if size == 0 { + return Ok(0); + } + let event = unsafe { CreateEventW(null(), 1, 0, null()) }; + if event.is_null() { + return Err(io::Error::last_os_error()); + } + let event = OwnedHandle(event); + let mut overlapped = Overlapped { + internal: 0, + internal_high: 0, + offset: 0, + offset_high: 0, + event: event.0, + }; + let mut transferred = 0; + let size = size.min(u32::MAX as usize) as u32; + let ok = unsafe { + if writing { + WriteFile( + self.handle.0, + buffer, + size, + &mut transferred, + &mut overlapped, + ) + } else { + ReadFile( + self.handle.0, + buffer, + size, + &mut transferred, + &mut overlapped, + ) + } + }; + if ok != 0 { + return Ok(transferred as usize); + } + let error = io::Error::last_os_error(); + if error.raw_os_error() == Some(ERROR_MORE_DATA) && !writing && transferred > 0 { + return Ok(transferred as usize); + } + if error.raw_os_error() != Some(ERROR_IO_PENDING) { + return Err(error); + } + let wait = unsafe { + WaitForSingleObject( + event.0, + self.timeout.as_millis().min(u32::MAX as u128 - 1) as u32, + ) + }; + if wait != 0 { + let error = if wait == 258 { + io::Error::new(io::ErrorKind::TimedOut, "Rockstar pipe operation timed out") + } else { + io::Error::last_os_error() + }; + unsafe { + CancelIoEx(self.handle.0, &mut overlapped); + GetOverlappedResult(self.handle.0, &mut overlapped, &mut transferred, 1); + } + return Err(error); + } + let ok = + unsafe { GetOverlappedResult(self.handle.0, &mut overlapped, &mut transferred, 0) }; + if ok != 0 { + return Ok(transferred as usize); + } + let error = io::Error::last_os_error(); + if error.raw_os_error() == Some(ERROR_MORE_DATA) && !writing && transferred > 0 { + return Ok(transferred as usize); + } + Err(error) + } +} + +impl Read for Pipe { + fn read(&mut self, buffer: &mut [u8]) -> io::Result { + self.transfer(buffer.as_mut_ptr(), buffer.len(), false) + } +} + +impl Write for Pipe { + fn write(&mut self, buffer: &[u8]) -> io::Result { + self.transfer(buffer.as_ptr() as *mut u8, buffer.len(), true) + } + + fn flush(&mut self) -> io::Result<()> { + Ok(()) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::{Frame, Length}; + use std::sync::mpsc; + use std::time::{SystemTime, UNIX_EPOCH}; + + fn name() -> String { + format!( + "dd-rockstar-test-{}-{}", + std::process::id(), + SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap() + .as_nanos() + ) + } + + #[test] + fn real_pipe_exchanges_both_framing_modes_and_identifies_the_client() { + let name = name(); + let listener = Listener::new(&name, Duration::from_secs(2)).unwrap(); + let worker = std::thread::spawn(move || { + let mut server = listener.accept().unwrap(); + assert_eq!(server.client_pid().unwrap(), std::process::id()); + assert_eq!( + Frame::read(&mut server, Length::Total).unwrap().tag, + *b"COLE" + ); + Frame { + tag: *b"DUNN", + payload: vec![b'A'; 640], + nul_terminated: false, + } + .write(&mut server, Length::Body) + .unwrap(); + }); + let mut client = Pipe::connect(&name, Duration::from_secs(2)).unwrap(); + Frame { + tag: *b"COLE", + payload: Vec::new(), + nul_terminated: true, + } + .write(&mut client, Length::Total) + .unwrap(); + let response = Frame::read(&mut client, Length::Body).unwrap(); + assert_eq!(response.payload.len(), 640); + assert!(!response.nul_terminated); + worker.join().unwrap(); + } + + #[test] + fn timed_out_accept_releases_the_first_pipe_instance() { + let name = name(); + let listener = Listener::new(&name, Duration::from_millis(20)).unwrap(); + assert!(matches!(listener.accept(), Err(error) if error.kind() == io::ErrorKind::TimedOut)); + assert!(Listener::new(&name, Duration::from_millis(20)).is_ok()); + } + + #[test] + fn timed_out_read_cancels_the_pending_operation() { + let name = name(); + let listener = Listener::new(&name, Duration::from_secs(2)).unwrap(); + let (done, wait) = mpsc::channel(); + let worker = std::thread::spawn(move || { + let _server = listener.accept().unwrap(); + wait.recv_timeout(Duration::from_secs(2)).unwrap(); + }); + let mut client = Pipe::connect(&name, Duration::from_millis(30)).unwrap(); + assert_eq!( + client.read(&mut [0u8; 4]).unwrap_err().kind(), + io::ErrorKind::TimedOut + ); + done.send(()).unwrap(); + worker.join().unwrap(); + } +} diff --git a/tools/tests/test_store_launch_rockstar.py b/tools/tests/test_store_launch_rockstar.py new file mode 100644 index 0000000000..68f4401544 --- /dev/null +++ b/tools/tests/test_store_launch_rockstar.py @@ -0,0 +1,90 @@ +import json +from pathlib import Path +import tempfile +import time +import unittest +from unittest.mock import patch + +from test_store_launch import store + + +class RockstarLaunch(unittest.TestCase): + def setup_game(self, root): + folder = Path(root) / 'game' + folder.mkdir() + exe = bytearray(128) + exe[:2] = b'MZ' + exe[0x3c:0x40] = (64).to_bytes(4, 'little') + exe[64:70] = b'PE\0\0\x4c\x01' + (folder / 'gta-vc.exe').write_bytes(exe) + (folder / 'MTLX.dll').write_bytes(b'vendor') + prefix = Path(root) / 'prefix' + (prefix / 'pfx').mkdir(parents=True) + (prefix / 'pfx/user.reg').write_text('WINE REGISTRY Version 2\n') + (prefix / 'pfx/system.reg').write_text('WINE REGISTRY Version 2\n') + service = Path(root) / 'service' + service.mkdir() + (service / 'Launcher32.exe').write_bytes(b'compiled-helper') + sidecar = {'store': 'rockstar', 'id': 'gtavc', 'exe': 'gta-vc.exe', 'args': ['one argument', '&literal']} + answer = {'ok': True, 'pipe': 'GTA-VC_Pipe', 'material': 'A' * 640, + 'expiresAt': int(time.time() * 1000) + 90000, 'ticket': 'must-not-be-exported'} + return folder, sidecar, prefix, service, answer + + def prepare(self, root, modify=lambda values: None): + values = self.setup_game(root) + modify(values) + folder, sidecar, prefix, service, answer = values + config = prefix / 'pfx' / store.ROCKSTAR_FOLDER / 'launch.json' + config.parent.mkdir(parents=True) + config.write_text('stale') + requests = [] + + def ask(channel, request, timeout): + requests.append(request) + return answer + + with patch.object(store, 'ROCKSTAR_SERVICE', service), patch.object(store, 'rockstar_registry', return_value=True): + result = store.prepare_rockstar(folder, sidecar, str(prefix), str(Path(root) / 'channel'), ask_app=ask) + return result, config, requests + + def test_handoff_contains_only_launch_fields_and_preserves_argument_boundaries(self): + with tempfile.TemporaryDirectory() as root: + result, path, requests = self.prepare(root) + self.assertEqual('ready', result) + data = json.loads(path.read_text()) + self.assertEqual({'folder', 'exe', 'workdir', 'args', 'pipe', 'material', 'expiresAt'}, set(data)) + self.assertEqual(['one argument', '&literal'], data['args']) + self.assertNotIn('must-not-be-exported', path.read_text()) + self.assertEqual('rockstar-launch', requests[0]['op']) + self.assertEqual(b'compiled-helper', path.with_name('Launcher.exe').read_bytes()) + + def test_rejected_or_expired_sessions_cannot_reuse_stale_material(self): + for update in ({'ok': False, 'reason': 'not-owned'}, {'material': 'A' * 641}, {'expiresAt': 1}): + with self.subTest(update=update), tempfile.TemporaryDirectory() as root: + result, config, _ = self.prepare(root, lambda values: values[4].update(update)) + self.assertNotEqual('ready', result) + self.assertFalse(config.exists()) + + def test_path_escape_does_not_request_account_data(self): + with tempfile.TemporaryDirectory() as root: + def change(values): + (Path(root) / 'outside.exe').write_bytes(b'MZ') + values[1]['exe'] = '../outside.exe' + result, config, requests = self.prepare(root, change) + self.assertEqual('invalid-game-path', result) + self.assertEqual([], requests) + self.assertFalse(config.exists()) + + def test_writes_both_registry_views_and_escapes_values(self): + with tempfile.TemporaryDirectory() as root: + folder, _, prefix, _, _ = self.setup_game(root) + with patch.object(store, 'wait_for_server', return_value=True): + self.assertTrue(store.rockstar_registry(folder, 'Grand Theft Auto: Vice City', prefix, '')) + text = (prefix / 'pfx/system.reg').read_text() + self.assertIn(r'[Software\\Rockstar Games\\Launcher]', text) + self.assertIn(r'[Software\\Wow6432Node\\Rockstar Games\\Launcher]', text) + self.assertIn('Grand Theft Auto: Vice City', text) + + +if __name__ == '__main__': + unittest.main() From d63193393d9747f225e1560911e5d005d565af71 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 21:36:32 -0500 Subject: [PATCH 46/57] feat(ui): agent features start off and live in Setup > Developer (#2550) --- .../droiddeck/launcher/agent/AgentAccess.kt | 2 +- .../com/droiddeck/launcher/agent/AgentTab.kt | 2 +- .../launcher/session/SessionPrefs.kt | 2 +- .../droiddeck/launcher/ui/FrontEndSetup.kt | 25 ++++++++++--------- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-b+es+419/strings.xml | 2 +- app/src/main/res/values-bg/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-da/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fi/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-hi/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-in/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-ko/strings.xml | 2 +- app/src/main/res/values-ms/strings.xml | 2 +- app/src/main/res/values-nb/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rPT/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ro/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-th/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-vi/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rHK/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- docs/agent-control.md | 2 +- docs/development/game-environment.md | 4 +-- docs/development/proot-performance.md | 2 +- tools/droiddeckctl | 2 +- tools/tests/test_droiddeckctl.py | 2 +- 42 files changed, 55 insertions(+), 54 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentAccess.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentAccess.kt index b755ca6466..2113161467 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentAccess.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentAccess.kt @@ -23,7 +23,7 @@ object AgentAccess { fun requireCommands(context: Context) { if (!commandsAllowed(context)) throw AgentException( "AGENT_COMMANDS_DISABLED", - "Debugging tools are off: turn on Setup > Diagnostics > Debugging tools on the device", + "Debugging tools are off: turn on Setup > Developer > Debugging tools on the device", ) } diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt index 7392473c72..b779288f3e 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.setValue import com.droiddeck.launcher.session.SessionPrefs object AgentTab { - var shown by mutableStateOf(true) + var shown by mutableStateOf(false) private set val visible: Boolean get() = shown && AgentHost.available diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index a14490bb8d..e47f9194bf 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -253,7 +253,7 @@ object SessionPrefs { prefs(context).edit().putBoolean("railLabels", show).apply() } - fun agentTab(context: Context): Boolean = prefs(context).getBoolean("agentTab", true) + fun agentTab(context: Context): Boolean = prefs(context).getBoolean("agentTab", false) fun setAgentTab(context: Context, show: Boolean) { prefs(context).edit().putBoolean("agentTab", show).apply() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index c3a5bb3784..0e22804a63 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -455,18 +455,6 @@ internal fun SetupPanel( val railContext = androidx.compose.ui.platform.LocalContext.current remember { RailLabels.load(railContext) } ToggleRow(host, "rail-labels", stringResource(R.string.setup_rail_labels), stringResource(R.string.setup_rail_labels_hint), RailLabels.shown) { RailLabels.set(railContext, it) } - if (com.droiddeck.launcher.agent.AgentHost.available) { - ToggleRow(host, "agent-tab", stringResource(R.string.setup_agent_tab), null, com.droiddeck.launcher.agent.AgentTab.shown) { - com.droiddeck.launcher.agent.AgentTab.set(railContext, it) - } - ToggleRow(host, "agent-pet", stringResource(R.string.setup_agent_pet), stringResource(R.string.setup_agent_pet_hint), AgentPet.enabled) { - AgentPet.set(railContext, it) - } - if (AgentPet.enabled && !AgentPet.allowed) ActionRow( - stringResource(R.string.setup_agent_pet_float), stringResource(R.string.setup_agent_pet_float_hint), - stringResource(R.string.setup_agent_pet_allow), onClick = { AgentPet.requestFloating(railContext) }, - ) - } LanguageRow(host, s.language, a.onLanguage) ToggleRow(host, "show-stores", stringResource(R.string.setup_stores), null, s.gameStoresEnabled, onChange = a.onGameStoresEnabled) } @@ -606,6 +594,19 @@ internal fun SetupPanel( ) { a.onGameDebugLogs() } ToggleRow(host, "vacdiag", stringResource(R.string.setup_vac_diag), stringResource(R.string.setup_vac_diag_hint), s.vacDiagnostics) { a.onVacDiagnostics() } ToggleRow(host, "agent-commands", stringResource(R.string.setup_agent_commands), null, s.agentCommands) { a.onAgentCommands() } + if (com.droiddeck.launcher.agent.AgentHost.available) { + val agentContext = androidx.compose.ui.platform.LocalContext.current + ToggleRow(host, "agent-tab", stringResource(R.string.setup_agent_tab), null, com.droiddeck.launcher.agent.AgentTab.shown) { + com.droiddeck.launcher.agent.AgentTab.set(agentContext, it) + } + ToggleRow(host, "agent-pet", stringResource(R.string.setup_agent_pet), stringResource(R.string.setup_agent_pet_hint), AgentPet.enabled) { + AgentPet.set(agentContext, it) + } + if (AgentPet.enabled && !AgentPet.allowed) ActionRow( + stringResource(R.string.setup_agent_pet_float), stringResource(R.string.setup_agent_pet_float_hint), + stringResource(R.string.setup_agent_pet_allow), onClick = { AgentPet.requestFloating(agentContext) }, + ) + } ToggleRow(host, "graphics-logs", stringResource(R.string.setup_graphics_logs), stringResource(R.string.setup_graphics_logs_hint), s.graphicsLogs) { a.onGraphicsLogs() } if (!s.adreno && com.droiddeck.launcher.session.SessionPrefs.steamGpuCompositingAllowed()) ToggleRow(host, "steam-gpu-drawing", stringResource(R.string.setup_steam_gpu_drawing), stringResource(R.string.setup_steam_gpu_drawing_hint), s.steamGpuDrawing) { a.onSteamGpuDrawing() } ActionRow(stringResource(R.string.setup_latest_logs), stringResource(R.string.drawer_logs_hint), stringResource(R.string.drawer_share_logs), a.onShareLogs, diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index e6cb1ab87c..7c2811030a 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2676,7 +2676,7 @@ %1$s · يلزم إعادة تشغيل هذا الجهاز إزالة %1$s؟ - التشخيص + المطوّر علامة مائية لاسم الإصدار عرض اسم إصدار الاختبار أو Lab على الشاشة. مفعّل افتراضيًا. جاهز للّعب diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 6f98b6bff0..078d972636 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2613,7 +2613,7 @@ %1$s · reinicio pendiente Este dispositivo ¿Quitar %1$s? - Diagnóstico + Desarrollador Marca de agua de compilación Muestra en pantalla la etiqueta de la versión de prueba o Lab. Activada de forma predeterminada. Listo para jugar diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 5aeb1e2e9a..dc02c0948f 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2568,7 +2568,7 @@ %1$s · нужен е рестарт Това устройство Премахване на %1$s? - Диагностика + Разработчик Воден знак с етикет на компилацията Показва етикета на тестовата или Lab компилация на екрана. Включено по подразбиране. Готово за игра diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 6011f2fe39..691da1a73c 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2622,7 +2622,7 @@ %1$s · čeká na restart Toto zařízení Odstranit %1$s? - Diagnostika + Vývojář Vodoznak s označením sestavení Zobrazit na obrazovce označení testovacího sestavení nebo sestavení Lab. Ve výchozím nastavení zapnuté. Připraveno ke hraní diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f443c3346e..f1b55c9650 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2568,7 +2568,7 @@ %1$s · kræver genstart Denne enhed Fjern %1$s? - Diagnostik + Udvikler Vandmærke med buildmærkat Vis mærkatet for test- eller Lab-builden på skærmen. Aktiveret som standard. Klar til at spille diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d16437026e..7d5ded3548 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2557,7 +2557,7 @@ %1$s · Neustart ausstehend Dieses Gerät %1$s entfernen? - Diagnose + Entwickler Build-Kennzeichnung als Wasserzeichen Kennzeichnung des Test- oder Lab-Builds auf dem Bildschirm anzeigen. Standardmäßig aktiviert. Bereit zum Spielen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index e64a289085..e31df6b602 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2568,7 +2568,7 @@ %1$s · απαιτείται επανεκκίνηση Αυτή η συσκευή Κατάργηση %1$s; - Διαγνωστικά + Προγραμματιστής Υδατογράφημα ετικέτας έκδοσης Εμφάνιση της ετικέτας δοκιμαστικής έκδοσης ή έκδοσης Lab στην οθόνη. Ενεργό από προεπιλογή. Έτοιμο για παιχνίδι diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c9fbd09fa9..c4639709ad 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2592,7 +2592,7 @@ %1$s · reinicio pendiente Este dispositivo ¿Quitar %1$s? - Diagnóstico + Desarrollador Marca de agua de compilación Muestra en pantalla la etiqueta de la versión de prueba o Lab. Activada de forma predeterminada. Listo para jugar diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 27acadee4a..9dcb88f402 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2568,7 +2568,7 @@ %1$s · vaatii uudelleenkäynnistyksen Tämä laite Poistetaanko %1$s? - Diagnostiikka + Kehittäjä Koontiversion vesileima Näytä testi- tai Lab-version tunniste näytöllä. Käytössä oletusarvoisesti. Valmis pelattavaksi diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index fd6bd7a654..412575e608 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2592,7 +2592,7 @@ %1$s · redémarrage en attente Cet appareil Supprimer %1$s ? - Diagnostic + Développeur Filigrane de version Afficher le libellé de la version de test ou Lab à l’écran. Activé par défaut. Prêt à jouer diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 1f48a5adef..c6042223f0 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2568,7 +2568,7 @@ %1$s · रीस्टार्ट बाकी यह डिवाइस %1$s हटाएं? - डायग्नोस्टिक्स + डेवलपर बिल्ड लेबल वॉटरमार्क स्क्रीन पर टेस्ट या Lab बिल्ड लेबल दिखाएँ। डिफ़ॉल्ट रूप से चालू। खेलने के लिए तैयार diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index b855f4a1ca..4d86e51f7e 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2568,7 +2568,7 @@ %1$s · újraindítás szükséges Ez a készülék Eltávolítja a %1$s-t? - Diagnosztika + Fejlesztő Buildcímke vízjelként A tesztbuild vagy Lab-build címkéjének megjelenítése a képernyőn. Alapértelmezés szerint bekapcsolva. Készen áll a játékra diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 7920ebc122..cecc8289f0 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2541,7 +2541,7 @@ %1$s · perlu mulai ulang Perangkat ini Hapus %1$s? - Diagnostik + Developer Tanda air label build Tampilkan label build pengujian atau Lab di layar. Aktif secara default. Siap bermain diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index dfcf569d61..58b65563ea 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2584,7 +2584,7 @@ %1$s · riavvio in attesa Questo dispositivo Rimuovere %1$s? - Diagnostica + Sviluppatore Filigrana con etichetta build Mostra sullo schermo l’etichetta della build di test o Lab. Attiva per impostazione predefinita. Pronto per giocare diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 3dee08d37a..0cdcc111bd 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2541,7 +2541,7 @@ %1$s · 再起動待ち このデバイス %1$sを削除しますか? - 診断 + 開発者 ビルドラベルの透かし テストビルドまたはLabビルドのラベルを画面に表示します。デフォルトで有効です。 プレイの準備完了 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index b0b023b482..fc352bcc37 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2541,7 +2541,7 @@ %1$s · 재시작 대기 이 기기 %1$s을(를) 제거하시겠습니까? - 진단 + 개발자 빌드 라벨 워터마크 테스트 또는 Lab 빌드 라벨을 화면에 표시합니다. 기본적으로 켜져 있습니다. 플레이 준비 완료 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 89a213972f..7135bd5457 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2541,7 +2541,7 @@ %1$s · perlu mula semula Peranti ini Alih keluar %1$s? - Diagnostik + Pembangun Tera air label binaan Paparkan label binaan ujian atau Lab pada skrin. Dihidupkan secara lalai. Sedia untuk bermain diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 7a67d2317b..f1a5b47fae 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2568,7 +2568,7 @@ %1$s · krever omstart Denne enheten Fjerne %1$s? - Diagnostikk + Utvikler Vannmerke for byggetikett Vis etiketten for test- eller Lab-bygget på skjermen. På som standard. Klar til å spille diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 2aa326714f..eff91dd724 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2568,7 +2568,7 @@ %1$s · herstart nodig Dit apparaat %1$s verwijderen? - Diagnostiek + Ontwikkelaar Buildlabel als watermerk Toon het label van de testbuild of Lab-build op het scherm. Standaard ingeschakeld. Klaar om te spelen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index fbca1d88dd..1267e54be9 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2622,7 +2622,7 @@ %1$s · wymaga restartu To urządzenie Usunąć %1$s? - Diagnostyka + Programista Znak wodny z etykietą kompilacji Pokazuj na ekranie etykietę kompilacji testowej lub Lab. Domyślnie włączone. Gotowe do gry diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 2d09f7127a..2db4dbb6ec 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2584,7 +2584,7 @@ %1$s · reinício pendente Este dispositivo Remover %1$s? - Diagnóstico + Programador Marca de água da compilação Mostrar no ecrã a etiqueta da compilação de teste ou Lab. Ativada por predefinição. Pronto para jogar diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 768753c6e6..643b20e847 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2584,7 +2584,7 @@ %1$s · reinício pendente Este aparelho Remover %1$s? - Diagnóstico + Desenvolvedor Marca de água da compilação Mostrar na tela a etiqueta da compilação de teste ou Lab. Ativada por padrão. Pronto para jogar diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index fac1699e94..3838347619 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2595,7 +2595,7 @@ %1$s · necesită repornire Acest dispozitiv Elimini %1$s? - Diagnosticare + Dezvoltator Filigrană cu eticheta versiunii Afișează pe ecran eticheta versiunii de testare sau Lab. Activată implicit. Pregătit de joc diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index cf3266525b..41cbd27d7c 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2702,7 +2702,7 @@ %1$s · нужен перезапуск Это устройство Удалить %1$s? - Диагностика + Разработчик Водяной знак с меткой сборки Показывать на экране метку тестовой сборки или сборки Lab. Включено по умолчанию. Готово к игре diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index e64a59dc88..5a6c222004 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2568,7 +2568,7 @@ %1$s · kräver omstart Den här enheten Ta bort %1$s? - Diagnostik + Utvecklare Vattenstämpel med byggetikett Visa testbyggets eller Lab-byggets etikett på skärmen. Aktiverad som standard. Redo att spela diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 1a778803c1..1e4d92cbf1 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2541,7 +2541,7 @@ %1$s · ต้องรีสตาร์ต อุปกรณ์นี้ ลบ %1$s? - การวินิจฉัย + นักพัฒนา ลายน้ำป้ายชื่อบิลด์ แสดงป้ายชื่อบิลด์ทดสอบหรือบิลด์ Lab บนหน้าจอ เปิดไว้โดยค่าเริ่มต้น พร้อมเล่นแล้ว diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index d4495911e0..906d04d13b 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2557,7 +2557,7 @@ %1$s · yeniden başlatma bekliyor Bu cihaz %1$s kaldırılsın mı? - Tanılama + Geliştirici Derleme etiketi filigranı Test veya Lab derlemesinin etiketini ekranda gösterir. Varsayılan olarak açıktır. Oynamaya hazır diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 77c5b4067e..5767ee73a2 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2622,7 +2622,7 @@ %1$s · потрібен перезапуск Цей пристрій Видалити %1$s? - Діагностика + Розробник Водяний знак із міткою збірки Показувати на екрані мітку тестової збірки або збірки Lab. Увімкнено за замовчуванням. Готово до гри diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 2ebccba807..c21f685321 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2541,7 +2541,7 @@ %1$s · cần khởi động lại Thiết bị này Xóa %1$s? - Chẩn đoán + Nhà phát triển Hình mờ nhãn bản dựng Hiển thị nhãn bản dựng thử nghiệm hoặc Lab trên màn hình. Được bật theo mặc định. Sẵn sàng để chơi diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 358546b076..5e9acd782f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2554,7 +2554,7 @@ 分别设置运行时驱动和显示驱动 使用 %1$s? 移除 %1$s? - 诊断 + 开发者 构建标签水印 在屏幕上显示测试版或 Lab 构建标签。默认启用。 可以游玩了 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 8510ce17d0..64f8133583 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2541,7 +2541,7 @@ %1$s · 等待重新啟動 此裝置 移除 %1$s? - 診斷 + 開發人員 建置標籤浮水印 在畫面上顯示測試版或 Lab 建置標籤。預設啟用。 可以開始遊戲 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index dc2ebfe803..30ef0996e5 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2541,7 +2541,7 @@ %1$s · 等待重新啟動 此裝置 要移除 %1$s 嗎? - 診斷 + 開發人員 組建標籤浮水印 在畫面上顯示測試版或 Lab 組建標籤。預設啟用。 已可開始遊戲 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b543ff3d78..e4611630b9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2991,7 +2991,7 @@ %1$s · restart pending This device Remove %1$s? - Diagnostics + Developer Smart glasses Display and head-tracking settings are shared across DroidDeck menus, games and desktop sessions. Connect smart glasses to change their display and tracking settings. Your saved settings are kept when you disconnect. diff --git a/docs/agent-control.md b/docs/agent-control.md index 7a1fed1d0e..4ac8706706 100644 --- a/docs/agent-control.md +++ b/docs/agent-control.md @@ -28,7 +28,7 @@ Player controls and observations work over authorized ADB on any build: `state`, `resume`, `wait`, `launch`, `quit`, `focus`, `input`, `ui`, `logs`, `screenshot`, `record`, `pacing`, `thermal`, `displays`, `wake`, `glasses` (except `glasses raw`), and `access`. -**Setup > Diagnostics > Debugging tools** is off by default in every build, including debug builds. +**Setup > Developer > Debugging tools** is off by default in every build, including debug builds. It enables `run`, `guest`, `cdp`, all `env` operations, `override`, `prefs`, and `glasses raw`. The toggle switches directly without a confirmation dialog. The bridge refuses to change it through `ui` or preference writes. The existing preference key, `setting-agent-commands` test tag, JSON command diff --git a/docs/development/game-environment.md b/docs/development/game-environment.md index 79206aa03a..766a565a55 100644 --- a/docs/development/game-environment.md +++ b/docs/development/game-environment.md @@ -104,7 +104,7 @@ Run the batch/reference and work-budget regressions with ## Game debug logs -Under **Setup > Diagnostics**, enable **Session logs** and **Game debug logs** +Under **Setup > Developer**, enable **Session logs** and **Game debug logs** before reproducing a Windows game problem. Game debug logs is off by default and is available when Session logs is enabled. It applies to the next game launch through DroidDeck's Valve or third-party Proton wrapper, including added games and store shortcuts. @@ -142,7 +142,7 @@ that diagnostics were skipped instead of writing uncollected files elsewhere. ## Enhanced diagnostics -Use **Setup > Diagnostics > Enhanced diagnostics for next session** when normal +Use **Setup > Developer > Enhanced diagnostics for next session** when normal session logs are not enough. The setting is one-shot: DroidDeck creates and retains the next session's log directory, records the diagnostic profile, then turns the setting off. It also enables the existing game diagnostic environment diff --git a/docs/development/proot-performance.md b/docs/development/proot-performance.md index bcf3424c1e..1cddb33976 100644 --- a/docs/development/proot-performance.md +++ b/docs/development/proot-performance.md @@ -325,7 +325,7 @@ or repeatedly hit a path the wrappers cannot resolve. ### Opt-in tracer profiling -With **Setup > Diagnostics > Debugging tools** enabled, queue profiling for one session: +With **Setup > Developer > Debugging tools** enabled, queue profiling for one session: ```sh tools/droiddeckctl proot-profile enable --slow-us 1000 diff --git a/tools/droiddeckctl b/tools/droiddeckctl index 3e37811d28..ea82343888 100755 --- a/tools/droiddeckctl +++ b/tools/droiddeckctl @@ -571,7 +571,7 @@ def unpack_logs(archive: Path, destination: Path, session_id: str) -> None: def require_commands(adb: str, serial: str) -> dict: access = checked(provider_call(adb, serial, "access"), "ACCESS_FAILED") if access.get("commands") is not True: - raise ControlError("Debugging tools are off: turn on Setup > Diagnostics > Debugging tools on the device", + raise ControlError("Debugging tools are off: turn on Setup > Developer > Debugging tools on the device", "AGENT_COMMANDS_DISABLED") return access diff --git a/tools/tests/test_droiddeckctl.py b/tools/tests/test_droiddeckctl.py index ab929de931..1f7e32cdff 100644 --- a/tools/tests/test_droiddeckctl.py +++ b/tools/tests/test_droiddeckctl.py @@ -303,7 +303,7 @@ class DroiddeckctlTest(FakeAdbTest): code, out = self.run_ctl("run", "/usr/bin/sh", "--", "-c", "true") self.assertEqual(7, code) self.assertEqual("AGENT_COMMANDS_DISABLED", out["error"]["code"]) - self.assertIn("Setup > Diagnostics > Debugging tools", out["error"]["message"]) + self.assertIn("Setup > Developer > Debugging tools", out["error"]["message"]) self.assertEqual(["access"], [c.get("method") for c in self.calls()]) def test_override_checks_names_before_pushing_any_file(self): From 827ab2d4856305f81a26e767d62e280f52c844e7 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 22:18:39 -0500 Subject: [PATCH 47/57] fix(hud): FPS and clocks read right after sleep and wake (#2552) * fix(hud): frame times follow the paused session's clock shift * fix(hud): core clocks show their average over each sample --- .../launcher/hud/DroidDeckHudHost.kt | 2 +- .../com/droiddeck/launcher/hud/GameFrames.kt | 27 +++++++- .../droiddeck/launcher/hud/HudMetrics.java | 66 ++++++++++++++----- .../com/droiddeck/launcher/ui/BottomStrip.kt | 3 +- .../launcher/ui/BottomTelemetryPage.kt | 3 +- .../launcher/hud/CoreClockAverageTest.kt | 26 ++++++++ .../droiddeck/launcher/hud/FrameStatsTest.kt | 15 +++++ 7 files changed, 120 insertions(+), 22 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/hud/CoreClockAverageTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt index 492d626c5b..e2ddefc692 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt @@ -22,7 +22,7 @@ import kotlin.math.roundToInt class DroidDeckHudHost(context: Context) { private val context = context.applicationContext private val handler = Handler(Looper.getMainLooper()) - private val feed = GameFrameFeed(File(LinuxRuntime.rootDir(this.context), HudFrames.PATH)) + private val feed = GameFrameFeed.forRoot(LinuxRuntime.rootDir(this.context)) private val readings = MangoReadings(File(this.context.filesDir, "session"), LinuxRuntime.rootDir(this.context)) private var view: DroidDeckHudView? = null private var parent: ViewGroup? = null diff --git a/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt b/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt index 2aba209ded..db5f74e4cf 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt @@ -1,6 +1,7 @@ package com.droiddeck.launcher.hud import java.io.File +import java.io.RandomAccessFile import kotlin.math.roundToInt internal class FrameStats { @@ -159,7 +160,11 @@ internal class FrameStats { } } -internal class GameFrameFeed(private val file: File, val stats: FrameStats = FrameStats()) { +internal class GameFrameFeed( + private val file: File, + val stats: FrameStats = FrameStats(), + private val clockControl: File? = null, +) { private var handle = 0L private var nextOpenNs = 0L private var lastRingFrameNs = 0L @@ -171,6 +176,8 @@ internal class GameFrameFeed(private val file: File, val stats: FrameStats = Fra private var lastCompositorNs = 0L @Volatile private var compositorFrames = 0L private var seenCompositorFrames = 0L + private var clockShiftNs = 0L + private var clockShiftReadNs = Long.MIN_VALUE @Volatile var engine = "" private set @@ -199,6 +206,9 @@ internal class GameFrameFeed(private val file: File, val stats: FrameStats = Fra } val n = HudFrames.nativePoll(handle, frametimes, times) if (n > 0) { + var shift = guestClockShift(nowNs, SHIFT_NS) + if (nowNs - (times[n - 1] + shift) > LIVE_NS) shift = guestClockShift(nowNs, SHIFT_RECHECK_NS) + for (i in 0 until n) times[i] += shift if (!fromGamescope) { stats.reset() fromGamescope = true @@ -216,6 +226,16 @@ internal class GameFrameFeed(private val file: File, val stats: FrameStats = Fra return n > 0 || compositorAdded } + internal fun guestClockShift(nowNs: Long, maxAgeNs: Long): Long { + val control = clockControl ?: return 0L + if (clockShiftReadNs != Long.MIN_VALUE && nowNs - clockShiftReadNs < maxAgeNs) return clockShiftNs + clockShiftReadNs = nowNs + clockShiftNs = runCatching { + RandomAccessFile(control, "r").use { if (it.length() < Long.SIZE_BYTES) 0L else java.lang.Long.reverseBytes(it.readLong()) } + }.getOrDefault(0L).coerceAtLeast(0L) + return clockShiftNs + } + fun onCompositorFrame(nowNs: Long) { if (fromGamescope) { lastCompositorNs = 0L @@ -253,6 +273,11 @@ internal class GameFrameFeed(private val file: File, val stats: FrameStats = Fra private const val LIVE_NS = 2_000_000_000L private const val STALE_NS = 5_000_000_000L private const val INFO_NS = 500_000_000L + private const val SHIFT_NS = 1_000_000_000L + private const val SHIFT_RECHECK_NS = 100_000_000L + private const val CLOCK_CONTROL_PATH = "tmp/.bl-clock" + + fun forRoot(root: File) = GameFrameFeed(File(root, HudFrames.PATH), clockControl = File(root, CLOCK_CONTROL_PATH)) fun engineLabel(name: String): String = when (name) { "DXVK" -> "DXVK" diff --git a/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java b/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java index 51a4e42608..1dc5a39bcd 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java +++ b/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java @@ -651,15 +651,10 @@ public class HudMetrics { return currentRawToAmps(raw); } - public Integer getCpuClockMhz() { - int cores = Runtime.getRuntime().availableProcessors(); - long maxKhz = 0; - for (int i = 0; i < cores; i++) { - Long cur = readLongFromLine("/sys/devices/system/cpu/cpu" + i + "/cpufreq/scaling_cur_freq"); - if (cur != null && cur > maxKhz) maxKhz = cur; - } - if (maxKhz <= 0) return null; - return (int) (maxKhz / 1000L); + static Integer fastestCoreMhz(int[] perCoreMhz) { + int max = 0; + for (int mhz : perCoreMhz) max = Math.max(max, mhz); + return max > 0 ? max : null; } private List gpuClockPathsCache = null; @@ -809,7 +804,8 @@ public class HudMetrics { if (mango != null) return mangoSnapshot(mango); Integer cpu = getCpuUsagePercent(); Integer gpu = getGpuUsagePercent(); - Integer cpuClk = getCpuClockMhz(); + int[] perCoreClk = getPerCoreClockMhz(); + Integer cpuClk = fastestCoreMhz(perCoreClk); Integer gpuClk = getGpuClockMhz(); Integer cpuTemp = getCpuTempC(); Integer gpuTemp = getGpuTempC(); @@ -829,7 +825,6 @@ public class HudMetrics { Battery battery = collectBattery(); int[] perCorePct = readPerCorePercent(); - int[] perCoreClk = getPerCoreClockMhz(); long[] swap = getSwapBytes(); long[] net = readNetRateBps(); @@ -850,24 +845,63 @@ public class HudMetrics { Battery battery = bat == null ? android : new Battery(bat.getWatts(), bat.getCharging(), bat.getPercent() != null ? bat.getPercent() : android.percent, android.tempC, android.runtimeText); long[] net = readNetRateBps(); - return new Snapshot(cpu != null ? cpu.getPercent() : null, m.gpuPercent(), getCpuClockMhz(), m.gpuClockMhz(), + int[] perCoreClk = getPerCoreClockMhz(); + return new Snapshot(cpu != null ? cpu.getPercent() : null, m.gpuPercent(), fastestCoreMhz(perCoreClk), m.gpuClockMhz(), m.cpuTempC(), m.gpuTempC(), used, total, total > 0 ? used * 100f / total : 0f, m.vramBytes(), battery, - cpu != null ? cpu.getPerCore() : new int[0], getPerCoreClockMhz(), + cpu != null ? cpu.getPerCore() : new int[0], perCoreClk, mem != null && mem.getSwapTotalBytes() > 0 ? mem.getSwapUsedBytes() : null, mem != null && mem.getSwapTotalBytes() > 0 ? mem.getSwapTotalBytes() : null, net == null ? null : net[0], net == null ? null : net[1]); } - public int[] getPerCoreClockMhz() { + private final java.util.Map lastTimeInState = new java.util.HashMap<>(); + + public synchronized int[] getPerCoreClockMhz() { int cores = Runtime.getRuntime().availableProcessors(); int[] out = new int[Math.max(0, cores)]; for (int i = 0; i < out.length; i++) { - Long cur = readLongFromLine("/sys/devices/system/cpu/cpu" + i + "/cpufreq/scaling_cur_freq"); - out[i] = (cur != null && cur > 0) ? (int) (cur / 1000L) : 0; + long[][] table = readTimeInState("/sys/devices/system/cpu/cpu" + i + "/cpufreq/stats/time_in_state"); + long khz = table == null ? -1L : averageKhz(lastTimeInState.put(i, table), table); + if (khz <= 0L) { + Long cur = readLongFromLine("/sys/devices/system/cpu/cpu" + i + "/cpufreq/scaling_cur_freq"); + khz = cur != null ? cur : 0L; + } + out[i] = khz > 0L ? (int) (khz / 1000L) : 0; } return out; } + static long averageKhz(long[][] before, long[][] after) { + if (before == null || after == null || !java.util.Arrays.equals(before[0], after[0])) return -1L; + long weighted = 0L, time = 0L; + for (int i = 0; i < after[0].length; i++) { + long dt = after[1][i] - before[1][i]; + if (dt <= 0L) continue; + weighted += after[0][i] * dt; + time += dt; + } + return time > 0L ? weighted / time : -1L; + } + + private static long[][] readTimeInState(String path) { + List rows = new ArrayList<>(); + try (BufferedReader r = new BufferedReader(new FileReader(path))) { + String line; + while ((line = r.readLine()) != null) { + String[] parts = line.trim().split("\\s+"); + if (parts.length < 2) continue; + try { rows.add(new long[] { Long.parseLong(parts[0]), Long.parseLong(parts[1]) }); } + catch (NumberFormatException ignored) {} + } + } catch (Exception e) { + return null; + } + if (rows.isEmpty()) return null; + long[][] table = new long[2][rows.size()]; + for (int i = 0; i < rows.size(); i++) { table[0][i] = rows.get(i)[0]; table[1][i] = rows.get(i)[1]; } + return table; + } + private long[] lastCoreTotal = null; private long[] lastCoreIdle = null; private static final int PER_CORE_STAT = 1, PER_CORE_ESTIMATE = 2; diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt index 3df2090bc4..60844df4de 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt @@ -14,7 +14,6 @@ import androidx.compose.ui.platform.LocalContext import com.droiddeck.launcher.hud.DroidDeckHudConfig import com.droiddeck.launcher.hud.FrameStats import com.droiddeck.launcher.hud.GameFrameFeed -import com.droiddeck.launcher.hud.HudFrames import com.droiddeck.launcher.hud.HudMetrics import com.droiddeck.launcher.hud.KeyValueSet import com.droiddeck.launcher.hud.MangoReadings @@ -34,7 +33,7 @@ private const val STRIP_TEMP_PLAIN = 0xFFF2F5F9.toInt() @Composable internal fun SessionBottomStrip(pageId: String?, fps: () -> Float?) { val context = LocalContext.current - val frames = remember { GameFrameFeed(File(LinuxRuntime.rootDir(context), HudFrames.PATH)) } + val frames = remember { GameFrameFeed.forRoot(LinuxRuntime.rootDir(context)) } DisposableEffect(frames) { onDispose { frames.close() } } val page by rememberUpdatedState(pageId) var frameTick by remember { mutableIntStateOf(0) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt index 08b4ae8ada..4c454b52d1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt @@ -55,7 +55,6 @@ import com.droiddeck.launcher.hud.DroidDeckHudConfig import com.droiddeck.launcher.hud.DroidDeckHudHost import com.droiddeck.launcher.hud.FrameStats import com.droiddeck.launcher.hud.GameFrameFeed -import com.droiddeck.launcher.hud.HudFrames import com.droiddeck.launcher.hud.HudMetrics import com.droiddeck.launcher.hud.KeyValueSet import com.droiddeck.launcher.hud.MangoReadings @@ -144,7 +143,7 @@ fun BottomTelemetryPage(fps: () -> Float?, runningGame: () -> String? = { null } var perfTick by remember { mutableIntStateOf(0) } var traceTick by remember { mutableIntStateOf(0) } var clock by remember { mutableStateOf("") } - val frames = remember { GameFrameFeed(File(LinuxRuntime.rootDir(context), HudFrames.PATH)) } + val frames = remember { GameFrameFeed.forRoot(LinuxRuntime.rootDir(context)) } DisposableEffect(frames) { onDispose { frames.close() } } val currentFps = { if (frames.live) frames.stats.fps else fps() } var hud by remember { mutableStateOf(StatsHud.from(SessionPrefs.statsHud(context))) } diff --git a/app/src/test/java/com/droiddeck/launcher/hud/CoreClockAverageTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/CoreClockAverageTest.kt new file mode 100644 index 0000000000..80c1c7121c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/hud/CoreClockAverageTest.kt @@ -0,0 +1,26 @@ +package com.droiddeck.launcher.hud + +import org.junit.Assert.assertEquals +import org.junit.Test + +class CoreClockAverageTest { + private val freqs = longArrayOf(902_400L, 1_459_200L, 2_803_200L) + + @Test fun aCoreShowsTheClockItRanAtThroughTheSample() { + val before = arrayOf(freqs, longArrayOf(100L, 50L, 10L)) + val after = arrayOf(freqs, longArrayOf(125L, 50L, 35L)) + assertEquals(1_852_800L, HudMetrics.averageKhz(before, after)) + } + + @Test fun theFirstSampleOrAChangedTableFallsBack() { + val after = arrayOf(freqs, longArrayOf(1L, 2L, 3L)) + assertEquals(-1L, HudMetrics.averageKhz(null, after)) + assertEquals(-1L, HudMetrics.averageKhz(arrayOf(longArrayOf(1L), longArrayOf(0L)), after)) + assertEquals(-1L, HudMetrics.averageKhz(after, after)) + } + + @Test fun theCpuClockIsTheFastestCore() { + assertEquals(2_803, HudMetrics.fastestCoreMhz(intArrayOf(902, 2_803, 1_459))) + assertEquals(null, HudMetrics.fastestCoreMhz(intArrayOf(0, 0))) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/hud/FrameStatsTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/FrameStatsTest.kt index 724275fd35..20e83499e8 100644 --- a/app/src/test/java/com/droiddeck/launcher/hud/FrameStatsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/hud/FrameStatsTest.kt @@ -81,6 +81,21 @@ class FrameStatsTest { assertEquals(0, stats.slowFrames(now, 60_000_000_000L)) } + @Test fun guestFrameTimesMoveByThePausedSessionsClockShift() { + val control = java.io.File.createTempFile("bl-clock", null) + try { + control.writeBytes(java.nio.ByteBuffer.allocate(8).order(java.nio.ByteOrder.LITTLE_ENDIAN).putLong(62_283_930_706L).array()) + val feed = GameFrameFeed(java.io.File("/nonexistent/droiddeck-hud/frames"), clockControl = control) + assertEquals(62_283_930_706L, feed.guestClockShift(1_000_000_000L, 1_000_000_000L)) + control.writeBytes(java.nio.ByteBuffer.allocate(8).order(java.nio.ByteOrder.LITTLE_ENDIAN).putLong(70_000_000_000L).array()) + assertEquals(62_283_930_706L, feed.guestClockShift(1_050_000_000L, 1_000_000_000L)) + assertEquals(70_000_000_000L, feed.guestClockShift(1_200_000_000L, 100_000_000L)) + assertEquals(0L, GameFrameFeed(java.io.File("/nonexistent/droiddeck-hud/frames")).guestClockShift(0L, 0L)) + } finally { + control.delete() + } + } + @Test fun compositorFramesDoNotCountAsLiveGamescopeFrames() { val feed = GameFrameFeed(java.io.File("/nonexistent/droiddeck-hud/frames")) var now = 1_000_000_000L From 1b732c1b652a3bd44979f343436d5d0dba2c84dd Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 22:38:22 -0500 Subject: [PATCH 48/57] Fix agent pet overlay permission and GitHub setup (#2548) --- app/src/main/assets/agent/dd-gh-login | 26 ++++++------------- .../launcher/agent/AgentHostService.kt | 3 +++ .../droiddeck/launcher/agent/AgentSetup.kt | 5 +++- .../com/droiddeck/launcher/ui/AgentPet.kt | 4 +++ tools/agent/dd-gh-login | 25 +++++++----------- 5 files changed, 28 insertions(+), 35 deletions(-) diff --git a/app/src/main/assets/agent/dd-gh-login b/app/src/main/assets/agent/dd-gh-login index 86ff4707e0..d3c7517e55 100644 --- a/app/src/main/assets/agent/dd-gh-login +++ b/app/src/main/assets/agent/dd-gh-login @@ -1,27 +1,17 @@ #!/bin/bash -# GitHub sign-in through Android's browser, with the one-time code typed in for the person. -serial=${ADB_SERIAL:-127.0.0.1:5555} -display=${DD_BROWSER_DISPLAY:-0} -adb connect "$serial" >/dev/null 2>&1 +# Starts GitHub's device login and opens its approval page in Android. coproc GH { BROWSER=true gh auth login --hostname github.com --git-protocol https --web 2>&1; } -# bash drops GH and GH_PID once gh exits, which can be before the loop reads its last line. -ghpid=$GH_PID +gh_pid=$GH_PID exec {ghout}<&"${GH[0]}" {ghin}>&"${GH[1]}" -typed= +shown= while IFS= read -r line <&"$ghout"; do printf '%s\n' "$line" code=$(grep -oE '[A-Z0-9]{4}-[A-Z0-9]{4}' <<<"$line" | head -1) - if [ -n "$code" ] && [ -z "$typed" ]; then - typed=1 + if [ -n "$code" ] && [ -z "$shown" ]; then + shown=1 echo >&"$ghin" - adb -s "$serial" shell "am start --display $display -a android.intent.action.VIEW -d https://github.com/login/device" >/dev/null 2>&1 - # Chrome drops characters from `input text` and from fast key events on this page. - keys= - for ((i = 0; i < ${#code}; i++)); do - c=${code:i:1} - [ "$c" = - ] || keys+="input -d $display keyevent KEYCODE_$c; sleep 0.4; " - done - (sleep 7; adb -s "$serial" shell "$keys" >/dev/null 2>&1) & + printf 'GitHub device code: %s · github.com/login/device\n' "$code" + android-open https://github.com/login/device fi done -wait "$ghpid" +wait "$gh_pid" diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHostService.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHostService.kt index e8f3036d16..66fed326ee 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHostService.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHostService.kt @@ -77,6 +77,9 @@ class AgentHostService : Service() { private fun describe(context: Context): String { val lab = AgentHost.lab?.takeIf { it.running } if (lab != null) return context.getString(R.string.agent_lab_progress, lab.permille / 10, minutes(lab.etaSeconds.toLong().coerceAtLeast(0))) + AgentSetup.detail[AgentSetup.Step.GITHUB]?.takeIf { + AgentSetup.status[AgentSetup.Step.GITHUB] == AgentSetup.Status.WORKING && it.startsWith("GitHub device code:") + }?.let { return it } if (AgentHost.state != AgentHost.State.WORKING) return context.getString(R.string.agent_setting_up) val tool = AgentHost.running() val elapsed = minutes((SystemClock.elapsedRealtime() - AgentHost.turnStarted) / 1000) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt index f5c080a060..754dfa2ea9 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt @@ -106,7 +106,10 @@ object AgentSetup { child.inputStream.bufferedReader().forEachLine { line -> log.appendLine(line) val text = line.trim() - if (text.isNotEmpty() && !noise(text)) main.post { detail[step] = text.take(160) } + if (text.isNotEmpty() && !noise(text)) main.post { + detail[step] = text.take(160) + if (step == Step.GITHUB && text.startsWith("GitHub device code:")) AgentHostService.update(app) + } } child.waitFor().also { log.appendLine("exit $it") } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPet.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPet.kt index f154295450..8adadcab9c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPet.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPet.kt @@ -116,6 +116,10 @@ internal object AgentPet { fun set(context: Context, on: Boolean) { enabled = on AgentHost.prefs(context).edit().putBoolean(KEY, on).apply() + if (on) { + allowed = PetWindows.allowed(context) + if (!allowed) requestFloating(context) + } } /** Opens the system page where the user lets DroidDeck draw over other apps. */ diff --git a/tools/agent/dd-gh-login b/tools/agent/dd-gh-login index adf816a247..d3c7517e55 100755 --- a/tools/agent/dd-gh-login +++ b/tools/agent/dd-gh-login @@ -1,24 +1,17 @@ #!/bin/bash -# GitHub sign-in through Android's browser on the bottom screen, with the one-time code typed in. -serial=${ADB_SERIAL:-127.0.0.1:5555} -adb connect "$serial" >/dev/null 2>&1 +# Starts GitHub's device login and opens its approval page in Android. coproc GH { BROWSER=true gh auth login --hostname github.com --git-protocol https --web 2>&1; } gh_pid=$GH_PID -typed= -while IFS= read -r line <&"${GH[0]}"; do +exec {ghout}<&"${GH[0]}" {ghin}>&"${GH[1]}" +shown= +while IFS= read -r line <&"$ghout"; do printf '%s\n' "$line" code=$(grep -oE '[A-Z0-9]{4}-[A-Z0-9]{4}' <<<"$line" | head -1) - if [ -n "$code" ] && [ -z "$typed" ]; then - typed=1 - echo >&"${GH[1]}" - adb -s "$serial" shell "am start --display 2 -a android.intent.action.VIEW -d https://github.com/login/device" >/dev/null 2>&1 - # Chrome drops characters from `input text` and from fast key events on this page. - keys= - for ((i = 0; i < ${#code}; i++)); do - c=${code:i:1} - [ "$c" = - ] || keys+="input -d 2 keyevent KEYCODE_$c; sleep 0.4; " - done - (sleep 7; adb -s "$serial" shell "$keys" >/dev/null 2>&1) & + if [ -n "$code" ] && [ -z "$shown" ]; then + shown=1 + echo >&"$ghin" + printf 'GitHub device code: %s · github.com/login/device\n' "$code" + android-open https://github.com/login/device fi done wait "$gh_pid" From bb05e20d1b72ea288d45270fbebb7774f383cc3c Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 22:39:06 -0500 Subject: [PATCH 49/57] feat(library): pick the game resolution for games started without Steam (#2520) --- .../launcher/core/GameEnvironment.kt | 10 +++ .../droiddeck/launcher/core/GameResolution.kt | 70 +++++++++++++++++++ .../launcher/session/GameEnvironmentStore.kt | 7 ++ .../launcher/session/NoSteamLaunch.kt | 19 +++++ .../launcher/session/SelectedGameProfile.kt | 2 +- .../launcher/session/SessionService.kt | 8 +++ .../droiddeck/launcher/ui/FrontEndSetup.kt | 64 +++++++++++++++++ app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-b+es+419/strings.xml | 1 + app/src/main/res/values-bg/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-hi/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values-ms/strings.xml | 1 + app/src/main/res/values-nb/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rPT/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ro/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-th/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-vi/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + .../launcher/core/GameResolutionTest.kt | 60 ++++++++++++++++ .../overlay/usr/local/bin/droiddeck-session | 8 ++- tools/tests/test_game_resolution.py | 53 ++++++++++++++ 43 files changed, 332 insertions(+), 2 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/core/GameResolution.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/core/GameResolutionTest.kt create mode 100644 tools/tests/test_game_resolution.py diff --git a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironment.kt b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironment.kt index 26ffb499cc..53f152a60b 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironment.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironment.kt @@ -49,6 +49,16 @@ object GameEnvironment { return withScopeValue(config, scope, NO_STEAM, if (on) "1" else null) } + const val GAME_RESOLUTION = "DROIDDECK_GAME_RESOLUTION" + + fun gameResolution(config: Config, scope: String): GameResolution.Choice? = + if (scope.isEmpty()) null else GameResolution.parse(config.games[scope]?.get(GAME_RESOLUTION)) + + fun withGameResolution(config: Config, scope: String, choice: GameResolution.Choice?): Config { + require(scope.isNotEmpty() && validScope(scope)) + return withScopeValue(config, scope, GAME_RESOLUTION, choice?.let(GameResolution::format)) + } + fun effective(config: Config, preset: String, scope: String, forceSsbs: Boolean = false): Map = defaults(preset, forceSsbs) + config.shared + if (scope.isEmpty()) emptyMap() else config.games[scope].orEmpty() diff --git a/app/src/main/java/com/droiddeck/launcher/core/GameResolution.kt b/app/src/main/java/com/droiddeck/launcher/core/GameResolution.kt new file mode 100644 index 0000000000..0255d9616b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/core/GameResolution.kt @@ -0,0 +1,70 @@ +package com.droiddeck.launcher.core + +object GameResolution { + sealed interface Choice + data class Fixed(val width: Int, val height: Int) : Choice + data class Scaled(val scale: Float) : Choice + + data class Aspect(val label: String, val sizes: List) + + val aspects = listOf( + Aspect("16:9", listOf(Fixed(960, 540), Fixed(1280, 720), Fixed(1600, 900), Fixed(1920, 1080), Fixed(2560, 1440))), + Aspect("16:10", listOf(Fixed(1280, 800), Fixed(1440, 900), Fixed(1680, 1050), Fixed(1920, 1200), Fixed(2560, 1600))), + Aspect("4:3", listOf(Fixed(640, 480), Fixed(800, 600), Fixed(1024, 768), Fixed(1280, 960), Fixed(1440, 1080))), + ) + + val scales = listOf(1.5f, 2f, 3f) + + const val MIN_WIDTH = 320 + const val MIN_HEIGHT = 240 + const val MAX_SIDE = 7680 + private const val SCALED_PREFIX = "/" + + fun parse(value: String?): Choice? { + val text = value?.trim().orEmpty() + if (text.startsWith(SCALED_PREFIX)) { + return text.removePrefix(SCALED_PREFIX).toFloatOrNull()?.takeIf { it > 1f && it <= 8f }?.let(::Scaled) + } + val parts = text.split('x', 'X', '×').map { it.trim().toIntOrNull() } + if (parts.size != 2) return null + val (w, h) = parts + return if (w != null && h != null && valid(w, h)) Fixed(w and 1.inv(), h and 1.inv()) else null + } + + fun valid(width: Int, height: Int) = width in MIN_WIDTH..MAX_SIDE && height in MIN_HEIGHT..MAX_SIDE + + fun format(choice: Choice): String = when (choice) { + is Fixed -> "${choice.width}x${choice.height}" + is Scaled -> SCALED_PREFIX + formatScale(choice.scale) + } + + fun formatScale(scale: Float): String = + (Math.round(scale * 10) / 10f).let { if (it % 1f == 0f) it.toInt().toString() else it.toString() } + + fun resolve(choice: Choice, output: Pair): Pair = when (choice) { + is Fixed -> choice.width to choice.height + is Scaled -> (Math.round(output.first / choice.scale).coerceAtLeast(MIN_WIDTH) and 1.inv()) to + (Math.round(output.second / choice.scale).coerceAtLeast(MIN_HEIGHT) and 1.inv()) + } + + fun aspectLabel(width: Int, height: Int): String { + if (width <= 0 || height <= 0) return "" + val ratio = width.toFloat() / height + aspects.firstOrNull { a -> + val (w, h) = a.label.split(':').map(String::toFloat) + kotlin.math.abs(ratio - w / h) < 0.02f + }?.let { return it.label } + if (kotlin.math.abs(ratio - 64f / 27f) < 0.04f || kotlin.math.abs(ratio - 21f / 9f) < 0.04f) return "21:9" + val g = gcd(width, height) + return if (width / g <= 32) "${width / g}:${height / g}" else String.format(java.util.Locale.ROOT, "%.2f:1", ratio) + } + + fun sizesFor(aspect: Aspect, panel: Pair): List { + val long = maxOf(panel.first, panel.second) + val short = minOf(panel.first, panel.second) + val fit = aspect.sizes.filter { it.width <= long && it.height <= short } + return fit.ifEmpty { aspect.sizes.take(1) } + } + + private tailrec fun gcd(a: Int, b: Int): Int = if (b == 0) a else gcd(b, a % b) +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt b/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt index 2a19f39abc..81dc109d67 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt @@ -79,6 +79,13 @@ object GameEnvironmentStore { return config } + @Synchronized + fun setGameResolution(context: Context, scope: String, choice: com.droiddeck.launcher.core.GameResolution.Choice?): GameEnvironment.Config { + val config = GameEnvironment.withGameResolution(read(context), scope, choice) + save(context, config) + return config + } + @Synchronized fun setDefault(context: Context, scope: String, name: String, value: String): Boolean { val config = read(context) diff --git a/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt b/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt index 8d8070f875..a1f39ae470 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt @@ -30,6 +30,25 @@ object NoSteamLaunch { GameEnvironment.gameNoSteam(GameEnvironmentStore.read(context), (appId and 0xFFFFFFFFL).toString()) }.getOrDefault(false) + fun scopeOf(program: String?, args: List, battleNetTitle: (String) -> String? = { null }): String? = when (program) { + EPIC -> EpicClient.shortcutAppId.toString() + BATTLENET -> args.getOrNull(args.indexOf("launch") + 1)?.takeIf { args.contains("launch") }?.let(battleNetTitle) + ?: com.droiddeck.launcher.runtime.BattleNet.APP_ID.toString() + PROTON_RUN -> args.getOrNull(args.indexOf("--app") + 1)?.takeIf { args.contains("--app") } + else -> null + }?.takeIf { it.isNotEmpty() && GameEnvironment.validScope(it) } + + fun battleNetTitleScope(context: Context, code: String): String? = + AddedGames.scan(context).firstOrNull { game -> + game.source == com.droiddeck.launcher.stores.Store.BATTLENET.id && + game.storeId?.let(com.droiddeck.launcher.runtime.BattleNet::title)?.code == code + }?.let { settingsId(it).toString() } + + fun resolution(config: GameEnvironment.Config, scope: String?, output: Pair): Pair? { + val choice = scope?.let { GameEnvironment.gameResolution(config, it) } ?: return null + return com.droiddeck.launcher.core.GameResolution.resolve(choice, output) + } + fun command(game: Library.SteamGame, added: AddedGames.Game?): Command? = when { game.library == Library.EPIC_LAUNCHER -> Command(EPIC, listOf("run"), game.name) game.library == Library.ADDED && game.source == com.droiddeck.launcher.stores.Store.BATTLENET.id -> diff --git a/app/src/main/java/com/droiddeck/launcher/session/SelectedGameProfile.kt b/app/src/main/java/com/droiddeck/launcher/session/SelectedGameProfile.kt index cdcc617a61..c3df4a97c4 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SelectedGameProfile.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SelectedGameProfile.kt @@ -59,7 +59,7 @@ data class SelectedGameProfile( ) } val otherEnvironment = environment.games[game.profileKey].orEmpty().keys - FexPreset.environmentKeys - - GameEnvironment.NO_STEAM + GameEnvironment.NO_STEAM - GameEnvironment.GAME_RESOLUTION return SelectedGameProfile( appId = selectedAppId, name = game.name, diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 232eaf0c6d..3e7f30b15f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -588,6 +588,14 @@ class SessionService : Service() { guest.add("BL_WIDTH=" + size.first) guest.add("BL_HEIGHT=" + size.second) + if (noSteamGame()) runCatching { + val scope = NoSteamLaunch.scopeOf(SessionState.program, SessionState.programArgs) { NoSteamLaunch.battleNetTitleScope(this, it) } + NoSteamLaunch.resolution(GameEnvironmentStore.read(this), scope, size) + }.onFailure { Log.w(TAG, "game resolution", it) }.getOrNull()?.let { (w, h) -> + guest.add("BL_GAME_WIDTH=$w") + guest.add("BL_GAME_HEIGHT=$h") + Log.i(TAG, "game resolution: ${w}x$h on a ${size.first}x${size.second} output") + } if (SessionState.followScreen || size.first < size.second || SessionPrefs.orientation(this) == android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER) guest.add("BL_FOLLOW_OUTPUT=1") diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 0e22804a63..3655ec0959 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -918,12 +918,37 @@ internal fun GameSettingsMenus(host: MenuHost, game: com.droiddeck.launcher.fron val custom = stringResource(R.string.comp_game_fex_custom) val customSync = stringResource(R.string.game_sync_custom) val resetDone = stringResource(R.string.comp_game_reset_done, game.name) + val resKey = "game-settings-res" + val resolution = current?.let { com.droiddeck.launcher.core.GameEnvironment.gameResolution(it, scope) } + val screen = remember { com.droiddeck.launcher.session.SessionDisplay.screenSize(com.droiddeck.launcher.session.SessionDisplay.panelSize(appContext)) } + val matchScreen = stringResource(R.string.display_match_screen, screen.first, screen.second) + val scaledLabels = com.droiddeck.launcher.core.GameResolution.scales.associateWith { + stringResource(R.string.display_follow_screen_scaled, com.droiddeck.launcher.core.GameResolution.formatScale(it)) + } + fun sizeLabel(size: Pair) = "${size.first}×${size.second} · ${com.droiddeck.launcher.core.GameResolution.aspectLabel(size.first, size.second)}" + fun resolutionLabel(choice: com.droiddeck.launcher.core.GameResolution.Choice?): String = when (choice) { + null -> matchScreen + is com.droiddeck.launcher.core.GameResolution.Scaled -> (scaledLabels[choice.scale] + ?: "÷" + com.droiddeck.launcher.core.GameResolution.formatScale(choice.scale)) + + " · " + sizeLabel(com.droiddeck.launcher.core.GameResolution.resolve(choice, screen)) + is com.droiddeck.launcher.core.GameResolution.Fixed -> sizeLabel(choice.width to choice.height) + } + fun pickResolution(choice: com.droiddeck.launcher.core.GameResolution.Choice?) { + host.open = key + save { com.droiddeck.launcher.session.GameEnvironmentStore.setGameResolution(it, scope, choice) } + } + var editResolution by remember(scope) { mutableStateOf(false) } AnchoredMenu(host.open == key, onDismiss = { if (host.open == key) host.open = null }, title = stringResource(R.string.game_settings_menu_title, game.name)) { first -> MenuItem(stringResource(R.string.game_no_steam_title), checked = noSteam, enabled = ready, detail = stringResource(R.string.game_no_steam_detail), focusRequester = first) { val on = !noSteam save { com.droiddeck.launcher.session.GameEnvironmentStore.setGameNoSteam(it, scope, on) } } + if (noSteam) MenuItem( + stringResource(R.string.game_res_title), checked = false, enabled = ready, + detail = resolutionLabel(resolution), + trailing = { Text("›", fontSize = 16.sp, color = colors.onSurfaceVariant) }, + ) { host.open = resKey } if (!launcher) { val chosen = com.droiddeck.launcher.core.FexPreset.all.firstOrNull { it.id == fex } MenuItem( @@ -960,6 +985,45 @@ internal fun GameSettingsMenus(host: MenuHost, game: com.droiddeck.launcher.fron } } } + AnchoredMenu(host.open == resKey, onDismiss = { if (host.open == resKey) host.open = null }, title = stringResource(R.string.game_res_title)) { first -> + MenuItem(matchScreen, checked = resolution == null, enabled = ready, focusRequester = first) { pickResolution(null) } + com.droiddeck.launcher.core.GameResolution.scales.forEach { scale -> + val choice = com.droiddeck.launcher.core.GameResolution.Scaled(scale) + MenuItem(scaledLabels.getValue(scale), checked = resolution == choice, enabled = ready, + detail = sizeLabel(com.droiddeck.launcher.core.GameResolution.resolve(choice, screen))) { pickResolution(choice) } + } + com.droiddeck.launcher.core.GameResolution.aspects.forEach { aspect -> + val sizes = com.droiddeck.launcher.core.GameResolution.sizesFor(aspect, screen) + MenuItem(aspect.label, checked = resolution in aspect.sizes, enabled = ready, + detail = sizes.joinToString(" · ") { "${it.width}×${it.height}" }, + trailing = { Text("›", fontSize = 16.sp, color = colors.onSurfaceVariant) }, + ) { host.open = "$resKey-${aspect.label}" } + } + val fixed = resolution as? com.droiddeck.launcher.core.GameResolution.Fixed + val customValue = fixed?.takeIf { f -> com.droiddeck.launcher.core.GameResolution.aspects.none { f in it.sizes } } + MenuItem( + if (customValue == null) stringResource(R.string.mode_res_custom) else stringResource(R.string.mode_res_custom_value, customValue.width, customValue.height), + checked = customValue != null, enabled = ready, + detail = customValue?.let { com.droiddeck.launcher.core.GameResolution.aspectLabel(it.width, it.height) }, + ) { editResolution = true } + } + com.droiddeck.launcher.core.GameResolution.aspects.forEach { aspect -> + val aspectKey = "$resKey-${aspect.label}" + AnchoredMenu(host.open == aspectKey, onDismiss = { if (host.open == aspectKey) host.open = null }, title = aspect.label) { first -> + com.droiddeck.launcher.core.GameResolution.sizesFor(aspect, screen).forEachIndexed { index, size -> + MenuItem("${size.width}×${size.height}", checked = resolution == size, enabled = ready, + focusRequester = if (index == 0) first else null) { pickResolution(size) } + } + } + } + if (editResolution) CustomResolutionDialog( + (resolution as? com.droiddeck.launcher.core.GameResolution.Fixed)?.let { it.width to it.height }, + onSave = { value -> + editResolution = false + pickResolution(com.droiddeck.launcher.core.GameResolution.Fixed(value.first, value.second)) + }, + onDismiss = { editResolution = false }, + ) AnchoredMenu(host.open == fexKey, onDismiss = { if (host.open == fexKey) host.open = null }, title = stringResource(R.string.fex_preset_title)) { first -> MenuItem(useDefault, checked = fex == null, enabled = ready, detail = stringResource(generalFex.label), focusRequester = first) { host.open = key diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 7c2811030a..36d31630f5 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -488,6 +488,7 @@ تشغيل يبدأ مع Steam يبدأ بدون Steam + دقة اللعبة الإعدادات إعدادات %1$s الافتراضي diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 078d972636..d9ef13c8b1 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -482,6 +482,7 @@ Activado Se inicia con Steam Se inicia sin Steam + Resolución del juego Ajustes Ajustes de %1$s Predeterminado diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index dc02c0948f..55449ac2f4 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -480,6 +480,7 @@ Включено Стартира със Steam Стартира без Steam + Резолюция на играта Настройки Настройки на %1$s По подразбиране diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 691da1a73c..35282822a5 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -484,6 +484,7 @@ Zapnuto Spouští se se Steamem Spouští se bez Steamu + Rozlišení hry Nastavení Nastavení %1$s Výchozí diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f1b55c9650..7a5aa072ef 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -480,6 +480,7 @@ Til Starter med Steam Starter uden Steam + Spilopløsning Indstillinger Indstillinger for %1$s Standard diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7d5ded3548..1d15db3d88 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -480,6 +480,7 @@ An Startet mit Steam Startet ohne Steam + Spielauflösung Einstellungen Einstellungen für %1$s Standard diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index e31df6b602..27692a1325 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -480,6 +480,7 @@ Ενεργό Ξεκινά με το Steam Ξεκινά χωρίς το Steam + Ανάλυση παιχνιδιού Ρυθμίσεις Ρυθμίσεις %1$s Προεπιλογή diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c4639709ad..adea64b8f4 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -482,6 +482,7 @@ Activado Se inicia con Steam Se inicia sin Steam + Resolución del juego Ajustes Ajustes de %1$s Predeterminado diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 9dcb88f402..481ed7ca5c 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -480,6 +480,7 @@ Päällä Käynnistyy Steamin kanssa Käynnistyy ilman Steamia + Pelin resoluutio Asetukset %1$s – asetukset Oletus diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 412575e608..61accc73a6 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -482,6 +482,7 @@ Activé Démarre avec Steam Démarre sans Steam + Résolution du jeu Paramètres Paramètres de %1$s Par défaut diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index c6042223f0..72f0917b03 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -480,6 +480,7 @@ चालू Steam के साथ शुरू होता है Steam के बिना शुरू होता है + गेम रिज़ॉल्यूशन सेटिंग %1$s सेटिंग डिफ़ॉल्ट diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 4d86e51f7e..409a9e72f8 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -480,6 +480,7 @@ Be Steammel indul Steam nélkül indul + Játék felbontása Beállítások %1$s beállításai Alapértelmezett diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index cecc8289f0..81ded51384 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -478,6 +478,7 @@ Aktif Dimulai dengan Steam Dimulai tanpa Steam + Resolusi game Setelan Setelan %1$s Default diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 58b65563ea..f8f6c7866c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -482,6 +482,7 @@ Attivo Si avvia con Steam Si avvia senza Steam + Risoluzione del gioco Impostazioni Impostazioni di %1$s Predefinito diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 0cdcc111bd..fe43ef5ee0 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -478,6 +478,7 @@ オン Steam と一緒に起動 Steam なしで起動 + ゲームの解像度 設定 %1$s の設定 デフォルト diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index fc352bcc37..e00a044135 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -478,6 +478,7 @@ 켜짐 Steam과 함께 시작 Steam 없이 시작 + 게임 해상도 설정 %1$s 설정 기본값 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 7135bd5457..58caf14b83 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -478,6 +478,7 @@ Hidup Bermula dengan Steam Bermula tanpa Steam + Resolusi permainan Tetapan Tetapan %1$s Lalai diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index f1a5b47fae..f56b734f56 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -480,6 +480,7 @@ På Starter med Steam Starter uten Steam + Spilloppløsning Innstillinger Innstillinger for %1$s Standard diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index eff91dd724..4240b47aee 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -480,6 +480,7 @@ Aan Start met Steam Start zonder Steam + Spelresolutie Instellingen Instellingen voor %1$s Standaard diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 1267e54be9..2c789b65d2 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -484,6 +484,7 @@ Wł. Uruchamia się ze Steam Uruchamia się bez Steam + Rozdzielczość gry Ustawienia Ustawienia: %1$s Domyślne diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 2db4dbb6ec..dde7bf233f 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -482,6 +482,7 @@ Ativado Inicia com o Steam Inicia sem o Steam + Resolução do jogo Definições Definições de %1$s Predefinição diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 643b20e847..1bf1feb07a 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -482,6 +482,7 @@ Ativado Inicia com o Steam Inicia sem o Steam + Resolução do jogo Configurações Configurações de %1$s Padrão diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 3838347619..a2e10057d6 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -482,6 +482,7 @@ Activat Pornește cu Steam Pornește fără Steam + Rezoluția jocului Setări Setări %1$s Implicit diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 41cbd27d7c..88dbfbc2fd 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -503,6 +503,7 @@ Включено Запускается со Steam Запускается без Steam + Разрешение игры Настройки Настройки %1$s По умолчанию diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 5a6c222004..e0754fe02b 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -480,6 +480,7 @@ På Startar med Steam Startar utan Steam + Spelupplösning Inställningar Inställningar för %1$s Standard diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 1e4d92cbf1..e483bfead0 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -478,6 +478,7 @@ เปิด เริ่มพร้อม Steam เริ่มโดยไม่ใช้ Steam + ความละเอียดของเกม การตั้งค่า การตั้งค่า %1$s ค่าเริ่มต้น diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 906d04d13b..479e767c1b 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -480,6 +480,7 @@ Açık Steam ile başlar Steam olmadan başlar + Oyun çözünürlüğü Ayarlar %1$s Ayarları Varsayılan diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 5767ee73a2..ea4e958377 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -484,6 +484,7 @@ Увімкнено Запускається зі Steam Запускається без Steam + Роздільна здатність гри Налаштування Налаштування %1$s За замовчуванням diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index c21f685321..e6b9a21732 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -478,6 +478,7 @@ Bật Khởi động cùng Steam Khởi động không cần Steam + Độ phân giải trò chơi Thiết lập Thiết lập %1$s Mặc định diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 5e9acd782f..67e815130d 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -478,6 +478,7 @@ 开 随 Steam 启动 不通过 Steam 启动 + 游戏分辨率 设置 %1$s 设置 默认 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 64f8133583..f97f66c3a1 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -478,6 +478,7 @@ 開 隨 Steam 啟動 不經 Steam 啟動 + 遊戲解像度 設定 %1$s 設定 預設 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 30ef0996e5..ee48c655e2 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -478,6 +478,7 @@ 開 隨 Steam 啟動 不經 Steam 啟動 + 遊戲解析度 設定 %1$s 設定 預設 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e4611630b9..f1a5dcf3f3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -528,6 +528,7 @@ On Starts with Steam Starts without Steam + Game resolution Settings %1$s Settings Default diff --git a/app/src/test/java/com/droiddeck/launcher/core/GameResolutionTest.kt b/app/src/test/java/com/droiddeck/launcher/core/GameResolutionTest.kt new file mode 100644 index 0000000000..5a76e0525e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/core/GameResolutionTest.kt @@ -0,0 +1,60 @@ +package com.droiddeck.launcher.core + +import com.droiddeck.launcher.session.NoSteamLaunch +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class GameResolutionTest { + @Test + fun choicesRoundTripThroughTheStoredValue() { + for (choice in listOf(GameResolution.Fixed(1280, 720), GameResolution.Scaled(1.5f), GameResolution.Scaled(2f))) { + assertEquals(choice, GameResolution.parse(GameResolution.format(choice))) + } + assertEquals("1280x720", GameResolution.format(GameResolution.Fixed(1280, 720))) + assertEquals("/1.5", GameResolution.format(GameResolution.Scaled(1.5f))) + } + + @Test + fun invalidValuesAreIgnored() { + for (value in listOf(null, "", "abc", "100x100", "1280", "1280x720x2", "/1", "/0.5", "/9")) { + assertNull(value, GameResolution.parse(value)) + } + } + + @Test + fun aScaleDividesTheOutputToEvenSides() { + assertEquals(1706 to 1066, GameResolution.resolve(GameResolution.Scaled(1.5f), 2560 to 1600)) + assertEquals(1280 to 800, GameResolution.resolve(GameResolution.Scaled(2f), 2560 to 1600)) + assertEquals(1280 to 720, GameResolution.resolve(GameResolution.Fixed(1280, 720), 2560 to 1600)) + } + + @Test + fun aspectRatiosAreNamed() { + assertEquals("16:9", GameResolution.aspectLabel(1920, 1080)) + assertEquals("16:10", GameResolution.aspectLabel(2560, 1600)) + assertEquals("4:3", GameResolution.aspectLabel(1024, 768)) + assertEquals("21:9", GameResolution.aspectLabel(2560, 1080)) + assertEquals("20:9", GameResolution.aspectLabel(2400, 1080)) + } + + @Test + fun presetsLargerThanThePanelAreLeftOut() { + val wide = GameResolution.aspects.first { it.label == "16:9" } + assertEquals(listOf(960 to 540, 1280 to 720, 1600 to 900, 1920 to 1080), + GameResolution.sizesFor(wide, 1920 to 1200).map { it.width to it.height }) + } + + @Test + fun theSessionFindsTheResolutionOfTheGameItStarts() { + val config = GameEnvironment.withGameResolution(GameEnvironment.Config(), "570", GameResolution.Fixed(1280, 800)) + val scope = NoSteamLaunch.scopeOf(NoSteamLaunch.PROTON_RUN, listOf("--app", "570")) + assertEquals("570", scope) + assertEquals(1280 to 800, NoSteamLaunch.resolution(config, scope, 2560 to 1600)) + assertNull(NoSteamLaunch.resolution(config, "440", 2560 to 1600)) + assertEquals("123", NoSteamLaunch.scopeOf(NoSteamLaunch.BATTLENET, listOf("launch", "WTCG")) { if (it == "WTCG") "123" else null }) + assertEquals(com.droiddeck.launcher.runtime.BattleNet.APP_ID.toString(), + NoSteamLaunch.scopeOf(NoSteamLaunch.BATTLENET, listOf("launch", "Pro"))) + assertNull(GameEnvironment.withGameResolution(config, "570", null).games["570"]) + } +} diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 8bb519db52..fbea003241 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -511,6 +511,12 @@ if [ -z "${BL_INSIDE:-}" ]; then echo "== gamescope: games at ${nested}x${nested_h} stretched to the ${width}x${height} output" fi fi + if [ "$mode" = run ] && [ "${BL_GAME_WIDTH:-0}" -gt 0 ] && [ "${BL_GAME_HEIGHT:-0}" -gt 0 ]; then + nested=$BL_GAME_WIDTH + nested_h=$BL_GAME_HEIGHT + game_size=1 + echo "== gamescope: the game runs at ${nested}x${nested_h}, scaled to the ${width}x${height} output with its proportions kept" + fi backend=${BL_GAMESCOPE_BACKEND:-wayland} case "$backend" in wayland) ;; @@ -528,7 +534,7 @@ if [ -z "${BL_INSIDE:-}" ]; then echo "== gamescope: composites every frame (Mali bridge: the Steam UI flickers on separate planes)" fi args=(--backend "$backend" --expose-wayland -f -W "$width" -H "$height" -w "$nested" -h "$nested_h") - if [ "$nested" != "$width" ] || [ "$nested_h" != "$height" ]; then + if [ "${game_size:-0}" != 1 ] && { [ "$nested" != "$width" ] || [ "$nested_h" != "$height" ]; }; then args+=(-S stretch) export BL_STRETCHED=1 fi diff --git a/tools/tests/test_game_resolution.py b/tools/tests/test_game_resolution.py new file mode 100644 index 0000000000..78c5fb3d98 --- /dev/null +++ b/tools/tests/test_game_resolution.py @@ -0,0 +1,53 @@ +import os +from pathlib import Path +import subprocess +import tempfile +import unittest + + +SESSION = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/droiddeck-session' + + +class GameResolutionTest(unittest.TestCase): + def launch(self, mode, **overrides): + source = SESSION.read_text() + start = source.index(' width=${BL_WIDTH:-1280}') + end = source.index('\nfi\n\nbl_displays()', start) + block = source[start:end].replace('/usr/local/bin/droiddeck-pipewire', 'pipewire_stub') + with tempfile.TemporaryDirectory() as directory: + env = dict(os.environ, XDG_RUNTIME_DIR=directory, BL_REFRESH='60', BL_MANGOAPP='0', + BL_WIDTH='2560', BL_HEIGHT='1600') + for name in ('BL_GAME_WIDTH', 'BL_GAME_HEIGHT', 'BL_FOLLOW_OUTPUT', 'BL_GAMESCOPE_STRETCH_16X9'): + env.pop(name, None) + env.update(overrides) + fake = Path(directory) / 'gamescope' + fake.write_text('#!/bin/bash\nprintf "ARG:%s\\n" "$@"\n') + fake.chmod(0o755) + env['PATH'] = directory + os.pathsep + env['PATH'] + script = f''' +set -u +mode={mode} +pipewire_stub() {{ return 1; }} +run_gamescope() {{ printf 'ARG:%s\n' "$@"; }} +''' + block + result = subprocess.run(['bash', '-c', script], env=env, capture_output=True, text=True, timeout=5) + self.assertEqual(0, result.returncode, result.stderr) + return [line.removeprefix('ARG:') for line in result.stdout.splitlines() if line.startswith('ARG:')] + + def test_a_game_started_without_steam_runs_at_its_resolution_with_proportions_kept(self): + args = self.launch('run', BL_GAME_WIDTH='1280', BL_GAME_HEIGHT='720') + self.assertEqual(['2560', '1600'], [args[args.index('-W') + 1], args[args.index('-H') + 1]]) + self.assertEqual(['1280', '720'], [args[args.index('-w') + 1], args[args.index('-h') + 1]]) + self.assertNotIn('-S', args) + + def test_without_a_game_resolution_the_game_matches_the_output(self): + args = self.launch('run') + self.assertEqual(['2560', '1600'], [args[args.index('-w') + 1], args[args.index('-h') + 1]]) + + def test_steam_ignores_the_game_resolution(self): + args = self.launch('steam', BL_GAME_WIDTH='1280', BL_GAME_HEIGHT='720') + self.assertEqual(['2560', '1600'], [args[args.index('-w') + 1], args[args.index('-h') + 1]]) + + +if __name__ == '__main__': + unittest.main() From f33181e430ac3009c29c918428fec6769cfcf07a Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Fri, 13 Nov 2026 00:55:18 -0500 Subject: [PATCH 50/57] fix(proot): fchdir takes the open directory's path instead of walking it again (#2553) * fix(proot): fchdir takes the open directory's path instead of walking it again * fix(proot): fchdir keeps trailing-period names and rechecks the binding's parent The descriptor path now carries the same final marker the walk produced, so a directory whose name ends with a period is not truncated. The parent of the matching binding is resolved again, so a binding whose ancestor was replaced by a symlink takes the full walk as before. The check script gains a trailing-period directory. * fix(proot): fchdir requires the binding's parent to be a directory --- docs/development/proot-performance.md | 2 +- tools/proot/PATCHES.md | 12 ++ tools/proot/bench/fchdir.py | 105 +++++++++++++++++ .../patches/0028-fchdir-open-directory.patch | 108 ++++++++++++++++++ 4 files changed, 226 insertions(+), 1 deletion(-) create mode 100644 tools/proot/bench/fchdir.py create mode 100644 tools/proot/patches/0028-fchdir-open-directory.patch diff --git a/docs/development/proot-performance.md b/docs/development/proot-performance.md index 1cddb33976..634b7bc63a 100644 --- a/docs/development/proot-performance.md +++ b/docs/development/proot-performance.md @@ -204,7 +204,7 @@ call can be answered in-process with the 0014 design. | syscalls | why proot traps them | can it bypass proot? | |---|---|---| | `openat`/`open`/`creat`, `newfstatat`/`stat`/`lstat`, `statx`, `faccessat`/`access`, `readlinkat` (exit), `mkdirat`, `unlinkat`, `renameat(2)`, `symlinkat`, `linkat`, `fchmodat`, `fchownat`, `utimensat`, `truncate`, `*xattr`, `inotify_add_watch`, `name_to_handle_at` | path translation (guest → host), plus exit fixups for `readlink` and `rename` | **Yes, through libc wrappers.** The prototype covers open, stat, statx, access, readlink, opendir and fopen; the write family is next. Raw `svc` and glibc's internal callers (ld.so, fts, realpath, nss) still go to proot. | -| `chdir`/`fchdir`, `getcwd` (exit) | proot emulates the cwd; until 0014 the kernel's cwd never moved | With 0014 the kernel's cwd follows the guest's. `getcwd` stays in proot (cheap, rare). | +| `chdir`/`fchdir`, `getcwd` (exit) | proot emulates the cwd; until 0014 the kernel's cwd never moved | With 0014 the kernel's cwd follows the guest's. With 0028 `fchdir` takes the path of the open directory from `/proc//fd` instead of walking it again. `getcwd` stays in proot (cheap, rare). | | `execve`/`execveat` | runs the loader, maps `PT_INTERP` inside the rootfs, shebangs, tracks `/proc/self/exe` | **No.** This is the core of what proot is for. Costs 0.4–0.8 ms per exec; the session scripts already avoid exec-heavy loops (`nap`). | | `brk` (entry and exit) | heap emulation: programs are mapped by proot's loader, so the kernel's brk area is the loader's | No (`PR_SET_MM` needs `CAP_SYS_RESOURCE`). **Fewer calls:** `GLIBC_TUNABLES=glibc.malloc.top_pad=…` grows the heap in larger steps. | | `bind`, `connect`, `accept(4)`, `getsockname`, `getpeername` | `sun_path` of Unix sockets | Same-path binds (runtime dir, files dir) need no translation, but the filter can't see the address. Possible fast-path candidate. | diff --git a/tools/proot/PATCHES.md b/tools/proot/PATCHES.md index 3099009c57..6347023473 100644 --- a/tools/proot/PATCHES.md +++ b/tools/proot/PATCHES.md @@ -170,6 +170,18 @@ Prototype (inert unless `PROOT_FASTPATH` is set; see `docs/development/proot-per Old kernel fixes: +- `0028-fchdir-open-directory.patch` - `fchdir` resolved the directory again from its guest path, + one `lstat` per path component, then an `lstat` and an `O_PATH` open of the result. The + descriptor is already open, so `/proc//fd/` gives its host path and one `stat` through + that link confirms it is a live directory. The guest path it maps to is checked to map back to + the same host path, and the parent of the binding it falls under is checked to still resolve + to itself, so the cwd PRoot records is the one the old walk produced; a deleted directory, a + path outside the guest, a binding whose ancestor became a symlink, or anything else that does + not round-trip takes the old walk. Listing a directory in Wine does `fchdir` there and back: on a memory card behind + Android's FUSE daemon the old walk cost about 4 ms per call in the single tracer thread, 8.4 s + of an 8.8 s tracer total across one program start, and is now under 0.1 ms. + `bench/fchdir.py [directory...]` checks the cwd after `fchdir` to plain, bound, symlinked, + renamed and deleted directories and prints the per-call cost. - `0015-lost-fork-events.patch` - works around a problem reported on Xiaomi's msm 4.14 kernel: the kernel sometimes reports a new process or thread but gives its ID as zero. Without that ID, PRoot cannot finish setting it up, which can leave the session stuck. The patch searches `/proc` diff --git a/tools/proot/bench/fchdir.py b/tools/proot/bench/fchdir.py new file mode 100644 index 0000000000..e8d5c9141f --- /dev/null +++ b/tools/proot/bench/fchdir.py @@ -0,0 +1,105 @@ +import errno +import os +import sys +import tempfile +import time + + +def report(label, check): + try: + print(label, check()) + except OSError as error: + print(label, "ERR", errno.errorcode.get(error.errno, error.errno)) + + +def enter(path): + fd = os.open(path, os.O_RDONLY | os.O_DIRECTORY) + try: + os.fchdir(fd) + return os.getcwd(), os.readlink("/proc/self/cwd"), os.path.samefile(".", path) + finally: + os.close(fd) + + +def enter_file(base): + fd = os.open(base + "/real/file", os.O_RDONLY) + try: + os.fchdir(fd) + finally: + os.close(fd) + + +def enter_deleted(base): + os.mkdir(base + "/gone") + fd = os.open(base + "/gone", os.O_RDONLY) + os.rmdir(base + "/gone") + try: + os.fchdir(fd) + return "ok" + finally: + os.close(fd) + os.chdir("/") + + +def enter_renamed(base): + os.mkdir(base + "/before") + fd = os.open(base + "/before", os.O_RDONLY) + os.rename(base + "/before", base + "/after") + try: + os.fchdir(fd) + return os.getcwd() == base + "/after" + finally: + os.close(fd) + os.chdir("/") + os.rmdir(base + "/after") + + +def relative(base): + fd = os.open(base, os.O_RDONLY) + os.fchdir(fd) + os.close(fd) + seen = os.path.exists("real/file"), os.path.exists("link/file") + os.chdir("real") + inside = os.getcwd() == base + "/real" + os.chdir("..") + return seen + (inside, os.getcwd() == base) + + +def cost(path, rounds=300): + fd = os.open(path, os.O_RDONLY) + back = os.open("/", os.O_RDONLY) + start = time.perf_counter() + for _ in range(rounds): + os.fchdir(fd) + os.fchdir(back) + elapsed = time.perf_counter() - start + os.close(fd) + os.close(back) + return round(elapsed / rounds / 2 * 1e6, 1) + + +def main(): + extra = sys.argv[1:] + base = tempfile.mkdtemp(prefix="fchdir-") + os.mkdir(base + "/real") + os.symlink(base + "/real", base + "/link") + os.mkdir(base + "/dot.") + open(base + "/real/file", "w").close() + for path in ["/", "/tmp", "/usr/lib", "/proc/self", "/dev", base + "/real", base + "/link", base + "/dot."] + extra: + report(path, lambda: enter(path)) + report("file", lambda: enter_file(base)) + report("deleted", lambda: enter_deleted(base)) + report("renamed", lambda: enter_renamed(base)) + report("badfd", lambda: os.fchdir(987)) + report("relative", lambda: relative(base)) + os.chdir("/") + for path in ["/usr/lib"] + extra: + print("fchdir_us", path, cost(path)) + os.unlink(base + "/real/file") + os.unlink(base + "/link") + os.rmdir(base + "/dot.") + os.rmdir(base + "/real") + os.rmdir(base) + + +main() diff --git a/tools/proot/patches/0028-fchdir-open-directory.patch b/tools/proot/patches/0028-fchdir-open-directory.patch new file mode 100644 index 0000000000..8e1a494386 --- /dev/null +++ b/tools/proot/patches/0028-fchdir-open-directory.patch @@ -0,0 +1,108 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: maxjivi05 +Date: Thu, 12 Nov 2026 22:00:00 -0500 +Subject: [PATCH] fchdir: take the path of the open directory instead of resolving + it again component by component + +--- +--- a/src/syscall/enter.c ++++ b/src/syscall/enter.c +@@ -46,8 +46,66 @@ + #include "tracee/abi.h" + #include "path/path.h" + #include "path/canon.h" ++#include "path/binding.h" + #include "arch.h" + ++static int translate_open_directory(Tracee *tracee, char path[PATH_MAX], int fd, struct stat *statl) ++{ ++ char guest[PATH_MAX]; ++ char mount[PATH_MAX]; ++ char parent[PATH_MAX]; ++ char link[32]; ++ char *slash; ++ const Binding *binding; ++ size_t length; ++ int status; ++ ++ status = readlink_proc_pid_fd(tracee->pid, fd, path); ++ if (status < 0 || path[0] != '/') ++ return 1; ++ ++ strcpy(guest, path); ++ status = detranslate_path(tracee, guest, NULL); ++ if (status < 0) ++ return 1; ++ ++ binding = get_binding(tracee, GUEST, guest); ++ if (binding == NULL) ++ return 1; ++ ++ strcpy(parent, binding->guest.path); ++ slash = strrchr(parent, '/'); ++ if (slash != NULL && slash != parent) { ++ if ((size_t) (slash - parent) + 3 > PATH_MAX) ++ return 1; ++ ++ strcpy(slash, "/."); ++ strcpy(mount, "/"); ++ status = canonicalize(tracee, parent, true, mount, 0); ++ if (status < 0 || strcmp(mount, parent) != 0) ++ return 1; ++ } ++ ++ status = substitute_binding(tracee, GUEST, guest); ++ if (status < 0 || strcmp(guest, path) != 0) ++ return 1; ++ ++ status = snprintf(link, sizeof(link), "/proc/%d/fd/%d", tracee->pid, fd); ++ if (status < 0 || (size_t) status >= sizeof(link)) ++ return 1; ++ ++ status = stat(link, statl); ++ if (status < 0 || !S_ISDIR(statl->st_mode) || statl->st_nlink == 0) ++ return 1; ++ ++ length = strlen(path); ++ if (length + 2 >= PATH_MAX) ++ return 1; ++ ++ strcpy(path + (length == 1 ? 0 : length), "/."); ++ return 0; ++} ++ + /** + * Translate @path and put the result in the @tracee's memory address + * space pointed to by the @reg argument of the current syscall. See +@@ -193,13 +251,16 @@ + dirfd = peek_reg(tracee, CURRENT, SYSARG_1); + } + +- status = translate_path(tracee, path, dirfd, oldpath, true); +- if (status < 0) +- break; ++ if (syscall_number == PR_chdir ++ || translate_open_directory(tracee, path, dirfd, &statl) != 0) { ++ status = translate_path(tracee, path, dirfd, oldpath, true); ++ if (status < 0) ++ break; + +- status = lstat(path, &statl); +- if (status < 0) +- break; ++ status = lstat(path, &statl); ++ if (status < 0) ++ break; ++ } + + /* Check this directory is accessible. */ + if ((statl.st_mode & S_IXUSR) == 0) +@@ -208,7 +269,7 @@ + + + +- if (getenv("PROOT_FASTPATH") != NULL) { ++ if (syscall_number == PR_chdir && getenv("PROOT_FASTPATH") != NULL) { + int fd = open(path, O_PATH | O_DIRECTORY | O_CLOEXEC); + + From 83de0e7f8c42df885c8fbcdd97629ab9957739ea Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 13 Nov 2026 06:17:12 -0500 Subject: [PATCH 51/57] feat(rockstar): broaden launcher protocol compatibility (#2547) --- .../droiddeck/launcher/frontend/AddedGames.kt | 2 +- .../droiddeck/launcher/stores/StoreLaunch.kt | 32 +- .../launcher/stores/rockstar/RockstarAuth.kt | 47 ++- .../stores/rockstar/RockstarBackend.kt | 3 + .../stores/rockstar/RockstarLaunch.kt | 31 +- .../stores/rockstar/RockstarMetadata.kt | 53 +++ .../com/droiddeck/launcher/ui/GameDetail.kt | 5 +- .../droiddeck/launcher/ui/StoresDownloads.kt | 4 +- app/src/main/res/values/strings.xml | 1 - .../stores/rockstar/RockstarMetadataTest.kt | 78 +++++ .../launcher/stores/rockstar/RockstarTest.kt | 82 ++++- .../usr/local/bin/droiddeck-store-launch | 151 +++++++- tools/rockstar-launcher/README.md | 10 +- tools/rockstar-launcher/examples/sdk_probe.rs | 80 +++++ tools/rockstar-launcher/src/identity.rs | 170 +++++++++ tools/rockstar-launcher/src/lib.rs | 18 + tools/rockstar-launcher/src/main.rs | 207 ++++++++--- tools/rockstar-launcher/src/pipe.rs | 49 ++- tools/rockstar-launcher/src/sdk.rs | 328 ++++++++++++++++++ tools/tests/test_store_launch_rockstar.py | 107 ++++++ 20 files changed, 1368 insertions(+), 90 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarMetadata.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarMetadataTest.kt create mode 100644 tools/rockstar-launcher/examples/sdk_probe.rs create mode 100644 tools/rockstar-launcher/src/identity.rs create mode 100644 tools/rockstar-launcher/src/sdk.rs 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 d9db3374e9..d0f4ea80a0 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -418,7 +418,7 @@ object AddedGames { private fun scanGame(context: Context, folder: File, out: MutableList, single: AddedExes.Entry? = null, reuse: Boolean = false) { run { val sidecar = StoreGameSidecar.read(folder)?.let { com.droiddeck.launcher.stores.StoreLaunch.adopt(folder, it) } - if (sidecar?.store == Store.ROCKSTAR && (!com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(sidecar.id) || sidecar.launcher != com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER)) return + if (sidecar?.store == Store.ROCKSTAR && sidecar.launcher != com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER) return sidecar?.takeIf { it.id.isNotEmpty() }?.let { SessionPrefs.followStoreGame(context, "${it.store.id}:${it.id}", folder.path) { old -> !File(old).exists() } } val ranking = rank(folder, reuse) val candidates = ranking.exes diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt index 37d731a2f7..f45a23c654 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt @@ -21,10 +21,6 @@ object StoreLaunch { val needs = sidecar.args.isNotEmpty() || sidecar.env.isNotEmpty() || sidecar.store == Store.EPIC || sidecar.store == Store.EA || sidecar.store == Store.UBISOFT || sidecar.store == Store.ROCKSTAR val file = File(folder, LAUNCHER) if (sidecar.store == Store.ROCKSTAR && java.nio.file.Files.isSymbolicLink(file.toPath())) return sidecar.copy(launcher = null) - if (sidecar.store == Store.ROCKSTAR && !com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(sidecar.id)) { - file.delete() - return sidecar.copy(launcher = null) - } if (!needs) { file.delete(); return sidecar.copy(launcher = null) } file.writeText(launcherText(sidecar)) return sidecar.copy(launcher = LAUNCHER) @@ -36,11 +32,11 @@ object StoreLaunch { ?: exe.substringBeforeLast('\\', "") val lines = ArrayList() lines += "@echo off" - lines += "setlocal" + lines += if (sidecar.store == Store.ROCKSTAR) "setlocal DisableDelayedExpansion" else "setlocal" if (sidecar.store != Store.ROCKSTAR) lines += "rem Written by DroidDeck for ${sidecar.store.label}: ${sidecar.title}. Steam's shortcut runs this file." lines += "cd /d \"%~dp0$dir\"" for ((k, v) in sidecar.env) if (ENV_NAME.matches(k)) lines += "set \"$k=${v.replace("\"", "")}\"" - val args = sidecar.args.joinToString(" ") { quoteArg(it) } + val args = sidecar.args.joinToString(" ") { if (sidecar.store == Store.ROCKSTAR) batchArg(it) else quoteArg(it) } val run = "\"%~dp0$exe\"" + (if (args.isNotEmpty()) " $args" else "") if (sidecar.store == Store.EPIC) { lines += "if exist \"%~dp0$EPIC_ARGS\" goto client" @@ -60,8 +56,11 @@ object StoreLaunch { lines += "if exist \"%~dp0$EPIC_CODE\" del \"%~dp0$EPIC_CODE\"" lines += "set \"$CLIENT_VAR=\" & \"%~dp0$exe\" %$CLIENT_VAR%" } else if (sidecar.store == Store.ROCKSTAR) { + lines += "if not exist \"C:\\Program Files\\Rockstar Games\\Launcher\\launch.json\" goto direct" lines += "\"C:\\Program Files\\Rockstar Games\\Launcher\\Launcher.exe\"" lines += "exit /b %errorlevel%" + lines += ":direct" + lines += run } else if (sidecar.store == Store.UBISOFT) { lines += "if not exist \"%~dp0$UBISOFT_LAUNCH\" goto direct" lines += "if not exist \"$UBISOFT_SERVICE\" goto direct" @@ -85,6 +84,22 @@ object StoreLaunch { private val ENV_NAME = Regex("[A-Za-z_][A-Za-z0-9_]*") + private fun batchArg(arg: String): String { + val quoted = StringBuilder("\"") + var slashes = 0 + for (c in arg.filter { it >= ' ' && it != '\u007f' }) { + if (c == '\\') { slashes++; continue } + quoted.append("\\".repeat(if (c == '"') slashes * 2 + 1 else slashes)).append(c) + slashes = 0 + } + quoted.append("\\".repeat(slashes * 2)).append('"') + return quoted.toString().map { c -> when (c) { + '%' -> "%%" + in "^&|<>()\"" -> "^$c" + else -> c.toString() + } }.joinToString("") + } + fun quoteArg(arg: String): String { val clean = arg.filter { it >= ' ' && it != '\u007f' } return if (' ' in clean && !clean.contains('"')) "\"$clean\"" else clean @@ -103,11 +118,12 @@ object StoreLaunch { fun adopt(folder: File, sidecar: StoreGameSidecar): StoreGameSidecar { if (sidecar.store !in listOf(Store.UBISOFT, Store.ROCKSTAR) || !sidecar.isInstalled) return sidecar - if (sidecar.store == Store.ROCKSTAR && !com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(sidecar.id)) return sidecar if (sidecar.store == Store.ROCKSTAR && java.nio.file.Files.isSymbolicLink(File(folder, LAUNCHER).toPath())) return sidecar.copy(launcher = null) val wrongExe = !sidecar.exeFile(folder).isFile || sidecar.exe.contains("installer", ignoreCase = true) || sidecar.exe.contains("autorun", ignoreCase = true) if (sidecar.store == Store.UBISOFT && sidecar.launcher == LAUNCHER && !wrongExe) return sidecar - val exe = if (wrongExe) StoreExe.pick(folder, null, sidecar.title).ifEmpty { sidecar.exe } else sidecar.exe + val metadataExe = if (sidecar.store == Store.ROCKSTAR) com.droiddeck.launcher.stores.rockstar.RockstarMetadata.find(folder)?.exe + ?.takeIf { File(folder, it).isFile && File(folder, it).canonicalPath.startsWith(folder.canonicalPath + File.separator) } else null + val exe = metadataExe ?: if (wrongExe) StoreExe.pick(folder, null, sidecar.title).ifEmpty { sidecar.exe } else sidecar.exe if (exe == sidecar.exe && sidecar.launcher == LAUNCHER && runCatching { File(folder, LAUNCHER).readText() }.getOrNull() == launcherText(sidecar)) return sidecar return runCatching { writeLauncher(folder, sidecar.copy(exe = exe)).also { it.write(folder) } }.getOrDefault(sidecar) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarAuth.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarAuth.kt index 781eddbe3f..b6c90cb41f 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarAuth.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarAuth.kt @@ -29,7 +29,7 @@ object RockstarAuth { private const val TICKET_MARGIN_MS = 15 * 60 * 1000L private val lock = Any() - class Ticket(val ticket: String, val sessionKey: String, val sessionTicket: String, val rockstarId: String, val nickname: String, val expiresAt: Long) + class Ticket(val ticket: String, val sessionKey: String, val sessionTicket: String, val rockstarId: String, val nickname: String, val expiresAt: Long, val email: String = "", val sdkTicket: String = "") internal fun fingerprint(context: Context): JSONObject { val p = context.applicationContext.getSharedPreferences(PREFS, Context.MODE_PRIVATE) @@ -159,7 +159,7 @@ object RockstarAuth { private fun stored(o: JSONObject): Ticket? { val t = o.optString("ticket").takeIf { it.isNotEmpty() } ?: return null - return Ticket(t, o.optString("session_key"), o.optString("session_ticket"), o.optString("rockstar_id"), o.optString("display_name"), o.optLong("ticket_expires_at")) + return Ticket(t, o.optString("session_key"), o.optString("session_ticket"), o.optString("rockstar_id"), o.optString("display_name"), o.optLong("ticket_expires_at"), o.optString("email"), o.optString("sdk_ticket").takeIf { o.optInt("sdk_ticket_version") == 1 }.orEmpty()) } private fun mint(context: Context): Ticket { @@ -176,7 +176,7 @@ object RockstarAuth { } val t = parseTicket(root) ?: throw IllegalStateException("no ticket in the answer") o.put("ticket", t.ticket).put("session_key", t.sessionKey).put("session_ticket", t.sessionTicket) - .put("rockstar_id", t.rockstarId).put("ticket_expires_at", t.expiresAt) + .put("rockstar_id", t.rockstarId).put("ticket_expires_at", t.expiresAt).put("email", t.email).put("sdk_ticket", t.sdkTicket).put("sdk_ticket_version", 1) if (t.nickname.isNotEmpty()) o.put("display_name", t.nickname) StoreAccounts.write(app, Store.ROCKSTAR, o) return t @@ -191,8 +191,49 @@ object RockstarAuth { (account?.let { RockstarRos.text(it, "RockstarId") } ?: RockstarRos.text(root, "RockstarId")).orEmpty(), account?.let { RockstarRos.text(it, "Nickname") }.orEmpty(), now + secs * 1000L, + account?.let { RockstarRos.text(it, "Email") }.orEmpty(), + sdkTicket(root), ) } + internal fun sdkTicket(root: org.w3c.dom.Element): String { + val document = javax.xml.parsers.DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument() + val response = document.createElement("Response").also { document.appendChild(it) } + val fields = setOf("Status", "Ticket", "SessionKey", "SessionTicket", "SecsUntilExpiration", "PlayerAccountId", "PlayerAccountRuid", + "Region", "Privileges", "Privs", "Services", "SslServices", "Hosts", "DisabledSecurityFlags", "SessionId", "CloudKey", "PublicIp", "PosixTime", "IsSubAccount") + val blocked = setOf("scauthtoken", "accesstoken", "refreshtoken", "rememberedmachinetoken", "loginguid", "password") + fun copy(source: org.w3c.dom.Element): org.w3c.dom.Element { + val target = document.createElement(source.tagName) + for (i in 0 until source.attributes.length) { + val attribute = source.attributes.item(i) + if (attribute.nodeName.lowercase() !in blocked) target.setAttribute(attribute.nodeName, attribute.nodeValue) + } + var child = source.firstChild + while (child != null) { + if (child is org.w3c.dom.Element) { + if (child.tagName.lowercase() !in blocked) target.appendChild(copy(child)) + } else if (child.nodeType == org.w3c.dom.Node.TEXT_NODE || child.nodeType == org.w3c.dom.Node.CDATA_SECTION_NODE) { + target.appendChild(document.createTextNode(child.nodeValue)) + } + child = child.nextSibling + } + return target + } + for (field in fields) RockstarRos.first(root, field)?.let { response.appendChild(copy(it)) } + RockstarRos.first(root, "RockstarAccount")?.let { account -> + val target = document.createElement("RockstarAccount") + for (field in setOf("RockstarId", "Nickname", "Email", "Age", "CountryCode", "LanguageCode", "AvatarUrl", "ZipCode", "Ruid")) { + RockstarRos.first(account, field)?.let { target.appendChild(copy(it)) } + } + response.appendChild(target) + } + val output = java.io.StringWriter() + javax.xml.transform.TransformerFactory.newInstance().newTransformer().apply { + setOutputProperty(javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes") + transform(javax.xml.transform.dom.DOMSource(document), javax.xml.transform.stream.StreamResult(output)) + } + return output.toString() + } + fun signOut(context: Context) = synchronized(lock) { StoreAccounts.clear(context.applicationContext, Store.ROCKSTAR) } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarBackend.kt index 3e878d3290..f816ed8ef1 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarBackend.kt @@ -147,6 +147,9 @@ object RockstarLibrary { internal fun owned(account: RockstarAccountApps): List = account.packages.filter { !it.featured }.flatMap { RockstarTitles.forName(it.title) }.distinct() + internal fun owns(account: RockstarAccountApps, rosId: Int, id: String): Boolean = + owned(account).any { it.rosTitleId == rosId } || account.packages.any { !it.featured && it.title == id } + internal fun games(account: RockstarAccountApps): List = owned(account).mapNotNull { t -> RockstarApps.deliverer(account.apps, t)?.let { RockstarTitles.item(t, owned = true, extra = mapOf("app" to it.name, "appId" to it.id)) } }.sortedBy { it.title.lowercase() } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunch.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunch.kt index c83b6548d8..52f1119f90 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunch.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunch.kt @@ -10,9 +10,9 @@ import java.security.MessageDigest import java.util.Base64 object RockstarLaunch { - internal val pipes = mapOf("gta3" to "GTA3_Pipe", "gtavc" to "GTA-VC_Pipe", "gtasa" to "GTA_SA_Pipe") + internal val pipes = mapOf("gta3" to "GTA3_Pipe", "gtavc" to "GTA-VC_Pipe", "gtasa" to "GTA_SA_Pipe", "gta4" to "GTAIV_Pipe", "lanoire" to "LANOIRE_Pipe") - fun supports(id: String?) = id != null && id in pipes + fun usesClassicLauncher(id: String) = id in pipes fun applyDefaults(app: Context, id: String, appId: Long) { val scope = (appId and 0xffffffffL).toString() @@ -23,16 +23,22 @@ object RockstarLaunch { } fun prepare(app: Context, id: String): JSONObject { - val pipe = pipes[id] ?: return failure("unsupported-title") - val title = RockstarTitles.byId(id) ?: return failure("unknown-title") val folder = StoreInstallRoot.gameFolders(app).firstOrNull { folder -> StoreGameSidecar.read(folder)?.let { it.store == Store.ROCKSTAR && it.id == id && it.isInstalled } == true } ?: return failure("not-installed") val installed = StoreGameSidecar.read(folder) ?: return failure("not-installed") val exe = installed.exeFile(folder).canonicalFile - if (!exe.path.startsWith(folder.canonicalPath + java.io.File.separator) || !exe.isFile || - !java.io.File(folder, "MTLX.dll").isFile) return failure("missing-game-files") + if (!exe.path.startsWith(folder.canonicalPath + java.io.File.separator) || !exe.isFile) return failure("missing-game-files") + val metadata = RockstarMetadata.find(folder) + val pipe = pipes[id] + val sdk = (pipe == null && metadata != null) || id in setOf("gta4", "lanoire") || listOf(folder, exe.parentFile).any { dir -> + dir.listFiles().orEmpty().any { it.isFile && it.name.lowercase() in setOf("socialclub.dll", "socialclub64.dll") } + } + if (pipe == null && !sdk) return failure("no-launcher-protocol") + if (pipe != null && !listOf(folder, exe.parentFile).any { java.io.File(it, "MTLX.dll").isFile }) return failure("missing-game-files") + val rosId = metadata?.rosId ?: RockstarTitles.byId(id)?.rosTitleId ?: return failure("missing-title-metadata") var ticket = RockstarAuth.ticket(app) ?: RockstarAuth.ticket(app, fresh = true) ?: return failure("signed-out") + if (sdk && ticket.sdkTicket.isEmpty()) ticket = RockstarAuth.ticket(app, fresh = true) ?: return failure("signed-out") val account = try { RockstarApps.fetch(ticket.ticket) {} } catch (e: RockstarRos.RosException) { @@ -40,16 +46,23 @@ object RockstarLaunch { ticket = RockstarAuth.ticket(app, fresh = true) ?: return failure("signed-out") RockstarApps.fetch(ticket.ticket) {} } - if (RockstarLibrary.owned(account).none { it.id == id } || RockstarApps.deliverer(account.apps, title) == null) return failure("not-owned") - val tokenRoot = RockstarRos.result("app.asmx/GetTitleAccessToken2", listOf("ticket" to ticket.ticket, "titleId" to title.rosTitleId.toString(), "platformId" to "8")) + if (metadata != null && account.apps.none { it.titleId.toIntOrNull() == rosId && (it.name == metadata.id || it.name.startsWith(metadata.id + "_")) }) return failure("title-metadata-mismatch") + val tokenRoot = RockstarRos.result("app.asmx/GetTitleAccessToken2", listOf("ticket" to ticket.ticket, "titleId" to rosId.toString(), "platformId" to "8")) val token = RockstarRos.text(tokenRoot, "Result")?.takeIf { it.isNotEmpty() } ?: return failure("no-title-token") + val result = JSONObject().put("ok", true).put("expiresAt", System.currentTimeMillis() + 90_000) + if (sdk) { + val session = JSONObject().put("accountId", ticket.rockstarId).put("identity", ticket.email.ifEmpty { ticket.nickname }).put("ticket", ticket.sdkTicket) + if (RockstarLibrary.owns(account, rosId, metadata?.id ?: id)) session.put("titleId", metadata?.id ?: id) + result.put("session", session) + } + if (pipe == null) return result val hash = MessageDigest.getInstance("SHA-256").digest(RockstarAuth.fingerprint(app).toString().toByteArray()).copyOf(16) val launch = RockstarRos.result("app.asmx/GetTitleLaunchData", listOf("ticket" to ticket.ticket, "titleAccessToken" to token, "machineHash" to Base64.getEncoder().encodeToString(hash))) val encoded = RockstarRos.text(launch, "Data") ?: return failure("no-launch-data") val iv = RockstarRos.text(launch, "EndpointIV") ?: return failure("no-launch-iv") val material = RockstarLaunchCipher.decode(encoded, iv) - return JSONObject().put("ok", true).put("pipe", pipe).put("material", material).put("expiresAt", System.currentTimeMillis() + 90_000) + return result.put("pipe", pipe).put("material", material) } private fun failure(reason: String) = JSONObject().put("ok", false).put("reason", reason) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarMetadata.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarMetadata.kt new file mode 100644 index 0000000000..5a7e052946 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarMetadata.kt @@ -0,0 +1,53 @@ +package com.droiddeck.launcher.stores.rockstar + +import org.json.JSONObject +import java.io.File +import java.nio.ByteBuffer +import java.nio.ByteOrder +import java.nio.charset.CodingErrorAction +import javax.crypto.Cipher +import javax.crypto.spec.IvParameterSpec +import javax.crypto.spec.SecretKeySpec + +internal object RockstarMetadata { + data class Title(val id: String, val rosId: Int, val exe: String) + + fun find(folder: File): Title? { + val root = folder.canonicalFile + var level = listOf(root) + repeat(4) { + val entries = level.map { it.listFiles().orEmpty() } + val metadata = entries.flatMap { files -> files.filter { it.name.equals("title.rgl", true) } } + for (file in metadata.filter { it.isFile && !java.nio.file.Files.isSymbolicLink(it.toPath()) && it.canonicalPath.startsWith(root.path + File.separator) }) { + if (file.length() in 112..1_048_576) runCatching { decode(file.readBytes()) }.getOrNull()?.let { + return it.copy(exe = File(file.parentFile, it.exe).relativeTo(root).invariantSeparatorsPath) + } + } + level = entries.flatMap { files -> files.asSequence().filter { + it.isDirectory && !java.nio.file.Files.isSymbolicLink(it.toPath()) && it.canonicalPath.startsWith(root.path + File.separator) + }.take(256).toList() }.take(256) + } + return null + } + + fun decode(bytes: ByteArray): Title? = runCatching { + require(bytes.size in 112..1_048_576 && bytes.copyOfRange(0, 4).contentEquals(byteArrayOf(82, 71, 76, 77))) + val header = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN) + require(header.getInt(4) == 1 && header.getInt(8) == bytes.size - 80 && (bytes.size - 80) % 16 == 0) + val cipher = Cipher.getInstance("AES/CBC/NoPadding") + cipher.init(Cipher.DECRYPT_MODE, SecretKeySpec(ByteArray(32), "AES"), IvParameterSpec(bytes.copyOfRange(80, 96))) + val clear = cipher.doFinal(bytes, 96, bytes.size - 96) + val pad = clear.last().toInt() and 255 + val size = if (pad in 1..16 && clear.takeLast(pad).all { (it.toInt() and 255) == pad }) clear.size - pad + else clear.indexOfLast { it != 0.toByte() } + 1 + val text = Charsets.UTF_8.newDecoder().onMalformedInput(CodingErrorAction.REPORT) + .onUnmappableCharacter(CodingErrorAction.REPORT).decode(ByteBuffer.wrap(clear, 0, size)).toString().removePrefix("\uFEFF") + val json = JSONObject(text) + val id = json.getString("titleId") + val rosId = json.get("rosTitleId").toString().takeIf { Regex("[1-9][0-9]{0,4}").matches(it) }?.toInt() ?: return null + val exe = json.getString("principalFileName").replace('\\', '/') + require(Regex("[a-z][a-z0-9_]{0,63}").matches(id) && rosId in 1..65535) + require(exe.isNotEmpty() && !exe.startsWith('/') && ':' !in exe && '\u0000' !in exe && exe.split('/').none { it == ".." }) + Title(id, rosId, exe) + }.getOrNull() +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index 729fc5ad19..bee82bbd2c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -400,7 +400,6 @@ internal fun GameActions( val failed = rawDownload?.takeIf { it.state == DownloadState.FAILED } val cloud = game?.library == Library.XBOX_CLOUD && installed == null val downloadBytes = catalogSize(item) - val launchSupported = store != Store.ROCKSTAR || com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(id) Actions { when { s.shortcutPicker && game != null -> { @@ -412,8 +411,8 @@ internal fun GameActions( val xboxBusy = store == Store.XBOX && id != null && XboxContent.busy(id) val preparing = (game?.launchKey ?: storeKey)?.let { it in s.preparingGames } == true PrimaryButton( - stringResource(if (!launchSupported) R.string.stores_rockstar_launch_unavailable else if (preparing) R.string.store_starting else R.string.stores_play), - enabled = launchSupported && !s.busy && !preparing && gone == null && download == null && !xboxBusy && (store != Store.GOG || installed?.sidecar?.isInstalled != false), + stringResource(if (preparing) R.string.store_starting else R.string.stores_play), + enabled = !s.busy && !preparing && gone == null && download == null && !xboxBusy && (store != Store.GOG || installed?.sidecar?.isInstalled != false), main = true, icon = Icons.Filled.PlayArrow, modifier = leadOn, ) { if (game != null) a.onSteamGame(game) else if (store != null && id != null) launchStoreGame(store, id, s, a) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt index d8daa53d58..0b1000e6e3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt @@ -221,7 +221,7 @@ private fun FinishedRow(d: DownloadEntry, s: FrontEndState, a: FrontEndActions, val ctx = LocalContext.current ArtStrip(d.cover, d.name) { StripLabel(d.name, d.store.id, stringResource(if (d.state == DownloadState.INSTALLED) R.string.stores_installed_chip else R.string.stores_dl_cancelled), Color.White.copy(alpha = 0.72f)) - if (d.state == DownloadState.INSTALLED && (d.store != Store.ROCKSTAR || com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(d.id))) Box(Modifier.bloomIn(bloom, GATHER_HOLD_MS + 150)) { + if (d.state == DownloadState.INSTALLED) Box(Modifier.bloomIn(bloom, GATHER_HOLD_MS + 150)) { RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else if (d.key == com.droiddeck.launcher.stores.battlenet.BattleNetClient.DOWNLOAD_KEY) a.onBattleNet() else launchStoreGame(d.store, d.id, s, a) } } } @@ -374,7 +374,7 @@ private fun DownloadCard(d: DownloadEntry, s: FrontEndState, a: FrontEndActions) RoundAction(Icons.Filled.Refresh, stringResource(R.string.stores_dl_resume), primary = true) { DownloadQueue.retry(ctx, d.key) } CancelAction { DownloadQueue.clear(ctx, d.key) } } - DownloadState.INSTALLED -> if (d.store != Store.ROCKSTAR || com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(d.id)) Box(Modifier.bloomIn(true, 420)) { + DownloadState.INSTALLED -> Box(Modifier.bloomIn(true, 420)) { RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else if (d.key == com.droiddeck.launcher.stores.battlenet.BattleNetClient.DOWNLOAD_KEY) a.onBattleNet() else launchStoreGame(d.store, d.id, s, a) } } DownloadState.CANCELLED -> {} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f1a5dcf3f3..734bfbb25e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3999,6 +3999,5 @@ Scarlet Snow White surfaces with red accents. - Launch unavailable No web browser is available to open this link. diff --git a/app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarMetadataTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarMetadataTest.kt new file mode 100644 index 0000000000..cb07f0914e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarMetadataTest.kt @@ -0,0 +1,78 @@ +package com.droiddeck.launcher.stores.rockstar + +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import java.nio.ByteBuffer +import java.nio.ByteOrder +import javax.crypto.Cipher +import javax.crypto.spec.IvParameterSpec +import javax.crypto.spec.SecretKeySpec + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], application = android.app.Application::class) +class RockstarMetadataTest { + @Test fun findsRootMetadataAfterManyOtherFiles() { + val root = java.nio.file.Files.createTempDirectory("rockstar-many-files").toFile() + try { + repeat(300) { java.io.File(root, "asset-$it.dat").writeText("asset") } + java.io.File(root, "title.rgl").writeBytes(container("""{"titleId":"game","rosTitleId":123,"principalFileName":"Game.exe"}""")) + assertEquals("game", RockstarMetadata.find(root)?.id) + java.io.File(root, "title.rgl").delete() + java.io.File(root, "Title.RGL").writeBytes(container("""{"titleId":"game","rosTitleId":123,"principalFileName":"Game.exe"}""")) + assertEquals("game", RockstarMetadata.find(root)?.id) + } finally { + root.deleteRecursively() + } + } + + private fun container(json: String): ByteArray { + val iv = ByteArray(16) { it.toByte() } + val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding") + cipher.init(Cipher.ENCRYPT_MODE, SecretKeySpec(ByteArray(32), "AES"), IvParameterSpec(iv)) + val payload = iv + cipher.doFinal(json.toByteArray()) + val header = ByteBuffer.allocate(80).order(ByteOrder.LITTLE_ENDIAN) + header.put(byteArrayOf(82, 71, 76, 77)).putInt(1).putInt(payload.size) + return header.array() + payload + } + + @Test fun decodesInstalledTitleWithoutAnAppIdAllowlist() { + val title = RockstarMetadata.decode(container("""{"titleId":"new_title","rosTitleId":123,"principalFileName":"Game/Binaries/Win64/Game.exe"}"""))!! + assertEquals("new_title", title.id) + assertEquals(123, title.rosId) + assertEquals("Game/Binaries/Win64/Game.exe", title.exe) + } + + @Test fun rejectsBrokenContainersAndEscapingExecutables() { + val valid = container("""{"titleId":"game","rosTitleId":123,"principalFileName":"Game.exe"}""") + assertNull(RockstarMetadata.decode(valid.copyOf(90))) + assertNull(RockstarMetadata.decode(valid.copyOf().also { it[4] = 2 })) + assertNull(RockstarMetadata.decode(valid + byteArrayOf(0))) + assertNull(RockstarMetadata.decode(container("""{"titleId":"game","rosTitleId":1.5,"principalFileName":"Game.exe"}"""))) + for (exe in listOf("../outside.exe", "C:/outside.exe", "/outside.exe")) { + assertNull(RockstarMetadata.decode(container("""{"titleId":"game","rosTitleId":123,"principalFileName":"$exe"}"""))) + } + } + + @Test fun doesNotFollowMetadataSymlinksOutsideTheGame() { + val root = java.nio.file.Files.createTempDirectory("rockstar-metadata").toFile() + val outside = java.io.File.createTempFile("rockstar-external", ".rgl") + try { + outside.writeBytes(container("""{"titleId":"game","rosTitleId":123,"principalFileName":"Game.exe"}""")) + val link = java.io.File(root, "title.rgl").toPath() + try { java.nio.file.Files.createSymbolicLink(link, outside.toPath()) } + catch (e: java.nio.file.FileSystemException) { org.junit.Assume.assumeNoException(e) } + assertNull(RockstarMetadata.find(root)) + java.nio.file.Files.delete(link) + java.io.File(root, "nested").mkdir() + outside.copyTo(java.io.File(root, "nested/title.rgl")) + assertEquals("game", RockstarMetadata.find(root)?.id) + assertEquals("nested/Game.exe", RockstarMetadata.find(root)?.exe) + } finally { + root.deleteRecursively() + outside.delete() + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarTest.kt index e356683511..755bd7320c 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarTest.kt @@ -12,6 +12,54 @@ import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @Config(sdk = [33], application = android.app.Application::class) class RockstarTest { + @Test fun sdkTicketExportsOnlyTheShortLivedServerResponse() { + val root = RockstarRos.parse("""1opaque-game-ticket456session-keysession-ticketexample.invalidservice-refresh-secretrefresh-secret123Playerplayer@example.invalidnested-refresh-secret""") + val sdk = RockstarRos.parse(RockstarAuth.sdkTicket(root)) + assertEquals("opaque-game-ticket", RockstarRos.text(sdk, "Ticket")) + assertEquals("session-key", RockstarRos.text(sdk, "SessionKey")) + assertEquals("123", RockstarRos.text(sdk, "RockstarId")) + assertEquals("456", RockstarRos.text(sdk, "PlayerAccountId")) + assertEquals("1", RockstarRos.first(sdk, "Services")?.getAttribute("Count")) + assertEquals("example.invalid", RockstarRos.text(sdk, "Host")) + assertNull(RockstarRos.first(sdk, "ScAuthToken")) + assertFalse(RockstarAuth.sdkTicket(root).contains("refresh-secret")) + } + + @Test fun sdkTitleStateRequiresAnOwnedPackageInsteadOfCatalogVisibility() { + val visible = RockstarApp("1", "future_title", "123", emptyList()) + val featured = RockstarAccountApps(listOf(visible), listOf(RockstarPackage("future_title", true))) + assertFalse(RockstarLibrary.owns(featured, 123, "future_title")) + val owned = RockstarAccountApps(listOf(visible), listOf(RockstarPackage("future_title", false))) + assertTrue(RockstarLibrary.owns(owned, 123, "future_title")) + assertFalse(RockstarLibrary.owns(owned, 124, "other_title")) + } + + @Test fun directLaunchPreservesArgumentsThroughTheWindowsBatchInterpreter() { + org.junit.Assume.assumeTrue(java.io.File.separatorChar == '\\') + val root = java.nio.file.Files.createTempDirectory("rockstar-batch").toFile() + try { + java.io.File(System.getenv("SystemRoot"), "System32/cscript.exe").copyTo(java.io.File(root, "Game.exe")) + java.io.File(root, "probe.vbs").writeText(""" + Set output = CreateObject("Scripting.FileSystemObject").CreateTextFile("args.txt", True) + For Each arg In WScript.Arguments + output.WriteLine(arg) + Next + output.Close + """.trimIndent()) + val args = listOf("", "&literal", "one argument", "%PATH%", "!PATH!", "^&|<>()") + val game = com.droiddeck.launcher.stores.StoreGameSidecar(com.droiddeck.launcher.stores.Store.ROCKSTAR, + "future_title", "Game", "Game.exe", args = listOf("//nologo", "probe.vbs") + args) + com.droiddeck.launcher.stores.StoreLaunch.writeLauncher(root, game) + val process = ProcessBuilder("cmd.exe", "/d", "/c", java.io.File(root, com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER).path) + .directory(root).redirectErrorStream(true).start() + assertTrue(process.waitFor(10, java.util.concurrent.TimeUnit.SECONDS)) + assertEquals(process.inputStream.bufferedReader().readText(), 0, process.exitValue()) + assertEquals(args, java.io.File(root, "args.txt").readLines()) + } finally { + root.deleteRecursively() + } + } + @Test fun launcherAdoptionDoesNotFollowSymbolicLinks() { val folder = java.nio.file.Files.createTempDirectory("rockstar-launch-link").toFile() val outside = java.io.File.createTempFile("rockstar-keep", ".txt").apply { writeText("keep") } @@ -51,7 +99,7 @@ class RockstarTest { } } - @Test fun unsupportedGamesKeepTheirFilesWithoutRegisteringALauncher() { + @Test fun otherRockstarGamesRegisterAndLaunchTheirInstalledExecutable() { val app = org.robolectric.RuntimeEnvironment.getApplication() com.droiddeck.launcher.session.SessionPrefs.setGameStorage(app, com.droiddeck.launcher.session.SessionPrefs.GAME_STORAGE_OFF, "") val folder = java.io.File(com.droiddeck.launcher.stores.StoreInstallRoot.storeDir(com.droiddeck.launcher.stores.StoreInstallRoot.installRoot(app), com.droiddeck.launcher.stores.Store.ROCKSTAR), "RDR2").apply { mkdirs() } @@ -62,11 +110,27 @@ class RockstarTest { script.writeText("old launcher") val finished = com.droiddeck.launcher.stores.StoreLaunch.writeLauncher(folder, game) finished.write(folder) - assertFalse(RockstarLaunch.supports(game.id)) - assertNull(finished.launcher) - assertFalse(script.exists()) + assertFalse(RockstarLaunch.usesClassicLauncher(game.id)) + assertEquals(com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER, finished.launcher) + assertTrue(script.readText().contains("\"%~dp0RDR2.exe\"")) + assertTrue(script.readText().contains("if not exist \"C:\\Program Files\\Rockstar Games\\Launcher\\launch.json\" goto direct")) assertTrue(java.io.File(folder, game.exe).isFile) - assertNull(com.droiddeck.launcher.frontend.AddedGames.single(app, folder.path)) + } finally { + folder.deleteRecursively() + } + } + + @Test fun otherRockstarGamesCanRegisterShortcuts() { + org.junit.Assume.assumeTrue(java.io.File.separatorChar == '/') + val app = org.robolectric.RuntimeEnvironment.getApplication() + com.droiddeck.launcher.session.SessionPrefs.setGameStorage(app, com.droiddeck.launcher.session.SessionPrefs.GAME_STORAGE_OFF, "") + val folder = java.io.File(com.droiddeck.launcher.stores.StoreInstallRoot.storeDir(com.droiddeck.launcher.stores.StoreInstallRoot.installRoot(app), com.droiddeck.launcher.stores.Store.ROCKSTAR), "RDR2").apply { mkdirs() } + try { + java.io.File(folder, "RDR2.exe").writeText("installed game") + com.droiddeck.launcher.stores.StoreGameSidecar(com.droiddeck.launcher.stores.Store.ROCKSTAR, "rdr2", "RDR2", "RDR2.exe").write(folder) + val game = com.droiddeck.launcher.frontend.AddedGames.single(app, folder.path) + assertTrue(game != null) + assertTrue(game!!.guestExe.endsWith("/" + com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER)) } finally { folder.deleteRecursively() } @@ -110,7 +174,8 @@ class RockstarTest { } @Test fun classicTitlesUseTheirObservedPipeNames() { - assertEquals(mapOf("gta3" to "GTA3_Pipe", "gtavc" to "GTA-VC_Pipe", "gtasa" to "GTA_SA_Pipe"), RockstarLaunch.pipes) + assertEquals(mapOf("gta3" to "GTA3_Pipe", "gtavc" to "GTA-VC_Pipe", "gtasa" to "GTA_SA_Pipe", "gta4" to "GTAIV_Pipe", "lanoire" to "LANOIRE_Pipe"), RockstarLaunch.pipes) + for (id in RockstarLaunch.pipes.keys) assertTrue(RockstarLaunch.usesClassicLauncher(id)) } @Test fun signingOutClearsOwnedShelfCards() { @@ -162,14 +227,15 @@ class RockstarTest { } @Test - fun classicGamesStartTheirParentLauncherWithoutEmbeddingCredentials() { + fun rockstarLaunchScriptsContainNoCredentials() { val sidecar = com.droiddeck.launcher.stores.StoreGameSidecar( com.droiddeck.launcher.stores.Store.ROCKSTAR, "gtavc", "Vice City", "gta-vc.exe", ) val text = com.droiddeck.launcher.stores.StoreLaunch.launcherText(sidecar) assertTrue(text.contains("\"C:\\Program Files\\Rockstar Games\\Launcher\\Launcher.exe\"")) assertTrue(text.contains("exit /b %errorlevel%")) - assertFalse(text.contains("gta-vc.exe")) + assertTrue(text.contains("goto direct")) + assertTrue(text.contains("\"%~dp0gta-vc.exe\"")) assertFalse(text.contains("ticket", true)) assertFalse(text.contains("rem ", true)) } diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch index ebb9718942..3d07aaba6a 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch @@ -315,14 +315,51 @@ UBISOFT_WINDOWS_DIR = "C:\\Program Files (x86)\\Ubisoft\\Ubisoft Game Launcher\\ UBISOFT_INSTALLER_URL = "https://static3.cdn.ubi.com/orbit/launcher_installer/UbisoftConnectInstaller.exe" ROCKSTAR_SERVICE = Path("/usr/local/lib/droiddeck-rockstar") ROCKSTAR_FOLDER = "drive_c/Program Files/Rockstar Games/Launcher" -ROCKSTAR_TITLES = {"gta3": "Grand Theft Auto III", "gtavc": "Grand Theft Auto: Vice City", "gtasa": "GTA: San Andreas"} +ROCKSTAR_TITLES = {"gta3": "Grand Theft Auto III", "gtavc": "Grand Theft Auto: Vice City", "gtasa": "GTA: San Andreas", + "gta4": "Grand Theft Auto IV", "lanoire": "LANoireMTL"} -def rockstar_registry(folder, title, compat_data, proton): +def rockstar_sdk(folder, sidecar): + if str(sidecar.get("id")) in ("gta4", "lanoire"): + return True + root = folder.resolve() + exe = (folder / str(sidecar.get("exe") or "").replace("\\", "/")).resolve() + if not exe.is_relative_to(root): + return False + for directory in {root, exe.parent}: + if directory.is_dir() and any(p.is_file() and not p.is_symlink() and p.name.lower() in ("socialclub.dll", "socialclub64.dll") + for p in directory.iterdir()): + return True + if str(sidecar.get("id")) in ROCKSTAR_TITLES: + return False + level = [root] + for _ in range(4): + children = [] + for directory in level: + for path in directory.iterdir(): + if path.is_symlink(): + continue + if path.name.lower() == "title.rgl" and path.is_file() and path.resolve().is_relative_to(root) and 112 <= path.stat().st_size <= 1048576: + with path.open("rb") as source: + if source.read(4) == b"RGLM": + return True + if len(children) < 256 and path.is_dir() and path.resolve().is_relative_to(root): + children.append(path) + level = children + return False + + +def rockstar_registry(folder, title, compat_data, proton, sdk_arch=None): pfx = Path(compat_data) / "pfx" launcher = r"C:\Program Files\Rockstar Games\Launcher" - values = [(r"Rockstar Games\Launcher", launcher), ("Rockstar Games\\" + title, windows_path(str(folder)))] + values = [(r"Rockstar Games\Launcher", launcher)] + if title: + values.append(("Rockstar Games\\" + title, windows_path(str(folder)))) entries = [("Software\\" + view + key, value) for view in ("", "Wow6432Node\\") for key, value in values] + if sdk_arch: + entries.append((r"Software\Rockstar Games\Rockstar Games Social Club", r"C:\Program Files\Rockstar Games\Social Club")) + program = "Program Files (x86)" if sdk_arch == "x86" else "Program Files" + entries.append((r"Software\Wow6432Node\Rockstar Games\Rockstar Games Social Club", "C:\\" + program + r"\Rockstar Games\Social Club")) reg = pfx / "system.reg" if all(has_value(reg, "[" + key.replace("\\", "\\\\") + "]", "InstallFolder", value) for key, value in entries): return True @@ -338,15 +375,88 @@ def rockstar_registry(folder, title, compat_data, proton): return result.returncode == 0 +def rockstar_runtime(folder, exe, compat_data, arch): + if arch == "x86": + rockstar_runtime(folder, exe, compat_data, "x64") + pfx = Path(compat_data) / "pfx" + target = pfx / "drive_c" / ("Program Files (x86)" if arch == "x86" else "Program Files") / "Rockstar Games/Social Club" + if not target.resolve().is_relative_to(pfx.resolve()): + raise ValueError("invalid Social Club destination") + required = ("socialclub.dll", "socialclub.pak") + (("SocialClubHelper.exe",) if arch == "x64" else ()) + marker = target / ".droiddeck-installing" + if all((target / name).is_file() for name in required) and not marker.exists(): + return "present" + root = folder.resolve() + installers = [base / sub / "Social-Club-Setup.exe" for base in (root, exe.parent) + for sub in ("Redistributables", "Installers")] + installer = next((p for p in installers if p.is_file() and p.resolve().is_relative_to(root) and p.stat().st_size <= 256 * 1024 * 1024), None) + if installer is None: + return "game-runtime" + tool = shutil.which("7z") + if not tool: + return "no-unpacker" + listing = subprocess.run([tool, "l", "-t7z", "-slt", "-ba", str(installer)], capture_output=True, + stdin=subprocess.DEVNULL, timeout=30) + if listing.returncode: + return "installer-unreadable" + entries, size = [], 0 + for block in listing.stdout.decode("utf-8", "replace").split("\n\n"): + fields = dict(line.split(" = ", 1) for line in block.splitlines() if " = " in line) + name = fields.get("Path", "").replace("\\", "/") + if not name.startswith(arch + "/"): + continue + if ".." in name.split("/") or ":" in name or fields.get("Symbolic Link") or fields.get("Hard Link"): + raise ValueError("invalid Social Club archive path") + entry_size = int(fields.get("Size", "0")) + if entry_size < 0: + raise ValueError("invalid Social Club member size") + size += entry_size + entries.append(name) + if not entries or len(entries) > 2048 or size > 768 * 1024 * 1024: + raise ValueError("invalid Social Club archive size") + with tempfile.TemporaryDirectory(prefix="droiddeck-socialclub-") as temporary: + result = subprocess.run([tool, "x", "-t7z", "-y", "-o" + temporary, str(installer), arch + "/*"], + stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, stdin=subprocess.DEVNULL, timeout=180) + source = Path(temporary) / arch + if result.returncode or not all((source / name).is_file() for name in required): + return "installer-incomplete" + target.mkdir(parents=True, exist_ok=True) + if marker.is_symlink(): + raise ValueError("invalid Social Club install marker") + marker.touch() + for path in source.rglob("*"): + if path.is_symlink() or not path.resolve().is_relative_to(source.resolve()): + raise ValueError("invalid Social Club archive member") + if not path.is_file(): + continue + output = target / path.relative_to(source) + if not output.resolve().is_relative_to(pfx.resolve()): + raise ValueError("invalid Social Club output path") + output.parent.mkdir(parents=True, exist_ok=True) + with tempfile.NamedTemporaryFile(dir=output.parent, delete=False) as stage: + stage_path = Path(stage.name) + try: + with path.open("rb") as stream: + shutil.copyfileobj(stream, stage) + except BaseException: + stage_path.unlink(missing_ok=True) + raise + os.replace(stage_path, output) + marker.unlink() + return "installed" + + def prepare_rockstar(folder, sidecar, compat_data, launch_dir, proton="", ask_app=None): if not compat_data: return "no-prefix" target = Path(compat_data) / "pfx" / ROCKSTAR_FOLDER + if not target.resolve().is_relative_to((Path(compat_data) / "pfx").resolve()): + return "invalid-service-path" config = target / "launch.json" config.unlink(missing_ok=True) + legacy = str(sidecar.get("id")) in ROCKSTAR_TITLES + sdk = rockstar_sdk(folder, sidecar) title = ROCKSTAR_TITLES.get(str(sidecar.get("id"))) - if not title: - return "unsupported-title" if not launch_dir: return "no-channel" root = folder.resolve() @@ -354,7 +464,7 @@ def prepare_rockstar(folder, sidecar, compat_data, launch_dir, proton="", ask_ap if not exe.is_relative_to(root): return "invalid-game-path" workdir = (folder / str(sidecar["workdir"])).resolve() if sidecar.get("workdir") is not None else exe.parent - if not workdir.is_relative_to(root) or not exe.is_file() or not (folder / "MTLX.dll").is_file(): + if not workdir.is_relative_to(root) or not exe.is_file() or legacy and not any((p / "MTLX.dll").is_file() for p in (root, exe.parent)): return "invalid-game-path" args = sidecar.get("args") or [] if not isinstance(args, list) or any(not isinstance(arg, str) or "\0" in arg for arg in args): @@ -376,7 +486,10 @@ def prepare_rockstar(folder, sidecar, compat_data, launch_dir, proton="", ask_ap made = "present" if (Path(compat_data) / "pfx/user.reg").is_file() else create_prefix(compat_data, proton) if made not in ("created", "present"): return "prefix-" + made - if not rockstar_registry(folder, title, compat_data, proton): + arch = "x86" if signature[4:] == b"\x4c\x01" else "x64" + if sdk: + log("rockstar runtime: " + rockstar_runtime(folder, exe, compat_data, arch)) + if not rockstar_registry(folder, title, compat_data, proton, sdk_arch=arch if sdk else None): return "registry-unavailable" target.mkdir(parents=True, exist_ok=True) with tempfile.NamedTemporaryFile(prefix="Launcher-", suffix=".exe", dir=target, delete=False) as temporary: @@ -391,14 +504,28 @@ def prepare_rockstar(folder, sidecar, compat_data, launch_dir, proton="", ask_ap answer = (ask_app or ask)(Path(launch_dir) / "stores", {"op": "rockstar-launch", "store": "rockstar", "id": str(sidecar.get("id"))}, timeout=120.0) if not isinstance(answer, dict) or not answer.get("ok"): return "session-" + (str(answer.get("reason") or "refused") if isinstance(answer, dict) else "timeout") - if not isinstance(answer.get("material"), str) or not re.fullmatch(r"[0-9A-Fa-f]{640}", answer["material"]): + if legacy and (not isinstance(answer.get("material"), str) or not re.fullmatch(r"[0-9A-Fa-f]{640}", answer["material"])): return "invalid-material" expires = answer.get("expiresAt") if not isinstance(expires, int) or not time.time() * 1000 < expires <= time.time() * 1000 + 120_000: return "invalid-expiry" launch = {"folder": windows_path(str(root)), "exe": windows_path(str(exe)), "workdir": windows_path(str(workdir)), - "args": args, "pipe": answer.get("pipe"), "material": answer["material"], "expiresAt": expires} - if len(json.dumps(launch).encode("utf-8")) > 16384: + "args": args, "expiresAt": expires} + if legacy: + launch.update(pipe=answer.get("pipe"), material=answer["material"]) + if sdk: + session = answer.get("session") + if not isinstance(session, dict) or not isinstance(session.get("accountId"), str) \ + or not re.fullmatch(r"[1-9][0-9]{0,19}", session["accountId"]) or int(session["accountId"]) > 2**64 - 1 \ + or any(not isinstance(session.get(key), str) or not session[key] or "\0" in session[key] + or len(session[key].encode("utf-8")) > limit for key, limit in (("identity", 512), ("ticket", 49152))): + return "invalid-sdk-session" + launch["session"] = {key: session[key] for key in ("accountId", "identity", "ticket")} + if "titleId" in session: + if not isinstance(session["titleId"], str) or not re.fullmatch(r"[a-z][a-z0-9_]{0,63}", session["titleId"]): + return "invalid-sdk-title" + launch["session"]["titleId"] = session["titleId"] + if len(json.dumps(launch).encode("utf-8")) > 65536: return "handoff-too-large" with tempfile.NamedTemporaryFile(mode="w", prefix="launch-", suffix=".json", dir=target, delete=False) as temporary: temporary_path = Path(temporary.name) @@ -1446,6 +1573,10 @@ def main(argv): log("gog registry: " + apply_gog_registry(folder, compat_data, os.environ.get("BL_STORE_PROTON", ""))) log("gog support data: " + gog_support_data(folder, compat_data, os.environ.get("BL_STORE_PROTON", ""))) if store == "rockstar": + if game not in ROCKSTAR_TITLES and not rockstar_sdk(folder, sidecar): + if compat_data: + (Path(compat_data) / "pfx" / ROCKSTAR_FOLDER / "launch.json").unlink(missing_ok=True) + return STORE_GAME try: state = prepare_rockstar(folder, sidecar, compat_data, launch_dir, os.environ.get("BL_STORE_PROTON", "")) except (OSError, ValueError, subprocess.TimeoutExpired): diff --git a/tools/rockstar-launcher/README.md b/tools/rockstar-launcher/README.md index e22a4183c8..2965084713 100644 --- a/tools/rockstar-launcher/README.md +++ b/tools/rockstar-launcher/README.md @@ -1,11 +1,17 @@ # Rockstar launcher service -`Launcher.exe` starts the selected installed game and serves its launcher pipe. The Android app checks ownership and retrieves the launch response from Rockstar. Account credentials and ROS tickets stay in the app. +`Launcher.exe` starts the selected installed game and serves its launcher pipes. The Android app obtains title authorization from Rockstar. Refresh credentials stay in Android Keystore-backed storage. -The handoff is deleted before starting the game. It expires after 90 seconds. The pipe accepts the child process's greeting and returns the server-issued launch material. No game files are patched. +The handoff is mode 0600, expires after 90 seconds and is deleted before starting the game. Legacy launches carry server-issued launch material. SDK launches also carry a short-lived ROS ticket and account identity; those values are kept in memory after the handoff is consumed and are not logged. Pipes reject remote clients and check the client process against the launched child. No game files are patched. + +GTA III, Vice City and San Andreas use body-length MTLX replies. GTA IV and L.A. Noire use total-length, terminated replies. Titles with installed Social Club metadata or SDK binaries use the SDK IPC adapter, including user-info, login, ticket, initialization and authorized title-state synchronization. The title metadata supplies the ROS identity and principal executable; it is checked against Rockstar's catalog before title authorization. Other titles retain Play and Steam shortcuts and attempt the normal executable launch path. + +The SDK runtime is extracted from the game's own Social-Club-Setup.exe when present. Architecture-specific payloads are staged into the prefix, archive paths and sizes are checked, interrupted copies are retried, and both registry views are registered. The helper discovers launcher identity pipe names in the game executable and answers bounded INIT challenges from the launched process. No vendor executables or runtime files are bundled with this tool. SDK initialization has a 90-second deadline. SDK wire tests and fixture clients do not establish gameplay compatibility for every title; per-title ROS ticket exchange and secondary SDK channels remain unverified. GTA III defaults to full x87 precision for FEX before Wine starts, because reduced precision crashed new-game initialization on the test device. San Andreas defaults to WineD3D, because DXVK intermittently corrupted its textures; full precision and conservative memory ordering did not prevent that corruption. These defaults use DroidDeck's per-game settings and preserve explicit per-game overrides. +Raw launcher identity requests use `INIT::` with a terminating colon. Framed requests carry their payload length. The reply echoes the complete challenge after `TINI:launcher:`; partial reads do not complete a raw request. + `build.sh` builds 32-bit and 64-bit executables with the GNU Windows targets and stages them as APK resources. `legacy-cipher.bin` contains the fixed client protocol tables, not account credentials or APK signing keys. Run the protocol tests with: diff --git a/tools/rockstar-launcher/examples/sdk_probe.rs b/tools/rockstar-launcher/examples/sdk_probe.rs new file mode 100644 index 0000000000..b280ce0409 --- /dev/null +++ b/tools/rockstar-launcher/examples/sdk_probe.rs @@ -0,0 +1,80 @@ +#[cfg(windows)] +fn run() -> Result<(), Box> { + use droiddeck_rockstar_launcher::{pipe::Pipe, sdk::Message, Frame, Length}; + use std::io::{Read, Write}; + for (path, framed) in [ + (b"\\\\.\\pipe\\ProbeLauncherPipe\0".as_slice(), true), + (b"\\\\.\\pipe\\RawProbeLauncher_Pipe\0".as_slice(), false), + ] { + let name = std::str::from_utf8(&path[9..path.len() - 1])?; + let mut pipe = Pipe::connect(name, std::time::Duration::from_secs(10))?; + let request = b"INIT:42:"; + if framed { + let mut bytes = (request.len() as u32).to_le_bytes().to_vec(); + bytes.extend_from_slice(request); + pipe.write_all(&bytes)?; + let response = Frame::read(&mut pipe, Length::Body)?; + if response.tag != *b"TINI" || response.payload != b"launcher:42:" { + return Err("invalid framed launcher identity reply".into()); + } + } else { + pipe.write_all(b"INIT:4")?; + std::thread::sleep(std::time::Duration::from_millis(20)); + pipe.write_all(b"2:")?; + let mut response = vec![0; b"TINI:launcher:42:".len()]; + pipe.read_exact(&mut response)?; + if response != b"TINI:launcher:42:" { + return Err("invalid raw launcher identity reply".into()); + } + } + } + let args: Vec<_> = std::env::args().collect(); + let instance: u32 = args + .iter() + .find_map(|arg| arg.strip_prefix("-processInstance=")) + .ok_or("missing instance")? + .parse()?; + let output = args + .windows(2) + .find(|pair| pair[0] == "--result") + .map(|pair| &pair[1]) + .ok_or("missing result path")?; + let mut pipe = Pipe::connect( + &format!("chrome.rgsc_gameinst_{instance}"), + std::time::Duration::from_secs(10), + )?; + if Message::read(&mut pipe)?.kind != 0xffff { + return Err("missing transport hello".into()); + } + Message { + routing: i32::MAX, + kind: 0x40000, + flags: 2, + payload: 4u32.to_le_bytes().to_vec(), + } + .write(&mut pipe)?; + let expected = [0x30002, 0x30003, 0x30004, 0x30000]; + for kind in expected { + let message = Message::read(&mut pipe)?; + if message.kind != kind || message.routing != i32::MAX || message.flags != 2 { + return Err("unexpected SDK message envelope".into()); + } + if kind == 0x30002 && message.payload != [3, 0, 0, 0, 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + { + return Err("unexpected fixture account".into()); + } + if kind == 0x30000 && message.payload != 4u32.to_le_bytes() { + return Err("launcher hello lost its context".into()); + } + } + std::fs::write(output, "SDK handshake accepted")?; + Ok(()) +} + +fn main() { + #[cfg(windows)] + if let Err(error) = run() { + eprintln!("SDK probe failed: {error}"); + std::process::exit(1); + } +} diff --git a/tools/rockstar-launcher/src/identity.rs b/tools/rockstar-launcher/src/identity.rs new file mode 100644 index 0000000000..795d56da1a --- /dev/null +++ b/tools/rockstar-launcher/src/identity.rs @@ -0,0 +1,170 @@ +use std::collections::BTreeSet; +use std::io::{self, Read}; + +const LIMIT: usize = 4096; + +fn invalid() -> io::Error { + io::Error::new( + io::ErrorKind::InvalidData, + "invalid launcher identity request", + ) +} + +fn collect(bytes: &[u8], names: &mut BTreeSet) { + let prefix = br"\\.\pipe\"; + for (index, window) in bytes.windows(prefix.len()).enumerate() { + if window != prefix { + continue; + } + let tail = &bytes[index + prefix.len()..]; + let Some(end) = tail.iter().take(97).position(|byte| *byte == 0) else { + continue; + }; + let name = &tail[..end]; + if !name.is_empty() + && name + .iter() + .all(|byte| byte.is_ascii_alphanumeric() || b"_-".contains(byte)) + { + let name = std::str::from_utf8(name).unwrap(); + if name.ends_with("LauncherPipe") || name.ends_with("Launcher_Pipe") { + names.insert(name.to_owned()); + } + } + } +} + +pub fn pipe_names(reader: &mut impl Read) -> io::Result> { + let mut names = BTreeSet::new(); + let mut carry = Vec::new(); + let mut chunk = [0; 65536]; + let mut total = 0usize; + loop { + let count = reader.read(&mut chunk)?; + if count == 0 { + break; + } + total += count; + if total > 256 * 1024 * 1024 { + return Err(invalid()); + } + carry.extend_from_slice(&chunk[..count]); + collect(&carry, &mut names); + for offset in 0..2 { + let ascii: Vec<_> = carry[offset..] + .chunks_exact(2) + .map(|pair| if pair[1] == 0 { pair[0] } else { 0 }) + .collect(); + collect(&ascii, &mut names); + } + if names.len() > 4 { + return Err(invalid()); + } + carry.drain(..carry.len().saturating_sub(256)); + } + Ok(names.into_iter().collect()) +} + +pub fn exchange(reader: &mut impl Read) -> io::Result> { + let mut header = [0; 4]; + reader.read_exact(&mut header)?; + let framed = header != *b"INIT"; + let mut request = if framed { + let size = u32::from_le_bytes(header) as usize; + if !(6..=LIMIT).contains(&size) { + return Err(invalid()); + } + let mut bytes = vec![0; size]; + reader.read_exact(&mut bytes)?; + bytes + } else { + let mut bytes = header.to_vec(); + let mut byte = [0]; + reader.read_exact(&mut byte)?; + if byte[0] != b':' { + return Err(invalid()); + } + bytes.push(b':'); + loop { + reader.read_exact(&mut byte)?; + if !(32..127).contains(&byte[0]) || bytes.len() >= 261 { + return Err(invalid()); + } + bytes.push(byte[0]); + if byte[0] == b':' { + break; + } + } + bytes + }; + if request.last() == Some(&0) { + request.pop(); + } + let challenge = request.strip_prefix(b"INIT:").ok_or_else(invalid)?; + if challenge.is_empty() + || !framed && challenge == b":" + || challenge.len() > 256 + || !challenge.iter().all(|byte| (32..127).contains(byte)) + { + return Err(invalid()); + } + let mut reply = b"TINI:launcher:".to_vec(); + reply.extend_from_slice(challenge); + if framed { + let mut bytes = (reply.len() as u32).to_le_bytes().to_vec(); + bytes.extend_from_slice(&reply); + Ok(bytes) + } else { + Ok(reply) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use std::io::Cursor; + + #[test] + fn discovers_ascii_and_wide_pipe_names_across_chunks() { + let mut bytes = vec![0; 65530]; + bytes.extend_from_slice(br"\\.\pipe\GameLauncherPipe"); + bytes.push(0); + for value in "\\\\.\\pipe\\OtherLauncher_Pipe\0".encode_utf16() { + bytes.extend_from_slice(&value.to_le_bytes()); + } + bytes.extend_from_slice(br"\\.\pipe\..\outsideLauncherPipe"); + bytes.push(0); + assert_eq!( + pipe_names(&mut Cursor::new(bytes)).unwrap(), + ["GameLauncherPipe", "OtherLauncher_Pipe"] + ); + } + + #[test] + fn identity_replies_echo_only_a_valid_challenge() { + struct Split(R); + impl Read for Split { + fn read(&mut self, buffer: &mut [u8]) -> io::Result { + let size = buffer.len().min(2); + self.0.read(&mut buffer[..size]) + } + } + assert_eq!( + exchange(&mut Split(Cursor::new(b"INIT:123456789:\0"))).unwrap(), + b"TINI:launcher:123456789:" + ); + let request = b"INIT:nonce:123:"; + let mut bytes = (request.len() as u32).to_le_bytes().to_vec(); + bytes.extend_from_slice(request); + let reply = exchange(&mut Cursor::new(bytes)).unwrap(); + assert_eq!( + u32::from_le_bytes(reply[..4].try_into().unwrap()) as usize, + reply.len() - 4 + ); + assert_eq!(&reply[4..], b"TINI:launcher:nonce:123:"); + assert!(exchange(&mut Cursor::new(b"INIT:")).is_err()); + assert!(exchange(&mut Cursor::new(b"INIT:a\0b")).is_err()); + assert!(exchange(&mut Cursor::new(b"INIT:unterminated")).is_err()); + assert!(exchange(&mut Cursor::new([255; 4])).is_err()); + } +} diff --git a/tools/rockstar-launcher/src/lib.rs b/tools/rockstar-launcher/src/lib.rs index e08b2bc92b..e37ff76d85 100644 --- a/tools/rockstar-launcher/src/lib.rs +++ b/tools/rockstar-launcher/src/lib.rs @@ -3,6 +3,9 @@ use std::io::{self, Read, Write}; #[cfg(windows)] pub mod pipe; +pub mod identity; +pub mod sdk; + pub const MAX_FRAME_BYTES: usize = 64 * 1024; const OVERHEAD: usize = 4 + 4 + 1; @@ -111,6 +114,21 @@ impl Frame { #[cfg(test)] mod tests { use super::*; + + #[test] + fn launcher_era_reply_uses_total_length_and_a_terminator() { + let mut bytes = Vec::new(); + Frame { + tag: *b"DUNN", + payload: vec![b'A'; 640], + nul_terminated: true, + } + .write(&mut bytes, Length::Total) + .unwrap(); + assert_eq!(bytes.len(), 650); + assert_eq!(&bytes[..9], &[138, 2, 0, 0, b'D', b'U', b'N', b'N', b':']); + assert_eq!(bytes[649], 0); + } use std::io::Cursor; #[test] diff --git a/tools/rockstar-launcher/src/main.rs b/tools/rockstar-launcher/src/main.rs index fe5923ab37..0913c6d548 100644 --- a/tools/rockstar-launcher/src/main.rs +++ b/tools/rockstar-launcher/src/main.rs @@ -23,17 +23,21 @@ fn log(message: &str) { #[cfg(windows)] fn run() -> Result> { - use droiddeck_rockstar_launcher::{pipe::Listener, wait_for_game, Frame, Length}; - use std::io::Read; + use droiddeck_rockstar_launcher::{ + pipe::Listener, + sdk::{Message, Session}, + wait_for_game, Frame, Length, + }; + use std::io::{Read, Write}; use std::time::{Duration, SystemTime, UNIX_EPOCH}; let config_path = std::env::current_exe()?.with_file_name("launch.json"); let mut data = Vec::new(); std::fs::File::open(&config_path)? - .take(16385) + .take(65537) .read_to_end(&mut data)?; std::fs::remove_file(&config_path)?; - if data.len() > 16384 { + if data.len() > 65536 { return Err("launch handoff exceeds size limit".into()); } let config: serde_json::Value = serde_json::from_slice(&data)?; @@ -51,16 +55,48 @@ fn run() -> Result> { if expires <= now || expires - now > 120_000 { return Err("launch handoff expired".into()); } - let material = text("material")?.as_bytes().to_vec(); - if material.len() != 640 || !material.iter().all(u8::is_ascii_hexdigit) { - return Err("invalid launch material".into()); - } - let pipe_name = text("pipe")?.to_owned(); - if !matches!( - pipe_name.as_str(), - "GTA3_Pipe" | "GTA-VC_Pipe" | "GTA_SA_Pipe" - ) { - return Err("unsupported Rockstar launch pipe".into()); + let legacy = if config.get("pipe").is_some() { + let pipe_name = text("pipe")?.to_owned(); + if !matches!( + pipe_name.as_str(), + "GTA3_Pipe" | "GTA-VC_Pipe" | "GTA_SA_Pipe" | "GTAIV_Pipe" | "LANOIRE_Pipe" + ) { + return Err("invalid Rockstar launch pipe".into()); + } + let material = text("material")?.as_bytes().to_vec(); + if material.len() != 640 || !material.iter().all(u8::is_ascii_hexdigit) { + return Err("invalid launch material".into()); + } + Some((pipe_name, material)) + } else { + None + }; + let session = config + .get("session") + .map(|value| -> Result> { + let account = value + .get("accountId") + .and_then(|v| v.as_str()) + .ok_or("missing SDK account")? + .parse::()?; + let identity = value + .get("identity") + .and_then(|v| v.as_str()) + .ok_or("missing SDK identity")?; + let ticket = value + .get("ticket") + .and_then(|v| v.as_str()) + .ok_or("missing SDK ticket")?; + let session = Session::new(account, identity.to_owned(), ticket.to_owned())?; + Ok(if let Some(title) = value.get("titleId") { + session.with_title(title.as_str().ok_or("invalid SDK title")?.to_owned())? + } else { + session + }) + }) + .transpose()?; + if legacy.is_none() && session.is_none() { + return Err("missing launch protocol".into()); } let root = std::fs::canonicalize(text("folder")?)?; let exe = std::fs::canonicalize(text("exe")?)?; @@ -68,7 +104,9 @@ fn run() -> Result> { if !exe.is_file() || !exe.starts_with(&root) || !workdir.starts_with(&root) - || !root.join("MTLX.dll").is_file() + || legacy.is_some() + && !root.join("MTLX.dll").is_file() + && !exe.parent().unwrap_or(&root).join("MTLX.dll").is_file() { return Err("invalid Rockstar game path".into()); } @@ -91,40 +129,125 @@ fn run() -> Result> { .map(|value| value.as_str().ok_or("invalid game argument")) .collect(); log("launch handoff accepted"); - let listener = Listener::new(&pipe_name, Duration::from_secs(30))?; - log("launcher pipe created"); - let mut child = std::process::Command::new(exe) - .current_dir(workdir) - .args(args?) - .spawn()?; + let legacy = legacy + .map(|(name, material)| { + let terminated = matches!(name.as_str(), "GTAIV_Pipe" | "LANOIRE_Pipe"); + Listener::new(&name, Duration::from_secs(90)) + .map(|listener| (listener, material, terminated)) + }) + .transpose()?; + let instance = std::process::id(); + let sdk_listener = if session.is_some() { + Some(Listener::new( + &format!("chrome.rgsc_gameinst_{instance}"), + Duration::from_secs(90), + )?) + } else { + None + }; + let mut identity_listeners = Vec::new(); + if session.is_some() { + for name in + droiddeck_rockstar_launcher::identity::pipe_names(&mut std::fs::File::open(&exe)?)? + { + identity_listeners.push(Listener::new(&name, Duration::from_secs(90))?); + } + } + log("launcher pipes created"); + let mut command = std::process::Command::new(exe); + command.current_dir(workdir).args(args?); + if session.is_some() { + command.arg(format!("-processInstance={instance}")); + } + let mut child = command.spawn()?; let pid = child.id(); log("game process started"); + for listener in identity_listeners { + std::thread::spawn(move || { + let serve = || -> std::io::Result<()> { + let mut pipe = listener.accept()?.with_deadline(Duration::from_secs(90)); + if pipe.client_pid()? != pid { + return Err(std::io::Error::new( + std::io::ErrorKind::PermissionDenied, + "unexpected launcher identity client", + )); + } + let reply = droiddeck_rockstar_launcher::identity::exchange(&mut pipe)?; + pipe.write_all(&reply)?; + log("launcher identity challenge complete"); + pipe = pipe.with_timeout(Duration::from_secs(86400)); + let mut progress = [0; 4096]; + while matches!(pipe.read(&mut progress), Ok(size) if size > 0) {} + Ok(()) + }; + if let Err(error) = serve() { + log(&format!("launcher identity exchange ended: {error}")); + } + }); + } let (result, handshake) = std::sync::mpsc::sync_channel(1); std::thread::spawn(move || { let serve = || -> std::io::Result<()> { - let mut pipe = listener.accept()?; - log("launcher pipe connected"); - if pipe.client_pid()? != pid { - return Err(std::io::Error::new( - std::io::ErrorKind::PermissionDenied, - "unexpected Rockstar pipe client", - )); + if let Some((listener, material, terminated)) = legacy { + let mut pipe = listener.accept()?; + log("legacy launcher pipe connected"); + if pipe.client_pid()? != pid { + return Err(std::io::Error::new( + std::io::ErrorKind::PermissionDenied, + "unexpected Rockstar pipe client", + )); + } + let request = Frame::read(&mut pipe, Length::Total)?; + if request.tag != *b"COLE" || !request.payload.is_empty() { + return Err(std::io::Error::new( + std::io::ErrorKind::InvalidData, + "unexpected Rockstar greeting", + )); + } + Frame { + tag: *b"DUNN", + payload: material, + nul_terminated: terminated, + } + .write( + &mut pipe, + if terminated { + Length::Total + } else { + Length::Body + }, + )?; + log("legacy launcher handshake complete"); } - let request = Frame::read(&mut pipe, Length::Total)?; - log("game greeting received"); - if request.tag != *b"COLE" || !request.payload.is_empty() { - return Err(std::io::Error::new( - std::io::ErrorKind::InvalidData, - "unexpected Rockstar greeting", - )); + if let (Some(listener), Some(session)) = (sdk_listener, session) { + let mut pipe = listener.accept()?.with_deadline(Duration::from_secs(90)); + if pipe.client_pid()? != pid { + return Err(std::io::Error::new( + std::io::ErrorKind::PermissionDenied, + "unexpected Rockstar SDK client", + )); + } + Message::hello(instance).write(&mut pipe)?; + let mut authenticated = false; + loop { + let request = match Message::read(&mut pipe) { + Ok(request) => request, + Err(_) if authenticated => return Ok(()), + Err(error) => return Err(error), + }; + let responses = session.respond(&request)?; + let sends_login = request.kind == 0x40000; + for response in responses { + response.write(&mut pipe)?; + } + if sends_login && !authenticated { + authenticated = true; + pipe = pipe.with_timeout(Duration::from_secs(86400)); + log("SDK login sent"); + let _ = result.send(Ok(())); + } + } } - Frame { - tag: *b"DUNN", - payload: material, - nul_terminated: false, - } - .write(&mut pipe, Length::Body)?; - log("launcher handshake complete"); Ok(()) }; let outcome = serve(); diff --git a/tools/rockstar-launcher/src/pipe.rs b/tools/rockstar-launcher/src/pipe.rs index 79ab4d9e42..9bffedde38 100644 --- a/tools/rockstar-launcher/src/pipe.rs +++ b/tools/rockstar-launcher/src/pipe.rs @@ -84,6 +84,7 @@ impl Drop for OwnedHandle { pub struct Pipe { handle: OwnedHandle, timeout: Duration, + deadline: Option, } pub struct Listener(Pipe); @@ -119,6 +120,7 @@ impl Listener { Ok(Self(Pipe { handle: OwnedHandle(handle), timeout, + deadline: None, })) } @@ -174,6 +176,18 @@ impl Listener { } impl Pipe { + pub fn with_timeout(mut self, timeout: Duration) -> Self { + self.timeout = timeout; + self.deadline = None; + self + } + + pub fn with_deadline(mut self, timeout: Duration) -> Self { + self.timeout = timeout; + self.deadline = Some(Instant::now() + timeout); + self + } + pub fn client_pid(&self) -> io::Result { let mut pid = 0; if unsafe { GetNamedPipeClientProcessId(self.handle.0, &mut pid) } == 0 || pid == 0 { @@ -210,6 +224,7 @@ impl Pipe { return Ok(Self { handle: OwnedHandle(handle), timeout, + deadline: None, }); } let error = io::Error::last_os_error(); @@ -234,6 +249,16 @@ impl Pipe { if size == 0 { return Ok(0); } + let timeout = self + .deadline + .map(|deadline| deadline.saturating_duration_since(Instant::now())) + .unwrap_or(self.timeout); + if timeout.is_zero() { + return Err(io::Error::new( + io::ErrorKind::TimedOut, + "Rockstar pipe deadline exceeded", + )); + } let event = unsafe { CreateEventW(null(), 1, 0, null()) }; if event.is_null() { return Err(io::Error::last_os_error()); @@ -280,7 +305,7 @@ impl Pipe { let wait = unsafe { WaitForSingleObject( event.0, - self.timeout.as_millis().min(u32::MAX as u128 - 1) as u32, + timeout.as_millis().min(u32::MAX as u128 - 1) as u32, ) }; if wait != 0 { @@ -342,6 +367,28 @@ mod tests { ) } + #[test] + fn initialization_deadline_survives_partial_reads() { + let name = name(); + let listener = Listener::new(&name, Duration::from_secs(2)).unwrap(); + let worker = std::thread::spawn(move || { + let mut server = listener + .accept() + .unwrap() + .with_deadline(Duration::from_millis(150)); + let mut byte = [0]; + server.read_exact(&mut byte).unwrap(); + std::thread::sleep(Duration::from_millis(180)); + assert_eq!( + server.read(&mut byte).unwrap_err().kind(), + io::ErrorKind::TimedOut + ); + }); + let mut client = Pipe::connect(&name, Duration::from_secs(2)).unwrap(); + client.write_all(&[1]).unwrap(); + worker.join().unwrap(); + } + #[test] fn real_pipe_exchanges_both_framing_modes_and_identifies_the_client() { let name = name(); diff --git a/tools/rockstar-launcher/src/sdk.rs b/tools/rockstar-launcher/src/sdk.rs new file mode 100644 index 0000000000..9361ad54c2 --- /dev/null +++ b/tools/rockstar-launcher/src/sdk.rs @@ -0,0 +1,328 @@ +use std::io::{self, Read, Write}; + +const HEADER: usize = 16; +const MAX_BYTES: usize = 64 * 1024; +const CONTROL: i32 = i32::MAX; + +#[derive(PartialEq, Eq)] +pub struct Message { + pub routing: i32, + pub kind: u32, + pub flags: u32, + pub payload: Vec, +} + +impl std::fmt::Debug for Message { + fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter + .debug_struct("Message") + .field("routing", &self.routing) + .field("kind", &self.kind) + .field("flags", &self.flags) + .field("payload_bytes", &self.payload.len()) + .finish() + } +} + +fn invalid() -> io::Error { + io::Error::new(io::ErrorKind::InvalidData, "invalid Rockstar SDK message") +} + +impl Message { + pub fn read(reader: &mut impl Read) -> io::Result { + let mut header = [0; HEADER]; + reader.read_exact(&mut header)?; + let size = u32::from_le_bytes(header[..4].try_into().unwrap()) as usize; + if size > MAX_BYTES - HEADER { + return Err(invalid()); + } + let mut payload = vec![0; size]; + reader.read_exact(&mut payload)?; + Ok(Self { + routing: i32::from_le_bytes(header[4..8].try_into().unwrap()), + kind: u32::from_le_bytes(header[8..12].try_into().unwrap()), + flags: u32::from_le_bytes(header[12..16].try_into().unwrap()), + payload, + }) + } + + pub fn write(&self, writer: &mut impl Write) -> io::Result<()> { + if self.payload.len() > MAX_BYTES - HEADER { + return Err(invalid()); + } + let mut bytes = Vec::with_capacity(HEADER + self.payload.len()); + bytes.extend_from_slice(&(self.payload.len() as u32).to_le_bytes()); + bytes.extend_from_slice(&self.routing.to_le_bytes()); + bytes.extend_from_slice(&self.kind.to_le_bytes()); + bytes.extend_from_slice(&self.flags.to_le_bytes()); + bytes.extend_from_slice(&self.payload); + writer.write_all(&bytes) + } + + fn control(kind: u32, payload: Payload) -> Self { + Self { + routing: CONTROL, + kind, + flags: 2, + payload: payload.0, + } + } + + pub fn hello(pid: u32) -> Self { + Self { + routing: -2, + kind: 0xffff, + flags: 2, + payload: pid.to_le_bytes().to_vec(), + } + } +} + +#[derive(Default)] +struct Payload(Vec); + +impl Payload { + fn raw(mut self, bytes: &[u8]) -> Self { + self.0.resize((self.0.len() + 3) & !3, 0); + self.0.extend_from_slice(bytes); + self + } + + fn u32(self, value: u32) -> Self { + self.raw(&value.to_le_bytes()) + } + fn u64(self, value: u64) -> Self { + self.raw(&value.to_le_bytes()) + } + fn string(self, value: &str) -> Self { + self.u32(value.len() as u32).raw(value.as_bytes()) + } +} + +pub struct Session { + account: u64, + identity: String, + ticket: String, + title: Option, + api: std::cell::Cell, +} + +impl Session { + pub fn new(account: u64, identity: String, ticket: String) -> io::Result { + if account == 0 + || identity.is_empty() + || identity.len() > 512 + || ticket.is_empty() + || ticket.len() > 48 * 1024 + || identity.contains('\0') + || ticket.contains('\0') + { + return Err(invalid()); + } + Ok(Self { + account, + identity, + ticket, + title: None, + api: std::cell::Cell::new(3), + }) + } + + pub fn with_title(mut self, title: String) -> io::Result { + if title.is_empty() + || title.len() > 64 + || !title.as_bytes()[0].is_ascii_lowercase() + || !title + .bytes() + .all(|value| value.is_ascii_lowercase() || value.is_ascii_digit() || value == b'_') + { + return Err(invalid()); + } + self.title = Some(title); + Ok(self) + } + + fn app_sync(&self, challenge: u64) -> io::Result { + let mut payload = Payload::default().u32(u32::from(self.title.is_some())); + if let Some(title) = &self.title { + payload = payload + .u64(u64::MAX) + .u64(0) + .u64(0) + .string(title) + .u32(1) + .u32(1) + .string(""); + } + let mut inner = Vec::new(); + Message::control(0x80006, payload).write(&mut inner)?; + Ok(Message::control( + 0x80002, + Payload::default().u64(challenge).string(&base64(&inner)), + )) + } + + pub fn login(&self) -> Vec { + let offset = u32::from(self.api.get() >= 4); + vec![ + Message::control( + 0x30001 + offset, + Payload::default().u32(3).u64(self.account).u32(0), + ), + Message::control( + 0x30002 + offset, + Payload::default() + .u64(self.account) + .u32(0) + .string(&self.identity), + ), + Message::control( + 0x30003 + offset, + Payload::default() + .string(&self.identity) + .string(&self.ticket), + ), + ] + } + + pub fn respond(&self, message: &Message) -> io::Result> { + match message.kind { + 0x80000 => { + if message.payload.len() != 8 { + return Err(invalid()); + } + let challenge = u64::from_le_bytes(message.payload[..8].try_into().unwrap()); + Ok(vec![self.app_sync(challenge)?]) + } + 0x40000 => { + if message.payload.len() < 4 { + return Err(invalid()); + } + let context = u32::from_le_bytes(message.payload[..4].try_into().unwrap()); + self.api.set(context); + let mut result = self.login(); + result.push(Message::control(0x30000, Payload::default().u32(context))); + Ok(result) + } + 0x40005 | 0x40007 => Ok(vec![Message::control( + 0x30004 + u32::from(self.api.get() >= 4), + Payload::default(), + )]), + _ => Ok(Vec::new()), + } + } +} + +fn base64(bytes: &[u8]) -> String { + const ALPHABET: &[u8] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + let mut output = String::with_capacity(bytes.len().div_ceil(3) * 4); + for part in bytes.chunks(3) { + let value = ((part[0] as u32) << 16) + | ((part.get(1).copied().unwrap_or(0) as u32) << 8) + | part.get(2).copied().unwrap_or(0) as u32; + output.push(ALPHABET[(value >> 18) as usize] as char); + output.push(ALPHABET[((value >> 12) & 63) as usize] as char); + output.push(if part.len() > 1 { + ALPHABET[((value >> 6) & 63) as usize] as char + } else { + '=' + }); + output.push(if part.len() > 2 { + ALPHABET[(value & 63) as usize] as char + } else { + '=' + }); + } + output +} + +#[cfg(test)] +mod tests { + use super::*; + use std::io::Cursor; + + #[test] + fn app_sync_echoes_challenge_without_inventing_owned_titles() { + let session = Session::new(123, "name".into(), "ticket".into()).unwrap(); + let request = Message::control(0x80000, Payload::default().u64(42)); + let response = session.respond(&request).unwrap().remove(0); + assert_eq!(response.kind, 0x80002); + assert_eq!(&response.payload[..8], &42u64.to_le_bytes()); + assert_eq!(&response.payload[12..], b"BAAAAP///38GAAgAAgAAAAAAAAA="); + assert_eq!(base64(b"f"), "Zg=="); + assert_eq!(base64(b"fo"), "Zm8="); + assert_eq!(base64(b"foo"), "Zm9v"); + assert!(session.with_title("../game".into()).is_err()); + } + + #[test] + fn transport_hello_matches_wire_layout() { + let mut bytes = Vec::new(); + Message::hello(0x1234).write(&mut bytes).unwrap(); + assert_eq!( + bytes, + [4, 0, 0, 0, 254, 255, 255, 255, 255, 255, 0, 0, 2, 0, 0, 0, 52, 18, 0, 0] + ); + } + + #[test] + fn login_preserves_string_lengths_and_alignment() { + let session = Session::new(0x1122334455667788, "a@b".into(), "ticket".into()).unwrap(); + let login = session.login(); + assert_eq!( + login[0].payload, + [3, 0, 0, 0, 136, 119, 102, 85, 68, 51, 34, 17, 0, 0, 0, 0] + ); + assert_eq!( + login[1].payload, + [136, 119, 102, 85, 68, 51, 34, 17, 0, 0, 0, 0, 3, 0, 0, 0, 97, 64, 98] + ); + assert_eq!( + login[2].payload, + [3, 0, 0, 0, 97, 64, 98, 0, 6, 0, 0, 0, 116, 105, 99, 107, 101, 116] + ); + } + + #[test] + fn init_sends_authenticated_state_before_launcher_hello() { + let session = Session::new(123, "name".into(), "ticket".into()).unwrap(); + for (api, expected) in [ + (3, [0x30001, 0x30002, 0x30003, 0x30000]), + (4, [0x30002, 0x30003, 0x30004, 0x30000]), + ] { + let request = Message::control(0x40000, Payload::default().u32(api)); + let result = session.respond(&request).unwrap(); + assert_eq!(result.iter().map(|m| m.kind).collect::>(), expected); + assert_eq!( + result[0].payload, + [3, 0, 0, 0, 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + ); + assert_eq!(result[3].payload, api.to_le_bytes()); + } + } + + #[test] + fn malformed_frames_and_sessions_are_rejected() { + assert!(Session::new(0, "name".into(), "ticket".into()).is_err()); + assert!(Session::new(123, "name".into(), "".into()).is_err()); + let session = Session::new(123, "name".into(), "ticket".into()).unwrap(); + assert!(session + .respond(&Message::control(0x40000, Payload::default())) + .is_err()); + assert!(Message::read(&mut Cursor::new(vec![255; 16])).is_err()); + assert!(Message::read(&mut Cursor::new(vec![0; 15])).is_err()); + } + + #[test] + fn concatenated_messages_remain_separate() { + let session = Session::new(123, "name".into(), "ticket".into()).unwrap(); + let mut bytes = Vec::new(); + for message in session.login() { + message.write(&mut bytes).unwrap(); + } + let mut reader = Cursor::new(bytes); + for message in session.login() { + assert_eq!(Message::read(&mut reader).unwrap(), message); + } + } +} diff --git a/tools/tests/test_store_launch_rockstar.py b/tools/tests/test_store_launch_rockstar.py index 68f4401544..23cd6ae632 100644 --- a/tools/tests/test_store_launch_rockstar.py +++ b/tools/tests/test_store_launch_rockstar.py @@ -1,4 +1,5 @@ import json +import os from pathlib import Path import tempfile import time @@ -9,6 +10,112 @@ from test_store_launch import store class RockstarLaunch(unittest.TestCase): + def test_service_directory_cannot_export_sessions_outside_the_prefix(self): + with tempfile.TemporaryDirectory() as root: + folder, sidecar, prefix, _, _ = self.setup_game(root) + outside = Path(root) / 'outside' + outside.mkdir() + target = prefix / 'pfx' / store.ROCKSTAR_FOLDER + target.parent.mkdir(parents=True) + target.symlink_to(outside, target_is_directory=True) + sentinel = outside / 'launch.json' + sentinel.write_text('keep') + with patch.object(store, 'ask') as ask: + self.assertEqual('invalid-service-path', store.prepare_rockstar(folder, sidecar, prefix, 'channel')) + ask.assert_not_called() + self.assertEqual('keep', sentinel.read_text()) + + def test_sdk_registration_does_not_use_an_untrusted_display_name_as_a_key(self): + with tempfile.TemporaryDirectory() as root: + folder, _, prefix, _, _ = self.setup_game(root) + with patch.object(store, 'wait_for_server', return_value=True): + self.assertTrue(store.rockstar_registry(folder, None, prefix, '', sdk_arch='x64')) + text = (prefix / 'pfx/system.reg').read_text() + self.assertIn(r'[Software\\Rockstar Games\\Rockstar Games Social Club]', text) + self.assertNotIn('Grand Theft Auto', text) + + def test_root_metadata_is_found_after_many_assets(self): + with tempfile.TemporaryDirectory() as root: + folder = Path(root) + for index in range(300): + (folder / ('asset-%s.dat' % index)).write_bytes(b'asset') + (folder / 'title.rgl').write_bytes(b'RGLM' + bytes(108)) + self.assertTrue(store.rockstar_sdk(folder, {'id': 'future_title', 'exe': 'Game.exe'})) + (folder / 'title.rgl').unlink() + (folder / 'Title.RGL').write_bytes(b'RGLM' + bytes(108)) + self.assertTrue(store.rockstar_sdk(folder, {'id': 'future_title', 'exe': 'Game.exe'})) + + def test_sdk_titles_receive_only_their_short_lived_game_session(self): + with tempfile.TemporaryDirectory() as root: + def change(values): + folder, sidecar, _, _, answer = values + sidecar['id'] = 'future_title' + (folder / 'socialclub.dll').write_bytes(b'game-runtime') + answer['session'] = {'accountId': '123', 'identity': 'player@example.invalid', 'ticket': 'game-session', + 'ScAuthToken': 'never-export-refresh-token'} + result, path, _ = self.prepare(root, change) + self.assertEqual('ready', result) + data = json.loads(path.read_text()) + self.assertEqual({'accountId', 'identity', 'ticket'}, set(data['session'])) + self.assertNotIn('pipe', data) + self.assertNotIn('material', data) + self.assertNotIn('never-export-refresh-token', path.read_text()) + self.assertEqual(0o600, path.stat().st_mode & 0o777) + + def test_invalid_sdk_sessions_cannot_reuse_an_old_handoff(self): + for session in (None, {'accountId': '0', 'identity': 'player', 'ticket': 'session'}, + {'accountId': '123', 'identity': 'player', 'ticket': 'bad\0session'}): + with self.subTest(session=session), tempfile.TemporaryDirectory() as root: + def change(values): + folder, sidecar, _, _, answer = values + sidecar['id'] = 'future_title' + (folder / 'socialclub.dll').write_bytes(b'game-runtime') + answer['session'] = session + result, path, _ = self.prepare(root, change) + self.assertEqual('invalid-sdk-session', result) + self.assertFalse(path.exists()) + + def test_sdk_detection_does_not_follow_external_metadata(self): + with tempfile.TemporaryDirectory() as root: + folder = Path(root) / 'game' + folder.mkdir() + metadata = Path(root) / 'outside.rgl' + metadata.write_bytes(b'RGLM' + bytes(108)) + (folder / 'title.rgl').symlink_to(metadata) + self.assertFalse(store.rockstar_sdk(folder, {'id': 'future_title', 'exe': 'Game.exe'})) + + def test_sdk_installer_cannot_escape_its_architecture_folder(self): + with tempfile.TemporaryDirectory() as root: + folder = Path(root) / 'game' + installer = folder / 'Installers/Social-Club-Setup.exe' + installer.parent.mkdir(parents=True) + installer.write_bytes(b'installer') + listing = type('Listing', (), {'returncode': 0, 'stdout': b'Path = x64/../../outside.dll\nSize = 1\n'})() + with patch.object(store.shutil, 'which', return_value='/bin/7z'), patch.object(store.subprocess, 'run', return_value=listing): + with self.assertRaises(ValueError): + store.rockstar_runtime(folder, folder / 'Game.exe', str(Path(root) / 'prefix'), 'x64') + self.assertFalse((Path(root) / 'outside.dll').exists()) + + def test_other_titles_can_launch_without_the_classic_pipe_service(self): + with tempfile.TemporaryDirectory() as root: + folder = Path(root) + sidecar = {'store': 'rockstar', 'id': 'rdr2', 'exe': 'RDR2.exe'} + with patch.object(store, 'find_store_game', return_value=(folder, sidecar)), \ + patch.object(store, 'prepare_rockstar') as prepare, \ + patch.object(store, 'ask') as ask, patch.dict(os.environ, {}, clear=True): + self.assertEqual(store.STORE_GAME, store.main([str(folder / 'RDR2.exe')])) + prepare.assert_not_called() + ask.assert_not_called() + + def test_classic_authentication_failure_still_stops_launch(self): + with tempfile.TemporaryDirectory() as root: + folder = Path(root) + sidecar = {'store': 'rockstar', 'id': 'gtavc', 'exe': 'gta-vc.exe'} + with patch.object(store, 'find_store_game', return_value=(folder, sidecar)), \ + patch.object(store, 'prepare_rockstar', return_value='session-not-owned'), \ + patch.dict(os.environ, {}, clear=True): + self.assertEqual(store.RAN_FAILED, store.main([str(folder / 'gta-vc.exe')])) + def setup_game(self, root): folder = Path(root) / 'game' folder.mkdir() From c57cc3312525ae3723f6d34a4b3b8922ef29b76d Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 13 Nov 2026 07:31:18 -0500 Subject: [PATCH 52/57] fix(ui): the portrait bottom bar follows the sidebar labels setting (#2558) --- .../com/droiddeck/launcher/ui/FrontEndRail.kt | 5 ++++- .../droiddeck/launcher/ui/PortraitLayoutTest.kt | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt index 351eded54c..599968d9f7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -105,13 +105,16 @@ internal fun BottomBar( val bounds = remember { androidx.compose.runtime.mutableStateMapOf() } val tint = androidx.compose.runtime.rememberUpdatedState(LocalPalette.current.signal) val content = remember { arrayOfNulls(1) } + val barContext = LocalContext.current + remember { RailLabels.load(barContext) } + val iconOnly = !RailLabels.shown Row(modifier.fillMaxWidth().background(MaterialTheme.colorScheme.surface), verticalAlignment = Alignment.CenterVertically) { BoxWithConstraints(Modifier.weight(1f)) { val itemWidth = (maxWidth / keys.size).coerceIn(56.dp, 88.dp) Box(Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).onPlaced { content[0] = it }) { if (shown in keys) ChipGlide(keys.indexOf(shown), bounds[shown], tint, GlideAxis.Horizontal, corner = 14.dp, fill = 0.14f, outline = 0f) Row(Modifier.selectableGroup().padding(vertical = 4.dp), horizontalArrangement = Arrangement.Center) { - NavigationItems(s, shown, compact = true, iconOnly = false, height = 56.dp, width = itemWidth, + NavigationItems(s, shown, compact = true, iconOnly = iconOnly, height = if (iconOnly) 48.dp else 56.dp, width = itemWidth, place = { key -> Modifier.onGloballyPositioned { item -> content[0]?.let { bounds[key] = it.localBoundingBoxOf(item) }; Hops.railBounds[key] = item.boundsInRoot() } }, onSelect = onSelect, onFocusSelect = onFocusSelect) } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/PortraitLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/PortraitLayoutTest.kt index e1210893f0..25ba697759 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/PortraitLayoutTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/PortraitLayoutTest.kt @@ -93,6 +93,21 @@ class PortraitLayoutTest { compose.onNodeWithContentDescription("Resume Steam").assertIsDisplayed() } + @Test fun bottomBarFollowsSidebarLabelsSetting() { + val context = org.robolectric.RuntimeEnvironment.getApplication() + RailLabels.set(context, false) + compose.setContent { + DroidDeckTheme { BottomBar(state, "steam", {}, {}, actions, Modifier.size(480.dp, 64.dp)) } + } + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Library").assertDoesNotExist() + compose.onNodeWithContentDescription("Library").assertIsDisplayed() + compose.runOnIdle { RailLabels.set(context, true) } + androidx.compose.runtime.snapshots.Snapshot.sendApplyNotifications() + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Library").assertIsDisplayed() + } + @Test fun compactHeaderKeepsAllActionsReachable() { compose.setContent { DroidDeckTheme { From d058bab64fface8d35d2ee174e94e911496a0fd4 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 13 Nov 2026 07:40:20 -0500 Subject: [PATCH 53/57] fix(session): picture in picture keeps the DroidDeck front end behind the game (#2559) --- .../java/com/droiddeck/launcher/HomeActivity.kt | 6 ++++-- app/src/main/java/com/droiddeck/launcher/HomeApp.kt | 13 +++++++++++++ .../launcher/session/SessionPipController.kt | 9 +++++++-- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt b/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt index 3947263c03..0f3a37e83e 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt @@ -4,6 +4,7 @@ import android.app.Activity import android.content.Intent import android.os.Bundle import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState class HomeActivity : Activity() { override fun attachBaseContext(newBase: android.content.Context) { @@ -18,7 +19,7 @@ class HomeActivity : Activity() { } private fun routeHome() { - val destination = if (HomeApp.isActiveSteamSession()) { + val destination = if (HomeApp.isActiveSteamSession() && !SessionState.pipActive) { Intent(this, SessionActivity::class.java) .setAction(SessionService.ACTION_HOME_GUIDE) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) @@ -32,7 +33,8 @@ class HomeActivity : Activity() { } } } - startActivity(destination) + if (SessionState.pipActive && destination.component?.className == FrontEndActivity::class.java.name) HomeApp.showFrontEnd(this, destination) + else startActivity(destination) finish() } } diff --git a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt index 8d3c7dc54c..789af4ec49 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt @@ -258,6 +258,19 @@ object HomeApp { fun isActiveSteamSession(): Boolean = SessionState.running && SessionState.mode == SessionService.MODE_STEAM + fun showFrontEnd(context: Context, intent: Intent = Intent(context, FrontEndActivity::class.java)) { + val frontEnd = FrontEndActivity::class.java.name + val tasks = runCatching { context.getSystemService(android.app.ActivityManager::class.java)?.appTasks }.getOrNull().orEmpty() + val own = tasks.firstOrNull { task -> + runCatching { task.taskInfo.let { it.baseIntent.component?.className == frontEnd && it.topActivity?.className == frontEnd } } + .getOrDefault(false) + } + val launch = Intent(intent).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) + if (own != null && runCatching { own.startActivity(context, launch, null) }.isSuccess) return + // The session task shares the front end's affinity, so without MULTIPLE_TASK the front end lands inside the session's PiP window. + context.startActivity(launch.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK)) + } + fun openSystemHomeSettings(context: Context) { try { context.startActivity(settingsIntent()) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPipController.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPipController.kt index 1b26e7de29..f32fe2abbf 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPipController.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPipController.kt @@ -21,6 +21,7 @@ class SessionPipController( private set private var suppressAuto = false private var visit = false + private var requested = false private var lastParams = "" val floating get() = transitioning || activity.isInPictureInPictureMode @@ -47,7 +48,7 @@ class SessionPipController( return builder.build() } - fun enter() { + fun enter(explicit: Boolean = true) { if (!eligible()) { Toast.makeText(activity, R.string.pip_not_ready, Toast.LENGTH_SHORT).show() return @@ -59,8 +60,10 @@ class SessionPipController( return } prepare() + requested = explicit val entered = runCatching { activity.enterPictureInPictureMode(params(bounds())) }.getOrDefault(false) if (!entered) { + requested = false restore() Toast.makeText(activity, R.string.pip_unavailable, Toast.LENGTH_SHORT).show() } @@ -68,7 +71,7 @@ class SessionPipController( fun leaving() { if (!automatic() || !allowed()) return - if (Build.VERSION.SDK_INT < 31) enter() else prepare() + if (Build.VERSION.SDK_INT < 31) enter(explicit = false) else prepare() } private fun prepare() { @@ -85,6 +88,8 @@ class SessionPipController( showPipUi(true) SessionService.beginPip(activity) SessionService.setActivityVisible(activity, true) + if (requested) runCatching { com.droiddeck.launcher.HomeApp.showFrontEnd(activity) } + requested = false } else restore() refresh(true) } From 33dbd8755fba83be48ad0cbd9b1cb2d359abf0ee Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Fri, 13 Nov 2026 08:48:23 -0500 Subject: [PATCH 54/57] fix(agent): run the setup package install as fake root (#2539) --- .../com/droiddeck/launcher/agent/AgentHost.kt | 7 +-- .../droiddeck/launcher/agent/AgentSetup.kt | 6 ++- .../launcher/runtime/LinuxRuntime.java | 21 +++++++- .../droiddeck/launcher/runtime/RootSpawner.kt | 3 +- .../launcher/agent/AgentGuestPathTest.kt | 18 +++++++ .../launcher/agent/AgentSetupRootTest.kt | 10 ++++ .../runtime/LinuxRuntimeRootPrefixTest.kt | 54 +++++++++++++++++++ 7 files changed, 110 insertions(+), 9 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/agent/AgentGuestPathTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/agent/AgentSetupRootTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/runtime/LinuxRuntimeRootPrefixTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt index aa369a6883..1f78672f4a 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt @@ -52,6 +52,7 @@ object AgentHost { private const val TAG = "AgentHost" private const val WORKSPACE = "/root/DroidDeck" + internal const val GUEST_PATH = "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" private const val TICK_MS = 1_000L private const val IDLE_TICK_MS = 5_000L @@ -377,10 +378,10 @@ object AgentHost { * proot over the installed rootfs, without a session. Loopback adb is connected first so * droiddeckctl reaches the app. */ - fun guest(app: Context, command: List, workdir: String = "/root", connectAdb: Boolean = true): ProcessBuilder { + fun guest(app: Context, command: List, workdir: String = "/root", connectAdb: Boolean = true, fakeRoot: Boolean = false): ProcessBuilder { val adb = AgentAdb.prepare(app) val env = listOf( - "/usr/bin/env", "HOME=/root", "PATH=/root/.local/bin:/usr/local/bin:/usr/bin:/bin", "LANG=C.UTF-8", + "/usr/bin/env", "HOME=/root", "PATH=$GUEST_PATH", "LANG=C.UTF-8", "ADB_SERIAL=${adb.serial}", "ADB_VENDOR_KEYS=${adb.vendorKeys}", "DD_AGENT=1", "DD_AGENT_INBOX=${File(app.filesDir, "agent").path}", "BROWSER=/root/.local/bin/android-open", "DD_BROWSER_DISPLAY=${AgentAdb.browserDisplay}", ) @@ -390,7 +391,7 @@ object AgentHost { (if (connectAdb) "adb start-server >/dev/null 2>&1; adb connect \"\$ADB_SERIAL\" >/dev/null 2>&1; " else "") + "cd \"$1\" 2>/dev/null; shift; exec \"$@\"", "sh", workdir, ) - val proot = LinuxRuntime.command(app, null, null, Environment.getExternalStorageDirectory(), env + shell + command) + val proot = LinuxRuntime.command(app, null, null, Environment.getExternalStorageDirectory(), null, env + shell + command, fakeRoot) return ProcessBuilder(proot).redirectErrorStream(true).apply { environment().apply { remove("LD_PRELOAD"); remove("LD_AUDIT"); remove("LD_LIBRARY_PATH") diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt index 754dfa2ea9..a5f900d6f5 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt @@ -73,6 +73,8 @@ object AgentSetup { Thread({ for ((step, command) in probes) probe(app, harness, step, command) }, "agent-checks").start() } + fun runsAsRoot(step: Step) = step == Step.INSTALL + /** Runs [step]'s action. [CONNECTION] is the app's own pairing flow, so the caller opens it. */ fun run(context: Context, step: Step) { val app = context.applicationContext @@ -81,7 +83,7 @@ object AgentSetup { Step.CONNECTION -> return Step.INSTALL -> { listOf("sh", "-c", "set -e; export DEBIAN_FRONTEND=noninteractive; " + - "dpkg --configure -a; apt-get update; apt-get -f install -y; " + + "dpkg --configure -a; apt-get update || echo 'Some package sources could not be refreshed; continuing'; apt-get -f install -y; " + "apt-get install -y --no-install-recommends git gh adb curl ca-certificates python3; ${harness.install}") } Step.SIGN_IN -> harness.signIn @@ -97,7 +99,7 @@ object AgentSetup { val result = runCatching { installHelpers(app) runCatching { harness.prepare(LinuxRuntime.rootDir(app)) } - val child = AgentHost.guest(app, command).start() + val child = AgentHost.guest(app, command, fakeRoot = runsAsRoot(step)).start() val pid = AgentProcesses.pidOf(child) OrphanReaper.keep(pid) try { diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java index 0253604021..0e5c2d6715 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java @@ -139,15 +139,26 @@ public final class LinuxRuntime { public static List command(Context context, File sessionRoot, File runtimeDir, File externalStorage, List extraBinds, List guestCommand) { + return command(context, sessionRoot, runtimeDir, externalStorage, extraBinds, guestCommand, false); + } + + public static List command(Context context, File sessionRoot, File runtimeDir, + File externalStorage, List extraBinds, + List guestCommand, boolean fakeRoot) { File root = rootDir(context); List binds = binds(context, sessionRoot, runtimeDir, externalStorage, extraBinds); if (sessionRoot != null) lastBinds = binds; - return commandWithBinds(context, root, binds, guestCommand); + return commandWithBinds(context, root, binds, guestCommand, fakeRoot); } public static List commandWithBinds(Context context, File root, List binds, List guestCommand) { - List cmd = prootPrefix(context, root, "/root"); + return commandWithBinds(context, root, binds, guestCommand, false); + } + + public static List commandWithBinds(Context context, File root, List binds, + List guestCommand, boolean fakeRoot) { + List cmd = fakeRoot ? rootPrefix(context, root, "/root") : prootPrefix(context, root, "/root"); for (String spec : binds) bind(cmd, spec); cmd.addAll(guestCommand); return cmd; @@ -170,6 +181,12 @@ public final class LinuxRuntime { return prootPrefix(context, root, cwd, false); } + public static List rootPrefix(Context context, File root, String cwd) { + List cmd = prootPrefix(context, root, cwd, true); + cmd.add(1, "--link2symlink"); + return cmd; + } + public static List prootPrefix(Context context, File root, String cwd, boolean fakeRoot) { List cmd = new ArrayList<>(); cmd.add(prootBinary(context).getPath()); diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt b/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt index a96ff46f38..16228be728 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt @@ -120,8 +120,7 @@ object RootSpawner { val builder = if (NativeGuest.forSession(context)) { NativeGuest.processBuilder(context, root, binds, guest, cwd) } else { - val cmd = LinuxRuntime.prootPrefix(context, root, cwd, true) - cmd.add(1, "--link2symlink") + val cmd = LinuxRuntime.rootPrefix(context, root, cwd) binds.forEach { cmd.add("-b"); cmd.add(it) } cmd.addAll(guest) ProcessBuilder(cmd).directory(root).also { b -> diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentGuestPathTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentGuestPathTest.kt new file mode 100644 index 0000000000..794a0e95f4 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentGuestPathTest.kt @@ -0,0 +1,18 @@ +package com.droiddeck.launcher.agent + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +class AgentGuestPathTest { + private val dirs = AgentHost.GUEST_PATH.split(':') + + @Test fun includesTheSystemBinariesDpkgNeedsAsRoot() { + assertTrue(dirs.containsAll(listOf("/usr/local/sbin", "/usr/sbin", "/sbin"))) + } + + @Test fun keepsUserBinariesFirstAndTheStandardDirs() { + assertEquals("/root/.local/bin", dirs.first()) + assertTrue(dirs.containsAll(listOf("/usr/local/bin", "/usr/bin", "/bin"))) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentSetupRootTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentSetupRootTest.kt new file mode 100644 index 0000000000..5e5c1656c2 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentSetupRootTest.kt @@ -0,0 +1,10 @@ +package com.droiddeck.launcher.agent + +import org.junit.Assert.assertEquals +import org.junit.Test + +class AgentSetupRootTest { + @Test fun onlyThePackageInstallRunsAsRoot() { + assertEquals(listOf(AgentSetup.Step.INSTALL), AgentSetup.Step.values().filter { AgentSetup.runsAsRoot(it) }) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/LinuxRuntimeRootPrefixTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/LinuxRuntimeRootPrefixTest.kt new file mode 100644 index 0000000000..e956781db9 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/LinuxRuntimeRootPrefixTest.kt @@ -0,0 +1,54 @@ +package com.droiddeck.launcher.runtime + +import android.app.Application +import android.system.Os +import android.system.StructUtsname +import androidx.test.core.app.ApplicationProvider +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import org.robolectric.annotation.Implementation +import org.robolectric.annotation.Implements +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], manifest = Config.NONE, application = Application::class, shadows = [LinuxRuntimeRootPrefixTest.Uname::class]) +class LinuxRuntimeRootPrefixTest { + private val context: Application = ApplicationProvider.getApplicationContext() + private val root = File(context.filesDir, "rootfs") + private val guest = listOf("/usr/bin/dpkg", "--configure", "-a") + + @Test fun fakeRootEmulatesHardLinksForPackageManagers() { + val cmd = LinuxRuntime.commandWithBinds(context, root, emptyList(), guest, true) + assertTrue("-0" in cmd) + assertTrue("--link2symlink" in cmd) + assertFalse("-i" in cmd) + assertEquals(guest, cmd.takeLast(guest.size)) + } + + @Test fun rootSpawnerAndFakeRootCommandsShareOnePrefix() { + assertEquals(LinuxRuntime.rootPrefix(context, root, "/root"), + LinuxRuntime.commandWithBinds(context, root, emptyList(), emptyList(), true)) + } + + @Test fun userCommandsKeepTheAppUidAndRealLinks() { + val cmd = LinuxRuntime.commandWithBinds(context, root, emptyList(), guest) + val uid = android.os.Process.myUid() + assertFalse("-0" in cmd) + assertFalse("--link2symlink" in cmd) + assertEquals("$uid:$uid", cmd[cmd.indexOf("-i") + 1]) + assertEquals(LinuxRuntime.prootPrefix(context, root, "/root"), cmd.dropLast(guest.size)) + } + + @Implements(Os::class) + class Uname { + companion object { + @JvmStatic @Implementation + fun uname() = StructUtsname("Linux", "localhost", "6.1.0", "#1 SMP", "aarch64") + } + } +} From d33f4b4896cdd51cebe539dcde0b5a400b7cf8b2 Mon Sep 17 00:00:00 2001 From: FX1922 <120828496+FX192@users.noreply.github.com> Date: Fri, 13 Nov 2026 16:49:48 +0300 Subject: [PATCH 55/57] feat: Add Soundtracks tab and music player (#2389) --- app/build.gradle | 2 + app/src/main/AndroidManifest.xml | 9 + .../droiddeck/launcher/FrontEndActivity.kt | 139 ++++++- .../launcher/frontend/AddedSoundtracks.kt | 69 ++++ .../launcher/frontend/GameRemoval.kt | 2 +- .../droiddeck/launcher/frontend/Library.kt | 23 +- .../droiddeck/launcher/frontend/Soundtrack.kt | 308 ++++++++++++++ .../frontend/SoundtrackCollectionArt.kt | 50 +++ .../frontend/SoundtrackCollections.kt | 191 +++++++++ .../launcher/frontend/SoundtrackIndex.kt | 32 ++ .../launcher/frontend/SoundtrackOrder.kt | 67 +++ .../launcher/frontend/SoundtrackShortcuts.kt | 41 ++ .../launcher/frontend/SoundtrackTracks.kt | 30 ++ .../launcher/frontend/SteamGameArt.kt | 6 +- .../launcher/playback/SoundtrackController.kt | 288 +++++++++++++ .../launcher/playback/SoundtrackService.kt | 282 +++++++++++++ .../launcher/playback/SoundtrackSettings.kt | 78 ++++ .../launcher/session/SessionPrefs.kt | 12 + .../launcher/session/SettingsReset.kt | 2 +- .../droiddeck/launcher/ui/AddedGameEditor.kt | 23 +- .../droiddeck/launcher/ui/FrontEndContent.kt | 9 +- .../com/droiddeck/launcher/ui/FrontEndRail.kt | 2 + .../droiddeck/launcher/ui/FrontEndScreen.kt | 22 +- .../droiddeck/launcher/ui/FrontEndSetup.kt | 2 + .../com/droiddeck/launcher/ui/GameDetail.kt | 14 +- .../com/droiddeck/launcher/ui/GameGlass.kt | 8 +- .../com/droiddeck/launcher/ui/LibraryPage.kt | 155 +++++-- .../launcher/ui/SoundtrackCollectionsUi.kt | 295 +++++++++++++ .../droiddeck/launcher/ui/SoundtrackDetail.kt | 391 ++++++++++++++++++ .../droiddeck/launcher/ui/SoundtrackIcon.kt | 15 + .../launcher/ui/SoundtrackOptions.kt | 217 ++++++++++ .../launcher/ui/SoundtrackTrackPanel.kt | 391 ++++++++++++++++++ .../com/droiddeck/launcher/ui/StoreChips.kt | 10 +- app/src/main/res/drawable/ic_repeat_all.xml | 10 + app/src/main/res/drawable/ic_repeat_off.xml | 11 + app/src/main/res/drawable/ic_repeat_one.xml | 10 + app/src/main/res/drawable/ic_shuffle_off.xml | 11 + app/src/main/res/drawable/ic_shuffle_on.xml | 10 + app/src/main/res/drawable/ic_soundtrack.xml | 10 + app/src/main/res/values-ar/strings.xml | 63 +++ app/src/main/res/values-b+es+419/strings.xml | 63 +++ app/src/main/res/values-bg/strings.xml | 63 +++ app/src/main/res/values-cs/strings.xml | 63 +++ app/src/main/res/values-da/strings.xml | 63 +++ app/src/main/res/values-de/strings.xml | 63 +++ app/src/main/res/values-el/strings.xml | 63 +++ app/src/main/res/values-es/strings.xml | 63 +++ app/src/main/res/values-fi/strings.xml | 63 +++ app/src/main/res/values-fr/strings.xml | 63 +++ app/src/main/res/values-hi/strings.xml | 63 +++ app/src/main/res/values-hu/strings.xml | 63 +++ app/src/main/res/values-in/strings.xml | 63 +++ app/src/main/res/values-it/strings.xml | 63 +++ app/src/main/res/values-ja/strings.xml | 63 +++ app/src/main/res/values-ko/strings.xml | 63 +++ app/src/main/res/values-ms/strings.xml | 63 +++ app/src/main/res/values-nb/strings.xml | 63 +++ app/src/main/res/values-nl/strings.xml | 63 +++ app/src/main/res/values-pl/strings.xml | 63 +++ app/src/main/res/values-pt-rPT/strings.xml | 63 +++ app/src/main/res/values-pt/strings.xml | 63 +++ app/src/main/res/values-ro/strings.xml | 63 +++ app/src/main/res/values-ru/strings.xml | 63 +++ app/src/main/res/values-sv/strings.xml | 63 +++ app/src/main/res/values-th/strings.xml | 63 +++ app/src/main/res/values-tr/strings.xml | 63 +++ app/src/main/res/values-uk/strings.xml | 63 +++ app/src/main/res/values-vi/strings.xml | 63 +++ app/src/main/res/values-zh-rCN/strings.xml | 63 +++ app/src/main/res/values-zh-rHK/strings.xml | 63 +++ app/src/main/res/values-zh-rTW/strings.xml | 63 +++ app/src/main/res/values/strings.xml | 64 +++ .../frontend/SoundtrackCollectionsTest.kt | 43 ++ .../launcher/frontend/SoundtrackOrderTest.kt | 34 ++ .../launcher/frontend/SoundtrackTest.kt | 151 +++++++ .../launcher/frontend/SoundtrackTracksTest.kt | 29 ++ .../droiddeck/launcher/ui/DragTargetTest.kt | 20 + docs/development/soundtracks.md | 78 ++++ 78 files changed, 5618 insertions(+), 64 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/frontend/AddedSoundtracks.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/frontend/Soundtrack.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackCollectionArt.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackCollections.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackIndex.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackOrder.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackShortcuts.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackTracks.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/playback/SoundtrackController.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/playback/SoundtrackService.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/playback/SoundtrackSettings.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/SoundtrackCollectionsUi.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/SoundtrackDetail.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/SoundtrackIcon.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/SoundtrackOptions.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/SoundtrackTrackPanel.kt create mode 100644 app/src/main/res/drawable/ic_repeat_all.xml create mode 100644 app/src/main/res/drawable/ic_repeat_off.xml create mode 100644 app/src/main/res/drawable/ic_repeat_one.xml create mode 100644 app/src/main/res/drawable/ic_shuffle_off.xml create mode 100644 app/src/main/res/drawable/ic_shuffle_on.xml create mode 100644 app/src/main/res/drawable/ic_soundtrack.xml create mode 100644 app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackCollectionsTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackOrderTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackTracksTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/DragTargetTest.kt create mode 100644 docs/development/soundtracks.md diff --git a/app/build.gradle b/app/build.gradle index 57b14a87fc..bb0b7132e5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -400,6 +400,8 @@ dependencies { exclude group: 'com.google.auto.value', module: 'auto-value' } implementation 'com.google.zxing:core:3.5.3' + implementation 'androidx.media3:media3-exoplayer:1.3.1' + implementation 'androidx.media3:media3-session:1.3.1' testImplementation 'junit:junit:4.13.2' testImplementation 'org.robolectric:robolectric:4.16.1' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 80c9312fe6..1264c8211a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -141,6 +141,7 @@ + @@ -334,6 +335,14 @@ android:name=".sync.SyncthingService" android:exported="false" android:foregroundServiceType="dataSync" /> + + + + + >(emptyList()) + private var soundtracksLoaded by mutableStateOf(false) private var gameStoresSpeedTier by mutableStateOf("fast") private var navRequest by mutableStateOf(null) private val gameLaunchRequest = java.util.concurrent.atomic.AtomicLong() @@ -785,6 +789,11 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet private var shortcutPicker by mutableStateOf(false) private var shortcutLibraryScanning by mutableStateOf(false) @Volatile private var libraryScanGeneration = 0 + private class SoundtrackRemoval(val op: Int, var scan: Int, var settled: Boolean) + private val soundtrackRemovals = HashMap() + private var soundtrackOp = 0 + private var soundtrackAddScan = -1 + private val soundtrackWork = java.util.concurrent.Executors.newSingleThreadExecutor { r -> Thread(r, "soundtrack-work").apply { isDaemon = true } } @Volatile private var lastComponentRestore = 0L @Volatile private var componentRestoreRetry = false private val componentRestoreLock = Any() @@ -847,6 +856,15 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet pendingGameLink = null gameLinkReading = false gameLinkTried = false + soundtrackLaunch = false + val soundtrackId = com.droiddeck.launcher.frontend.SoundtrackShortcuts.read(request) + if (soundtrackId != null) { + soundtrackLaunch = true + navRequest = if (SessionPrefs.soundtracksEnabled(this)) "sound:$soundtrackId" else "app:$soundtrackId" + request.data = null + request.action = Intent.ACTION_MAIN + return + } if (GameLaunchIntent.accepts(request.action)) { gameLinkReading = true com.droiddeck.launcher.ui.DualScreenPanel.hide(taskId) @@ -871,6 +889,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet } private fun launchGame(game: Library.SteamGame, returnHome: Boolean = false): Boolean { + if (!SessionPrefs.soundtracksIngame(this)) com.droiddeck.launcher.playback.SoundtrackController.pause(this) if (pkgStage != null) { android.widget.Toast.makeText(this, R.string.main_wait_install_game, android.widget.Toast.LENGTH_SHORT).show() return false @@ -1144,6 +1163,8 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet LauncherIcon.repair(this, intent?.component) launcherIcon = LauncherIcon.current(this) gameStoresEnabled = SessionPrefs.gameStoresEnabled(this) + soundtracksEnabled = SessionPrefs.soundtracksEnabled(this) + soundtracksIngame = SessionPrefs.soundtracksIngame(this) gameStoresSpeedTier = SessionPrefs.gameStoresSpeedTier(this) storesShowMature = SessionPrefs.storesShowMature(this) storesSort = SessionPrefs.storesSort(this) @@ -1239,6 +1260,10 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet lowStorageWarning = lowStorageWarning, launcherIcon = launcherIcon, gameStoresEnabled = gameStoresEnabled, + soundtracksEnabled = soundtracksEnabled, + soundtracksIngame = soundtracksIngame, + soundtracks = soundtracks, + soundtracksLoaded = soundtracksLoaded, gameStoresSpeedTier = gameStoresSpeedTier, navigate = navRequest, addedGamesArt = addedGamesArt, @@ -1287,7 +1312,10 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet }, onEpicLauncher = { openEpicLauncher() }, onUninstallEpicLauncher = { uninstallEpicLauncher() }, - onGameShortcut = { g -> com.droiddeck.launcher.frontend.GameShortcuts.pin(this, g) }, + onGameShortcut = { g -> + if (g.soundtrack) com.droiddeck.launcher.frontend.SoundtrackShortcuts.pin(this, g) + else com.droiddeck.launcher.frontend.GameShortcuts.pin(this, g) + }, onExportGameFile = { g -> pickGameExport(g) }, onSyncGameFiles = { pickGameExport(null) }, onAddGameExe = { path -> addGameExe(path) }, @@ -1312,8 +1340,9 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet }, "game-file-stop-sync").start() }, onCopyGameLink = { g -> - (getSystemService(CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip( - ClipData.newPlainText(g.name, com.droiddeck.launcher.frontend.GameLaunchLink.uri(g.gameIdString))) + val link = if (g.soundtrack) com.droiddeck.launcher.frontend.SoundtrackShortcuts.uri(g.appId) + else com.droiddeck.launcher.frontend.GameLaunchLink.uri(g.gameIdString) + (getSystemService(CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(ClipData.newPlainText(g.name, link)) android.widget.Toast.makeText(this, R.string.game_link_copied, android.widget.Toast.LENGTH_SHORT).show() }, onDesktop = { @@ -1338,6 +1367,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet }, onRom = { g -> val e = emulatorList.first { it.id == g.emulatorId } + if (!SessionPrefs.soundtracksIngame(this)) com.droiddeck.launcher.playback.SoundtrackController.pause(this) startActivity(Intent(this, SessionActivity::class.java) .putExtra(SessionService.EXTRA_MODE, SessionService.MODE_RUN) .putExtra(SessionService.EXTRA_PROGRAM, e.program) @@ -1506,6 +1536,15 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet }, onPageBack = { showPerformance = false; showComponents = false; showMapping = false }, onGameStoresEnabled = { on -> SessionPrefs.setGameStoresEnabled(this, on); gameStoresEnabled = on }, + onSoundtracksEnabled = { on -> SessionPrefs.setSoundtracksEnabled(this, on); soundtracksEnabled = on }, + onSoundtracksIngame = { on -> + SessionPrefs.setSoundtracksIngame(this, on) + soundtracksIngame = on + com.droiddeck.launcher.playback.SoundtrackController.setIngame(this, on) + }, + onSoundtrackAdded = { folder -> addSoundtrack(folder) }, + onSoundtracksChanged = { refreshAddedSoundtracks() }, + onSoundtrackRemoved = { g -> removeSoundtrack(g) }, onTheme = { id -> SessionPrefs.setTheme(this, id); theme = id }, onLauncherIcon = { style -> switchLauncherIcon(style) }, onLanguage = { tag -> @@ -1799,7 +1838,10 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet startSteamAtStartupIfEnabled() } + private var soundtrackLaunch = false + private fun startSteamAtStartupIfEnabled(cold: Boolean = false) { + if (soundtrackLaunch) return if (intent.action != Intent.ACTION_MAIN && !(cold && intent.action == null)) return if (isFinishing || isDestroyed) return when (SessionPrefs.startupSession(this)) { @@ -2644,15 +2686,89 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet val version = (steamArtRefreshes[appId] ?: 0) + 1 steamArtRefreshes[appId] = version Thread({ - val fresh = com.droiddeck.launcher.frontend.Library.steamGames(this).firstOrNull { it.appId == appId } ?: return@Thread + val fresh = com.droiddeck.launcher.frontend.Library.steamGames(this, soundtracks = true).firstOrNull { it.appId == appId } ?: return@Thread ui.post { if (steamArtRefreshes[appId] != version) return@post - steamGames = steamGames.map { if (it.appId == appId && it.library != Library.ADDED) fresh else it } + if (fresh.soundtrack) soundtracks = soundtracks.map { if (it.appId == appId && it.library != Library.ADDED) fresh else it } + else steamGames = steamGames.map { if (it.appId == appId && it.library != Library.ADDED) fresh else it } } }, "steam-art-update").start() } + private fun addSoundtrack(folder: java.io.File) { + val op = ++soundtrackOp + soundtrackAddScan = libraryScanGeneration + soundtrackWork.execute { + val added = com.droiddeck.launcher.frontend.AddedSoundtracks.add(this, folder) + val list = com.droiddeck.launcher.frontend.AddedSoundtracks.games(this) + ui.post { + if (added) { + soundtrackRemovals[folder.path]?.takeIf { it.op < op }?.let { + soundtrackRemovals.remove(folder.path) + com.droiddeck.launcher.playback.SoundtrackController.allow(listOf(folder.path)) + } + val visible = list.filterNot { s -> s.gameFiles?.path?.let { soundtrackRemovals[it] }?.let { it.op > op } == true } + soundtracks = soundtracks.filter { it.library != Library.ADDED } + visible + } else android.widget.Toast.makeText(this, R.string.soundtracks_add_empty, android.widget.Toast.LENGTH_SHORT).show() + } + } + } + + private fun refreshAddedSoundtracks() { + val op = soundtrackOp + soundtrackWork.execute { + val list = com.droiddeck.launcher.frontend.AddedSoundtracks.games(this) + ui.post { + if (op != soundtrackOp) return@post + val visible = list.filterNot { s -> s.gameFiles?.path?.let { soundtrackRemovals[it] } != null } + soundtracks = soundtracks.filter { it.library != Library.ADDED } + visible + } + } + } + + private fun removeSoundtrack(g: Library.SteamGame) { + val path = g.gameFiles?.path + val added = g.library == Library.ADDED + val target = if (added) null else com.droiddeck.launcher.frontend.GameRemoval.steamFiles(g) ?: return + com.droiddeck.launcher.playback.SoundtrackController.stopIf(this, g.gameFiles) + val marker = SoundtrackRemoval(++soundtrackOp, libraryScanGeneration, added) + path?.let { soundtrackRemovals[it] = marker } + if (target == null) { + soundtracks = soundtracks.filterNot { it.appId == g.appId && it.library == Library.ADDED } + soundtrackWork.execute { + val removed = com.droiddeck.launcher.frontend.AddedSoundtracks.remove(this, path.orEmpty()) + val list = if (removed) emptyList() else com.droiddeck.launcher.frontend.AddedSoundtracks.games(this) + if (!removed) ui.post { + if (path != null && soundtrackRemovals[path] === marker) { + soundtrackRemovals.remove(path) + com.droiddeck.launcher.playback.SoundtrackController.allow(listOf(path)) + } + soundtracks = soundtracks.filter { it.library != Library.ADDED } + list.filterNot { s -> s.gameFiles?.path?.let { soundtrackRemovals[it] } != null } + android.widget.Toast.makeText(this, getString(R.string.gfiles_remove_failed, g.name), android.widget.Toast.LENGTH_SHORT).show() + } + } + return + } + soundtrackWork.execute { + val deleted = com.droiddeck.launcher.frontend.GameRemoval.delete(target) + ui.post { + if (deleted) { + marker.scan = libraryScanGeneration + marker.settled = true + } else { + if (path != null && soundtrackRemovals[path] === marker) { + soundtrackRemovals.remove(path) + com.droiddeck.launcher.playback.SoundtrackController.allow(listOf(path)) + } + android.widget.Toast.makeText(this, getString(R.string.gfiles_remove_failed, g.name), android.widget.Toast.LENGTH_SHORT).show() + } + refresh() + } + } + } + private fun removeGame(g: Library.SteamGame) { + if (g.soundtrack) { removeSoundtrack(g); return } val folder = g.gameFiles ?: return when (com.droiddeck.launcher.frontend.GameRemoval.kind(g)) { com.droiddeck.launcher.frontend.GameRemoval.Kind.LAUNCHER -> Unit @@ -2936,6 +3052,19 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet } val scannedArch = SessionPrefs.activeSteamClientArch(this) val scannedX64 = scannedArch == "x86_64" + val scannedSoundtracks = runCatching { + (if (ready || com.droiddeck.launcher.runtime.LinuxRuntime.hasRootfs(this)) Library.soundtracks(this, scannedArch) else emptyList()) + + com.droiddeck.launcher.frontend.AddedSoundtracks.games(this) + }.getOrDefault(emptyList()) + ui.post { + if (scanGeneration == libraryScanGeneration) { + val scanned = if (scanGeneration <= soundtrackAddScan) scannedSoundtracks + soundtracks.filter { cur -> cur.library == Library.ADDED && scannedSoundtracks.none { it.library == Library.ADDED && it.appId == cur.appId } } else scannedSoundtracks + val kept = scanned.filterNot { s -> s.gameFiles?.path?.let { p -> soundtrackRemovals[p]?.let { m -> !m.settled || s.library == Library.ADDED || scanGeneration <= m.scan } } == true } + com.droiddeck.launcher.playback.SoundtrackController.allow(kept.mapNotNull { it.gameFiles?.path }) + soundtracks = kept + soundtracksLoaded = true + } + } val games = if (ready || com.droiddeck.launcher.runtime.LinuxRuntime.hasRootfs(this)) Library.launchableGames(this, arch = scannedArch) else emptyList() val all = games.distinctBy { it.gameId } if (ready && scanGeneration == libraryScanGeneration) com.droiddeck.launcher.frontend.LibraryCache.save(this, all, scannedX64) diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedSoundtracks.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedSoundtracks.kt new file mode 100644 index 0000000000..635941cb7a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedSoundtracks.kt @@ -0,0 +1,69 @@ +package com.droiddeck.launcher.frontend + +import android.content.Context +import org.json.JSONArray +import org.json.JSONObject +import java.io.File + +object AddedSoundtracks { + private fun file(context: Context) = File(context.filesDir, "added-soundtracks.json") + + class Entry(val path: String, val name: String, val id: Int = 0) + + internal fun assignIds(list: List): List { + val used = list.filter { it.id != 0 }.map { it.id }.toMutableSet() + return list.map { e -> + if (e.id != 0) e else { + var id = idOf(e.path) + while (id == 0 || !used.add(id)) id = (id + 1) or Int.MIN_VALUE + Entry(e.path, e.name, id) + } + } + } + + @Synchronized + fun entries(context: Context): List = runCatching { + val f = file(context).takeIf { it.isFile } ?: return emptyList() + val array = JSONArray(f.readText()) + val raw = List(array.length()) { i -> array.getJSONObject(i).let { Entry(it.getString("path"), it.getString("name"), it.optInt("id", 0)) } } + val ready = assignIds(raw) + if (raw.any { it.id == 0 }) save(context, ready) + ready + }.getOrDefault(emptyList()) + + @Synchronized + private fun save(context: Context, list: List): Boolean = + runCatching { + val array = JSONArray() + list.forEach { array.put(JSONObject().put("path", it.path).put("name", it.name).put("id", it.id)) } + val f = file(context) + val tmp = File(f.path + ".tmp") + tmp.writeText(array.toString()) + if (tmp.renameTo(f)) true else { tmp.delete(); false } + }.getOrDefault(false) + + fun add(context: Context, folder: File): Boolean { + if (!folder.isDirectory || Soundtrack.audioFiles(folder).isEmpty()) return false + return synchronized(this) { + val list = entries(context) + list.any { it.path == folder.path } || save(context, assignIds(list + Entry(folder.path, folder.name))) + } + } + + fun remove(context: Context, path: String): Boolean = + synchronized(this) { save(context, entries(context).filterNot { it.path == path }) } + + internal fun idOf(path: String): Int = path.hashCode() or Int.MIN_VALUE + + fun games(context: Context): List = entries(context).mapNotNull { e -> + val dir = File(e.path).takeIf { it.isDirectory } ?: return@mapNotNull null + game(context, e, dir, e.id) + } + + private fun game(context: Context, e: Entry, dir: File, id: Int): Library.SteamGame { + return Library.SteamGame( + appId = id, name = e.name, art = SoundtrackCollectionArt.chosen(context, id) ?: Soundtrack.firstCover(context, dir), library = Library.ADDED, gameId = id.toLong() and 0xFFFFFFFFL, + gameFiles = dir, source = Library.ADDED, soundtrack = true, + ) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt b/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt index 388448e184..a35c71342b 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt @@ -21,7 +21,7 @@ object GameRemoval { fun steamFiles(game: Library.SteamGame): SteamFiles? { val dir = game.gameFiles ?: return null val common = dir.parentFile ?: return null - if (common.name != "common") return null + if (common.name != (if (game.soundtrack) "music" else "common")) return null val steamapps = common.parentFile ?: return null if (steamapps.name != "steamapps") return null val manifest = File(steamapps, "appmanifest_${game.appId}.acf") diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt index 99732653b6..8acbbe18b0 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -19,9 +19,10 @@ object Library { val storeId: String? = null, val logo: File? = null, val installedAt: Long = 0L, + val soundtrack: Boolean = false, ) { fun withArt(art: File?, hero: File?, icon: File?, logo: File? = this.logo) = - SteamGame(appId, name, art, library, gameId, hero, lastPlayed, gameFiles, protonPrefix, icon, source, storeId, logo, installedAt) + SteamGame(appId, name, art, library, gameId, hero, lastPlayed, gameFiles, protonPrefix, icon, source, storeId, logo, installedAt, soundtrack) val gameIdString: String get() = java.lang.Long.toUnsignedString(gameId) val launchKey: String get() = if (storeId != null) "$source:$storeId" else gameIdString @@ -38,6 +39,7 @@ object Library { const val BATTLENET_LAUNCHER = "battlenet-launcher" const val XBOX_CLOUD = "xbox-cloud" const val SOURCE_STEAM = "steam" + const val SOURCE_COLLECTION = "collection" class Rom(val name: String, val hostPath: File, val guestPath: String, val emulatorId: String, val art: File? = null) class Emulator(val id: String, val name: String, val system: String, val program: String, val installed: Boolean, val games: List) { @@ -123,9 +125,12 @@ object Library { .distinctBy { runCatching { it.canonicalPath }.getOrDefault(it.absolutePath) } } + fun soundtracks(context: Context, arch: String = SessionPrefs.activeSteamClientArch(context)): List = + steamGames(context, arch = arch, withShared = false, soundtracks = true, soundtracksOnly = true) + fun steamGames( context: Context, strictRead: Boolean = false, arch: String = SessionPrefs.activeSteamClientArch(context), - withShared: Boolean = true, + withShared: Boolean = true, soundtracks: Boolean = false, soundtracksOnly: Boolean = false, onlyAppIds: Set? = null, ): List { val root = SessionPrefs.steamRoot(context, arch) @@ -146,16 +151,19 @@ object Library { val name = NAME.find(text)?.groupValues?.get(1)?.trim().orEmpty() val flags = STATE.find(text)?.groupValues?.get(1)?.toIntOrNull() ?: 0 if (name.isEmpty() || flags and 4 == 0) return@forEach + val installDir = INSTALL_DIR.find(text)?.groupValues?.get(1)?.trim() + ?.takeIf { it.isNotEmpty() && it != "." && it != ".." && '/' !in it && '\\' !in it } + val gameFiles = installDir?.let { File(steamapps, "common/$it").takeIf(File::isDirectory) } + val musicFiles = if (gameFiles == null) installDir?.let { File(steamapps, "music/$it").takeIf(File::isDirectory) } else null + if (musicFiles != null && !soundtracks) return@forEach + if (soundtracksOnly && musicFiles == null) return@forEach val images = SteamCacheImages(File(cache, appId.toString())) val art = images.find(STEAM_CAPSULES) val hero = images.find(STEAM_HEROES) val lastPlayed = LAST_PLAYED.find(text)?.groupValues?.get(1)?.toLongOrNull() ?: 0L - val installDir = INSTALL_DIR.find(text)?.groupValues?.get(1)?.trim() - ?.takeIf { it.isNotEmpty() && it != "." && it != ".." && '/' !in it && '\\' !in it } - val gameFiles = installDir?.let { File(steamapps, "common/$it").takeIf(File::isDirectory) } out[appId] = SteamGameArt.withOverrides(context, SteamGame( - appId, name, art, label, hero = hero, lastPlayed = lastPlayed, - gameFiles = gameFiles, + appId, name, art ?: musicFiles?.let { Soundtrack.firstCover(context, it) }, label, hero = hero, lastPlayed = lastPlayed, + gameFiles = gameFiles ?: musicFiles, soundtrack = musicFiles != null, protonPrefix = protonPrefix(context, appId.toLong(), library, roots), icon = images.icon(), logo = images.find(STEAM_LOGOS), @@ -177,6 +185,7 @@ object Library { strictRead = strictRead, arch = other, withShared = false, + soundtracks = soundtracks, onlyAppIds = shared, ) } catch (e: Exception) { diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/Soundtrack.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Soundtrack.kt new file mode 100644 index 0000000000..7f66f20962 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Soundtrack.kt @@ -0,0 +1,308 @@ +package com.droiddeck.launcher.frontend + +import android.content.Context +import android.media.MediaMetadataRetriever +import org.json.JSONArray +import org.json.JSONObject +import java.io.File + +object Soundtrack { + class Track( + val file: File, val title: String, val disc: Int, val number: Int, val durationMs: Long, val artist: String = "", + val discLabel: String = disc.toString(), + ) { + val id: String get() = file.path + } + + class Album(val disc: Map>, val artist: String, val cover: File?) { + val tracks: List get() = disc.values.flatten() + val discs: List get() = disc.keys.toList() + val multiDisc: Boolean get() = disc.size > 1 + val totalMs: Long get() = tracks.sumOf { it.durationMs } + } + + class Raw( + val file: File, val folder: String, val tagDisc: Int?, val tagTrack: Int?, val tagTitle: String?, val tagArtist: String?, + val durationMs: Long, val size: Long = file.length(), + ) + + val EXTENSIONS = setOf("mp3", "flac", "ogg", "oga", "opus", "wav", "m4a", "aac") + private val LOSSLESS = setOf("flac", "wav") + private val COVERS = listOf("AlbumArtwork", "albumartwork", "cover", "Cover", "folder", "Folder", "front", "Front", "artwork", "Artwork") + internal val COVER_EXT = listOf("png", "jpg", "jpeg", "webp") + private val LEADING = Regex("^\\s*\\d+\\s*[.\\-_)]*\\s+") + private val DIGITS = Regex("^\\s*(\\d+)") + + fun isAudio(file: File): Boolean = file.isFile && file.extension.lowercase() in EXTENSIONS + + fun cleanTitle(fileName: String): String { + val base = fileName.substringBeforeLast('.', fileName).trim() + val tail = if (" - " in base) base.substringAfterLast(" - ") else base + val stripped = tail.replace(LEADING, "").trim() + return stripped.ifEmpty { tail.ifEmpty { base } } + } + + internal fun leadingNumber(fileName: String): Int? = DIGITS.find(fileName.substringAfterLast(" - "))?.groupValues?.get(1)?.toIntOrNull() + + private fun identity(r: Raw): String { + val d = r.tagDisc + val t = r.tagTrack + if (d != null && t != null) return "n:$d:$t" + val title = (r.tagTitle?.takeIf { it.isNotBlank() } ?: cleanTitle(r.file.name)).lowercase().filter { it.isLetterOrDigit() } + return "t:$title:${leadingNumber(r.file.name)}" + } + + private fun better(a: Raw, b: Raw): Raw { + val la = a.file.extension.lowercase() in LOSSLESS + val lb = b.file.extension.lowercase() in LOSSLESS + return when { + la != lb -> if (la) a else b + a.size != b.size -> if (a.size > b.size) a else b + else -> if (a.file.path <= b.file.path) a else b + } + } + + fun group(raws: List): Map> { + if (raws.isEmpty()) return emptyMap() + val unique = LinkedHashMap() + val home = HashMap() + val disc = HashMap() + val track = HashMap() + val title = HashMap() + for (r in raws) { + val id = identity(r) + unique[id] = unique[id]?.let { better(it, r) } ?: r + if (r.folder.isNotEmpty() && home[id].isNullOrEmpty()) home[id] = r.folder + r.tagDisc?.let { disc.putIfAbsent(id, it) } + r.tagTrack?.let { track.putIfAbsent(id, it) } + r.tagTitle?.takeIf { it.isNotBlank() }?.let { title.putIfAbsent(id, it) } + } + val kept = unique.map { (id, r) -> + Raw( + r.file, home[id] ?: r.folder, disc[id] ?: r.tagDisc, track[id] ?: r.tagTrack, title[id] ?: r.tagTitle, r.tagArtist, + r.durationMs, r.size, + ) + } + val folders = kept.filter { it.tagDisc == null }.map { it.folder }.distinct().sortedWith(naturalOrder) + val discs = kept.groupBy { r -> + r.tagDisc ?: if (folders.size <= 1 && kept.none { it.tagDisc != null }) 0 else folders.indexOf(r.folder) + 1 + } + return discs.toSortedMap().mapValues { (disc, list) -> + list.sortedWith( + compareBy({ leadingNumber(it.file.name) ?: it.tagTrack ?: Int.MAX_VALUE }, { it.tagTrack ?: Int.MAX_VALUE }, { it.file.name.lowercase() }), + ).mapIndexed { i, r -> + Track( + r.file, r.tagTitle?.takeIf { it.isNotBlank() } ?: cleanTitle(r.file.name), disc, i + 1, + r.durationMs, r.tagArtist.orEmpty(), labelOf(r, disc), + ) + } + } + } + + private val FOLDER_LABEL = Regex("[0-9][0-9 +&,.\\-]*") + + private fun labelOf(r: Raw, disc: Int): String { + if (r.tagDisc != null) return disc.toString() + val name = r.folder.substringAfterLast('/') + return if (FOLDER_LABEL.matches(name)) name else disc.toString() + } + + private val naturalOrder = Comparator { a, b -> + val x = Regex("\\d+|\\D+").findAll(a.lowercase()).map { it.value }.toList() + val y = Regex("\\d+|\\D+").findAll(b.lowercase()).map { it.value }.toList() + var i = 0 + var out = 0 + while (out == 0 && i < minOf(x.size, y.size)) { + val nx = x[i].toBigIntegerOrNull() + val ny = y[i].toBigIntegerOrNull() + out = if (nx != null && ny != null) nx.compareTo(ny) else x[i].compareTo(y[i]) + i++ + } + if (out != 0) out else x.size.compareTo(y.size) + } + + fun cover(dir: File): File? { + for (name in COVERS) for (ext in COVER_EXT) File(dir, "$name.$ext").takeIf { it.isFile }?.let { return it } + return dir.listFiles()?.filter { it.isFile && it.extension.lowercase() in COVER_EXT }?.minByOrNull { it.name.lowercase() } + } + + private fun parseNumber(value: String?): Int? = value?.substringBefore('/')?.trim()?.toIntOrNull() + + private fun read(file: File, root: File): Raw { + val folder = file.parentFile?.let { parent -> + if (parent.path == root.path) "" else parent.path.removePrefix(root.path).trimStart('/') + }.orEmpty() + val retriever = MediaMetadataRetriever() + return try { + retriever.setDataSource(file.path) + Raw( + file, folder, + parseNumber(retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DISC_NUMBER)), + parseNumber(retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_CD_TRACK_NUMBER)), + retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_TITLE), + retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_ARTIST) + ?: retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_ALBUMARTIST), + retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLongOrNull() ?: 0L, + ) + } catch (e: Exception) { + Raw(file, folder, null, null, null, null, 0L) + } finally { + runCatching { retriever.release() } + } + } + + private fun cacheFile(context: Context, root: File) = File(context.filesDir, "soundtrack-index/${root.path.hashCode().toUInt()}.json") + + private fun fromCache(context: Context, root: File, files: List): List? = runCatching { + val f = cacheFile(context, root).takeIf { it.isFile } ?: return null + val json = JSONObject(f.readText()) + if (json.optString("root") != root.path) return null + val rows = json.getJSONArray("rows") + val byPath = HashMap() + for (i in 0 until rows.length()) rows.getJSONObject(i).let { byPath[it.getString("p")] = it } + if (byPath.size != files.size) return null + files.map { file -> + val row = byPath[file.path] ?: return null + if (row.getLong("s") != file.length() || row.getLong("m") != file.lastModified()) return null + Raw( + file, row.getString("f"), row.optInt("d", -1).takeIf { it >= 0 }, row.optInt("n", -1).takeIf { it >= 0 }, + row.optString("t").takeIf { it.isNotEmpty() }, row.optString("a").takeIf { it.isNotEmpty() }, row.optLong("l"), + ) + } + }.getOrNull() + + private fun toCache(context: Context, root: File, raws: List) { + runCatching { + val rows = JSONArray() + for (r in raws) rows.put( + JSONObject().put("p", r.file.path).put("s", r.file.length()).put("m", r.file.lastModified()).put("f", r.folder) + .put("d", r.tagDisc ?: -1).put("n", r.tagTrack ?: -1).put("t", r.tagTitle.orEmpty()).put("a", r.tagArtist.orEmpty()) + .put("l", r.durationMs), + ) + val f = cacheFile(context, root) + f.parentFile?.mkdirs() + val tmp = File(f.path + ".tmp") + tmp.writeText(JSONObject().put("root", root.path).put("rows", rows).toString()) + if (!tmp.renameTo(f)) tmp.delete() + } + } + + fun audioFiles(root: File): List { + val out = ArrayList() + fun walk(dir: File, depth: Int) { + val children = dir.listFiles() ?: return + for (c in children.sortedBy { it.name.lowercase() }) { + if (c.isDirectory) { if (depth < 4) walk(c, depth + 1) } else if (isAudio(c)) out += c + } + } + walk(root, 0) + return out + } + + private fun coverCache(context: Context, root: File): File { + val digest = java.security.MessageDigest.getInstance("SHA-256").digest(root.path.toByteArray(Charsets.UTF_8)) + val key = digest.take(16).joinToString("") { "%02x".format(it) } + return File(context.filesDir, "soundtrack-index/cover-$key.jpg") + } + + fun cachedCover(context: Context, root: File): File? = coverCache(context, root).takeIf { it.isFile && it.length() > 0L } + + private fun embeddedBytes(file: File): ByteArray? = runCatching { + val retriever = MediaMetadataRetriever() + try { + retriever.setDataSource(file.path) + retriever.embeddedPicture + } finally { + runCatching { retriever.release() } + } + }.getOrNull()?.takeIf { it.isNotEmpty() } + + private fun hashOf(bytes: ByteArray): String = + java.security.MessageDigest.getInstance("SHA-256").digest(bytes).take(16).joinToString("") { "%02x".format(it) } + + private fun embeddedCover(context: Context, root: File, files: List): File? { + cachedCover(context, root)?.let { return it } + val miss = File(coverCache(context, root).path + ".none") + val probed = files.take(8) + val signature = hashOf(probed.joinToString("\n") { "${it.path}|${it.length()}|${it.lastModified()}" }.toByteArray(Charsets.UTF_8)) + if (runCatching { miss.isFile && miss.readText().trim() == signature }.getOrDefault(false)) return null + for (file in probed) { + val bytes = embeddedBytes(file) ?: continue + val out = coverCache(context, root) + runCatching { + out.parentFile?.mkdirs() + out.writeBytes(bytes) + }.onSuccess { return out } + } + runCatching { + miss.parentFile?.mkdirs() + miss.writeText(signature) + } + return null + } + + fun firstCover(context: Context, root: File): File? = cover(root) ?: embeddedCover(context, root, audioFiles(root)) + + @Synchronized + fun trackCover(context: Context, file: File): File? { + val dir = File(context.filesDir, "soundtrack-index/track-covers") + val marker = File(dir, "t-" + hashOf("${file.path}|${file.length()}|${file.lastModified()}".toByteArray(Charsets.UTF_8))) + if (marker.isFile) { + val name = runCatching { marker.readText().trim() }.getOrDefault("") + if (name.isEmpty()) return null + File(dir, name).takeIf { it.isFile && it.length() > 0L }?.let { + val now = System.currentTimeMillis() + marker.setLastModified(now) + it.setLastModified(now) + return it + } + } + val bytes = embeddedBytes(file) + return runCatching { + dir.mkdirs() + if (bytes == null) { + marker.writeText("") + prune(dir, setOf(marker.name)) + null + } else { + val out = File(dir, "c-" + hashOf(bytes) + ".jpg") + if (!out.isFile || out.length() == 0L) out.writeBytes(bytes) + marker.writeText(out.name) + prune(dir, setOf(marker.name, out.name)) + out + } + }.getOrNull() + } + + private const val TRACK_COVER_BYTES = 64L * 1024 * 1024 + private const val TRACK_COVER_FILES = 2000 + + private fun prune(dir: File, keep: Set) { + val all = dir.listFiles()?.filter { it.isFile } ?: return + var bytes = all.sumOf { it.length() } + var count = all.size + for (f in all.sortedBy { it.lastModified() }) { + if (bytes <= TRACK_COVER_BYTES && count <= TRACK_COVER_FILES) break + if (f.name in keep) continue + bytes -= f.length() + count-- + f.delete() + } + } + + fun load(context: Context, root: File, coverHint: File? = null): Album { + val files = audioFiles(root) + val raws = fromCache(context, root, files) ?: files.map { read(it, root) }.also { toCache(context, root, it) } + val disc = SoundtrackOrder.apply(context, root, group(raws)) + val artist = disc.values.flatten().map { it.artist }.filter { it.isNotBlank() }.groupingBy { it }.eachCount().maxByOrNull { it.value }?.key.orEmpty() + return Album(disc, artist, coverHint ?: cover(root) ?: embeddedCover(context, root, files)) + } + + fun formatLength(ms: Long): String { + val total = ms / 1000 + val h = total / 3600 + val m = (total % 3600) / 60 + val s = total % 60 + return if (h > 0) "%d:%02d:%02d".format(h, m, s) else "%d:%02d".format(m, s) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackCollectionArt.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackCollectionArt.kt new file mode 100644 index 0000000000..44274fb55b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackCollectionArt.kt @@ -0,0 +1,50 @@ +package com.droiddeck.launcher.frontend + +import android.content.Context +import java.io.File + +object SoundtrackCollectionArt { + internal fun dir(context: Context, id: Int) = File(context.filesDir, "soundtrack-art/$id") + + private fun sourceFile(context: Context, id: Int) = File(dir(context, id), "source") + + fun chosen(context: Context, id: Int): File? = dir(context, id).takeIf { it.isDirectory }?.let { AddedGameArt.chosen(it, AddedGameArt.Slot.COVER) } + + fun source(context: Context, id: Int): String = + sourceFile(context, id).takeIf { it.isFile }?.readText()?.trim().orEmpty().substringAfter('|', "") + + fun options(context: Context, id: Int, root: File?): List { + val paths = if (root != null) { + val images = root.listFiles()?.filter { it.isFile && it.extension.lowercase() in Soundtrack.COVER_EXT }?.sortedBy { it.name.lowercase() }.orEmpty() + (images + listOfNotNull(Soundtrack.firstCover(context, root))).map { it.path } + } else SoundtrackCollections.tracksOf(id).map { it.cover } + return paths.filter { it.isNotEmpty() && File(it).isFile }.distinct().map { AddedGameArt.Option(AddedGameArt.FOLDER, it, it) } + } + + fun choose(context: Context, id: Int, option: AddedGameArt.Option): Boolean { + val folder = dir(context, id) + val fresh = AddedGameArt.storeNew(folder, AddedGameArt.Slot.COVER, option) ?: return false + AddedGameArt.dropOlder(folder, AddedGameArt.Slot.COVER, fresh) + sourceFile(context, id).writeText(option.group + "|" + option.full) + return true + } + + fun reset(context: Context, id: Int) { + chosen(context, id)?.delete() + sourceFile(context, id).delete() + } + + fun describe(context: Context, id: Int, root: File? = null): List { + val own = chosen(context, id) + val state = if (own != null) AddedGameArt.SlotState(AddedGameArt.Slot.COVER, own, AddedGameArt.FILE, true) + else { + val auto = if (root != null) Soundtrack.firstCover(context, root) else SoundtrackCollections.autoCover(id) + AddedGameArt.SlotState(AddedGameArt.Slot.COVER, auto, if (auto != null) AddedGameArt.FOLDER else AddedGameArt.AUTO, false) + } + return listOf(state) + } + + fun clear(context: Context, id: Int) { + dir(context, id).deleteRecursively() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackCollections.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackCollections.kt new file mode 100644 index 0000000000..d680ae0709 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackCollections.kt @@ -0,0 +1,191 @@ +package com.droiddeck.launcher.frontend + +import android.content.Context +import androidx.compose.runtime.mutableStateOf +import org.json.JSONArray +import org.json.JSONObject +import java.io.File +import java.util.concurrent.Executors + +object SoundtrackCollections { + const val FAVORITES_ID = 2_000_000_000 + + class TrackRef(val path: String, val title: String, val artist: String, val album: String, val durationMs: Long, val cover: String = "") + class Collection(val id: Int, val name: String, val tracks: List) + class Snapshot(val favorites: List, val collections: List) + + private val state = mutableStateOf(Snapshot(emptyList(), emptyList())) + private var loaded = false + private val writer = Executors.newSingleThreadExecutor { r -> Thread(r, "soundtrack-collections").apply { isDaemon = true } } + + val snapshot: Snapshot get() = state.value + + private fun file(context: Context) = File(context.filesDir, "soundtrack-collections.json") + + internal fun toggled(list: List, ref: TrackRef): List = + if (list.any { it.path == ref.path }) list.filterNot { it.path == ref.path } else list + ref + + internal fun merged(list: List, add: List): List { + val have = list.mapTo(HashSet()) { it.path } + return list + add.filter { have.add(it.path) } + } + + internal fun cleanName(raw: String): String = raw.trim().replace(Regex("\\s+"), " ") + + internal fun nameTaken(collections: List, name: String, except: Int? = null): Boolean = + collections.any { it.id != except && it.name.equals(name, ignoreCase = true) } + + internal fun nextId(collections: List): Int = + (collections.maxOfOrNull { it.id } ?: FAVORITES_ID).coerceAtLeast(FAVORITES_ID) + 1 + + private fun encode(s: Snapshot): String { + fun refs(list: List) = JSONArray().also { array -> + list.forEach { + array.put( + JSONObject().put("path", it.path).put("title", it.title).put("artist", it.artist).put("album", it.album) + .put("duration", it.durationMs).put("cover", it.cover), + ) + } + } + val collections = JSONArray() + s.collections.forEach { collections.put(JSONObject().put("id", it.id).put("name", it.name).put("tracks", refs(it.tracks))) } + return JSONObject().put("favorites", refs(s.favorites)).put("collections", collections).toString() + } + + private fun decode(text: String): Snapshot { + fun refs(array: JSONArray?): List = if (array == null) emptyList() else List(array.length()) { i -> + array.getJSONObject(i).let { + TrackRef(it.getString("path"), it.optString("title"), it.optString("artist"), it.optString("album"), it.optLong("duration"), it.optString("cover")) + } + } + val root = JSONObject(text) + val collections = root.optJSONArray("collections") + return Snapshot( + refs(root.optJSONArray("favorites")), + if (collections == null) emptyList() else List(collections.length()) { i -> + collections.getJSONObject(i).let { Collection(it.getInt("id"), it.getString("name"), refs(it.optJSONArray("tracks"))) } + }, + ) + } + + @Synchronized + fun load(context: Context) { + if (loaded) return + loaded = true + val f = file(context) + if (f.isFile) runCatching { state.value = decode(f.readText()) } + } + + private fun commit(context: Context, next: Snapshot) { + state.value = next + val f = file(context) + val json = encode(next) + writer.execute { + runCatching { + val tmp = File(f.path + ".tmp") + tmp.writeText(json) + if (!tmp.renameTo(f)) tmp.delete() + } + } + } + + fun tracksOf(id: Int): List = + if (id == FAVORITES_ID) snapshot.favorites else snapshot.collections.firstOrNull { it.id == id }?.tracks.orEmpty() + + fun isFavorite(path: String): Boolean = snapshot.favorites.any { it.path == path } + + @Synchronized + fun toggleFavorite(context: Context, ref: TrackRef) { + load(context) + val s = snapshot + commit(context, Snapshot(toggled(s.favorites, ref), s.collections)) + } + + @Synchronized + fun create(context: Context, rawName: String, tracks: List): Int? { + load(context) + val s = snapshot + val name = cleanName(rawName) + if (name.isEmpty() || nameTaken(s.collections, name)) return null + val id = nextId(s.collections) + commit(context, Snapshot(s.favorites, s.collections + Collection(id, name, merged(emptyList(), tracks)))) + return id + } + + @Synchronized + fun rename(context: Context, id: Int, rawName: String): Boolean { + load(context) + val s = snapshot + val name = cleanName(rawName) + if (id == FAVORITES_ID || name.isEmpty() || nameTaken(s.collections, name, id)) return false + commit(context, Snapshot(s.favorites, s.collections.map { if (it.id == id) Collection(id, name, it.tracks) else it })) + return true + } + + @Synchronized + fun delete(context: Context, id: Int) { + load(context) + val s = snapshot + if (id == FAVORITES_ID) return + commit(context, Snapshot(s.favorites, s.collections.filterNot { it.id == id })) + SoundtrackCollectionArt.clear(context, id) + } + + @Synchronized + fun add(context: Context, id: Int, tracks: List) { + load(context) + val s = snapshot + if (id == FAVORITES_ID) commit(context, Snapshot(merged(s.favorites, tracks), s.collections)) + else commit(context, Snapshot(s.favorites, s.collections.map { if (it.id == id) Collection(id, it.name, merged(it.tracks, tracks)) else it })) + } + + @Synchronized + fun remove(context: Context, id: Int, paths: Set) { + load(context) + val s = snapshot + if (id == FAVORITES_ID) commit(context, Snapshot(s.favorites.filterNot { it.path in paths }, s.collections)) + else commit(context, Snapshot(s.favorites, s.collections.map { if (it.id == id) Collection(id, it.name, it.tracks.filterNot { t -> t.path in paths }) else it })) + } + + @Synchronized + fun reorder(context: Context, id: Int, ordered: List) { + load(context) + val s = snapshot + fun arrange(list: List): List { + val byPath = list.associateBy { it.path } + val placed = ordered.mapNotNull { byPath[it] } + val named = ordered.toSet() + val rest = list.filter { it.path !in named } + return placed + rest + } + if (id == FAVORITES_ID) commit(context, Snapshot(arrange(s.favorites), s.collections)) + else commit(context, Snapshot(s.favorites, s.collections.map { if (it.id == id) Collection(id, it.name, arrange(it.tracks)) else it })) + } + + @Synchronized + fun refresh() { + state.value = Snapshot(state.value.favorites, state.value.collections) + } + + internal fun autoCover(id: Int): File? = coverOf(tracksOf(id)) + + private fun coverOf(tracks: List): File? = + tracks.firstNotNullOfOrNull { t -> t.cover.takeIf { it.isNotEmpty() }?.let { File(it) }?.takeIf { it.isFile } } + + private fun game(context: Context, id: Int, name: String, tracks: List): Library.SteamGame = Library.SteamGame( + appId = id, name = name, art = SoundtrackCollectionArt.chosen(context, id) ?: coverOf(tracks), library = Library.ADDED, gameId = id.toLong(), + source = Library.SOURCE_COLLECTION, soundtrack = true, + ) + + fun games(context: Context, favoritesLabel: String): List { + val s = snapshot + return listOf(game(context, FAVORITES_ID, favoritesLabel, s.favorites)) + s.collections.map { game(context, it.id, it.name, it.tracks) } + } + + fun album(context: Context, id: Int): Soundtrack.Album { + val tracks = tracksOf(id).filter { File(it.path).isFile }.mapIndexed { i, t -> + Soundtrack.Track(File(t.path), t.title, 1, i + 1, t.durationMs, t.artist) + } + return Soundtrack.Album(mapOf(1 to tracks), "", SoundtrackCollectionArt.chosen(context, id)) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackIndex.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackIndex.kt new file mode 100644 index 0000000000..8da6a884df --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackIndex.kt @@ -0,0 +1,32 @@ +package com.droiddeck.launcher.frontend + +import android.content.Context + +object SoundtrackIndex { + class Hit(val ref: SoundtrackCollections.TrackRef, val game: Library.SteamGame) + + private var cacheKey = "" + private var cache: List = emptyList() + + private fun fingerprint(dir: java.io.File?): Long = + if (dir == null) 0L else Soundtrack.audioFiles(dir).fold(17L) { h, f -> 31 * (31 * (31 * h + f.path.hashCode()) + f.length()) + f.lastModified() } + + fun build(context: Context, games: List): List { + val roots = games.filter { it.gameFiles != null } + val key = roots.joinToString("|") { "${it.appId}:${it.gameFiles?.path}:${it.art?.path}:${fingerprint(it.gameFiles)}" } + synchronized(this) { if (key == cacheKey) return cache } + val hits = roots.flatMap { g -> + val dir = g.gameFiles ?: return@flatMap emptyList() + val album = Soundtrack.load(context, dir, g.art) + val cover = (g.art ?: album.cover)?.path.orEmpty() + album.tracks.map { t -> + Hit(SoundtrackCollections.TrackRef(t.file.path, t.title, t.artist.ifBlank { album.artist }, g.name, t.durationMs, cover), g) + } + } + synchronized(this) { + cacheKey = key + cache = hits + } + return hits + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackOrder.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackOrder.kt new file mode 100644 index 0000000000..a8018825ce --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackOrder.kt @@ -0,0 +1,67 @@ +package com.droiddeck.launcher.frontend + +import android.content.Context +import androidx.compose.runtime.mutableIntStateOf +import org.json.JSONArray +import org.json.JSONObject +import java.io.File +import java.util.concurrent.Executors + +object SoundtrackOrder { + private val changes = mutableIntStateOf(0) + private var cache: Map>? = null + private val writer = Executors.newSingleThreadExecutor { r -> Thread(r, "soundtrack-order").apply { isDaemon = true } } + + val version: Int get() = changes.intValue + + private fun file(context: Context) = File(context.filesDir, "soundtrack-order.json") + + @Synchronized + private fun read(context: Context): Map> { + cache?.let { return it } + val out = HashMap>() + val f = file(context) + if (f.isFile) runCatching { + val json = JSONObject(f.readText()) + for (key in json.keys()) { + val array = json.getJSONArray(key) + out[key] = List(array.length()) { array.getString(it) } + } + } + cache = out + return out + } + + @Synchronized + fun set(context: Context, root: File, paths: List) { + val next = HashMap(read(context)) + next[root.path] = paths + cache = next + val body = JSONObject().also { json -> next.forEach { (k, v) -> json.put(k, JSONArray(v)) } }.toString() + val target = file(context) + writer.execute { + val tmp = File(target.path + ".tmp") + runCatching { + tmp.writeText(body) + if (!tmp.renameTo(target)) tmp.delete() + } + } + changes.intValue++ + } + + internal fun ordered(disc: Map>, order: List): Map> { + if (order.isEmpty()) return disc + val index = HashMap() + order.forEachIndexed { i, p -> index.putIfAbsent(p, i) } + return disc.mapValues { (_, list) -> + list.sortedBy { index[it.file.path] ?: Int.MAX_VALUE }.mapIndexed { i, t -> + Soundtrack.Track(t.file, t.title, t.disc, i + 1, t.durationMs, t.artist, t.discLabel) + } + } + } + + fun apply(context: Context, root: File, disc: Map>): Map> { + val order = read(context)[root.path] ?: return disc + return ordered(disc, order) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackShortcuts.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackShortcuts.kt new file mode 100644 index 0000000000..c85940cd16 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackShortcuts.kt @@ -0,0 +1,41 @@ +package com.droiddeck.launcher.frontend + +import android.app.Activity +import android.content.Context +import android.content.Intent +import android.content.pm.ShortcutInfo +import android.content.pm.ShortcutManager +import android.graphics.drawable.Icon +import android.net.Uri +import android.widget.Toast +import com.droiddeck.launcher.FrontEndActivity +import com.droiddeck.launcher.LauncherIcon +import com.droiddeck.launcher.R + +object SoundtrackShortcuts { + private val linkPattern = Regex("droiddeck://soundtrack/(-?[0-9]{1,11})") + + fun uri(appId: Int): String = "droiddeck://soundtrack/$appId" + + fun parse(link: String?): Int? = link?.let { linkPattern.matchEntire(it)?.groupValues?.get(1)?.toIntOrNull() } + + fun read(intent: Intent): Int? = if (intent.action == Intent.ACTION_VIEW) parse(intent.dataString) else null + + private fun info(context: Context, game: Library.SteamGame): ShortcutInfo { + val name = game.name.ifBlank { context.getString(R.string.app_name) } + val icon = GameShortcuts.iconBitmap(game)?.let(Icon::createWithBitmap) ?: Icon.createWithResource(context, R.mipmap.ic_launcher) + val intent = Intent(Intent.ACTION_VIEW, Uri.parse(uri(game.appId)), context, FrontEndActivity::class.java) + .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) + return ShortcutInfo.Builder(context, "soundtrack:${game.appId}") + .setActivity(LauncherIcon.activity(context)) + .setShortLabel(name.take(40)).setLongLabel(name).setIcon(icon).setIntent(intent).build() + } + + fun pin(activity: Activity, game: Library.SteamGame) { + val manager = activity.getSystemService(ShortcutManager::class.java) + val requested = runCatching { + manager.isRequestPinShortcutSupported && manager.requestPinShortcut(info(activity, game), null) + }.getOrDefault(false) + if (!requested) Toast.makeText(activity, R.string.game_shortcut_unsupported, Toast.LENGTH_LONG).show() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackTracks.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackTracks.kt new file mode 100644 index 0000000000..744614710d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackTracks.kt @@ -0,0 +1,30 @@ +package com.droiddeck.launcher.frontend + +object SoundtrackTracks { + enum class Sort { DEFAULT, TITLE_ASC, TITLE_DESC, LONGEST, SHORTEST } + + fun sort(items: List, sort: Sort, title: (T) -> String, duration: (T) -> Long): List = when (sort) { + Sort.DEFAULT -> items + Sort.TITLE_ASC -> items.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER, title)) + Sort.TITLE_DESC -> items.sortedWith(compareByDescending(String.CASE_INSENSITIVE_ORDER, title)) + Sort.LONGEST -> items.sortedByDescending(duration) + Sort.SHORTEST -> items.sortedBy(duration) + } + + fun matches(query: String, vararg fields: String): Boolean { + val words = query.trim().lowercase().split(' ').filter { it.isNotEmpty() } + if (words.isEmpty()) return true + val haystack = fields.map { it.lowercase() } + return words.all { word -> haystack.any { it.contains(word) } } + } + + fun rank(query: String, title: String): Int { + val q = query.trim().lowercase() + val t = title.lowercase() + return when { + t == q -> 0 + t.startsWith(q) -> 1 + else -> 2 + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SteamGameArt.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SteamGameArt.kt index 25a3cb8fb5..d7a6522742 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/SteamGameArt.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SteamGameArt.kt @@ -24,11 +24,7 @@ object SteamGameArt { val icon = chosenFile(context, game.appId, AddedGameArt.Slot.ICON) val logo = chosenFile(context, game.appId, AddedGameArt.Slot.LOGO) if (cover == null && hero == null && icon == null && logo == null) return game - return Library.SteamGame( - game.appId, game.name, cover ?: game.art, game.library, game.gameId, - hero ?: game.hero, game.lastPlayed, game.gameFiles, game.protonPrefix, icon ?: game.icon, game.source, game.storeId, - logo ?: game.logo, - ) + return game.withArt(cover ?: game.art, hero ?: game.hero, icon ?: game.icon, logo ?: game.logo) } fun chosenSource(context: Context, appId: Int, slot: AddedGameArt.Slot): Pair { diff --git a/app/src/main/java/com/droiddeck/launcher/playback/SoundtrackController.kt b/app/src/main/java/com/droiddeck/launcher/playback/SoundtrackController.kt new file mode 100644 index 0000000000..7242fd6615 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/playback/SoundtrackController.kt @@ -0,0 +1,288 @@ +package com.droiddeck.launcher.playback + +import android.content.ComponentName +import android.content.Context +import android.os.Bundle +import android.net.Uri +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableLongStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.core.content.ContextCompat +import androidx.media3.common.MediaItem +import androidx.media3.common.MediaMetadata +import androidx.media3.common.PlaybackParameters +import androidx.media3.common.Player +import androidx.media3.session.MediaController +import androidx.media3.session.SessionToken +import com.droiddeck.launcher.frontend.Soundtrack +import com.google.common.util.concurrent.ListenableFuture +import java.io.File + +object SoundtrackController { + var playing by mutableStateOf(false) + private set + var currentId by mutableStateOf(null) + private set + var title by mutableStateOf("") + private set + var shuffle by mutableStateOf(false) + private set + var repeat by mutableStateOf(Player.REPEAT_MODE_OFF) + private set + var durationMs by mutableStateOf(0L) + private set + var buffering by mutableStateOf(false) + private set + var volume by mutableStateOf(1f) + private set + + var activeCollection by mutableStateOf(null) + private set + + var sleepEndsAt by mutableLongStateOf(0L) + private set + var sleepTrackEnd by mutableStateOf(false) + private set + + private var app: Context? = null + private val removed: MutableSet = java.util.Collections.synchronizedSet(HashSet()) + private var activeRoot: String? = null + private var savedId: String? = null + private var future: ListenableFuture? = null + private var controller: MediaController? = null + private val pending = ArrayList<(MediaController) -> Unit>() + + private val listener = object : Player.Listener { + override fun onEvents(player: Player, events: Player.Events) = sync(player) + } + + private val disconnect = object : MediaController.Listener { + override fun onDisconnected(controller: MediaController) { + if (this@SoundtrackController.controller === controller) { + this@SoundtrackController.controller = null + future = null + reset() + } + } + } + + private fun reset() { + playing = false + currentId = null + title = "" + durationMs = 0L + buffering = false + volume = 1f + activeCollection = null + } + + private fun sync(player: Player) { + playing = player.isPlaying + buffering = player.playbackState == Player.STATE_BUFFERING + currentId = player.currentMediaItem?.mediaId?.takeIf { player.mediaItemCount > 0 } + title = player.mediaMetadata.title?.toString().orEmpty() + shuffle = player.shuffleModeEnabled + repeat = player.repeatMode + durationMs = player.duration.takeIf { it > 0 } ?: 0L + volume = player.volume + if (!player.playWhenReady) sleepTrackEnd = false + persistResume(player) + } + + private fun persistResume(player: Player) { + val context = app ?: return + val id = currentId ?: return + if (activeCollection != null) return + val root = activeRoot ?: SoundtrackSettings.resume(context)?.root?.takeIf { id.startsWith("$it/") }?.also { activeRoot = it } ?: return + if (id != savedId || !player.isPlaying) { + savedId = id + SoundtrackSettings.saveResume(context, root, id, if (player.playbackState == Player.STATE_ENDED) 0L else player.currentPosition) + } + } + + private fun applySettings(c: MediaController) { + val context = app ?: return + SoundtrackSettings.load(context) + c.setPlaybackParameters(PlaybackParameters(SoundtrackSettings.speed, SoundtrackSettings.pitch)) + c.sendCustomCommand(SoundtrackService.SKIP_SILENCE, Bundle().apply { putBoolean(SoundtrackService.ARG_ON, SoundtrackSettings.skipSilence) }) + sendEqualizer(c) + c.sendCustomCommand(SoundtrackService.INGAME, Bundle().apply { putBoolean(SoundtrackService.ARG_ON, com.droiddeck.launcher.session.SessionPrefs.soundtracksIngame(context)) }) + } + + private fun sendEqualizer(c: MediaController) { + c.sendCustomCommand( + SoundtrackService.EQUALIZER, + Bundle().apply { + putBoolean(SoundtrackService.ARG_ON, SoundtrackSettings.eqOn) + putIntArray(SoundtrackService.ARG_BANDS, SoundtrackSettings.bands.toIntArray()) + putInt(SoundtrackService.ARG_BASS, SoundtrackSettings.bass) + }, + ) + } + + private fun run(context: Context, block: (MediaController) -> Unit) { + app = context.applicationContext + val live = controller + if (live != null) { block(live); return } + pending += block + if (future != null) return + val app = context.applicationContext + val token = SessionToken(app, ComponentName(app, SoundtrackService::class.java)) + val built = MediaController.Builder(app, token).setListener(disconnect) + .setConnectionHints(Bundle().apply { putBoolean(SoundtrackService.HINT_OWNER, true) }).buildAsync() + future = built + built.addListener({ + val ready = runCatching { built.get() }.getOrNull() + if (ready == null) { + future = null + pending.clear() + return@addListener + } + controller = ready + ready.addListener(listener) + applySettings(ready) + sync(ready) + val queued = pending.toList() + pending.clear() + queued.forEach { it(ready) } + }, ContextCompat.getMainExecutor(app)) + } + + fun connect(context: Context) = run(context) { } + + fun position(): Long = controller?.currentPosition ?: 0L + + fun belongsCollection(id: Int): Boolean = activeCollection == id && currentId != null + + fun belongs(root: File?): Boolean { + if (activeCollection != null) return false + val id = currentId ?: return false + return root != null && id.startsWith(root.path + "/") + } + + private fun items(album: Soundtrack.Album, albumTitle: String): List { + val cover = album.cover?.let { Uri.fromFile(it) } + return album.tracks.map { t -> + MediaItem.Builder() + .setMediaId(t.file.path) + .setMediaMetadata( + MediaMetadata.Builder() + .setTitle(t.title) + .setArtist(t.artist.ifBlank { album.artist }.ifBlank { null }) + .setAlbumTitle(albumTitle) + .setTrackNumber(t.number) + .setDiscNumber(t.disc.takeIf { it > 0 }) + .setArtworkUri(cover) + .setIsPlayable(true) + .build(), + ) + .build() + } + } + + fun play( + context: Context, album: Soundtrack.Album, albumTitle: String, startId: String?, shuffled: Boolean? = null, + root: File? = null, startMs: Long = 0L, collection: Int? = null, + ) { + val list = items(album, albumTitle) + if (list.isEmpty()) return + run(context) { c -> + if (root != null && root.path in removed) return@run + val start = list.indexOfFirst { it.mediaId == startId }.coerceAtLeast(0) + root?.let { activeRoot = it.path } + activeCollection = collection + c.setMediaItems(list, start, startMs) + shuffled?.let { c.shuffleModeEnabled = it } + c.prepare() + c.play() + } + } + + fun allow(paths: Collection) { + removed.removeAll(paths.toSet()) + } + + fun toggle(context: Context, album: Soundtrack.Album, albumTitle: String, root: File?, collection: Int? = null) { + run(context) { c -> + if (root != null && root.path in removed) return@run + val mine = if (collection != null) belongsCollection(collection) else belongs(root) + if (mine && c.mediaItemCount > 0) { + if (c.isPlaying) c.pause() else { + if (c.playbackState == Player.STATE_ENDED) c.seekToDefaultPosition(0) + c.play() + } + } else { + val saved = if (collection != null) null else root?.let { r -> SoundtrackSettings.resume(context)?.takeIf { it.root == r.path && album.tracks.any { t -> t.id == it.id } } } + play(context, album, albumTitle, saved?.id ?: album.tracks.firstOrNull()?.id, root = root, startMs = saved?.positionMs ?: 0L, collection = collection) + } + } + } + + fun pause(context: Context) { + val live = controller + if (live != null) live.pause() else if (future != null) pending += { it.pause() } + } + + fun next(context: Context) = run(context) { it.seekToNext() } + fun previous(context: Context) = run(context) { c -> if (c.currentPosition > 3000L) c.seekTo(0) else c.seekToPrevious() } + fun seekTo(context: Context, ms: Long) = run(context) { it.seekTo(ms) } + fun setShuffle(context: Context, on: Boolean) = run(context) { it.shuffleModeEnabled = on } + fun cycleRepeat(context: Context) = run(context) { + it.repeatMode = when (it.repeatMode) { + Player.REPEAT_MODE_OFF -> Player.REPEAT_MODE_ALL + Player.REPEAT_MODE_ALL -> Player.REPEAT_MODE_ONE + else -> Player.REPEAT_MODE_OFF + } + } + fun setVolume(context: Context, volume: Float) = run(context) { it.volume = volume.coerceIn(0f, 1f) } + + fun setSpeed(context: Context, value: Float) { + SoundtrackSettings.load(context) + SoundtrackSettings.setSpeed(context, value) + run(context) { it.setPlaybackParameters(PlaybackParameters(SoundtrackSettings.speed, SoundtrackSettings.pitch)) } + } + + fun setPitch(context: Context, value: Float) { + SoundtrackSettings.load(context) + SoundtrackSettings.setPitch(context, value) + run(context) { it.setPlaybackParameters(PlaybackParameters(SoundtrackSettings.speed, SoundtrackSettings.pitch)) } + } + + fun setSkipSilence(context: Context, on: Boolean) { + SoundtrackSettings.load(context) + SoundtrackSettings.setSkipSilence(context, on) + run(context) { it.sendCustomCommand(SoundtrackService.SKIP_SILENCE, Bundle().apply { putBoolean(SoundtrackService.ARG_ON, on) }) } + } + + fun setEqualizer(context: Context, on: Boolean, bands: List, bass: Int) { + SoundtrackSettings.load(context) + SoundtrackSettings.setEqualizer(context, on, bands, bass) + run(context) { sendEqualizer(it) } + } + + fun setIngame(context: Context, on: Boolean) { + run(context) { it.sendCustomCommand(SoundtrackService.INGAME, Bundle().apply { putBoolean(SoundtrackService.ARG_ON, on) }) } + } + + fun setSleep(context: Context, minutes: Int) { + sleepEndsAt = if (minutes > 0) System.currentTimeMillis() + minutes * 60_000L else 0L + sleepTrackEnd = minutes < 0 + run(context) { it.sendCustomCommand(SoundtrackService.SLEEP, Bundle().apply { putInt(SoundtrackService.ARG_MINUTES, minutes) }) } + } + + fun sleepRemainingMs(): Long { + val left = sleepEndsAt - System.currentTimeMillis() + if (sleepEndsAt > 0L && left <= 0L) sleepEndsAt = 0L + return left.coerceAtLeast(0L) + } + + fun stopIf(context: Context, root: File?) { + root?.let { removed.add(it.path) } + if (root == null || currentId?.startsWith(root.path + "/") != true) return + run(context) { c -> + c.stop() + c.clearMediaItems() + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/playback/SoundtrackService.kt b/app/src/main/java/com/droiddeck/launcher/playback/SoundtrackService.kt new file mode 100644 index 0000000000..083b935cd5 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/playback/SoundtrackService.kt @@ -0,0 +1,282 @@ +package com.droiddeck.launcher.playback + +import android.app.PendingIntent +import android.content.Context +import android.content.Intent +import android.media.audiofx.BassBoost +import android.media.audiofx.Equalizer +import android.net.Uri +import android.os.Bundle +import android.os.Handler +import android.os.Looper +import android.os.Process +import androidx.media3.common.AudioAttributes +import androidx.media3.common.C +import androidx.media3.common.MediaItem +import androidx.media3.common.Player +import androidx.media3.exoplayer.ExoPlayer +import androidx.media3.session.CommandButton +import androidx.media3.session.DefaultMediaNotificationProvider +import androidx.media3.session.MediaSession +import androidx.media3.session.MediaSessionService +import androidx.media3.session.SessionCommand +import androidx.media3.session.SessionResult +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Soundtrack +import com.google.common.collect.ImmutableList +import com.google.common.util.concurrent.Futures +import com.google.common.util.concurrent.ListenableFuture +import java.io.File + +private class EdgeButtonsProvider(context: Context) : DefaultMediaNotificationProvider(context) { + override fun getMediaButtons( + session: MediaSession, playerCommands: Player.Commands, customLayout: ImmutableList, showPauseButton: Boolean, + ): ImmutableList { + val all = super.getMediaButtons(session, playerCommands, customLayout, showPauseButton) + val custom = all.filter { it.sessionCommand != null } + if (custom.size < 2) return all + return ImmutableList.builder() + .add(custom.first()) + .addAll(all.filter { it.sessionCommand == null }) + .addAll(custom.drop(1)) + .build() + } +} + +class SoundtrackService : MediaSessionService() { + private var session: MediaSession? = null + private var exo: ExoPlayer? = null + private var equalizer: Equalizer? = null + private var bassBoost: BassBoost? = null + private var effectsSession = C.AUDIO_SESSION_ID_UNSET + private var eqOn = false + private var eqBands = IntArray(0) + private var eqBass = 0 + private var sleepAtTrackEnd = false + private val handler = Handler(Looper.getMainLooper()) + private val sleepRunnable = Runnable { session?.player?.pause() } + private val covers = java.util.concurrent.Executors.newSingleThreadExecutor { r -> Thread(r, "soundtrack-cover").apply { isDaemon = true } } + + override fun onCreate() { + super.onCreate() + val player = ExoPlayer.Builder(this) + .setAudioAttributes(mediaAttributes(), !com.droiddeck.launcher.session.SessionPrefs.soundtracksIngame(this)) + .setHandleAudioBecomingNoisy(true) + .setWakeMode(androidx.media3.common.C.WAKE_MODE_LOCAL) + .build() + exo = player + val sessionIntent = packageManager.getLaunchIntentForPackage(packageName)?.let { + PendingIntent.getActivity(this, 0, it, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) + } + player.addListener(object : Player.Listener { + override fun onShuffleModeEnabledChanged(shuffleModeEnabled: Boolean) = refreshButtons() + override fun onRepeatModeChanged(repeatMode: Int) = refreshButtons() + override fun onAudioSessionIdChanged(audioSessionId: Int) = applyEffects() + override fun onPlayWhenReadyChanged(playWhenReady: Boolean, reason: Int) { + if (!playWhenReady) sleepAtTrackEnd = false + } + override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) { + refreshTrackCover(mediaItem) + val ended = reason == Player.MEDIA_ITEM_TRANSITION_REASON_AUTO || reason == Player.MEDIA_ITEM_TRANSITION_REASON_REPEAT + if (sleepAtTrackEnd && ended) { + sleepAtTrackEnd = false + player.pause() + } + } + }) + session = MediaSession.Builder(this, player).setCallback(Resolver()).apply { sessionIntent?.let { setSessionActivity(it) } }.build() + setMediaNotificationProvider(EdgeButtonsProvider(this).apply { setSmallIcon(R.drawable.ic_soundtrack) }) + } + + private fun mediaAttributes(): AudioAttributes = + AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).setContentType(C.AUDIO_CONTENT_TYPE_MUSIC).build() + + private fun buttons(player: Player): ImmutableList = ImmutableList.of( + CommandButton.Builder() + .setDisplayName(getString(R.string.soundtracks_shuffle)) + .setIconResId(if (player.shuffleModeEnabled) R.drawable.ic_shuffle_on else R.drawable.ic_shuffle_off) + .setSessionCommand(SHUFFLE) + .build(), + CommandButton.Builder() + .setDisplayName( + getString( + when (player.repeatMode) { + Player.REPEAT_MODE_ALL -> R.string.soundtracks_repeat_all + Player.REPEAT_MODE_ONE -> R.string.soundtracks_repeat_one + else -> R.string.soundtracks_repeat_off + }, + ), + ) + .setIconResId( + when (player.repeatMode) { + Player.REPEAT_MODE_ALL -> R.drawable.ic_repeat_all + Player.REPEAT_MODE_ONE -> R.drawable.ic_repeat_one + else -> R.drawable.ic_repeat_off + }, + ) + .setSessionCommand(REPEAT) + .build(), + ) + + private fun hasPinnedArt(item: MediaItem): Boolean = + item.mediaMetadata.artworkUri?.path.orEmpty().let { it.contains("/steam-art/") || it.contains("/soundtrack-art/") } + + private fun refreshTrackCover(item: MediaItem?) { + val current = item ?: return + if (hasPinnedArt(current)) return + val file = File(current.mediaId) + covers.execute { + val art = Soundtrack.trackCover(this, file) ?: return@execute + handler.post { + val player = exo ?: return@post + val live = player.currentMediaItem ?: return@post + val uri = Uri.fromFile(art) + if (live.mediaId != current.mediaId || live.mediaMetadata.artworkUri == uri || hasPinnedArt(live)) return@post + player.replaceMediaItem( + player.currentMediaItemIndex, + live.buildUpon().setMediaMetadata(live.mediaMetadata.buildUpon().setArtworkUri(uri).build()).build(), + ) + } + } + } + + private fun releaseEffects() { + runCatching { equalizer?.release() } + runCatching { bassBoost?.release() } + equalizer = null + bassBoost = null + effectsSession = C.AUDIO_SESSION_ID_UNSET + } + + private fun applyEffects() { + val id = exo?.audioSessionId ?: C.AUDIO_SESSION_ID_UNSET + if (!eqOn || id == C.AUDIO_SESSION_ID_UNSET) { + releaseEffects() + return + } + if (id != effectsSession) { + releaseEffects() + effectsSession = id + equalizer = runCatching { Equalizer(0, id) }.getOrNull() + bassBoost = runCatching { BassBoost(0, id) }.getOrNull() + } + runCatching { + equalizer?.let { eq -> + val range = eq.bandLevelRange + for (band in 0 until minOf(eq.numberOfBands.toInt(), eqBands.size)) { + eq.setBandLevel(band.toShort(), eqBands[band].coerceIn(range[0].toInt(), range[1].toInt()).toShort()) + } + eq.enabled = true + } + } + runCatching { + bassBoost?.let { boost -> + if (boost.strengthSupported) boost.setStrength(eqBass.coerceIn(0, 1000).toShort()) + boost.enabled = eqBass > 0 + } + } + } + + private fun setSleep(minutes: Int) { + handler.removeCallbacks(sleepRunnable) + sleepAtTrackEnd = false + if (minutes > 0) handler.postDelayed(sleepRunnable, minutes * 60_000L) + else if (minutes < 0) sleepAtTrackEnd = true + } + + private fun refreshButtons() { + val live = session ?: return + live.setCustomLayout(buttons(live.player)) + } + + override fun onGetSession(controllerInfo: MediaSession.ControllerInfo): MediaSession? = session + + override fun onTaskRemoved(rootIntent: Intent?) { + val player = session?.player + if (player == null || !player.playWhenReady || player.mediaItemCount == 0 || player.playbackState == Player.STATE_ENDED) stopSelf() + } + + override fun onDestroy() { + handler.removeCallbacks(sleepRunnable) + covers.shutdownNow() + releaseEffects() + session?.let { + it.player.release() + it.release() + } + session = null + super.onDestroy() + } + + companion object { + const val HINT_OWNER = "droiddeck.owner" + private val SHUFFLE = SessionCommand("droiddeck.shuffle", Bundle.EMPTY) + private val REPEAT = SessionCommand("droiddeck.repeat", Bundle.EMPTY) + val SKIP_SILENCE = SessionCommand("droiddeck.skipsilence", Bundle.EMPTY) + val EQUALIZER = SessionCommand("droiddeck.equalizer", Bundle.EMPTY) + val SLEEP = SessionCommand("droiddeck.sleep", Bundle.EMPTY) + val INGAME = SessionCommand("droiddeck.ingame", Bundle.EMPTY) + const val ARG_ON = "on" + const val ARG_BANDS = "bands" + const val ARG_BASS = "bass" + const val ARG_MINUTES = "minutes" + } + + private inner class Resolver : MediaSession.Callback { + private fun isOwner(controller: MediaSession.ControllerInfo) = + controller.uid == Process.myUid() && controller.connectionHints.getBoolean(HINT_OWNER, false) + + override fun onConnect(session: MediaSession, controller: MediaSession.ControllerInfo): MediaSession.ConnectionResult = + if (controller.uid == Process.myUid() || controller.isTrusted) { + MediaSession.ConnectionResult.AcceptedResultBuilder(session) + .setAvailableSessionCommands( + MediaSession.ConnectionResult.DEFAULT_SESSION_COMMANDS.buildUpon().add(SHUFFLE).add(REPEAT).add(SKIP_SILENCE).add(EQUALIZER).add(SLEEP).add(INGAME).build(), + ) + .setCustomLayout(buttons(session.player)) + .build() + } else { + MediaSession.ConnectionResult.reject() + } + + override fun onCustomCommand( + session: MediaSession, controller: MediaSession.ControllerInfo, customCommand: SessionCommand, args: Bundle, + ): ListenableFuture { + val player = session.player + when (customCommand.customAction) { + SHUFFLE.customAction -> player.shuffleModeEnabled = !player.shuffleModeEnabled + REPEAT.customAction -> player.repeatMode = when (player.repeatMode) { + Player.REPEAT_MODE_OFF -> Player.REPEAT_MODE_ALL + Player.REPEAT_MODE_ALL -> Player.REPEAT_MODE_ONE + else -> Player.REPEAT_MODE_OFF + } + SKIP_SILENCE.customAction, EQUALIZER.customAction, SLEEP.customAction, INGAME.customAction -> { + if (!isOwner(controller)) return Futures.immediateFuture(SessionResult(SessionResult.RESULT_ERROR_PERMISSION_DENIED)) + when (customCommand.customAction) { + SKIP_SILENCE.customAction -> exo?.skipSilenceEnabled = args.getBoolean(ARG_ON) + INGAME.customAction -> exo?.setAudioAttributes(mediaAttributes(), !args.getBoolean(ARG_ON)) + EQUALIZER.customAction -> { + eqOn = args.getBoolean(ARG_ON) + eqBands = args.getIntArray(ARG_BANDS) ?: IntArray(0) + eqBass = args.getInt(ARG_BASS) + applyEffects() + } + else -> setSleep(args.getInt(ARG_MINUTES)) + } + } + else -> return Futures.immediateFuture(SessionResult(SessionResult.RESULT_ERROR_NOT_SUPPORTED)) + } + return Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS)) + } + + override fun onAddMediaItems( + mediaSession: MediaSession, controller: MediaSession.ControllerInfo, mediaItems: MutableList, + ): ListenableFuture> { + if (!isOwner(controller)) return Futures.immediateFailedFuture(SecurityException("Only DroidDeck can queue soundtrack files")) + val resolved = mediaItems.mapNotNull { item -> + val file = File(item.mediaId) + if (Soundtrack.isAudio(file)) item.buildUpon().setUri(Uri.fromFile(file)).build() else null + }.toMutableList() + return Futures.immediateFuture(resolved) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/playback/SoundtrackSettings.kt b/app/src/main/java/com/droiddeck/launcher/playback/SoundtrackSettings.kt new file mode 100644 index 0000000000..c34af1e32e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/playback/SoundtrackSettings.kt @@ -0,0 +1,78 @@ +package com.droiddeck.launcher.playback + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableFloatStateOf +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue + +object SoundtrackSettings { + const val MIN_RATE = 0.5f + const val MAX_RATE = 2f + + var speed by mutableFloatStateOf(1f) + private set + var pitch by mutableFloatStateOf(1f) + private set + var skipSilence by mutableStateOf(false) + private set + var eqOn by mutableStateOf(false) + private set + var bands by mutableStateOf>(emptyList()) + private set + var bass by mutableIntStateOf(0) + private set + + class Resume(val root: String, val id: String, val positionMs: Long) + + private var loaded = false + + private fun prefs(context: Context) = context.applicationContext.getSharedPreferences("soundtrack_settings", Context.MODE_PRIVATE) + + @Synchronized + fun load(context: Context) { + if (loaded) return + loaded = true + val p = prefs(context) + speed = p.getFloat("speed", 1f).coerceIn(MIN_RATE, MAX_RATE) + pitch = p.getFloat("pitch", 1f).coerceIn(MIN_RATE, MAX_RATE) + skipSilence = p.getBoolean("skipSilence", false) + eqOn = p.getBoolean("eqOn", false) + bands = p.getString("bands", "").orEmpty().split(',').mapNotNull { it.trim().toIntOrNull() } + bass = p.getInt("bass", 0).coerceIn(0, 1000) + } + + fun setSpeed(context: Context, value: Float) { + speed = value.coerceIn(MIN_RATE, MAX_RATE) + prefs(context).edit().putFloat("speed", speed).apply() + } + + fun setPitch(context: Context, value: Float) { + pitch = value.coerceIn(MIN_RATE, MAX_RATE) + prefs(context).edit().putFloat("pitch", pitch).apply() + } + + fun setSkipSilence(context: Context, on: Boolean) { + skipSilence = on + prefs(context).edit().putBoolean("skipSilence", on).apply() + } + + fun setEqualizer(context: Context, on: Boolean, levels: List, bassStrength: Int) { + eqOn = on + bands = levels + bass = bassStrength.coerceIn(0, 1000) + prefs(context).edit().putBoolean("eqOn", on).putString("bands", levels.joinToString(",")).putInt("bass", bass).apply() + } + + fun resume(context: Context): Resume? { + val p = prefs(context) + val root = p.getString("resumeRoot", null) ?: return null + val id = p.getString("resumeId", null) ?: return null + return Resume(root, id, p.getLong("resumePosition", 0L)) + } + + fun saveResume(context: Context, root: String, id: String, positionMs: Long) { + prefs(context).edit().putString("resumeRoot", root).putString("resumeId", id).putLong("resumePosition", positionMs.coerceAtLeast(0L)).apply() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index e47f9194bf..f55d994e1c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -201,6 +201,18 @@ object SessionPrefs { prefs(context).edit().putBoolean("gameStoresEnabled", on).apply() } + fun soundtracksEnabled(context: Context): Boolean = prefs(context).getBoolean("soundtracksEnabled", true) + + fun setSoundtracksEnabled(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("soundtracksEnabled", on).apply() + } + + fun soundtracksIngame(context: Context): Boolean = prefs(context).getBoolean("soundtracksIngame", false) + + fun setSoundtracksIngame(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("soundtracksIngame", on).apply() + } + fun gameStoresSpeedTier(context: Context): String = prefs(context).getString("gameStoresSpeedTier", "fast") ?: "fast" fun setGameStoresSpeedTier(context: Context, tier: String) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index 756b05f45f..6849c621c9 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -14,7 +14,7 @@ object SettingsReset { internal val SESSION_KEYS = setOf( "orientation", "launcherFullscreen", "animations", "lowStorageWarning", "theme", "runSteamAtStartup", "startupSession", "addedGamesArt", "dualScreenMode", "dualScreenSessionMode", "dualScreenLauncher", "dualScreenSessionControls", "androidTextFieldKeyboard", - "gameStoresEnabled", "gameStoresSpeedTier", "gameStoresParallel", "storesOpenTab", "storesShowMature", + "gameStoresEnabled", "soundtracksEnabled", "soundtracksIngame", "gameStoresSpeedTier", "gameStoresParallel", "storesOpenTab", "storesShowMature", "storesInstallLanguage", "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "__KEEP_droidDeckHud__", "__KEEP_droidDeckHudPos__", "backHold", "backActionsInverted", "backDoubleTapMs", "touch", "osc", "shape", "steamController", "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt b/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt index 89e1480869..a1b205e64a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt @@ -70,6 +70,7 @@ import com.droiddeck.launcher.frontend.AddedGameArt import com.droiddeck.launcher.frontend.AddedGameEdits import com.droiddeck.launcher.frontend.AddedGames import com.droiddeck.launcher.frontend.LogoPosition +import com.droiddeck.launcher.frontend.SoundtrackCollectionArt import com.droiddeck.launcher.frontend.SteamGameArt import com.droiddeck.launcher.frontend.SteamGridDb import com.droiddeck.launcher.frontend.SteamLaunchOptions @@ -179,6 +180,16 @@ internal class ArtTarget( { c, value -> AddedGameEdits.setLogoPosition(c, game.folder.path, value) }, ) + fun ofCollection(id: Int, name: String, root: java.io.File? = null) = ArtTarget( + name, + { c, _ -> SoundtrackCollectionArt.source(c, id) }, + { c, _ -> AddedGameArt.Choices(SoundtrackCollectionArt.options(c, id, root), SteamGridDb.Status.OK) }, + { c, _, option -> SoundtrackCollectionArt.choose(c, id, option) }, + { c, _ -> SoundtrackCollectionArt.reset(c, id) }, + { _ -> null }, + { _, _ -> false }, + ) + fun of(game: com.droiddeck.launcher.frontend.Library.SteamGame) = ArtTarget( game.name, { c, slot -> SteamGameArt.chosenSource(c, game.appId, slot).second }, @@ -199,6 +210,12 @@ internal fun SteamGameArtEditor( ArtOnlyEditor(game.name, target, game, { SteamGameArt.describe(it, game) }, onClose, onChanged) } +@Composable +internal fun CollectionArtEditor(id: Int, name: String, root: java.io.File? = null, onClose: () -> Unit, onChanged: () -> Unit) { + val target = remember(id, root) { ArtTarget.ofCollection(id, name, root) } + ArtOnlyEditor(name, target, id, { SoundtrackCollectionArt.describe(it, id, root) }, onClose, onChanged, listOf(AddedGameArt.Slot.COVER)) +} + @Composable internal fun StoreGameArtEditor(folder: String, name: String, onClose: () -> Unit, onChanged: () -> Unit) { val app = LocalContext.current.applicationContext @@ -212,7 +229,7 @@ internal fun StoreGameArtEditor(folder: String, name: String, onClose: () -> Uni @Composable private fun ArtOnlyEditor( name: String, target: ArtTarget?, refresh: Any?, describe: (Context) -> List, - onClose: () -> Unit, onChanged: () -> Unit, + onClose: () -> Unit, onChanged: () -> Unit, slots: List = AddedGameArt.Slot.values().toList(), ) { val app = LocalContext.current.applicationContext val shown = rememberShown(onClose) @@ -233,7 +250,7 @@ private fun ArtOnlyEditor( modifier = Modifier.fillMaxWidth().heightIn(max = maxHeight).verticalScroll(rememberScrollState()), ) { Text(stringResource(R.string.edit_artwork), fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(start = 4.dp, top = 2.dp)) - for (slot in AddedGameArt.Slot.values()) key(slot) { + for (slot in slots) key(slot) { val state = arts.firstOrNull { it.slot == slot } FieldRow(slot.label(), focus = if (slot == AddedGameArt.Slot.COVER) first else null, onClick = { if (target != null) artSlot = slot }) { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { @@ -242,7 +259,7 @@ private fun ArtOnlyEditor( } } } - PickerRow(Icons.Outlined.Tune, stringResource(R.string.art_adjust_logo), logoPositionSummary(position?.value), enabled = target != null && position != null) { logoOpen = true } + if (AddedGameArt.Slot.LOGO in slots) PickerRow(Icons.Outlined.Tune, stringResource(R.string.art_adjust_logo), logoPositionSummary(position?.value), enabled = target != null && position != null) { logoOpen = true } } } val chosen = target ?: return diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt index 28b3dc33bb..b99ee02316 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt @@ -115,6 +115,7 @@ internal fun Pane( s.pageKey != null && page != null -> null selected.startsWith("app:") -> s.steamGames.firstOrNull { "app:${it.appId}" == selected }?.art selected == "games" -> s.steamGames.maxByOrNull { it.lastPlayed }?.art + selected.startsWith("sound:") -> s.soundtracks.firstOrNull { "sound:${it.appId}" == selected }?.let { it.hero ?: it.art } selected.startsWith("rom:") -> romFor(s, selected)?.second?.art else -> null } @@ -124,10 +125,12 @@ internal fun Pane( val origins = remember { HashMap() } val paneAt = remember { arrayOf(Offset.Zero) } val livePage by rememberUpdatedState(s.pageKey) - val railContent = if (selected.startsWith("app:")) "games" else selected + val railContent = if (selected.startsWith("app:")) "games" else if (selected.startsWith("sound:")) "soundtracks" else selected val target = if (page != null && s.pageKey != null) s.pageKey else railContent val gameShown = remember { arrayOf("games") } if (selected == "games" || selected.startsWith("app:")) gameShown[0] = selected + val soundShown = remember { arrayOf("soundtracks") } + if (selected == "soundtracks" || selected.startsWith("sound:")) soundShown[0] = selected val before = remember { arrayOf(target) } if (page != null && s.pageKey != null) { pages[s.pageKey] = page @@ -171,7 +174,7 @@ internal fun Pane( label = "pane", ) { key -> val drawn = (if (page != null && key == s.pageKey) page else pages[key]) - ?: { Content(s, if (key == "games") gameShown[0] else key, a, Modifier.fillMaxSize(), onSelect, onAndroidAppClick, onOpenDeveloperOptions, onRequestWirelessAdb, onPairWirelessDebugging) } + ?: { Content(s, if (key == "games") gameShown[0] else if (key == "soundtracks") soundShown[0] else key, a, Modifier.fillMaxSize(), onSelect, onAndroidAppClick, onOpenDeveloperOptions, onRequestWirelessAdb, onPairWirelessDebugging) } val hopSink by androidx.compose.animation.core.animateFloatAsState( if (Hops.sinking == key) 1f else 0f, Motion.tw(260), label = "hopSink", ) @@ -262,7 +265,7 @@ private fun Content( StoresPage(s, a, modifier) return } - if (selected == "games" || selected.startsWith("app:")) { + if (selected == "games" || selected.startsWith("app:") || selected == "soundtracks" || selected.startsWith("sound:")) { LibraryPage(s, a, selected, onSelect, modifier) return } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt index 599968d9f7..87d8ac6644 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -126,6 +126,7 @@ internal fun BottomBar( internal fun navigationKeys(s: FrontEndState) = buildList { add("steam"); add("games") + if (s.soundtracksEnabled) add("soundtracks") if (s.gameStoresEnabled) add("stores") add("desktop") if (com.droiddeck.launcher.agent.AgentTab.visible) add("agent") @@ -200,6 +201,7 @@ internal fun SideRail( internal fun railLabelIcon(key: String): Pair = when (key) { "steam" -> R.string.rail_steam to Icons.Outlined.SportsEsports "games" -> R.string.rail_games to Icons.Outlined.VideoLibrary + "soundtracks" -> R.string.rail_music to SoundtrackIcon "stores" -> R.string.rail_stores to Icons.Outlined.LocalMall "desktop" -> R.string.rail_desktop to Icons.Outlined.DesktopWindows "components" -> R.string.rail_components to Icons.Outlined.Layers diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index f9914d5a38..2d2baaff3f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -181,6 +181,10 @@ class FrontEndState( val lowStorageWarning: Boolean = true, val launcherIcon: String = com.droiddeck.launcher.LauncherIcon.DARK, val gameStoresEnabled: Boolean = true, + val soundtracksEnabled: Boolean = true, + val soundtracksIngame: Boolean = false, + val soundtracks: List = emptyList(), + val soundtracksLoaded: Boolean = true, val gameStoresSpeedTier: String = "fast", val navigate: String? = null, val addedGamesArt: Boolean = true, @@ -285,6 +289,11 @@ class FrontEndActions( val onDownloadPrefix: (String) -> Unit = {}, val onDownloadProxy: (String) -> Unit = {}, val onGameStoresEnabled: (Boolean) -> Unit = {}, + val onSoundtracksEnabled: (Boolean) -> Unit = {}, + val onSoundtracksIngame: (Boolean) -> Unit = {}, + val onSoundtrackAdded: (java.io.File) -> Unit = {}, + val onSoundtracksChanged: () -> Unit = {}, + val onSoundtrackRemoved: (Library.SteamGame) -> Unit = {}, val onGameStoresSpeedTier: (String) -> Unit = {}, val onNavigated: () -> Unit = {}, val onStoresShowMature: (Boolean) -> Unit = {}, @@ -567,8 +576,14 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com selected = if (selected.startsWith("rom:")) "emu:" + selected.removePrefix("rom:").substringBefore(':') else "desktop" } LaunchedEffect(s.isHomeApp) { if (!s.isHomeApp && selected == "android-apps") selected = "steam" } - LaunchedEffect(s.steamGames.isEmpty()) { - if (s.steamGames.isEmpty() && selected.startsWith("app:") && GameRef.parse(selected).appId != null) selected = "games" + LaunchedEffect(s.soundtracksEnabled) { + if (!s.soundtracksEnabled && (selected == "soundtracks" || selected.startsWith("sound:"))) selected = "games" + } + LaunchedEffect(s.steamGames.isEmpty(), s.soundtracks, s.soundtracksLoaded) { + if (s.steamGames.isEmpty() && selected.startsWith("app:")) { + val id = GameRef.parse(selected).appId + if (id != null && s.soundtracks.none { it.appId == id } && s.soundtracksLoaded) selected = "games" + } } remember { Motion.refresh(ctx); true } @@ -577,6 +592,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com s.pageKey == "performance" -> "steam" s.pageKey == "controller-mapping" -> "setup" selected.startsWith("app:") -> "games" + selected.startsWith("sound:") -> "soundtracks" selected.startsWith("emu:") || selected.startsWith("rom:") || selected.startsWith("user:") || selected == "store" -> "desktop" else -> s.pageKey ?: selected } @@ -688,7 +704,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com val r = Hops.restore ?: return@LaunchedEffect if (r.surface == HOP_SURFACE_SHEET) return@LaunchedEffect Hops.restore = null - if (r.rail != selected && !(r.rail == "games" && selected.startsWith("app:"))) selected = r.rail + if (r.rail != selected && !(r.rail == "games" && selected.startsWith("app:")) && !(r.rail == "soundtracks" && selected.startsWith("sound:"))) selected = r.rail kotlinx.coroutines.delay(Motion.ms(PAGE_EXIT_MS).toLong()) if (inputModeManager.inputMode != InputMode.Keyboard) return@LaunchedEffect frontFocus.last = r.control diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 3655ec0959..fa78998cf4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -457,6 +457,8 @@ internal fun SetupPanel( ToggleRow(host, "rail-labels", stringResource(R.string.setup_rail_labels), stringResource(R.string.setup_rail_labels_hint), RailLabels.shown) { RailLabels.set(railContext, it) } LanguageRow(host, s.language, a.onLanguage) ToggleRow(host, "show-stores", stringResource(R.string.setup_stores), null, s.gameStoresEnabled, onChange = a.onGameStoresEnabled) + ToggleRow(host, "show-soundtracks", stringResource(R.string.setup_soundtracks), null, s.soundtracksEnabled, onChange = a.onSoundtracksEnabled) + if (s.soundtracksEnabled) ToggleRow(host, "soundtracks-ingame", stringResource(R.string.setup_soundtracks_ingame), stringResource(R.string.setup_soundtracks_ingame_hint), s.soundtracksIngame, onChange = a.onSoundtracksIngame) } } val device: @Composable () -> Unit = { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index bee82bbd2c..7aba7feb45 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -148,7 +148,7 @@ internal fun GameDetail( val narrow = LocalNarrowPane.current val stacked = narrow || LocalConfiguration.current.screenWidthDp < 700 val ref = remember(key) { GameRef.parse(key) } - val games = s.steamGames + rememberXboxCloudRows(s) + val games = s.steamGames + rememberXboxCloudRows(s) + if (s.soundtracksEnabled) emptyList() else s.soundtracks val found = ref.game(games) val known = remember(key) { arrayOfNulls>(1) } val store = ref.store ?: Store.byId(found?.source) ?: known[0]?.first @@ -280,7 +280,7 @@ internal fun GameDetail( } @Composable -private fun SourceBadge(source: String) { +internal fun SourceBadge(source: String) { val c = sourceColours(source) Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(7.dp), @@ -574,13 +574,13 @@ private fun buyLabel(item: CatalogItem): String = when { } @Composable -private fun FileButtons(game: Library.SteamGame, a: FrontEndActions) { +internal fun FileButtons(game: Library.SteamGame, a: FrontEndActions) { game.gameFiles?.takeIf { it.isDirectory }?.let { dir -> SecondaryButton(stringResource(R.string.games_files), compact = true) { a.onBrowseFiles(dir) } } game.protonPrefix?.takeIf { it.isDirectory }?.let { dir -> SecondaryButton(stringResource(R.string.games_prefix), compact = true) { a.onBrowseFiles(dir) } } } @Composable -private fun GameShortcutMenu(g: Library.SteamGame, a: FrontEndActions) { +internal fun GameShortcutMenu(g: Library.SteamGame, a: FrontEndActions) { var open by remember(g.gameId) { mutableStateOf(false) } Box { SecondaryButton(stringResource(R.string.game_shortcut), compact = true) { open = !open } @@ -593,7 +593,7 @@ private fun GameShortcutMenu(g: Library.SteamGame, a: FrontEndActions) { } @Composable -private fun rememberEditArt(g: Library.SteamGame): (() -> Unit)? { +internal fun rememberEditArt(g: Library.SteamGame): (() -> Unit)? { val ctx = LocalContext.current val folder = g.gameFiles return when { @@ -607,7 +607,7 @@ private fun rememberEditArt(g: Library.SteamGame): (() -> Unit)? { } @Composable -private fun EditArtButton(g: Library.SteamGame) { +internal fun EditArtButton(g: Library.SteamGame) { val open = rememberEditArt(g) ?: return IconAction(Icons.Outlined.Edit, stringResource(R.string.game_edit_art), "game:edit", onClick = open) } @@ -664,7 +664,7 @@ internal fun IconAction(icon: androidx.compose.ui.graphics.vector.ImageVector, l } @Composable -private fun RemoveButton(title: String, game: Library.SteamGame?, installed: InstalledStoreGame?, a: FrontEndActions) { +internal fun RemoveButton(title: String, game: Library.SteamGame?, installed: InstalledStoreGame?, a: FrontEndActions) { val ctx = LocalContext.current val colors = MaterialTheme.colorScheme if ((installed?.sidecar?.store?.id ?: game?.source) == Store.BATTLENET.id && installed?.sidecar?.id?.let(BattleNetInstall::product) == null) return diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt index a2660d1b47..e5fd8845bd 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt @@ -38,6 +38,7 @@ import androidx.compose.ui.graphics.drawscope.drawIntoCanvas import androidx.compose.ui.graphics.drawscope.DrawScope import androidx.compose.ui.graphics.drawscope.clipRect import androidx.compose.ui.graphics.drawscope.translate +import androidx.compose.ui.draw.blur import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.graphics.luminance import androidx.compose.ui.graphics.painter.Painter @@ -147,6 +148,7 @@ internal fun GameBackdrop( fadeTop: Boolean, modifier: Modifier = Modifier, onArtPlaced: (androidx.compose.ui.geometry.Rect?) -> Unit = {}, + artBlur: androidx.compose.ui.unit.Dp = 0.dp, content: @Composable () -> Unit, ) { val ctx = LocalContext.current @@ -178,13 +180,13 @@ internal fun GameBackdrop( glass.fadeBottom(this, size) }, ) - if (art != null) ArtLayer(art, ambient ?: art, fadeTop, onArtPlaced) + if (art != null) ArtLayer(art, ambient ?: art, fadeTop, artBlur, onArtPlaced) CompositionLocalProvider(LocalGlass provides glass) { content() } } } @Composable -private fun ArtLayer(model: Any?, sample: Any?, fadeTop: Boolean, onPlaced: (androidx.compose.ui.geometry.Rect?) -> Unit) { +private fun ArtLayer(model: Any?, sample: Any?, fadeTop: Boolean, blur: androidx.compose.ui.unit.Dp, onPlaced: (androidx.compose.ui.geometry.Rect?) -> Unit) { val colors = MaterialTheme.colorScheme val light = colors.background.luminance() > 0.5f val pale = ((rememberArtBrightness(sample) - 0.28f) / 0.5f).coerceIn(0f, 1f) @@ -208,7 +210,7 @@ private fun ArtLayer(model: Any?, sample: Any?, fadeTop: Boolean, onPlaced: (and model = model, contentDescription = null, contentScale = ContentScale.Crop, alignment = BiasAlignment(0.45f, -0.35f), colorFilter = artFilter, - modifier = Modifier.matchParentSize(), + modifier = Modifier.matchParentSize().then(if (blur > 0.dp) Modifier.blur(blur) else Modifier), ) Box( Modifier.matchParentSize().drawBehind { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index 73dad7aa70..e3d76dcd1f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -42,6 +42,7 @@ import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.BookmarkBorder import androidx.compose.material.icons.filled.FilterAlt import androidx.compose.material.icons.filled.GridView import androidx.compose.material.icons.filled.PlayArrow @@ -61,6 +62,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.produceState import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -92,6 +94,11 @@ import androidx.compose.ui.unit.sp import coil.compose.AsyncImage import com.droiddeck.launcher.R import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.frontend.Soundtrack +import com.droiddeck.launcher.frontend.SoundtrackCollections +import com.droiddeck.launcher.frontend.SoundtrackIndex +import com.droiddeck.launcher.frontend.SoundtrackTracks +import com.droiddeck.launcher.playback.SoundtrackController import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.stores.CatalogItem import com.droiddeck.launcher.stores.Store @@ -156,7 +163,7 @@ internal fun installedFirst(entries: List): List = e internal const val LIBRARY_ALL = "all" internal fun librarySources(entries: List, order: List, always: Set = emptySet()): List = - (listOf(Library.SOURCE_STEAM) + arrangeStoreTabs(order, emptySet()).map { it.store.id } + Library.ADDED) + (listOf(Library.SOURCE_STEAM) + arrangeStoreTabs(order, emptySet()).map { it.store.id } + Library.ADDED + Library.SOURCE_COLLECTION) .filter { source -> source in always || entries.any { it.source == source } } internal object LibraryDisplay { @@ -215,14 +222,24 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val inputMode = androidx.compose.ui.platform.LocalInputModeManager.current LaunchedEffect(Unit) { StoresState.refresh(ctx) } remember { LibraryDisplay.load(ctx) } - val stores = s.gameStoresEnabled && !s.shortcutPicker + val soundMode = selected == "soundtracks" || selected.startsWith("sound:") + val stores = s.gameStoresEnabled && !s.shortcutPicker && !soundMode val signedIn = Store.entries.filter { StoresState.isSignedIn(it) } LaunchedEffect(stores, signedIn) { if (stores) signedIn.forEach { StoresState.loadLibrary(ctx, it) } } val owned = if (stores) signedIn.associateWith { StoresState.library[it].orEmpty() } else emptyMap() val installedStore = StoresState.installed.map { it.key }.toSet() val syncing = if (stores) signedIn.mapNotNull { st -> StoresState.status[st]?.let { st to it } } else emptyList() val cloudRows = rememberXboxCloudRows(s) - val all = remember(s.steamGames, cloudRows, owned, installedStore) { libraryEntries(s.steamGames + cloudRows, owned, installedStore) } + remember { SoundtrackCollections.load(ctx) } + val savedSnapshot = SoundtrackCollections.snapshot + val favoritesLabel = stringResource(R.string.soundtracks_favorites) + val all = remember(soundMode, s.steamGames, s.soundtracks, s.soundtracksEnabled, cloudRows, owned, installedStore, savedSnapshot, favoritesLabel) { + if (soundMode) s.soundtracks.map { LibraryEntry("sound:${it.appId}", it.source, it.name, it, null, true) } + + (if (s.soundtracks.isEmpty() && savedSnapshot.favorites.isEmpty() && savedSnapshot.collections.isEmpty()) emptyList() else SoundtrackCollections.games(ctx, favoritesLabel)) + .map { LibraryEntry("sound:${it.appId}", it.source, it.name, it, null, true) } + else libraryEntries(s.steamGames + cloudRows + if (s.soundtracksEnabled) emptyList() else s.soundtracks.filter { it.library != Library.ADDED }, owned, installedStore) + } + var addingSoundtrack by remember { mutableStateOf(false) } LaunchedEffect(Unit) { XboxLibraryFilter.load(ctx) } var showUninstalled by remember(LibraryView.ownedRequest) { mutableStateOf(SessionPrefs.libraryShowUninstalled(ctx)) } var collectionShows by remember { mutableStateOf?>(null) } @@ -240,7 +257,10 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, } val itchSignedIn = owned.containsKey(Store.ITCH) val gameJoltSignedIn = owned.containsKey(Store.GAMEJOLT) - val sources = librarySources(all, SessionPrefs.storesTabOrder(ctx), listOfNotNull(Store.ITCH.id.takeIf { itchSignedIn }, Store.GAMEJOLT.id.takeIf { gameJoltSignedIn }).toSet()) + val sources = librarySources( + all, SessionPrefs.storesTabOrder(ctx), + listOfNotNull(Store.ITCH.id.takeIf { itchSignedIn && !soundMode }, Store.GAMEJOLT.id.takeIf { gameJoltSignedIn && !soundMode }, Library.SOURCE_COLLECTION.takeIf { soundMode }).toSet(), + ) val source = LibraryView.source.takeIf { it == LIBRARY_ALL || it in sources } ?: LIBRARY_ALL val q = LibraryView.query.trim().lowercase() val xboxFilter = if (source == Store.XBOX.id) XboxLibraryFilter.current else XboxLibraryFilter.ALL @@ -265,6 +285,30 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, (source == LIBRARY_ALL || it.source == source) && (q.isEmpty() || it.title.lowercase().contains(q)) && keepsXbox(xboxFilter, it) } val listUninstalled = if (collectionId == null) showUninstalled else collectionShows?.takeIf { it.first == collectionId }?.second ?: true + val trackHits by produceState>(emptyList(), soundMode, q, source, s.soundtracks) { + if (!soundMode || q.isEmpty()) { + value = emptyList() + return@produceState + } + kotlinx.coroutines.delay(150) + value = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { + SoundtrackIndex.build(ctx, s.soundtracks) + .filter { (source == LIBRARY_ALL || it.game.source == source) && SoundtrackTracks.matches(q, it.ref.title, it.ref.artist, it.ref.album) } + .distinctBy { it.ref.path } + .sortedWith(compareBy({ SoundtrackTracks.rank(q, it.ref.title) }, { it.ref.title.lowercase() })) + .take(100) + } + } + val shownHits = trackHits.filter { source == LIBRARY_ALL || it.game.source == source } + val hitScope = rememberCoroutineScope() + val playHit: (SoundtrackIndex.Hit) -> Unit = { hit -> + val dir = hit.game.gameFiles + if (dir != null) hitScope.launch { + val album = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { Soundtrack.load(ctx, dir, hit.game.art) } + SoundtrackController.play(ctx, album, hit.game.name, hit.ref.path, root = dir) + } + } + var savedDialog by remember { mutableStateOf(false) } val candidates = if (listUninstalled) matching else matching.filter { it.installed } val hiddenUninstalled = if (listUninstalled) 0 else matching.count { !it.installed } val sort = s.storesSort @@ -304,18 +348,20 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, var stable by remember { mutableStateOf(emptyList()) } val ordered = if (sizesPending) retainOrder(candidates, stable) { it.key } else sorted SideEffect { if (!sizesPending) stable = sorted } - val visible = installedFirst(ordered) + val visible = installedFirst(ordered).let { list -> + if (soundMode && source == Library.SOURCE_COLLECTION) list.sortedBy { if (it.game?.appId == SoundtrackCollections.FAVORITES_ID) 0 else 1 } else list + } val split = visible.count { it.installed }.takeIf { it in 1 until visible.size } ?: 0 - val open = selected.takeIf { it.startsWith("app:") } - val back = { onSelect("games") } + val open = selected.takeIf { it.startsWith(if (soundMode) "sound:" else "app:") } + val back = { onSelect(if (soundMode) "soundtracks" else "games") } BackHandler(enabled = open == null && LibraryView.query.isNotEmpty()) { LibraryView.query = "" } BackHandler(enabled = open != null) { back() } val lead = remember { FocusRequester() } var detailFocused by remember { mutableStateOf(false) } var lastOpened by remember { mutableStateOf(null) } val wasOpen = remember { booleanArrayOf(false) } - val backLabel = stringResource(R.string.rail_games) + val backLabel = stringResource(if (soundMode) R.string.rail_soundtracks else R.string.rail_games) LaunchedEffect(open) { val closing = open == null && wasOpen[0] wasOpen[0] = open != null @@ -349,7 +395,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, kotlinx.coroutines.delay(Motion.ms(240).toLong()) focusWithinFrames({ ff.last?.startsWith("card:") == true }) { if (ff.firstTileAttached > 0) ff.firstTile else FocusRequester.Default } } - if (all.isEmpty() && open == null && !itchSignedIn && !gameJoltSignedIn) { + if (!soundMode && all.isEmpty() && open == null && !itchSignedIn && !gameJoltSignedIn) { LibraryEmpty(s, a, modifier) return } @@ -385,9 +431,26 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, onOpen = { focusManager.clearFocus(force = true); onSelect(it) }, searchCleared = open != null, onFocus = { gridFocused = it }, + soundMode = soundMode, + emptyText = when { + soundMode && all.isEmpty() -> R.string.soundtracks_empty + soundMode && source == Library.SOURCE_COLLECTION && q.isEmpty() -> R.string.soundtracks_collections_empty + else -> R.string.stores_nothing_matches + }, + onAddSoundtrack = { addingSoundtrack = true }, + onCollections = { savedDialog = true }, + trackHits = shownHits, onPlayHit = playHit, ) }, - ) { key -> GameDetail(key, s, a, lead, backLabel, hopRail = "games", onBack = back) } + ) { key -> + if (soundMode || (!s.soundtracksEnabled && s.soundtracks.any { GameRef.key(it) == key })) SoundtrackDetail(key, s, a, lead, backLabel, onBack = back) + else GameDetail(key, s, a, lead, backLabel, hopRail = "games", onBack = back) + } + if (savedDialog) SavedDialog(emptyList(), onOpen = { id -> onSelect("sound:$id") }) { savedDialog = false } + if (addingSoundtrack) SyncFolderPicker(stringResource(R.string.soundtracks_add_title), null, onDismiss = { addingSoundtrack = false }) { dir -> + addingSoundtrack = false + a.onSoundtrackAdded(dir) + } } @Composable @@ -416,6 +479,8 @@ private fun LibraryGrid( sources: List, source: String, sizesPending: Boolean, syncing: List>, showUninstalled: Boolean?, onShowUninstalled: (Boolean) -> Unit, hiddenUninstalled: Int, onSource: (String) -> Unit, onCycle: (Int) -> Unit, onOpen: (String) -> Unit, onFocus: (Boolean) -> Unit, searchCleared: Boolean, + soundMode: Boolean = false, emptyText: Int = R.string.stores_nothing_matches, onAddSoundtrack: () -> Unit = {}, + onCollections: () -> Unit = {}, trackHits: List = emptyList(), onPlayHit: (SoundtrackIndex.Hit) -> Unit = {}, ) { val listMode = s.storesView == "list" val capsules = s.storesView == "capsules" @@ -438,7 +503,7 @@ private fun LibraryGrid( val next = storeGridNeighbor(index, visible.size, if (listMode) 1 else columns, direction, split) when { direction == 0 || index < 0 -> false - next == null -> direction > 0 + next == null -> direction > 0 && trackHits.isEmpty() else -> { if (key.action == KeyEvent.ACTION_DOWN) { val target = "card:${visible[next].key}" @@ -470,7 +535,7 @@ private fun LibraryGrid( contentPadding = PaddingValues(top = 4.dp, bottom = 16.dp), ) { item(key = "header", span = { GridItemSpan(maxLineSpan) }) { - Rise(0) { LibraryHeader(s, a, total, searchCleared, source == Store.XBOX.id, showUninstalled, onShowUninstalled, collections = Store.byId(source)?.takeIf { it == Store.ITCH || it == Store.GAMEJOLT }) } + Rise(0) { LibraryHeader(s, a, total, searchCleared, source == Store.XBOX.id, showUninstalled, onShowUninstalled, collections = Store.byId(source)?.takeIf { it == Store.ITCH || it == Store.GAMEJOLT }, soundMode = soundMode, onAddSoundtrack = onAddSoundtrack, onCollections = onCollections) } } item(key = "filters", span = { GridItemSpan(maxLineSpan) }) { Rise(1) { LibraryFilters(sources, source, onSource) } @@ -488,7 +553,7 @@ private fun LibraryGrid( Text(stringResource(R.string.store_section_loading), fontSize = 11.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) } } - val empty = R.string.stores_nothing_matches + val empty = emptyText if (visible.isEmpty() && hiddenUninstalled > 0) item(key = "browse-owned", span = { GridItemSpan(maxLineSpan) }) { Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.fillMaxWidth().padding(vertical = 32.dp)) { Text(stringResource(R.string.library_no_installed_matches), fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) @@ -502,6 +567,40 @@ private fun LibraryGrid( item(key = "not-installed-label", span = { GridItemSpan(maxLineSpan) }) { SectionLabel(stringResource(R.string.stores_section_not_installed)) } libraryGrid(visible.drop(split), empty, tile) } + if (trackHits.isNotEmpty()) { + item(key = "tracks-label", span = { GridItemSpan(maxLineSpan) }) { SectionLabel(stringResource(R.string.soundtracks_tracks_heading)) } + items(trackHits, key = { "track:${it.ref.path}" }, span = { GridItemSpan(maxLineSpan) }, contentType = { "track" }) { hit -> TrackHitRow(hit, onPlayHit) } + } + } +} + +@Composable +private fun TrackHitRow(hit: SoundtrackIndex.Hit, onPlay: (SoundtrackIndex.Hit) -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val shape = RoundedCornerShape(10.dp) + val cover = hit.ref.cover.takeIf { it.isNotEmpty() }?.let { java.io.File(it) }?.takeIf { it.isFile } + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), + modifier = Modifier.fillMaxWidth().heightIn(min = 56.dp).paneItem("trackhit:${hit.ref.path}").testTag("track-hit") + .clip(shape).glideBorder(hot, shape, pal.signal, pal.line) + .hoverable(src).clickable(role = Role.Button, interactionSource = src, indication = LocalIndication.current) { onPlay(hit) } + .controllerConfirm { onPlay(hit) } + .padding(horizontal = 10.dp, vertical = 6.dp), + ) { + Box(Modifier.size(44.dp).clip(RoundedCornerShape(8.dp)).background(artBrush(hueOf(hit.ref.album)))) { + if (cover != null) AsyncImage(model = cover, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.matchParentSize()) + } + Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(2.dp)) { + Text(hit.ref.title, fontSize = 14.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text( + listOf(hit.ref.album, hit.ref.artist).filter { it.isNotBlank() }.joinToString(" · "), + fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, + ) + } + if (hit.ref.durationMs > 0) Text(Soundtrack.formatLength(hit.ref.durationMs), fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1) } } @@ -532,28 +631,31 @@ private fun LazyGridScope.libraryGrid(entries: List, empty: Int, t private fun LibraryHeader( s: FrontEndState, a: FrontEndActions, total: Int, searchCleared: Boolean, xbox: Boolean, showUninstalled: Boolean?, onShowUninstalled: (Boolean) -> Unit, collections: Store?, + soundMode: Boolean = false, onAddSoundtrack: () -> Unit = {}, onCollections: () -> Unit = {}, ) { val colors = MaterialTheme.colorScheme val narrow = LocalNarrowPane.current + val heading = stringResource(if (soundMode) R.string.rail_soundtracks else R.string.rail_games) ModeHeader( - stringResource(R.string.rail_games), LibraryView.query, { LibraryView.query = it }, - placeholder = stringResource(R.string.stores_search_library), + heading, LibraryView.query, { LibraryView.query = it }, + placeholder = stringResource(if (soundMode) R.string.soundtracks_search else R.string.stores_search_library), clearSearchFocus = searchCleared, inlineWhenStacked = true, lead = { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(start = 2.dp, end = 4.dp)) { - Text(stringResource(R.string.rail_games), fontSize = if (narrow) 20.sp else 24.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1) - Text(pluralStringResource(R.plurals.mode_added_count, total, total), fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1) + Text(heading, fontSize = if (narrow) 20.sp else 24.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1) + Text(if (soundMode) total.toString() else pluralStringResource(R.plurals.mode_added_count, total, total), fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1) if (s.steamGamesX64 && !narrow) ClientTag() } }, ) { + if (soundMode) HeaderIconButton(stringResource(R.string.soundtracks_saved), Icons.Filled.BookmarkBorder, "collections", onCollections) DisplayButton() - if (showUninstalled != null || xbox) LibraryFilterButton(showUninstalled, onShowUninstalled, xbox) + if (!soundMode && (showUninstalled != null || xbox)) LibraryFilterButton(showUninstalled, onShowUninstalled, xbox) if (collections != null) CollectionsButton(collections) SortButton(s, a) ViewButton(s, a) - GameFileFolderActions(s, a) - if (!s.shortcutPicker) AddGameButton { GamesDialogState.adding = true } + if (!soundMode) GameFileFolderActions(s, a) + if (!s.shortcutPicker) AddGameButton { if (soundMode) onAddSoundtrack() else GamesDialogState.adding = true } } if (s.steamGamesX64 && narrow) Box(Modifier.padding(top = 4.dp)) { ClientTag() } } @@ -570,7 +672,7 @@ private fun LibraryFilters(sources: List, source: String, onSource: (Str val store = Store.byId(src) val dot = when { store != null -> sourceColours(src).dot.copy(alpha = if (StoresState.isSignedIn(store) && StoresState.expired[store] != true) 1f else 0.35f) - src == Library.SOURCE_STEAM -> sourceColours(src).dot + src == Library.SOURCE_STEAM || src == Library.ADDED || src == Library.SOURCE_COLLECTION -> sourceColours(src).dot else -> null } SourceFilterChip(src, if (src == Library.ADDED) stringResource(R.string.library_filter_added) else store?.shortLabel ?: sourceLabel(src), source == src, dot) { onSource(src) } @@ -649,7 +751,7 @@ private fun LibraryArt(e: LibraryEntry, wide: Any?, tall: Any?, download: Downlo } ArtCard( e.title, wide, tall, download, hot, capsule, chip, - badge = if (showSource) ({ SourceChip(e.source, small = true, modifier = Modifier.align(Alignment.TopStart).padding(6.dp)) }) else null, + badge = if (showSource) ({ SourceChip(e.source, small = true, modifier = Modifier.align(Alignment.TopStart).padding(6.dp), label = favoritesBadge(e), colours = favoritesColours(e)) }) else null, ) { LibrarySize(e) } } @@ -786,7 +888,7 @@ private fun LibraryRow(e: LibraryEntry, first: Boolean, navigation: Modifier, ch Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) { Text(e.title, fontSize = 14.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { - SourceChip(e.source, small = true) + SourceChip(e.source, small = true, label = favoritesBadge(e), colours = favoritesColours(e)) Text(meta.joinToString(" · "), fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) } } @@ -1004,3 +1106,10 @@ private fun ViewButton(s: FrontEndState, a: FrontEndActions) { "view", ) { a.onStoresView(next) } } + +@Composable +private fun favoritesBadge(e: LibraryEntry): String? = + if (e.game?.appId == SoundtrackCollections.FAVORITES_ID && e.source == Library.SOURCE_COLLECTION) stringResource(R.string.soundtracks_favorites) else null + +private fun favoritesColours(e: LibraryEntry): SourceColours? = + if (e.game?.appId == SoundtrackCollections.FAVORITES_ID && e.source == Library.SOURCE_COLLECTION) FavoritesColours else null diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackCollectionsUi.kt b/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackCollectionsUi.kt new file mode 100644 index 0000000000..2bf1314621 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackCollectionsUi.kt @@ -0,0 +1,295 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.Bookmark +import androidx.compose.material.icons.filled.Check +import androidx.compose.material.icons.filled.Delete +import androidx.compose.material.icons.filled.Edit +import androidx.compose.material.icons.filled.Remove +import androidx.compose.material.icons.filled.CheckBox +import androidx.compose.material.icons.filled.CheckBoxOutlineBlank +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.produceState +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import coil.compose.AsyncImage +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.frontend.Soundtrack +import com.droiddeck.launcher.frontend.SoundtrackCollections +import com.droiddeck.launcher.frontend.SoundtrackIndex +import com.droiddeck.launcher.frontend.SoundtrackTracks +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +@Composable +internal fun SavedDialog(pending: List, onOpen: ((Int) -> Unit)?, onDismiss: () -> Unit) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + remember { SoundtrackCollections.load(ctx) } + val snapshot = SoundtrackCollections.snapshot + val favoritesLabel = stringResource(R.string.soundtracks_favorites) + var naming by remember { mutableStateOf(false) } + val rows = listOf(Triple(SoundtrackCollections.FAVORITES_ID, favoritesLabel, snapshot.favorites)) + + snapshot.collections.map { Triple(it.id, it.name, it.tracks) } + AlertDialog( + onDismissRequest = onDismiss, + title = { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(stringResource(R.string.soundtracks_saved), modifier = Modifier.weight(1f)) + Icon(Icons.Filled.Bookmark, contentDescription = null, tint = colors.onSurfaceVariant) + } + }, + text = { + Column(Modifier.verticalScroll(rememberScrollState()), verticalArrangement = Arrangement.spacedBy(8.dp)) { + SavedRow(stringResource(R.string.soundtracks_create_collection), stringResource(R.string.soundtracks_organise), null, "saved-create", null) { + TextButton(onClick = { naming = true }, modifier = Modifier.focusGlide(CircleShape).testTag("saved-new")) { + Icon(Icons.Filled.Add, contentDescription = null, modifier = Modifier.size(18.dp)) + Text(stringResource(R.string.soundtracks_new)) + } + } + for ((id, name, tracks) in rows) { + val cover = tracks.firstNotNullOfOrNull { t -> t.cover.takeIf { it.isNotEmpty() }?.let { java.io.File(it) }?.takeIf { it.isFile } } + val subtitle = stringResource(R.string.soundtracks_length_value, tracks.size, Soundtrack.formatLength(tracks.sumOf { it.durationMs })) + val added = pending.isNotEmpty() && pending.all { p -> tracks.any { it.path == p.path } } + SavedRow(name, subtitle, cover, "saved-$id", if (pending.isEmpty() && onOpen != null) ({ onDismiss(); onOpen(id) }) else null) { + if (pending.isNotEmpty()) CircleAction(if (added) Icons.Filled.Check else Icons.Filled.Add, name, "saved-add-$id") { + if (added) SoundtrackCollections.remove(ctx, id, pending.map { it.path }.toSet()) + else SoundtrackCollections.add(ctx, id, pending) + } + } + } + } + }, + confirmButton = { TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_close)) } }, + ) + if (naming) NameDialog( + stringResource(R.string.soundtracks_create_collection), "", stringResource(R.string.soundtracks_create), + onConfirm = { name -> + val id = SoundtrackCollections.create(ctx, name, pending) + if (id != null && pending.isEmpty() && onOpen != null) { onDismiss(); onOpen(id) } + id != null + }, + onDismiss = { naming = false }, + ) +} + +@Composable +private fun SavedRow(title: String, subtitle: String, cover: Any?, tag: String, onClick: (() -> Unit)?, trailing: @Composable () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) && onClick != null + val shape = RoundedCornerShape(10.dp) + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), + modifier = Modifier.fillMaxWidth().testTag(tag).clip(shape).background(if (hot) pal.signal.copy(alpha = 0.12f) else Color.Transparent) + .glideBorder(hot, shape, pal.signal, Color.Transparent) + .then( + if (onClick != null) Modifier.hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onClick) + .controllerConfirm(onClick = onClick) + else Modifier, + ) + .padding(vertical = 4.dp), + ) { + Box(Modifier.size(52.dp).clip(RoundedCornerShape(8.dp)).background(Color.White.copy(alpha = 0.08f))) { + if (cover != null) AsyncImage(cover, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.matchParentSize()) + } + Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(2.dp)) { + Text(title, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onSurface, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text(subtitle, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + trailing() + } +} + +@Composable +private fun CircleAction(icon: androidx.compose.ui.graphics.vector.ImageVector, label: String, tag: String, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.testTag(tag).size(40.dp).clip(CircleShape).background(if (hot) pal.signal.copy(alpha = 0.16f) else Color.Transparent) + .border(1.dp, if (hot) pal.signal else colors.onSurface.copy(alpha = 0.7f), CircleShape) + .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onClick) + .controllerConfirm(onClick = onClick) + .semantics { contentDescription = label }, + ) { Icon(icon, contentDescription = null, tint = colors.onSurface, modifier = Modifier.size(20.dp)) } +} + +@Composable +internal fun NameDialog(title: String, initial: String, confirm: String, onConfirm: (String) -> Boolean, onDismiss: () -> Unit) { + var text by remember { mutableStateOf(initial) } + var invalid by remember { mutableStateOf(false) } + val submit: () -> Unit = { + val ok = onConfirm(text) + if (ok) onDismiss() + invalid = !ok + } + AlertDialog( + onDismissRequest = onDismiss, + title = { Text(title) }, + text = { + Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + AdbTextField( + value = text, onValueChange = { text = it; invalid = false }, label = stringResource(R.string.soundtracks_collection_name), + keyboardType = KeyboardType.Text, imeAction = ImeAction.Done, focusOnShow = true, onDone = submit, + ) + if (invalid) Text(stringResource(R.string.soundtracks_name_invalid), fontSize = 12.sp, color = MaterialTheme.colorScheme.error) + } + }, + confirmButton = { TextButton(onClick = submit, modifier = Modifier.focusGlide(CircleShape).testTag("name-confirm")) { Text(confirm) } }, + dismissButton = { TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, + ) +} + +@Composable +internal fun ManageDialog(id: Int, games: List, onRemoveMode: () -> Unit, onDismiss: () -> Unit) { + val ctx = LocalContext.current + val name = SoundtrackCollections.snapshot.collections.firstOrNull { it.id == id }?.name.orEmpty() + val favorites = id == SoundtrackCollections.FAVORITES_ID + var renaming by remember { mutableStateOf(false) } + var adding by remember { mutableStateOf(false) } + var deleting by remember { mutableStateOf(false) } + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + AppDialog(shown, close, "soundtrackManage", wide = false, maxWidth = 420.dp) { + Column(verticalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth()) { + DialogTitleRow(stringResource(R.string.soundtracks_manage), onClose = close) + if (!favorites) PickerRow(Icons.Filled.Edit, stringResource(R.string.soundtracks_rename), null) { renaming = true } + PickerRow(Icons.Filled.Add, stringResource(R.string.soundtracks_add_tracks), null) { adding = true } + PickerRow(Icons.Filled.Remove, stringResource(R.string.soundtracks_remove_tracks), null) { onDismiss(); onRemoveMode() } + if (!favorites) PickerRow(Icons.Filled.Delete, stringResource(R.string.soundtracks_delete_collection), null) { deleting = true } + } + } + if (renaming) NameDialog( + stringResource(R.string.soundtracks_rename), name, stringResource(R.string.soundtracks_rename), + onConfirm = { SoundtrackCollections.rename(ctx, id, it) }, onDismiss = { renaming = false }, + ) + if (adding) TrackPickerDialog(id, games) { adding = false } + if (deleting) ConfirmDialog( + title = stringResource(R.string.soundtracks_delete_title, name), text = stringResource(R.string.soundtracks_delete_body), + confirm = stringResource(R.string.common_delete), + onConfirm = { SoundtrackCollections.delete(ctx, id); onDismiss() }, + onDismiss = { deleting = false }, + ) +} + +@Composable +internal fun TrackPickerDialog(id: Int, games: List, onDismiss: () -> Unit) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val hits by produceState?>(null, games) { value = withContext(Dispatchers.IO) { SoundtrackIndex.build(ctx, games) } } + var query by remember { mutableStateOf("") } + var picked by remember { mutableStateOf(setOf()) } + val have = SoundtrackCollections.tracksOf(id).mapTo(HashSet()) { it.path } + val list = hits?.distinctBy { it.ref.path }?.filter { it.ref.path !in have && SoundtrackTracks.matches(query, it.ref.title, it.ref.artist, it.ref.album) } + AlertDialog( + onDismissRequest = onDismiss, + title = { Text(stringResource(R.string.soundtracks_add_tracks)) }, + text = { + Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + AdbTextField( + value = query, onValueChange = { query = it }, label = "", keyboardType = KeyboardType.Text, imeAction = ImeAction.Search, + placeholder = stringResource(R.string.soundtracks_search_tracks), compact = true, + ) + Row(horizontalArrangement = Arrangement.spacedBy(4.dp), verticalAlignment = Alignment.CenterVertically) { + TextButton(onClick = { picked = picked + list.orEmpty().map { it.ref.path } }, modifier = Modifier.focusGlide(CircleShape)) { + Text(stringResource(R.string.soundtracks_select_all)) + } + TextButton(onClick = { picked = emptySet() }, modifier = Modifier.focusGlide(CircleShape)) { + Text(stringResource(R.string.soundtracks_deselect_all)) + } + } + if (list == null) Text(stringResource(R.string.store_section_loading), fontSize = 13.sp, color = colors.onSurfaceVariant) + else LazyColumn(Modifier.fillMaxWidth().heightIn(max = 340.dp).testTag("track-picker")) { + items(list, key = { it.ref.path }) { hit -> + val on = hit.ref.path in picked + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val toggle = { picked = if (on) picked - hit.ref.path else picked + hit.ref.path } + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), + modifier = Modifier.fillMaxWidth().clip(RoundedCornerShape(8.dp)).background(if (on) pal.signal.copy(alpha = 0.16f) else if (hot) Color.White.copy(alpha = 0.08f) else Color.Transparent) + .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Checkbox, onClick = toggle) + .controllerConfirm(onClick = toggle).padding(horizontal = 8.dp, vertical = 8.dp), + ) { + Icon( + if (on) Icons.Filled.CheckBox else Icons.Filled.CheckBoxOutlineBlank, contentDescription = null, + tint = if (on) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(20.dp), + ) + Column(Modifier.weight(1f)) { + Text(hit.ref.title, fontSize = 14.sp, color = colors.onSurface, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text( + listOf(hit.ref.album, hit.ref.artist).filter { it.isNotBlank() }.joinToString(" · "), + fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, + ) + } + if (hit.ref.durationMs > 0) Text(Soundtrack.formatLength(hit.ref.durationMs), fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1) + } + } + } + } + }, + confirmButton = { + TextButton( + enabled = picked.isNotEmpty(), + onClick = { + SoundtrackCollections.add(ctx, id, hits.orEmpty().filter { it.ref.path in picked }.map { it.ref }) + onDismiss() + }, + modifier = Modifier.focusGlide(CircleShape).testTag("picker-add"), + ) { Text(stringResource(R.string.soundtracks_add_count, picked.size)) } + }, + dismissButton = { TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, + ) +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackDetail.kt new file mode 100644 index 0000000000..896e94c343 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackDetail.kt @@ -0,0 +1,391 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.BookmarkBorder +import androidx.compose.material.icons.filled.Favorite +import androidx.compose.material.icons.filled.FavoriteBorder +import androidx.compose.material.icons.filled.Pause +import androidx.compose.material.icons.filled.PlayArrow +import androidx.compose.material.icons.filled.Repeat +import androidx.compose.material.icons.filled.RepeatOne +import androidx.compose.material.icons.filled.Shuffle +import androidx.compose.material.icons.filled.SkipNext +import androidx.compose.material.icons.filled.SkipPrevious +import androidx.compose.material.icons.filled.VolumeOff +import androidx.compose.material.icons.filled.VolumeUp +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Slider +import androidx.compose.material3.SliderDefaults +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableFloatStateOf +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.produceState +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.media3.common.Player +import coil.compose.AsyncImage +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.frontend.Soundtrack +import com.droiddeck.launcher.frontend.SoundtrackCollections +import com.droiddeck.launcher.frontend.SoundtrackOrder +import com.droiddeck.launcher.playback.SoundtrackController +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.withContext + +@Composable +internal fun SoundtrackDetail(key: String, s: FrontEndState, a: FrontEndActions, lead: FocusRequester, backLabel: String, onBack: () -> Unit) { + val appId = remember(key) { key.removePrefix("sound:").removePrefix("app:").toIntOrNull() } + val ctx = LocalContext.current + remember { SoundtrackCollections.load(ctx) } + val favoritesLabel = stringResource(R.string.soundtracks_favorites) + val snapshot = SoundtrackCollections.snapshot + val saved = remember(snapshot, favoritesLabel) { SoundtrackCollections.games(ctx, favoritesLabel) } + val game = s.soundtracks.firstOrNull { it.appId == appId } ?: saved.firstOrNull { it.appId == appId } + LaunchedEffect(game == null, s.soundtracksLoaded) { if (game == null && s.soundtracksLoaded) onBack() } + if (game == null) return + val narrow = LocalNarrowPane.current + val stacked = narrow || LocalConfiguration.current.screenWidthDp < 700 + val root = game.gameFiles + val collectionId = if (game.source == Library.SOURCE_COLLECTION) game.appId else null + val target = remember(root, collectionId) { PlayTarget(root, collectionId) } + val loadedAlbum by produceState(null, root, game.art, SoundtrackOrder.version) { + value = root?.let { dir -> withContext(Dispatchers.IO) { Soundtrack.load(ctx, dir, game.art) } } + } + val collectionAlbum = remember(snapshot, collectionId) { collectionId?.let { SoundtrackCollections.album(ctx, it) } } + val album = collectionAlbum ?: loadedAlbum + LaunchedEffect(Unit) { SoundtrackController.connect(ctx) } + val inset = LocalDetailInset.current + val currentTrack = if (target.belongs) SoundtrackController.currentId else null + val trackArt by produceState(null, currentTrack) { + value = currentTrack?.let { id -> withContext(Dispatchers.IO) { Soundtrack.trackCover(ctx, java.io.File(id)) } } + } + val pinned = game.art?.path.orEmpty().let { it.contains("/steam-art/") || it.contains("/soundtrack-art/") } + val art: Any? = if (pinned) game.art else trackArt ?: game.art ?: album?.cover + val refs = remember(snapshot, collectionId) { collectionId?.let { id -> SoundtrackCollections.tracksOf(id).associateBy { it.path } }.orEmpty() } + val coverPath = (game.art ?: album?.cover)?.path.orEmpty() + val refOf: (Soundtrack.Track) -> SoundtrackCollections.TrackRef = { t -> + refs[t.id] ?: SoundtrackCollections.TrackRef(t.id, t.title, t.artist.ifBlank { album?.artist.orEmpty() }, game.name, t.durationMs, coverPath) + } + var selectRequest by remember { mutableIntStateOf(0) } + val onReorder: ((List) -> Unit)? = when { + collectionId != null -> ({ paths: List -> SoundtrackCollections.reorder(ctx, collectionId, paths) }) + game.library == Library.ADDED && root != null -> ({ paths: List -> SoundtrackOrder.set(ctx, root, paths) }) + else -> null + } + GameBackdrop(art, art, hueOf(game.name), fadeTop = inset.top < 8.dp, artBlur = 24.dp) { + Column(Modifier.fillMaxWidth().padding(horizontal = inset.horizontal).padding(top = inset.top)) { + Rise(0) { + Row(Modifier.fillMaxWidth().padding(bottom = 8.dp), verticalAlignment = Alignment.CenterVertically) { + Box(Modifier.glass(CircleShape)) { BackLink(backLabel, compact = true, onClick = onBack) } + Spacer(Modifier.weight(1f)) + SourceBadge(game.source) + } + } + val loaded = album + if (stacked) Column(verticalArrangement = Arrangement.spacedBy(14.dp)) { + Rise(1) { SoundtrackPlayer(game, loaded, art, lead, s, a, target, refOf, collectionId) { selectRequest++ } } + if (loaded != null) Rise(2) { + TrackPanel(loaded, game.name, target, refOf, collectionId, selectRequest, onReorder, Modifier.fillMaxWidth().height((LocalConfiguration.current.screenHeightDp * 0.55f).dp)) + } + } else Row(horizontalArrangement = Arrangement.spacedBy(28.dp), modifier = Modifier.fillMaxWidth()) { + Rise(1, Modifier.weight(0.42f)) { SoundtrackPlayer(game, loaded, art, lead, s, a, target, refOf, collectionId) { selectRequest++ } } + if (loaded != null) Rise(2, Modifier.weight(0.58f)) { + TrackPanel(loaded, game.name, target, refOf, collectionId, selectRequest, onReorder, Modifier.fillMaxWidth().height((LocalConfiguration.current.screenHeightDp * 0.72f).dp)) + } + } + } + } +} + +@Composable +private fun SoundtrackPlayer( + game: Library.SteamGame, album: Soundtrack.Album?, art: Any?, lead: FocusRequester, s: FrontEndState, a: FrontEndActions, + target: PlayTarget, refOf: (Soundtrack.Track) -> SoundtrackCollections.TrackRef, collectionId: Int?, onRemoveMode: () -> Unit, +) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val belongs = target.belongs + val playing = belongs && SoundtrackController.playing + val shownArt: Any? = art + var saving by remember { mutableStateOf(false) } + Column(verticalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.fillMaxWidth()) { + Row(horizontalArrangement = Arrangement.spacedBy(16.dp), verticalAlignment = Alignment.Top) { + Box(Modifier.size(120.dp).clip(RoundedCornerShape(10.dp)).background(Color.Black.copy(alpha = 0.35f))) { + if (shownArt != null) AsyncImage(shownArt, contentDescription = game.name, contentScale = ContentScale.Fit, modifier = Modifier.matchParentSize().testTag("soundtrack-cover")) + } + Column(verticalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.weight(1f)) { + Text( + game.name, fontSize = 22.sp, lineHeight = 26.sp, fontWeight = FontWeight.Black, color = colors.onBackground, + maxLines = 2, overflow = TextOverflow.Ellipsis, + ) + val artist = album?.artist.orEmpty() + if (artist.isNotBlank()) Text(artist, fontSize = 14.sp, color = colors.onBackground.copy(alpha = 0.8f), maxLines = 1, overflow = TextOverflow.Ellipsis) + if (album != null && album.tracks.isNotEmpty()) { + Text( + stringResource(R.string.soundtracks_total_length).uppercase(), fontSize = 11.sp, fontWeight = FontWeight.Bold, letterSpacing = 0.8.sp, + color = colors.onSurfaceVariant, modifier = Modifier.padding(top = 4.dp), + ) + Text( + stringResource(R.string.soundtracks_length_value, album.tracks.size, Soundtrack.formatLength(album.totalMs)), + fontSize = 13.sp, color = colors.onBackground, + ) + } + } + } + Seek(target, album) + val shuffleLabel = stringResource(R.string.soundtracks_shuffle) + val previousLabel = stringResource(R.string.soundtracks_previous) + val playLabel = stringResource(if (playing) R.string.soundtracks_pause else R.string.soundtracks_play) + val nextLabel = stringResource(R.string.soundtracks_next) + val repeatLabel = stringResource( + when (SoundtrackController.repeat) { + Player.REPEAT_MODE_ALL -> R.string.soundtracks_repeat_all + Player.REPEAT_MODE_ONE -> R.string.soundtracks_repeat_one + else -> R.string.soundtracks_repeat_off + }, + ) + val loaded = album?.takeIf { it.tracks.isNotEmpty() } + Row(horizontalArrangement = Arrangement.spacedBy(14.dp, Alignment.CenterHorizontally), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) { + TransportButton(Icons.Filled.Shuffle, shuffleLabel, "sound:shuffle", on = belongs && SoundtrackController.shuffle, enabled = loaded != null) { + if (loaded == null) return@TransportButton + if (belongs) SoundtrackController.setShuffle(ctx, !SoundtrackController.shuffle) + else SoundtrackController.play(ctx, loaded, game.name, null, shuffled = true, root = target.root, collection = target.collection) + } + TransportButton(Icons.Filled.SkipPrevious, previousLabel, "sound:previous", enabled = loaded != null) { + if (loaded == null) return@TransportButton + if (belongs) SoundtrackController.previous(ctx) else SoundtrackController.play(ctx, loaded, game.name, null, root = target.root, collection = target.collection) + } + TransportButton( + if (playing) Icons.Filled.Pause else Icons.Filled.PlayArrow, playLabel, "sound:play", big = true, enabled = loaded != null, + modifier = Modifier.focusRequester(lead), + ) { + if (loaded != null) SoundtrackController.toggle(ctx, loaded, game.name, target.root, target.collection) + } + TransportButton(Icons.Filled.SkipNext, nextLabel, "sound:next", enabled = loaded != null) { + if (loaded == null) return@TransportButton + if (belongs) SoundtrackController.next(ctx) else SoundtrackController.play(ctx, loaded, game.name, null, root = target.root, collection = target.collection) + } + TransportButton( + if (SoundtrackController.repeat == Player.REPEAT_MODE_ONE) Icons.Filled.RepeatOne else Icons.Filled.Repeat, repeatLabel, "sound:repeat", + on = SoundtrackController.repeat != Player.REPEAT_MODE_OFF, enabled = loaded != null && belongs, + ) { SoundtrackController.cycleRepeat(ctx) } + } + val heartTrack = if (belongs) loaded?.tracks?.firstOrNull { it.id == SoundtrackController.currentId } else null + val liked = heartTrack != null && SoundtrackCollections.snapshot.favorites.any { it.path == heartTrack.id } + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End, verticalAlignment = Alignment.CenterVertically) { + TransportButton( + if (liked) Icons.Filled.Favorite else Icons.Filled.FavoriteBorder, stringResource(R.string.soundtracks_add_favorites), "sound:favorite", + on = liked, enabled = heartTrack != null, + ) { heartTrack?.let { SoundtrackCollections.toggleFavorite(ctx, refOf(it)) } } + TransportButton(Icons.Filled.BookmarkBorder, stringResource(R.string.soundtracks_saved), "sound:saved", enabled = heartTrack != null) { saving = true } + } + if (saving && heartTrack != null) SavedDialog(listOf(refOf(heartTrack)), null) { saving = false } + Volume() + Column(verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth().padding(top = 4.dp)) { + SoundtrackActions(game, s, a, collectionId, onRemoveMode) + } + } +} + +@Composable +private fun Seek(target: PlayTarget, album: Soundtrack.Album?) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val belongs = target.belongs + var position by remember { mutableFloatStateOf(0f) } + var dragging by remember { mutableStateOf(false) } + val duration = if (belongs) SoundtrackController.durationMs else 0L + LaunchedEffect(belongs, SoundtrackController.currentId) { + if (!belongs) { + if (!dragging) position = 0f + return@LaunchedEffect + } + while (true) { + if (!dragging) position = SoundtrackController.position().toFloat() + delay(400) + } + } + Column(verticalArrangement = Arrangement.spacedBy(0.dp), modifier = Modifier.fillMaxWidth()) { + Slider( + value = if (duration > 0) (position / duration).coerceIn(0f, 1f) else 0f, + onValueChange = { dragging = true; position = it * duration }, + onValueChangeFinished = { dragging = false; SoundtrackController.seekTo(ctx, position.toLong()) }, + enabled = belongs && duration > 0 && album != null, + colors = SliderDefaults.colors(thumbColor = pal.signal, activeTrackColor = pal.signal, inactiveTrackColor = colors.onBackground.copy(alpha = 0.18f)), + modifier = Modifier.fillMaxWidth().testTag("soundtrack-seek"), + ) + Row(Modifier.fillMaxWidth().padding(horizontal = 4.dp)) { + Text(Soundtrack.formatLength(position.toLong()), fontSize = 11.sp, color = colors.onSurfaceVariant) + Spacer(Modifier.weight(1f)) + Text(Soundtrack.formatLength(duration), fontSize = 11.sp, color = colors.onSurfaceVariant) + } + } +} + +@Composable +private fun Volume() { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + var level by remember { mutableFloatStateOf(SoundtrackController.volume) } + LaunchedEffect(SoundtrackController.volume) { level = SoundtrackController.volume } + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.fillMaxWidth()) { + Icon(if (level <= 0.001f) Icons.Filled.VolumeOff else Icons.Filled.VolumeUp, contentDescription = stringResource(R.string.soundtracks_volume), tint = colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) + Slider( + value = level, onValueChange = { level = it; SoundtrackController.setVolume(ctx, it) }, + colors = SliderDefaults.colors(thumbColor = pal.signal, activeTrackColor = pal.signal, inactiveTrackColor = colors.onBackground.copy(alpha = 0.18f)), + modifier = Modifier.weight(1f).testTag("soundtrack-volume"), + ) + } +} + +@Composable +private fun TransportButton( + icon: ImageVector, label: String, id: String, big: Boolean = false, on: Boolean = false, enabled: Boolean = true, + modifier: Modifier = Modifier, onClick: () -> Unit, +) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) && enabled + val size = if (big) 60.dp else 44.dp + val fill = when { + big -> pal.signal.copy(alpha = if (hot) 1f else 0.9f) + hot -> pal.signal.copy(alpha = 0.16f) + else -> Color.Transparent + } + Box( + contentAlignment = Alignment.Center, + modifier = modifier.paneItem(id).testTag(id).size(size).clip(CircleShape).background(fill) + .glideBorder(hot, CircleShape, pal.signal, if (big) Color.Transparent else Color.Transparent) + .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, enabled = enabled, onClick = onClick) + .controllerConfirm(enabled = enabled, onClick = onClick) + .semantics { contentDescription = label }, + ) { + Icon( + icon, contentDescription = null, + tint = when { + big -> colors.background + !enabled -> colors.onSurfaceVariant.copy(alpha = 0.4f) + on -> pal.signal + else -> colors.onBackground + }, + modifier = Modifier.size(if (big) 34.dp else 26.dp), + ) + } +} + +@Composable +private fun SeeMoreButton(label: String, id: String, danger: Boolean = false, modifier: Modifier = Modifier, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val shape = RoundedCornerShape(10.dp) + val accent = if (danger) colors.error else pal.signal + Box( + contentAlignment = Alignment.Center, + modifier = modifier.fillMaxWidth().paneItem(id).testTag(id).heightIn(min = 44.dp).clip(shape) + .background(if (hot) accent.copy(alpha = 0.16f) else Color.White.copy(alpha = 0.09f)) + .glideBorder(hot, shape, accent, Color.White.copy(alpha = 0.10f)) + .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onClick) + .controllerConfirm(onClick = onClick) + .padding(horizontal = 16.dp, vertical = 10.dp), + ) { + Text( + label, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, textAlign = TextAlign.Center, + color = if (danger && hot) colors.error else colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, + ) + } +} + +@Composable +private fun SoundtrackActions(game: Library.SteamGame, s: FrontEndState, a: FrontEndActions, collectionId: Int?, onRemoveMode: () -> Unit) { + var options by remember { mutableStateOf(false) } + var managing by remember { mutableStateOf(false) } + if (collectionId != null) SeeMoreButton(stringResource(R.string.soundtracks_manage), "sound:manage") { managing = true } + if (managing && collectionId != null) ManageDialog(collectionId, s.soundtracks, onRemoveMode) { managing = false } + SeeMoreButton(stringResource(R.string.soundtracks_options), "sound:options") { options = true } + if (options) SoundtrackOptionsDialog { options = false } + game.gameFiles?.takeIf { it.isDirectory }?.let { dir -> + SeeMoreButton(stringResource(R.string.games_files), "sound:files") { a.onBrowseFiles(dir) } + } + var menu by remember(game.appId) { mutableStateOf(false) } + Box { + SeeMoreButton(stringResource(R.string.game_shortcut), "sound:shortcut") { menu = !menu } + AnchoredMenu(menu, onDismiss = { menu = false }, title = stringResource(R.string.game_shortcut)) { first -> + MenuItem(stringResource(R.string.game_shortcut_add), checked = false, focusRequester = first) { menu = false; a.onGameShortcut(game) } + MenuItem(stringResource(R.string.game_link_copy), checked = false) { menu = false; a.onCopyGameLink(game) } + } + } + var collectionArt by remember(game.appId) { mutableStateOf(false) } + val ownArt = game.library == Library.ADDED + if (ownArt) SeeMoreButton(stringResource(R.string.game_edit_art), "sound:art") { collectionArt = true } + else SeeMoreButton(stringResource(R.string.game_edit_art), "sound:art") { GamesDialogState.steamArt = game } + if (collectionArt && ownArt) CollectionArtEditor( + game.appId, game.name, game.gameFiles, + onClose = { collectionArt = false }, + onChanged = { if (collectionId != null) SoundtrackCollections.refresh() else a.onSoundtracksChanged() }, + ) + if (collectionId != null) return + var asking by remember(game.appId) { mutableStateOf(false) } + val added = game.library == Library.ADDED + val label = stringResource(if (added) R.string.edit_remove else R.string.common_uninstall) + SeeMoreButton(label, "sound:remove", danger = true) { asking = true } + if (asking) ConfirmDialog( + title = if (added) stringResource(R.string.games_remove_title, game.name) else stringResource(R.string.stores_uninstall_title, game.name), + text = if (added) stringResource(R.string.games_remove_body) else stringResource(R.string.games_uninstall_body), + confirm = label, + onConfirm = { a.onSoundtrackRemoved(game) }, + onDismiss = { asking = false }, + ) +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackIcon.kt b/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackIcon.kt new file mode 100644 index 0000000000..70c1fd0178 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackIcon.kt @@ -0,0 +1,15 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.unit.dp + +private const val NOTES = "M8.4,4.5 L20,2 V6 L8.4,8.5 Z M8.4,4.5 H10.6 V17.5 H8.4 Z M17.9,2 H20 V15.5 H17.9 Z M7.2,14.7 A3.4,2.8 0 1,0 7.2,20.3 A3.4,2.8 0 1,0 7.2,14.7 Z M16.6,12.7 A3.4,2.8 0 1,0 16.6,18.3 A3.4,2.8 0 1,0 16.6,12.7 Z" + +internal val SoundtrackIcon: ImageVector by lazy { + ImageVector.Builder("Soundtrack", 24.dp, 24.dp, 24f, 24f) + .addPath(addPathNodes(NOTES), fill = SolidColor(Color.Black)) + .build() +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackOptions.kt b/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackOptions.kt new file mode 100644 index 0000000000..dc9fadfa28 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackOptions.kt @@ -0,0 +1,217 @@ +package com.droiddeck.launcher.ui + +import android.media.AudioManager +import android.media.audiofx.BassBoost +import android.media.audiofx.Equalizer +import androidx.compose.foundation.background +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.selection.selectable +import androidx.compose.foundation.selection.toggleable +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Slider +import androidx.compose.material3.SliderDefaults +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableLongStateOf +import androidx.compose.runtime.produceState +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Soundtrack +import com.droiddeck.launcher.playback.SoundtrackController +import com.droiddeck.launcher.playback.SoundtrackSettings +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.withContext +import kotlin.math.roundToInt + +private class EqInfo( + val bands: Int, val min: Int, val max: Int, val freqs: List, val presets: List>>, val bassSupported: Boolean, +) + +private fun readEqInfo(audio: AudioManager): EqInfo? = runCatching { + val id = audio.generateAudioSessionId() + val eq = Equalizer(0, id) + try { + val count = eq.numberOfBands.toInt() + val presets = (0 until eq.numberOfPresets.toInt()).map { preset -> + eq.usePreset(preset.toShort()) + eq.getPresetName(preset.toShort()) to (0 until count).map { eq.getBandLevel(it.toShort()).toInt() } + } + val bass = runCatching { BassBoost(0, id).let { b -> try { b.strengthSupported } finally { b.release() } } }.getOrDefault(false) + EqInfo( + count, eq.bandLevelRange[0].toInt(), eq.bandLevelRange[1].toInt(), + (0 until count).map { eq.getCenterFreq(it.toShort()) / 1000 }, presets, bass, + ) + } finally { + eq.release() + } +}.getOrNull() + +@Composable +internal fun SoundtrackOptionsDialog(onDismiss: () -> Unit) { + val ctx = LocalContext.current + LaunchedEffect(Unit) { SoundtrackSettings.load(ctx) } + AlertDialog( + onDismissRequest = onDismiss, + title = { Text(stringResource(R.string.soundtracks_options)) }, + text = { + Column(Modifier.verticalScroll(rememberScrollState()), verticalArrangement = Arrangement.spacedBy(16.dp)) { + RateRow(stringResource(R.string.theme_rgb_speed), SoundtrackSettings.speed, "soundtrack-speed") { SoundtrackController.setSpeed(ctx, it) } + RateRow(stringResource(R.string.soundtracks_pitch), SoundtrackSettings.pitch, "soundtrack-pitch") { SoundtrackController.setPitch(ctx, it) } + SwitchRow(stringResource(R.string.soundtracks_skip_silence), SoundtrackSettings.skipSilence, "soundtrack-skip-silence") { + SoundtrackController.setSkipSilence(ctx, it) + } + SleepSection() + EqualizerSection() + } + }, + confirmButton = { TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_close)) } }, + ) +} + +@Composable +private fun RateRow(label: String, value: Float, tag: String, onChange: (Float) -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Column(verticalArrangement = Arrangement.spacedBy(2.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(label, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onSurface, modifier = Modifier.weight(1f)) + Text("%.2f×".format(value), fontSize = 14.sp, color = colors.onSurfaceVariant) + TextButton(onClick = { onChange(1f) }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.soundtracks_reset)) } + } + Slider( + value = value, onValueChange = { v -> (v * 20f).roundToInt().div(20f).let { if (it != value) onChange(it) } }, + valueRange = SoundtrackSettings.MIN_RATE..SoundtrackSettings.MAX_RATE, steps = 29, + colors = SliderDefaults.colors(thumbColor = pal.signal, activeTrackColor = pal.signal, inactiveTrackColor = colors.onSurface.copy(alpha = 0.18f)), + modifier = Modifier.fillMaxWidth().testTag(tag), + ) + } +} + +@Composable +private fun SwitchRow(label: String, checked: Boolean, tag: String, onChange: (Boolean) -> Unit) { + val colors = MaterialTheme.colorScheme + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth().focusGlide(RoundedCornerShape(12.dp)).toggleable(checked, role = Role.Switch, onValueChange = onChange).padding(vertical = 4.dp).testTag(tag), + ) { + Text(label, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onSurface, modifier = Modifier.weight(1f)) + Switch(checked = checked, onCheckedChange = null) + } +} + +@Composable +private fun OptionChip(label: String, selected: Boolean, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val shape = RoundedCornerShape(99.dp) + Text( + label, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, + color = if (selected) pal.signal else colors.onSurface, + modifier = Modifier.focusGlide(shape).clip(shape) + .background(if (selected) pal.signal.copy(alpha = 0.18f) else colors.onSurface.copy(alpha = 0.08f)) + .selectable(selected = selected, role = Role.RadioButton, onClick = onClick) + .padding(horizontal = 14.dp, vertical = 8.dp), + ) +} + +@Composable +private fun SleepSection() { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + var left by remember { mutableLongStateOf(0L) } + LaunchedEffect(Unit) { + while (true) { + left = SoundtrackController.sleepRemainingMs() + delay(1000) + } + } + val trackEnd = SoundtrackController.sleepTrackEnd + val timed = left > 0L + Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(stringResource(R.string.soundtracks_sleep), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onSurface, modifier = Modifier.weight(1f)) + if (timed) Text(stringResource(R.string.soundtracks_sleep_left, Soundtrack.formatLength(left)), fontSize = 13.sp, color = colors.onSurfaceVariant) + } + Row(Modifier.horizontalScroll(rememberScrollState()), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + OptionChip(stringResource(R.string.perf_cap_off), !timed && !trackEnd) { SoundtrackController.setSleep(ctx, 0) } + for (minutes in listOf(15, 30, 60)) OptionChip(stringResource(R.string.soundtracks_sleep_minutes, minutes), false) { SoundtrackController.setSleep(ctx, minutes) } + OptionChip(stringResource(R.string.soundtracks_sleep_track_end), trackEnd) { SoundtrackController.setSleep(ctx, -1) } + } + } +} + +@Composable +private fun EqualizerSection() { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val info by produceState(null) { + value = withContext(Dispatchers.IO) { readEqInfo(ctx.getSystemService(AudioManager::class.java)) } + } + val ready = info + val on = SoundtrackSettings.eqOn + val levels = ready?.let { i -> SoundtrackSettings.bands.takeIf { it.size == i.bands } ?: List(i.bands) { 0 } }.orEmpty() + val bass = SoundtrackSettings.bass + Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + SwitchRow(stringResource(R.string.soundtracks_equalizer), on && ready != null, "soundtrack-eq") { + if (ready != null) SoundtrackController.setEqualizer(ctx, it, levels, bass) + } + if (ready == null || ready.bands == 0) { + if (ready != null) Text(stringResource(R.string.soundtracks_eq_unavailable), fontSize = 13.sp, color = colors.onSurfaceVariant) + return@Column + } + if (ready.presets.isNotEmpty()) Row(Modifier.horizontalScroll(rememberScrollState()), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + for ((name, preset) in ready.presets) OptionChip(name, on && preset == levels) { SoundtrackController.setEqualizer(ctx, true, preset, bass) } + } + for (band in 0 until ready.bands) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { + val hz = ready.freqs[band] + Text(if (hz >= 1000) "%.1f kHz".format(hz / 1000f) else "$hz Hz", fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(end = 2.dp)) + Slider( + value = levels[band].toFloat(), valueRange = ready.min.toFloat()..ready.max.toFloat(), + onValueChange = { v -> SoundtrackController.setEqualizer(ctx, true, levels.toMutableList().also { it[band] = v.roundToInt() }, bass) }, + colors = SliderDefaults.colors(thumbColor = pal.signal, activeTrackColor = pal.signal, inactiveTrackColor = colors.onSurface.copy(alpha = 0.18f)), + modifier = Modifier.weight(1f).testTag("soundtrack-eq-$band"), + ) + } + } + if (ready.bassSupported) Column { + Text(stringResource(R.string.soundtracks_bass), fontSize = 13.sp, color = colors.onSurfaceVariant) + Slider( + value = bass.toFloat(), valueRange = 0f..1000f, + onValueChange = { v -> SoundtrackController.setEqualizer(ctx, true, levels, v.roundToInt()) }, + colors = SliderDefaults.colors(thumbColor = pal.signal, activeTrackColor = pal.signal, inactiveTrackColor = colors.onSurface.copy(alpha = 0.18f)), + modifier = Modifier.fillMaxWidth().testTag("soundtrack-bass"), + ) + } + TextButton(onClick = { SoundtrackController.setEqualizer(ctx, on, List(ready.bands) { 0 }, 0) }, modifier = Modifier.focusGlide(CircleShape)) { + Text(stringResource(R.string.soundtracks_reset)) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackTrackPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackTrackPanel.kt new file mode 100644 index 0000000000..c0769536c7 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackTrackPanel.kt @@ -0,0 +1,391 @@ +package com.droiddeck.launcher.ui + +import androidx.activity.compose.BackHandler +import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.combinedClickable +import androidx.compose.foundation.gestures.detectDragGesturesAfterLongPress +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.CheckBox +import androidx.compose.material.icons.filled.CheckBoxOutlineBlank +import androidx.compose.material.icons.filled.PlayArrow +import androidx.compose.material.icons.filled.Sort +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableFloatStateOf +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.rememberCoroutineScope +import kotlinx.coroutines.launch +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.rememberUpdatedState +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.zIndex +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Soundtrack +import com.droiddeck.launcher.frontend.SoundtrackCollections +import com.droiddeck.launcher.frontend.SoundtrackTracks +import com.droiddeck.launcher.playback.SoundtrackController + +internal class PlayTarget(val root: java.io.File?, val collection: Int?) { + val belongs: Boolean get() = if (collection != null) SoundtrackController.belongsCollection(collection) else SoundtrackController.belongs(root) +} + +private sealed interface SoundRow { + class Disc(val number: Int, val label: String) : SoundRow + class Item(val track: Soundtrack.Track) : SoundRow +} + +private fun rowsOf(album: Soundtrack.Album): List = buildList { + for ((disc, tracks) in album.disc) { + if (album.multiDisc) add(SoundRow.Disc(disc, tracks.firstOrNull()?.discLabel ?: disc.toString())) + tracks.forEach { add(SoundRow.Item(it)) } + } +} + +@Composable +private fun sortLabel(sort: SoundtrackTracks.Sort): String = stringResource( + when (sort) { + SoundtrackTracks.Sort.DEFAULT -> R.string.soundtracks_sort_default + SoundtrackTracks.Sort.TITLE_ASC -> R.string.stores_sort_title_asc + SoundtrackTracks.Sort.TITLE_DESC -> R.string.stores_sort_title_desc + SoundtrackTracks.Sort.LONGEST -> R.string.soundtracks_sort_longest + SoundtrackTracks.Sort.SHORTEST -> R.string.soundtracks_sort_shortest + }, +) + +@Composable +internal fun TrackPanel( + album: Soundtrack.Album, title: String, target: PlayTarget, refOf: (Soundtrack.Track) -> SoundtrackCollections.TrackRef, + collectionId: Int?, selectRequest: Int, onReorder: ((List) -> Unit)?, modifier: Modifier, +) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + var query by remember { mutableStateOf("") } + var sort by remember { mutableStateOf(SoundtrackTracks.Sort.DEFAULT) } + var sortMenu by remember { mutableStateOf(false) } + var selecting by remember { mutableStateOf(false) } + var picked by remember { mutableStateOf(setOf()) } + var saving by remember { mutableStateOf(false) } + val leave: () -> Unit = { + selecting = false + picked = emptySet() + } + LaunchedEffect(selectRequest) { if (selectRequest > 0) selecting = true } + BackHandler(enabled = selecting) { leave() } + val rows: List = remember(album, query, sort) { + if (sort == SoundtrackTracks.Sort.DEFAULT && query.isBlank()) rowsOf(album) + else SoundtrackTracks.sort( + album.tracks.filter { SoundtrackTracks.matches(query, it.title, it.artist) }, sort, { it.title }, { it.durationMs }, + ).map { SoundRow.Item(it) } + } + val rowIds = rows.filterIsInstance().map { it.track.id } + var working by remember(rowIds) { mutableStateOf?>(null) } + val display = working ?: rows + val canReorder = onReorder != null && sort == SoundtrackTracks.Sort.DEFAULT && query.isBlank() && selecting + var dragId by remember { mutableStateOf(null) } + var dragTotal by remember { mutableFloatStateOf(0f) } + var dragTo by remember { mutableIntStateOf(0) } + val numbers = remember(display) { + val out = HashMap() + var n = 0 + for (row in display) { + if (row is SoundRow.Disc) n = 0 + else if (row is SoundRow.Item) out[row.track.id] = ++n + } + out + } + val state = rememberLazyListState() + val scope = rememberCoroutineScope() + val drag = remember { DragState() } + fun applyDrag() { + drag.total = drag.total.coerceIn((drag.lo - drag.from) * drag.size, (drag.hi - drag.from) * drag.size) + dragTotal = drag.total + dragTo = dragTarget(drag.total, drag.size, drag.from, drag.lo, drag.hi) + } + val finishDrag: () -> Unit = { + if (dragId != null) { + val from = drag.from + val to = dragTo + if (to != from && from in drag.base.indices) { + val moved = drag.base.toMutableList().apply { add(to, removeAt(from)) } + val index = state.firstVisibleItemIndex + val offset = state.firstVisibleItemScrollOffset + working = moved + scope.launch { state.scrollToItem(index, offset) } + onReorder?.invoke(moved.filterIsInstance().map { it.track.id }) + } + dragId = null + dragTotal = 0f + dragTo = from + } + } + val rowsNow by rememberUpdatedState(rows) + val finishNow by rememberUpdatedState(finishDrag) + val current = if (target.belongs) SoundtrackController.currentId else null + var scrolledTo by remember { mutableStateOf(null) } + LaunchedEffect(album, current) { + if (current == null) { + scrolledTo = null + return@LaunchedEffect + } + if (dragId != null || current == scrolledTo) return@LaunchedEffect + val at = rows.indexOfFirst { it is SoundRow.Item && it.track.id == current } + if (at >= 0) { + scrolledTo = current + state.animateScrollToItem(at) + } + } + val chosen = album.tracks.filter { it.id in picked }.map(refOf) + Column(modifier) { + Row(Modifier.fillMaxWidth().padding(bottom = 8.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { + Box(Modifier.weight(1f)) { + AdbTextField( + value = query, onValueChange = { query = it }, label = "", keyboardType = KeyboardType.Text, imeAction = ImeAction.Search, + placeholder = stringResource(R.string.soundtracks_search_tracks), compact = true, + ) + } + Box { + HeaderIconButton(stringResource(R.string.stores_sort), Icons.Filled.Sort, "tracks-sort") { sortMenu = !sortMenu } + AnchoredMenu(sortMenu, onDismiss = { sortMenu = false }, title = stringResource(R.string.stores_sort)) { first -> + SoundtrackTracks.Sort.values().forEachIndexed { i, option -> + MenuItem(sortLabel(option), checked = option == sort, focusRequester = if (i == 0) first else null) { + sort = option + sortMenu = false + } + } + } + } + HeaderIconButton(stringResource(R.string.soundtracks_select), Icons.Filled.CheckBox, "tracks-select") { + if (selecting) leave() else selecting = true + } + } + if (selecting) Row( + Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).padding(bottom = 6.dp), + horizontalArrangement = Arrangement.spacedBy(2.dp), verticalAlignment = Alignment.CenterVertically, + ) { + Text(stringResource(R.string.soundtracks_selected, picked.size), fontSize = 13.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(horizontal = 6.dp)) + TextButton(onClick = { picked = rowIds.toSet() }, modifier = Modifier.focusGlide(CircleShape).testTag("tracks-select-all")) { + Text(stringResource(R.string.soundtracks_select_all)) + } + TextButton(onClick = { picked = emptySet() }, modifier = Modifier.focusGlide(CircleShape).testTag("tracks-deselect-all")) { + Text(stringResource(R.string.soundtracks_deselect_all)) + } + TextButton(enabled = picked.isNotEmpty(), onClick = { saving = true }, modifier = Modifier.focusGlide(CircleShape).testTag("tracks-add-collection")) { + Text(stringResource(R.string.soundtracks_add_to_collection)) + } + TextButton( + enabled = picked.isNotEmpty(), + onClick = { + SoundtrackCollections.add(ctx, SoundtrackCollections.FAVORITES_ID, chosen) + leave() + }, + modifier = Modifier.focusGlide(CircleShape).testTag("tracks-add-favorites"), + ) { Text(stringResource(R.string.soundtracks_add_favorites)) } + if (collectionId != null) TextButton( + enabled = picked.isNotEmpty(), + onClick = { + SoundtrackCollections.remove(ctx, collectionId, picked) + leave() + }, + modifier = Modifier.focusGlide(CircleShape).testTag("tracks-remove"), + ) { Text(stringResource(R.string.soundtracks_remove_from_collection)) } + TextButton(onClick = leave, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } + } + if (display.isEmpty()) Text( + stringResource(if (album.tracks.isEmpty()) R.string.soundtracks_no_tracks else R.string.stores_nothing_matches), + fontSize = 13.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(top = 12.dp), + ) + else LazyColumn( + state = state, + modifier = Modifier.weight(1f).fillMaxWidth().clip(RoundedCornerShape(10.dp)).background(Color.Black.copy(alpha = 0.28f)).testTag("soundtrack-tracks"), + ) { + items(display, key = { if (it is SoundRow.Item) it.track.id else "disc-${(it as SoundRow.Disc).number}" }) { row -> + when (row) { + is SoundRow.Disc -> Text( + stringResource(R.string.soundtracks_disc, row.label), fontSize = 13.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, + modifier = Modifier.fillMaxWidth().background(Color.White.copy(alpha = 0.12f)).padding(horizontal = 12.dp, vertical = 8.dp), + ) + is SoundRow.Item -> { + val id = row.track.id + val flip = { picked = if (id in picked) picked - id else picked + id } + val dragging = dragId == id + val draggable = canReorder && id in picked + val shift = if (!canReorder) Modifier else Modifier + .zIndex(if (dragging) 1f else 0f) + .graphicsLayer { + translationY = when { + dragId == null -> 0f + dragId == id -> dragTotal + else -> { + val at = drag.index[id] ?: -1 + val f = drag.from + val t = dragTo + if (at < 0) 0f + else if (f < t && at in (f + 1)..t) -drag.size + else if (t < f && at in t until f) drag.size + else 0f + } + } + } + val dragModifier = if (!draggable) shift else shift + .pointerInput(id) { + detectDragGesturesAfterLongPress( + onDragStart = { + val base = working ?: rowsNow + val from = base.indexOfFirst { it is SoundRow.Item && it.track.id == id } + if (from >= 0) { + val disc = (base[from] as SoundRow.Item).track.disc + var lo = from + while (lo > 0 && (base[lo - 1] as? SoundRow.Item)?.track?.disc == disc) lo-- + var hi = from + while (hi < base.lastIndex && (base[hi + 1] as? SoundRow.Item)?.track?.disc == disc) hi++ + val visible = state.layoutInfo.visibleItemsInfo + val me = visible.firstOrNull { it.key == id } + val next = visible.firstOrNull { it.index == (me?.index ?: -2) + 1 && it.key != "disc-0" && base.getOrNull(from + 1) is SoundRow.Item } + val prev = visible.firstOrNull { it.index == (me?.index ?: -2) - 1 && base.getOrNull(from - 1) is SoundRow.Item } + val pitch = when { + me != null && next != null -> (next.offset - me.offset).toFloat() + me != null && prev != null -> (me.offset - prev.offset).toFloat() + else -> me?.size?.toFloat() ?: 0f + } + drag.base = base + drag.index = HashMap().also { m -> base.forEachIndexed { i, r -> if (r is SoundRow.Item) m[r.track.id] = i } } + drag.from = from + drag.lo = lo + drag.hi = hi + drag.size = if (pitch > 0f) pitch else 1f + drag.total = 0f + dragTotal = 0f + dragTo = from + dragId = id + } + }, + onDrag = { change, amount -> + change.consume() + if (dragId == id) { + drag.total += amount.y + applyDrag() + } + }, + onDragEnd = { finishNow() }, + onDragCancel = { finishNow() }, + ) + } + TrackRow( + row.track, numbers[id] ?: row.track.number, dragging, dragModifier, id == current, selecting, id in picked, + onClick = { + if (selecting) flip() + else if (id == current) SoundtrackController.toggle(ctx, album, title, target.root, target.collection) + else SoundtrackController.play(ctx, album, title, id, root = target.root, collection = target.collection) + }, + onLongClick = if (draggable) null else ({ + if (selecting) flip() + else { + selecting = true + picked = setOf(id) + } + }), + ) + } + } + } + } + } + if (saving) SavedDialog(chosen, null) { + saving = false + leave() + } +} + +@OptIn(ExperimentalFoundationApi::class) +@Composable +private fun TrackRow( + track: Soundtrack.Track, number: Int, dragging: Boolean, extra: Modifier, current: Boolean, selecting: Boolean, selected: Boolean, + onClick: () -> Unit, onLongClick: (() -> Unit)?, +) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val shape = RoundedCornerShape(8.dp) + val tint = if (current) pal.signal else colors.onBackground + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), + modifier = extra.fillMaxWidth().padding(horizontal = 4.dp, vertical = 1.dp).clip(shape) + .background(if (dragging) pal.signal.copy(alpha = 0.32f) else if (selected) pal.signal.copy(alpha = 0.24f) else if (current) pal.signal.copy(alpha = 0.14f) else if (hot) Color.White.copy(alpha = 0.08f) else Color.Transparent) + .glideBorder(hot, shape, pal.signal, Color.Transparent) + .hoverable(src) + .combinedClickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onLongClick = onLongClick, onClick = onClick) + .controllerConfirm(onClick = onClick) + .padding(horizontal = 10.dp, vertical = 9.dp), + ) { + Box(Modifier.width(28.dp), contentAlignment = Alignment.CenterEnd) { + when { + selecting -> Icon( + if (selected) Icons.Filled.CheckBox else Icons.Filled.CheckBoxOutlineBlank, contentDescription = null, + tint = if (selected) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(20.dp), + ) + current && SoundtrackController.playing -> Icon(Icons.Filled.PlayArrow, contentDescription = null, tint = tint, modifier = Modifier.size(16.dp)) + else -> Text("$number.", fontSize = 13.sp, color = if (current) pal.signal else colors.onSurfaceVariant, maxLines = 1) + } + } + Text( + track.title, fontSize = 14.sp, color = tint, fontWeight = if (current) FontWeight.SemiBold else FontWeight.Normal, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f), + ) + if (track.durationMs > 0) Text(Soundtrack.formatLength(track.durationMs), fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1) + } +} + +private class DragState { + var base: List = emptyList() + var index: Map = emptyMap() + var from = 0 + var lo = 0 + var hi = 0 + var size = 1f + var total = 0f +} + +internal fun dragTarget(total: Float, size: Float, from: Int, lo: Int, hi: Int): Int = + (from + Math.round(total / size)).coerceIn(lo, hi) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt index f1afd42c0d..3921df7f32 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt @@ -25,6 +25,8 @@ internal const val FLATHUB = "flathub" internal class SourceColours(val fill: Color, val ink: Color, val dot: Color) +internal val FavoritesColours = SourceColours(Color(0xFF3D1A26), Color(0xFFFFB3C8), Color(0xFFFF5C8A)) + internal fun sourceColours(source: String): SourceColours = when (source) { Store.GOG.id -> SourceColours(Color(0xFF3A1A3C), Color(0xFFE6A3EA), Color(0xFFC25BC8)) Store.EPIC.id -> SourceColours(Color(0xFF2A2A2A), Color(0xFFDDDDDD), Color(0xFFBDBDBD)) @@ -37,6 +39,7 @@ internal fun sourceColours(source: String): SourceColours = when (source) { Store.EA.id -> SourceColours(Color(0xFF3A0E12), Color(0xFFFF9A9A), Color(0xFFFF4747)) Store.ROCKSTAR.id -> SourceColours(Color(0xFF3A2A06), Color(0xFFFFD780), Color(0xFFFCAF17)) Library.SOURCE_STEAM -> SourceColours(Color(0xFF16293D), Color(0xFF7CC4FF), Color(0xFF1A9FFF)) + Library.SOURCE_COLLECTION -> SourceColours(Color(0xFF2B1A3D), Color(0xFFD2A8FF), Color(0xFFA25BFF)) FLATHUB -> SourceColours(Color(0xFF0B2E2B), Color(0xFF9FE3DD), FlathubTeal) else -> SourceColours(Color(0xFF1A1D22), Color(0xFF9AA3AF), Color(0xFF9AA3AF)) } @@ -44,6 +47,7 @@ internal fun sourceColours(source: String): SourceColours = when (source) { @Composable internal fun sourceLabel(source: String): String = when (source) { Library.SOURCE_STEAM -> stringResource(R.string.source_steam) + Library.SOURCE_COLLECTION -> stringResource(R.string.soundtracks_collections) Store.GOG.id -> Store.GOG.label Store.EPIC.id -> Store.EPIC.label Store.AMAZON.id -> Store.AMAZON.label @@ -58,10 +62,10 @@ internal fun sourceLabel(source: String): String = when (source) { } @Composable -internal fun SourceChip(source: String, small: Boolean = false, modifier: Modifier = Modifier) { - val c = sourceColours(source) +internal fun SourceChip(source: String, small: Boolean = false, modifier: Modifier = Modifier, label: String? = null, colours: SourceColours? = null) { + val c = colours ?: sourceColours(source) Text( - sourceLabel(source), fontSize = if (small) 10.sp else 11.sp, fontWeight = FontWeight.Bold, letterSpacing = 0.4.sp, + label ?: sourceLabel(source), fontSize = if (small) 10.sp else 11.sp, fontWeight = FontWeight.Bold, letterSpacing = 0.4.sp, color = c.ink, maxLines = 1, modifier = modifier.clip(RoundedCornerShape(6.dp)).background(c.fill) .padding(horizontal = if (small) 6.dp else 8.dp, vertical = if (small) 1.dp else 2.dp), diff --git a/app/src/main/res/drawable/ic_repeat_all.xml b/app/src/main/res/drawable/ic_repeat_all.xml new file mode 100644 index 0000000000..c696a476a6 --- /dev/null +++ b/app/src/main/res/drawable/ic_repeat_all.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/drawable/ic_repeat_off.xml b/app/src/main/res/drawable/ic_repeat_off.xml new file mode 100644 index 0000000000..e989d57d7b --- /dev/null +++ b/app/src/main/res/drawable/ic_repeat_off.xml @@ -0,0 +1,11 @@ + + + + diff --git a/app/src/main/res/drawable/ic_repeat_one.xml b/app/src/main/res/drawable/ic_repeat_one.xml new file mode 100644 index 0000000000..fda860fcc2 --- /dev/null +++ b/app/src/main/res/drawable/ic_repeat_one.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/drawable/ic_shuffle_off.xml b/app/src/main/res/drawable/ic_shuffle_off.xml new file mode 100644 index 0000000000..3ede806a20 --- /dev/null +++ b/app/src/main/res/drawable/ic_shuffle_off.xml @@ -0,0 +1,11 @@ + + + + diff --git a/app/src/main/res/drawable/ic_shuffle_on.xml b/app/src/main/res/drawable/ic_shuffle_on.xml new file mode 100644 index 0000000000..8f62d5de55 --- /dev/null +++ b/app/src/main/res/drawable/ic_shuffle_on.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/drawable/ic_soundtrack.xml b/app/src/main/res/drawable/ic_soundtrack.xml new file mode 100644 index 0000000000..00839efe01 --- /dev/null +++ b/app/src/main/res/drawable/ic_soundtrack.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 36d31630f5..f92ce94ee7 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -3839,4 +3839,67 @@ ثلج قرمزي + الموسيقى التصويرية + الموسيقى + خيارات التشغيل + المفضلة + المجموعات + لا توجد مجموعات بعد. اضغط على أيقونة الإشارة المرجعية لإنشاء مجموعة. + المحفوظات + إنشاء مجموعة + نظّم ما حفظته + جديد + إنشاء + اسم المجموعة + أدخل اسمًا لا تستخدمه أي مجموعة أخرى + إدارة + إعادة تسمية + إضافة مقاطع + إضافة (%1$d) + إزالة مقاطع + حذف المجموعة + حذف %1$s؟ + تبقى المقاطع على جهازك. تتم إزالة المجموعة فقط. + تحديد + تحديد الكل + إلغاء تحديد الكل + تم تحديد %1$d + إضافة إلى مجموعة + إضافة إلى المفضلة + إزالة من المجموعة + ابحث في المقاطع + ترتيب الألبوم + الأطول أولًا + الأقصر أولًا + المقاطع + طبقة الصوت + إعادة ضبط + تخطي الصمت + مؤقت النوم + %1$d د + نهاية المقطع + متبقي %1$s + المعادل + تعزيز الجهير + المعادل غير متاح على هذا الجهاز + الموسيقى التصويرية + تفعيل أثناء اللعب + استمر في تشغيل الموسيقى التصويرية أثناء تشغيل اللعبة + لا توجد موسيقى تصويرية مثبّتة بعد. + ابحث في الموسيقى التصويرية + إضافة مجلد موسيقى تصويرية + لا توجد ملفات صوتية في هذا المجلد + المدة الإجمالية + %1$d مقطعًا / %2$s + القرص %1$s + عشوائي + السابق + تشغيل + إيقاف مؤقت + التالي + التكرار متوقف + تكرار الكل + تكرار مقطع واحد + مستوى الصوت + لا توجد ملفات صوتية في هذه الموسيقى التصويرية diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index d9ef13c8b1..5139e4953d 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -3694,4 +3694,67 @@ No se pudo importar esta disposición Nieve escarlata Superficies blancas con acentos rojos. + Bandas sonoras + Música + Opciones de reproducción + Favoritos + Colecciones + Aún no hay colecciones. Toca el ícono de marcador para crear una. + Guardados + Crear una colección + Organiza tus guardados + Nueva + Crear + Nombre de la colección + Ingresa un nombre que no use ninguna otra colección + Administrar + Cambiar nombre + Agregar pistas + Agregar (%1$d) + Quitar pistas + Eliminar colección + ¿Eliminar %1$s? + Las pistas permanecen en tu dispositivo. Solo se elimina la colección. + Seleccionar + Seleccionar todo + Deseleccionar todo + %1$d seleccionadas + Agregar a la colección + Agregar a favoritos + Quitar de la colección + Buscar pistas + Orden del álbum + Más largas primero + Más cortas primero + Pistas + Tono + Restablecer + Omitir silencios + Temporizador de sueño + %1$d min + Fin de la pista + Quedan %1$s + Ecualizador + Refuerzo de graves + El ecualizador no está disponible en este dispositivo + Bandas sonoras + Activar en el juego + Mantén la banda sonora sonando mientras se ejecuta un juego + Aún no hay bandas sonoras instaladas. + Buscar bandas sonoras + Añadir una carpeta de banda sonora + No hay archivos de audio en esa carpeta + Duración total + %1$d pistas / %2$s + Disco %1$s + Aleatorio + Anterior + Reproducir + Pausar + Siguiente + Repetición desactivada + Repetir todo + Repetir una + Volumen + No hay archivos de audio en esta banda sonora diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 55449ac2f4..4b446b2140 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -3683,4 +3683,67 @@ Ален сняг + Саундтраци + Музика + Опции за възпроизвеждане + Любими + Колекции + Все още няма колекции. Докоснете иконата на отметка, за да създадете. + Запазени + Създаване на колекция + Организирайте запазеното + Нова + Създай + Име на колекцията + Въведете име, което не се използва от друга колекция + Управление + Преименуване + Добавяне на песни + Добави (%1$d) + Премахване на песни + Изтриване на колекция + Да се изтрие ли %1$s? + Песните остават на устройството ви. Премахва се само колекцията. + Избор + Избери всички + Отмени избора на всички + Избрани: %1$d + Добави към колекция + Добави в любими + Премахни от колекцията + Търсене на песни + Като в албума + Най-дългите първо + Най-кратките първо + Песни + Височина на тона + Нулиране + Прескачане на тишина + Таймер за заспиване + %1$d мин + Край на песента + Остават %1$s + Еквалайзер + Усилване на басите + Еквалайзерът не е наличен на това устройство + Саундтраци + Включи в играта + Саундтракът да продължи да свири, докато върви игра + Все още няма инсталирани саундтраци. + Търсене на саундтраци + Добавяне на папка със саундтрак + В тази папка няма аудиофайлове + Обща продължителност + %1$d песни / %2$s + Диск %1$s + Разбъркване + Предишна + Пускане + Пауза + Следваща + Повторението е изключено + Повтаряне на всички + Повтаряне на една + Сила на звука + В този саундтрак няма аудиофайлове diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 35282822a5..365c2f1083 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -3761,4 +3761,67 @@ Šarlatový sníh + Soundtracky + Hudba + Možnosti přehrávání + Oblíbené + Kolekce + Zatím žádné kolekce. Klepnutím na ikonu záložky nějakou vytvoříte. + Uloženo + Vytvořit kolekci + Uspořádejte si uložené skladby + Nová + Vytvořit + Název kolekce + Zadejte název, který nepoužívá žádná jiná kolekce + Spravovat + Přejmenovat + Přidat skladby + Přidat (%1$d) + Odebrat skladby + Smazat kolekci + Smazat %1$s? + Skladby zůstanou ve vašem zařízení. Odstraní se pouze kolekce. + Vybrat + Vybrat vše + Zrušit výběr + Vybráno: %1$d + Přidat do kolekce + Přidat do oblíbených + Odebrat z kolekce + Hledat skladby + Pořadí alba + Nejdelší první + Nejkratší první + Skladby + Výška tónu + Obnovit + Přeskakovat ticho + Časovač vypnutí + %1$d min + Konec skladby + Zbývá %1$s + Ekvalizér + Zesílení basů + Ekvalizér není na tomto zařízení k dispozici + Soundtracky + Povolit ve hře + Nechat soundtrack hrát během hry + Zatím nejsou nainstalovány žádné soundtracky. + Hledat soundtracky + Přidat složku se soundtrackem + V této složce nejsou žádné zvukové soubory + Celková délka + Skladeb: %1$d / %2$s + Disk %1$s + Náhodně + Předchozí + Přehrát + Pozastavit + Další + Opakování vypnuto + Opakovat vše + Opakovat jednu + Hlasitost + V tomto soundtracku nejsou žádné zvukové soubory diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 7a5aa072ef..83ee1c91f4 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -3683,4 +3683,67 @@ Skarlagensne + Soundtracks + Musik + Afspilningsindstillinger + Favoritter + Samlinger + Ingen samlinger endnu. Tryk på bogmærkeikonet for at oprette en. + Gemt + Opret en samling + Organiser dine gemte numre + Ny + Opret + Navn på samling + Angiv et navn, som ingen anden samling bruger + Administrer + Omdøb + Tilføj numre + Tilføj (%1$d) + Fjern numre + Slet samling + Slet %1$s? + Numrene bliver på din enhed. Kun samlingen fjernes. + Vælg + Vælg alle + Fravælg alle + %1$d valgt + Føj til samling + Føj til favoritter + Fjern fra samling + Søg i numre + Albumrækkefølge + Længste først + Korteste først + Numre + Tonehøjde + Nulstil + Spring stilhed over + Sovetimer + %1$d min. + Slut på nummer + %1$s tilbage + Equalizer + Bassforstærkning + Equalizeren er ikke tilgængelig på denne enhed + Soundtracks + Aktivér i spil + Lad soundtracket spille, mens et spil kører + Ingen soundtracks installeret endnu. + Søg i soundtracks + Tilføj en soundtrack-mappe + Ingen lydfiler i den mappe + Samlet længde + %1$d numre / %2$s + Disk %1$s + Bland + Forrige + Afspil + Pause + Næste + Gentag fra + Gentag alle + Gentag én + Lydstyrke + Ingen lydfiler i dette soundtrack diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1d15db3d88..3ed4aa1f1b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -3683,4 +3683,67 @@ Scharlachroter Schnee + Soundtracks + Musik + Wiedergabeoptionen + Favoriten + Sammlungen + Noch keine Sammlungen. Tippe auf das Lesezeichen-Symbol, um eine zu erstellen. + Gespeichert + Sammlung erstellen + Ordne deine gespeicherten Titel + Neu + Erstellen + Name der Sammlung + Gib einen Namen ein, den keine andere Sammlung verwendet + Verwalten + Umbenennen + Titel hinzufügen + Hinzufügen (%1$d) + Titel entfernen + Sammlung löschen + %1$s löschen? + Die Titel bleiben auf deinem Gerät. Nur die Sammlung wird entfernt. + Auswählen + Alle auswählen + Alle abwählen + %1$d ausgewählt + Zur Sammlung hinzufügen + Zu Favoriten hinzufügen + Aus Sammlung entfernen + Titel suchen + Albumreihenfolge + Längste zuerst + Kürzeste zuerst + Titel + Tonhöhe + Zurücksetzen + Stille überspringen + Schlaftimer + %1$d Min. + Ende des Titels + Noch %1$s + Equalizer + Bassverstärkung + Der Equalizer ist auf diesem Gerät nicht verfügbar + Soundtracks + Im Spiel aktivieren + Soundtrack während eines Spiels weiterspielen + Noch keine Soundtracks installiert. + Soundtracks durchsuchen + Soundtrack-Ordner hinzufügen + Keine Audiodateien in diesem Ordner + Gesamtlänge + %1$d Titel / %2$s + Disc %1$s + Zufällig + Zurück + Wiedergabe + Pause + Weiter + Wiederholen aus + Alle wiederholen + Titel wiederholen + Lautstärke + Keine Audiodateien in diesem Soundtrack diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 27692a1325..d9e2ac10e8 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -3683,4 +3683,67 @@ Κατακόκκινο χιόνι + Soundtrack + Μουσική + Επιλογές αναπαραγωγής + Αγαπημένα + Συλλογές + Δεν υπάρχουν συλλογές ακόμη. Πατήστε το εικονίδιο σελιδοδείκτη για να δημιουργήσετε μία. + Αποθηκευμένα + Δημιουργία συλλογής + Οργανώστε τα αποθηκευμένα σας + Νέα + Δημιουργία + Όνομα συλλογής + Εισαγάγετε ένα όνομα που δεν χρησιμοποιεί άλλη συλλογή + Διαχείριση + Μετονομασία + Προσθήκη κομματιών + Προσθήκη (%1$d) + Κατάργηση κομματιών + Διαγραφή συλλογής + Διαγραφή %1$s; + Τα κομμάτια παραμένουν στη συσκευή σας. Καταργείται μόνο η συλλογή. + Επιλογή + Επιλογή όλων + Αποεπιλογή όλων + %1$d επιλεγμένα + Προσθήκη στη συλλογή + Προσθήκη στα αγαπημένα + Κατάργηση από τη συλλογή + Αναζήτηση κομματιών + Σειρά άλμπουμ + Μεγαλύτερη διάρκεια πρώτα + Μικρότερη διάρκεια πρώτα + Κομμάτια + Τόνος + Επαναφορά + Παράλειψη σιωπής + Χρονοδιακόπτης ύπνου + %1$d λ. + Τέλος κομματιού + Απομένουν %1$s + Ισοσταθμιστής + Ενίσχυση μπάσων + Ο ισοσταθμιστής δεν είναι διαθέσιμος σε αυτή τη συσκευή + Soundtrack + Ενεργοποίηση εντός παιχνιδιού + Η μουσική συνεχίζει να παίζει όσο εκτελείται ένα παιχνίδι + Δεν υπάρχουν εγκατεστημένα soundtrack ακόμη. + Αναζήτηση soundtrack + Προσθήκη φακέλου soundtrack + Δεν υπάρχουν αρχεία ήχου σε αυτόν τον φάκελο + Συνολική διάρκεια + %1$d κομμάτια / %2$s + Δίσκος %1$s + Τυχαία σειρά + Προηγούμενο + Αναπαραγωγή + Παύση + Επόμενο + Επανάληψη ανενεργή + Επανάληψη όλων + Επανάληψη ενός + Ένταση + Δεν υπάρχουν αρχεία ήχου σε αυτό το soundtrack diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index adea64b8f4..7fa671b3ce 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -3722,4 +3722,67 @@ Nieve escarlata + Bandas sonoras + Música + Opciones de reproducción + Favoritos + Colecciones + Aún no hay colecciones. Toca el icono de marcador para crear una. + Guardados + Crear una colección + Organiza tus guardados + Nueva + Crear + Nombre de la colección + Introduce un nombre que no use ninguna otra colección + Gestionar + Cambiar nombre + Añadir pistas + Añadir (%1$d) + Quitar pistas + Eliminar colección + ¿Eliminar %1$s? + Las pistas permanecen en tu dispositivo. Solo se elimina la colección. + Seleccionar + Seleccionar todo + Deseleccionar todo + %1$d seleccionadas + Añadir a la colección + Añadir a favoritos + Quitar de la colección + Buscar pistas + Orden del álbum + Más largas primero + Más cortas primero + Pistas + Tono + Restablecer + Omitir silencios + Temporizador de sueño + %1$d min + Fin de la pista + Quedan %1$s + Ecualizador + Refuerzo de graves + El ecualizador no está disponible en este dispositivo + Bandas sonoras + Activar en el juego + Mantén la banda sonora sonando mientras se ejecuta un juego + Aún no hay bandas sonoras instaladas. + Buscar bandas sonoras + Añadir una carpeta de banda sonora + No hay archivos de audio en esa carpeta + Duración total + %1$d pistas / %2$s + Disco %1$s + Aleatorio + Anterior + Reproducir + Pausar + Siguiente + Repetición desactivada + Repetir todo + Repetir una + Volumen + No hay archivos de audio en esta banda sonora diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 481ed7ca5c..222896d3e6 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -3683,4 +3683,67 @@ Helakanpunainen lumi + Soundtrackit + Musiikki + Toistoasetukset + Suosikit + Kokoelmat + Ei vielä kokoelmia. Luo sellainen napauttamalla kirjanmerkkikuvaketta. + Tallennettu + Luo kokoelma + Järjestä tallennuksesi + Uusi + Luo + Kokoelman nimi + Anna nimi, jota mikään toinen kokoelma ei käytä + Hallitse + Nimeä uudelleen + Lisää kappaleita + Lisää (%1$d) + Poista kappaleita + Poista kokoelma + Poistetaanko %1$s? + Kappaleet säilyvät laitteellasi. Vain kokoelma poistetaan. + Valitse + Valitse kaikki + Poista kaikkien valinta + %1$d valittu + Lisää kokoelmaan + Lisää suosikkeihin + Poista kokoelmasta + Hae kappaleita + Albumin järjestys + Pisin ensin + Lyhin ensin + Kappaleet + Äänenkorkeus + Palauta + Ohita hiljaisuus + Uniajastin + %1$d min + Kappaleen loppu + %1$s jäljellä + Taajuuskorjain + Bassonkorostus + Taajuuskorjain ei ole käytettävissä tällä laitteella + Soundtrackit + Ota käyttöön pelin aikana + Pidä soundtrack soimassa pelin aikana + Soundtrackeja ei ole vielä asennettu. + Hae soundtrackeja + Lisää soundtrack-kansio + Kansiossa ei ole äänitiedostoja + Kokonaiskesto + %1$d kappaletta / %2$s + Levy %1$s + Sekoita + Edellinen + Toista + Tauko + Seuraava + Toisto pois + Toista kaikki + Toista yksi + Äänenvoimakkuus + Tässä soundtrackissa ei ole äänitiedostoja diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 61accc73a6..20c091baca 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -3722,4 +3722,67 @@ Neige écarlate + Bandes originales + Musique + Options de lecture + Favoris + Collections + Aucune collection pour le moment. Touchez l\'icône de favori pour en créer une. + Enregistrés + Créer une collection + Organisez vos titres enregistrés + Nouvelle + Créer + Nom de la collection + Saisissez un nom qu\'aucune autre collection n\'utilise + Gérer + Renommer + Ajouter des morceaux + Ajouter (%1$d) + Retirer des morceaux + Supprimer la collection + Supprimer %1$s ? + Les morceaux restent sur votre appareil. Seule la collection est supprimée. + Sélectionner + Tout sélectionner + Tout désélectionner + %1$d sélectionné(s) + Ajouter à une collection + Ajouter aux favoris + Retirer de la collection + Rechercher des morceaux + Ordre de l\'album + Plus longs d\'abord + Plus courts d\'abord + Morceaux + Hauteur + Réinitialiser + Ignorer les silences + Minuteur de veille + %1$d min + Fin du morceau + %1$s restantes + Égaliseur + Renforcement des basses + L\'égaliseur n\'est pas disponible sur cet appareil + Bandes originales + Activer en jeu + Garder la bande originale active pendant une partie + Aucune bande originale installée pour le moment. + Rechercher des bandes originales + Ajouter un dossier de bande originale + Aucun fichier audio dans ce dossier + Durée totale + %1$d pistes / %2$s + Disque %1$s + Aléatoire + Précédent + Lecture + Pause + Suivant + Répétition désactivée + Tout répéter + Répéter une piste + Volume + Aucun fichier audio dans cette bande originale diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 72f0917b03..4046306fe4 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -3683,4 +3683,67 @@ किरमिज़ी बर्फ + साउंडट्रैक + संगीत + प्लेबैक विकल्प + पसंदीदा + कलेक्शन + अभी तक कोई कलेक्शन नहीं है। बनाने के लिए बुकमार्क आइकन पर टैप करें। + सहेजे गए + कलेक्शन बनाएं + अपने सेव व्यवस्थित करें + नया + बनाएं + कलेक्शन का नाम + ऐसा नाम दर्ज करें जो किसी अन्य कलेक्शन में उपयोग न हुआ हो + प्रबंधित करें + नाम बदलें + ट्रैक जोड़ें + जोड़ें (%1$d) + ट्रैक हटाएं + कलेक्शन हटाएं + %1$s हटाएं? + ट्रैक आपके डिवाइस पर रहेंगे। केवल कलेक्शन हटाया जाएगा। + चुनें + सभी चुनें + सभी चयन हटाएं + %1$d चुने गए + कलेक्शन में जोड़ें + पसंदीदा में जोड़ें + कलेक्शन से हटाएं + ट्रैक खोजें + एल्बम क्रम + सबसे लंबे पहले + सबसे छोटे पहले + ट्रैक + पिच + रीसेट करें + मौन छोड़ें + स्लीप टाइमर + %1$d मिनट + ट्रैक का अंत + %1$s शेष + इक्वलाइज़र + बास बूस्ट + इस डिवाइस पर इक्वलाइज़र उपलब्ध नहीं है + साउंडट्रैक + गेम के दौरान चालू करें + गेम चलते समय साउंडट्रैक बजता रखें + अभी तक कोई साउंडट्रैक इंस्टॉल नहीं है। + साउंडट्रैक खोजें + साउंडट्रैक फ़ोल्डर जोड़ें + उस फ़ोल्डर में कोई ऑडियो फ़ाइल नहीं है + कुल अवधि + %1$d ट्रैक / %2$s + डिस्क %1$s + शफ़ल + पिछला + चलाएँ + रोकें + अगला + रिपीट बंद + सभी दोहराएँ + एक दोहराएँ + वॉल्यूम + इस साउंडट्रैक में कोई ऑडियो फ़ाइल नहीं है diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 409a9e72f8..4a2c408ac7 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -3683,4 +3683,67 @@ Skarlátvörös hó + Soundtrackek + Zene + Lejátszási beállítások + Kedvencek + Gyűjtemények + Még nincs gyűjtemény. Koppints a könyvjelző ikonra egy létrehozásához. + Mentve + Gyűjtemény létrehozása + Rendezd a mentéseidet + Új + Létrehozás + Gyűjtemény neve + Adj meg egy nevet, amelyet más gyűjtemény nem használ + Kezelés + Átnevezés + Számok hozzáadása + Hozzáadás (%1$d) + Számok eltávolítása + Gyűjtemény törlése + Törlöd ezt: %1$s? + A számok az eszközödön maradnak. Csak a gyűjtemény törlődik. + Kijelölés + Összes kijelölése + Kijelölés törlése + %1$d kijelölve + Hozzáadás gyűjteményhez + Hozzáadás a kedvencekhez + Eltávolítás a gyűjteményből + Számok keresése + Albumsorrend + Leghosszabb elöl + Legrövidebb elöl + Számok + Hangmagasság + Visszaállítás + Csend átugrása + Alvásidőzítő + %1$d perc + Szám vége + %1$s van hátra + Hangszínszabályzó + Mélyhangerősítés + A hangszínszabályzó nem érhető el ezen az eszközön + Soundtrackek + Engedélyezés játék közben + A soundtrack szóljon tovább játék közben + Még nincs telepített soundtrack. + Soundtrackek keresése + Soundtrack mappa hozzáadása + Nincs hangfájl ebben a mappában + Teljes hossz + %1$d szám / %2$s + %1$s. lemez + Keverés + Előző + Lejátszás + Szünet + Következő + Ismétlés kikapcsolva + Összes ismétlése + Egy ismétlése + Hangerő + Nincs hangfájl ebben a soundtrackben diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 81ded51384..d71b8f83f1 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -3653,4 +3653,67 @@ Salju Kirmizi + Soundtrack + Musik + Opsi pemutaran + Favorit + Koleksi + Belum ada koleksi. Ketuk ikon penanda untuk membuatnya. + Tersimpan + Buat koleksi + Atur simpananmu + Baru + Buat + Nama koleksi + Masukkan nama yang tidak dipakai koleksi lain + Kelola + Ganti nama + Tambah lagu + Tambah (%1$d) + Hapus lagu + Hapus koleksi + Hapus %1$s? + Lagu tetap ada di perangkatmu. Hanya koleksinya yang dihapus. + Pilih + Pilih semua + Batalkan semua pilihan + %1$d dipilih + Tambahkan ke koleksi + Tambahkan ke favorit + Hapus dari koleksi + Cari lagu + Urutan album + Terpanjang dulu + Terpendek dulu + Lagu + Nada + Atur ulang + Lewati keheningan + Timer tidur + %1$d mnt + Akhir lagu + Sisa %1$s + Ekualiser + Penguat bass + Ekualiser tidak tersedia di perangkat ini + Soundtrack + Aktifkan saat bermain + Tetap putar soundtrack saat game berjalan + Belum ada soundtrack yang terpasang. + Cari soundtrack + Tambahkan folder soundtrack + Tidak ada file audio di folder itu + Total durasi + %1$d trek / %2$s + Disk %1$s + Acak + Sebelumnya + Putar + Jeda + Berikutnya + Ulangi mati + Ulangi semua + Ulangi satu + Volume + Tidak ada file audio di soundtrack ini diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index f8f6c7866c..e5a9d021e2 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -3722,4 +3722,67 @@ Neve scarlatta + Colonne sonore + Musica + Opzioni di riproduzione + Preferiti + Raccolte + Nessuna raccolta per ora. Tocca l\'icona del segnalibro per crearne una. + Salvati + Crea una raccolta + Organizza i tuoi salvataggi + Nuova + Crea + Nome della raccolta + Inserisci un nome non usato da altre raccolte + Gestisci + Rinomina + Aggiungi brani + Aggiungi (%1$d) + Rimuovi brani + Elimina raccolta + Eliminare %1$s? + I brani restano sul dispositivo. Viene rimossa solo la raccolta. + Seleziona + Seleziona tutto + Deseleziona tutto + %1$d selezionati + Aggiungi alla raccolta + Aggiungi ai preferiti + Rimuovi dalla raccolta + Cerca brani + Ordine dell\'album + Più lunghi prima + Più brevi prima + Brani + Tonalità + Reimposta + Salta i silenzi + Timer di spegnimento + %1$d min + Fine del brano + Restano %1$s + Equalizzatore + Potenziamento bassi + L\'equalizzatore non è disponibile su questo dispositivo + Colonne sonore + Attiva in gioco + Mantieni la colonna sonora in riproduzione durante una partita + Nessuna colonna sonora installata. + Cerca colonne sonore + Aggiungi una cartella di colonna sonora + Nessun file audio in questa cartella + Durata totale + %1$d brani / %2$s + Disco %1$s + Casuale + Precedente + Riproduci + Pausa + Successivo + Ripetizione disattivata + Ripeti tutto + Ripeti uno + Volume + Nessun file audio in questa colonna sonora diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index fe43ef5ee0..bd0e241e4e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -3653,4 +3653,67 @@ 緋色の雪 + サウンドトラック + 音楽 + 再生オプション + お気に入り + コレクション + コレクションはまだありません。ブックマークアイコンをタップして作成できます。 + 保存済み + コレクションを作成 + 保存した曲を整理 + 新規 + 作成 + コレクション名 + 他のコレクションで使われていない名前を入力してください + 管理 + 名前を変更 + トラックを追加 + 追加(%1$d) + トラックを削除 + コレクションを削除 + %1$sを削除しますか? + トラックはデバイスに残ります。コレクションのみが削除されます。 + 選択 + すべて選択 + すべて選択解除 + %1$d件選択中 + コレクションに追加 + お気に入りに追加 + コレクションから削除 + トラックを検索 + アルバム順 + 長い順 + 短い順 + トラック + ピッチ + リセット + 無音部分をスキップ + スリープタイマー + %1$d分 + トラックの終わり + 残り %1$s + イコライザー + 低音ブースト + このデバイスではイコライザーを使用できません + サウンドトラック + ゲーム中も有効にする + ゲーム実行中もサウンドトラックを再生し続けます + インストール済みのサウンドトラックはまだありません。 + サウンドトラックを検索 + サウンドトラックのフォルダーを追加 + そのフォルダーに音声ファイルがありません + 合計時間 + %1$d トラック / %2$s + ディスク %1$s + シャッフル + 前へ + 再生 + 一時停止 + 次へ + リピートなし + 全曲リピート + 1曲リピート + 音量 + このサウンドトラックに音声ファイルがありません diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index e00a044135..4fadd28078 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -3653,4 +3653,67 @@ 진홍빛 눈 + 사운드트랙 + 음악 + 재생 옵션 + 즐겨찾기 + 컬렉션 + 아직 컬렉션이 없습니다. 북마크 아이콘을 눌러 만들어 보세요. + 저장됨 + 컬렉션 만들기 + 저장한 곡을 정리하세요 + 새로 만들기 + 만들기 + 컬렉션 이름 + 다른 컬렉션에서 사용하지 않는 이름을 입력하세요 + 관리 + 이름 변경 + 트랙 추가 + 추가 (%1$d) + 트랙 제거 + 컬렉션 삭제 + %1$s을(를) 삭제할까요? + 트랙은 기기에 그대로 남습니다. 컬렉션만 삭제됩니다. + 선택 + 모두 선택 + 모두 선택 해제 + %1$d개 선택됨 + 컬렉션에 추가 + 즐겨찾기에 추가 + 컬렉션에서 제거 + 트랙 검색 + 앨범 순서 + 긴 순서 + 짧은 순서 + 트랙 + 피치 + 초기화 + 무음 건너뛰기 + 취침 타이머 + %1$d분 + 트랙 끝 + %1$s 남음 + 이퀄라이저 + 베이스 부스트 + 이 기기에서는 이퀄라이저를 사용할 수 없습니다 + 사운드트랙 + 게임 중 사용 + 게임이 실행되는 동안 사운드트랙 계속 재생 + 설치된 사운드트랙이 아직 없습니다. + 사운드트랙 검색 + 사운드트랙 폴더 추가 + 해당 폴더에 오디오 파일이 없습니다 + 총 재생 시간 + %1$d개 트랙 / %2$s + 디스크 %1$s + 셔플 + 이전 + 재생 + 일시정지 + 다음 + 반복 끔 + 전체 반복 + 한 곡 반복 + 볼륨 + 이 사운드트랙에 오디오 파일이 없습니다 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 58caf14b83..cf509abbf8 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -3653,4 +3653,67 @@ Salji Merah Skarlet + Runut bunyi + Muzik + Pilihan main balik + Kegemaran + Koleksi + Belum ada koleksi. Ketik ikon penanda buku untuk mencipta satu. + Disimpan + Cipta koleksi + Susun simpanan anda + Baharu + Cipta + Nama koleksi + Masukkan nama yang tidak digunakan oleh koleksi lain + Urus + Namakan semula + Tambah lagu + Tambah (%1$d) + Alih keluar lagu + Padam koleksi + Padam %1$s? + Lagu kekal pada peranti anda. Hanya koleksi dialih keluar. + Pilih + Pilih semua + Nyahpilih semua + %1$d dipilih + Tambah ke koleksi + Tambah ke kegemaran + Alih keluar daripada koleksi + Cari lagu + Susunan album + Terpanjang dahulu + Terpendek dahulu + Lagu + Pic + Tetapkan semula + Langkau senyap + Pemasa tidur + %1$d min + Hujung lagu + %1$s lagi + Penyama + Peningkat bes + Penyama tidak tersedia pada peranti ini + Runut bunyi + Dayakan dalam permainan + Teruskan memainkan runut bunyi semasa permainan berjalan + Belum ada runut bunyi dipasang. + Cari runut bunyi + Tambah folder runut bunyi + Tiada fail audio dalam folder itu + Jumlah tempoh + %1$d trek / %2$s + Cakera %1$s + Rawak + Sebelumnya + Main + Jeda + Seterusnya + Ulang dimatikan + Ulang semua + Ulang satu + Kelantangan + Tiada fail audio dalam runut bunyi ini diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index f56b734f56..4605b7306f 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -3683,4 +3683,67 @@ Skarlagenssnø + Lydspor + Musikk + Avspillingsalternativer + Favoritter + Samlinger + Ingen samlinger ennå. Trykk på bokmerkeikonet for å opprette en. + Lagret + Opprett en samling + Organiser det du lagrer + Ny + Opprett + Navn på samling + Skriv inn et navn som ingen andre samlinger bruker + Administrer + Gi nytt navn + Legg til spor + Legg til (%1$d) + Fjern spor + Slett samling + Slette %1$s? + Sporene blir værende på enheten din. Bare samlingen fjernes. + Velg + Velg alle + Fjern alle valg + %1$d valgt + Legg til i samling + Legg til i favoritter + Fjern fra samling + Søk i spor + Albumrekkefølge + Lengste først + Korteste først + Spor + Tonehøyde + Tilbakestill + Hopp over stillhet + Søvntimer + %1$d min + Slutten av sporet + %1$s igjen + Equalizer + Bassforsterkning + Equalizeren er ikke tilgjengelig på denne enheten + Lydspor + Aktiver i spill + Fortsett å spille lydsporet mens et spill kjører + Ingen lydspor installert ennå. + Søk i lydspor + Legg til en lydspormappe + Ingen lydfiler i denne mappen + Total lengde + %1$d spor / %2$s + Plate %1$s + Tilfeldig rekkefølge + Forrige + Spill av + Pause + Neste + Gjentakelse av + Gjenta alle + Gjenta ett + Volum + Ingen lydfiler i dette lydsporet diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 4240b47aee..558e70e934 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -3683,4 +3683,67 @@ Scharlakenrode sneeuw + Soundtracks + Muziek + Afspeelopties + Favorieten + Collecties + Nog geen collecties. Tik op het bladwijzericoon om er een te maken. + Opgeslagen + Maak een collectie + Orden je opgeslagen nummers + Nieuw + Maken + Naam van collectie + Voer een naam in die geen andere collectie gebruikt + Beheren + Hernoemen + Nummers toevoegen + Toevoegen (%1$d) + Nummers verwijderen + Collectie verwijderen + %1$s verwijderen? + De nummers blijven op je apparaat. Alleen de collectie wordt verwijderd. + Selecteren + Alles selecteren + Alles deselecteren + %1$d geselecteerd + Toevoegen aan collectie + Toevoegen aan favorieten + Verwijderen uit collectie + Nummers zoeken + Albumvolgorde + Langste eerst + Kortste eerst + Nummers + Toonhoogte + Resetten + Stilte overslaan + Slaaptimer + %1$d min + Einde van het nummer + Nog %1$s + Equalizer + Basversterking + De equalizer is niet beschikbaar op dit apparaat + Soundtracks + In-game inschakelen + Laat de soundtrack doorspelen terwijl een game draait + Nog geen soundtracks geïnstalleerd. + Soundtracks zoeken + Soundtrackmap toevoegen + Geen audiobestanden in deze map + Totale lengte + %1$d nummers / %2$s + Schijf %1$s + Willekeurig + Vorige + Afspelen + Pauzeren + Volgende + Herhalen uit + Alles herhalen + Eén herhalen + Volume + Geen audiobestanden in deze soundtrack diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 2c789b65d2..76cf52a264 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -3761,4 +3761,67 @@ Szkarłatny śnieg + Ścieżki dźwiękowe + Muzyka + Opcje odtwarzania + Ulubione + Kolekcje + Brak kolekcji. Dotknij ikony zakładki, aby utworzyć nową. + Zapisane + Utwórz kolekcję + Uporządkuj swoje zapisy + Nowa + Utwórz + Nazwa kolekcji + Wpisz nazwę, której nie używa żadna inna kolekcja + Zarządzaj + Zmień nazwę + Dodaj utwory + Dodaj (%1$d) + Usuń utwory + Usuń kolekcję + Usunąć %1$s? + Utwory pozostają na urządzeniu. Usunięta zostanie tylko kolekcja. + Zaznacz + Zaznacz wszystko + Odznacz wszystko + Zaznaczono: %1$d + Dodaj do kolekcji + Dodaj do ulubionych + Usuń z kolekcji + Szukaj utworów + Kolejność z albumu + Najdłuższe najpierw + Najkrótsze najpierw + Utwory + Wysokość dźwięku + Resetuj + Pomijaj ciszę + Wyłącznik czasowy + %1$d min + Koniec utworu + Pozostało %1$s + Korektor + Wzmocnienie basów + Korektor nie jest dostępny na tym urządzeniu + Ścieżki dźwiękowe + Włącz w grze + Odtwarzaj ścieżkę dźwiękową podczas działania gry + Brak zainstalowanych ścieżek dźwiękowych. + Szukaj ścieżek dźwiękowych + Dodaj folder ze ścieżką dźwiękową + Brak plików audio w tym folderze + Całkowity czas + Utworów: %1$d / %2$s + Płyta %1$s + Losowo + Poprzedni + Odtwórz + Wstrzymaj + Następny + Powtarzanie wyłączone + Powtarzaj wszystko + Powtarzaj jeden + Głośność + Brak plików audio w tej ścieżce dźwiękowej diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index dde7bf233f..5df34b54fd 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -3722,4 +3722,67 @@ Neve Escarlate + Bandas sonoras + Música + Opções de reprodução + Favoritas + Coleções + Ainda não há coleções. Toque no ícone de marcador para criar uma. + Guardadas + Criar uma coleção + Organize as suas faixas guardadas + Nova + Criar + Nome da coleção + Introduza um nome que nenhuma outra coleção utilize + Gerir + Mudar o nome + Adicionar faixas + Adicionar (%1$d) + Remover faixas + Eliminar coleção + Eliminar %1$s? + As faixas permanecem no seu dispositivo. Apenas a coleção é removida. + Selecionar + Selecionar tudo + Desselecionar tudo + %1$d selecionadas + Adicionar à coleção + Adicionar às favoritas + Remover da coleção + Pesquisar faixas + Ordem do álbum + Mais longas primeiro + Mais curtas primeiro + Faixas + Tom + Repor + Saltar silêncio + Temporizador de suspensão + %1$d min + Fim da faixa + Restam %1$s + Equalizador + Reforço de graves + O equalizador não está disponível neste dispositivo + Bandas sonoras + Ativar durante o jogo + Continuar a reproduzir a banda sonora enquanto um jogo está em execução + Ainda não há bandas sonoras instaladas. + Pesquisar bandas sonoras + Adicionar uma pasta de banda sonora + Nenhum ficheiro de áudio nessa pasta + Duração total + %1$d faixas / %2$s + Disco %1$s + Aleatório + Anterior + Reproduzir + Pausar + Seguinte + Repetição desativada + Repetir tudo + Repetir uma + Volume + Nenhum ficheiro de áudio nesta banda sonora diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 1bf1feb07a..be24a67375 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -3722,4 +3722,67 @@ Neve Escarlate + Trilhas sonoras + Música + Opções de reprodução + Favoritas + Coleções + Nenhuma coleção ainda. Toque no ícone de marcador para criar uma. + Salvas + Criar uma coleção + Organize suas faixas salvas + Nova + Criar + Nome da coleção + Digite um nome que nenhuma outra coleção use + Gerenciar + Renomear + Adicionar faixas + Adicionar (%1$d) + Remover faixas + Excluir coleção + Excluir %1$s? + As faixas continuam no seu dispositivo. Somente a coleção é removida. + Selecionar + Selecionar tudo + Desmarcar tudo + %1$d selecionadas + Adicionar à coleção + Adicionar às favoritas + Remover da coleção + Pesquisar faixas + Ordem do álbum + Mais longas primeiro + Mais curtas primeiro + Faixas + Tom + Redefinir + Pular silêncio + Timer de sono + %1$d min + Fim da faixa + Restam %1$s + Equalizador + Reforço de graves + O equalizador não está disponível neste dispositivo + Trilhas sonoras + Ativar durante o jogo + Continuar tocando a trilha sonora enquanto um jogo está em execução + Nenhuma trilha sonora instalada ainda. + Pesquisar trilhas sonoras + Adicionar uma pasta de trilha sonora + Nenhum arquivo de áudio nessa pasta + Duração total + %1$d faixas / %2$s + Disco %1$s + Aleatório + Anterior + Reproduzir + Pausar + Próxima + Repetição desativada + Repetir tudo + Repetir uma + Volume + Nenhum arquivo de áudio nesta trilha sonora diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index a2e10057d6..059d8c8d45 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -3722,4 +3722,67 @@ Zăpadă stacojie + Coloane sonore + Muzică + Opțiuni de redare + Favorite + Colecții + Nicio colecție încă. Atinge pictograma de marcaj pentru a crea una. + Salvate + Creează o colecție + Organizează-ți piesele salvate + Nouă + Creează + Numele colecției + Introdu un nume pe care nu îl folosește nicio altă colecție + Gestionează + Redenumește + Adaugă piese + Adaugă (%1$d) + Elimină piese + Șterge colecția + Ștergi %1$s? + Piesele rămân pe dispozitiv. Se elimină doar colecția. + Selectează + Selectează tot + Deselectează tot + %1$d selectate + Adaugă în colecție + Adaugă la favorite + Elimină din colecție + Caută piese + Ordinea albumului + Cele mai lungi primele + Cele mai scurte primele + Piese + Înălțime + Resetează + Omite tăcerea + Temporizator de somn + %1$d min + Sfârșitul piesei + Mai sunt %1$s + Egalizator + Amplificare bas + Egalizatorul nu este disponibil pe acest dispozitiv + Coloane sonore + Activează în joc + Continuă redarea coloanei sonore cât timp rulează un joc + Nicio coloană sonoră instalată încă. + Caută coloane sonore + Adaugă un dosar de coloană sonoră + Niciun fișier audio în acel dosar + Durată totală + Piese: %1$d · %2$s + Discul %1$s + Amestecare + Anterior + Redare + Pauză + Următor + Repetare dezactivată + Repetă tot + Repetă una + Volum + Niciun fișier audio în această coloană sonoră diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 88dbfbc2fd..34bb4b9cb1 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -3844,4 +3844,67 @@ Алый снег + Саундтреки + Музыка + Параметры воспроизведения + Избранное + Коллекции + Коллекций пока нет. Нажмите на значок закладки, чтобы создать её. + Сохранено + Создать коллекцию + Упорядочите сохранённое + Новая + Создать + Название коллекции + Введите название, которое не используется в другой коллекции + Управление + Переименовать + Добавить треки + Добавить (%1$d) + Убрать треки + Удалить коллекцию + Удалить %1$s? + Треки останутся на устройстве. Будет удалена только коллекция. + Выбрать + Выбрать все + Снять выбор + Выбрано: %1$d + Добавить в коллекцию + Добавить в избранное + Убрать из коллекции + Поиск треков + Порядок в альбоме + Сначала длинные + Сначала короткие + Треки + Высота тона + Сбросить + Пропускать тишину + Таймер сна + %1$d мин + Конец трека + Осталось %1$s + Эквалайзер + Усиление баса + Эквалайзер недоступен на этом устройстве + Саундтреки + Включить в игре + Продолжать воспроизведение саундтрека во время игры + Саундтреки ещё не установлены. + Поиск саундтреков + Добавить папку саундтрека + В этой папке нет аудиофайлов + Общая длительность + Треков: %1$d / %2$s + Диск %1$s + Перемешать + Назад + Воспроизвести + Пауза + Далее + Повтор выключен + Повторять всё + Повторять один + Громкость + В этом саундтреке нет аудиофайлов diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index e0754fe02b..1fcbc9a807 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -3683,4 +3683,67 @@ Scharlakansröd snö + Soundtracks + Musik + Uppspelningsalternativ + Favoriter + Samlingar + Inga samlingar än. Tryck på bokmärkesikonen för att skapa en. + Sparade + Skapa en samling + Organisera dina sparade spår + Ny + Skapa + Samlingens namn + Ange ett namn som ingen annan samling använder + Hantera + Byt namn + Lägg till spår + Lägg till (%1$d) + Ta bort spår + Ta bort samling + Ta bort %1$s? + Spåren finns kvar på din enhet. Bara samlingen tas bort. + Välj + Välj alla + Avmarkera alla + %1$d valda + Lägg till i samling + Lägg till i favoriter + Ta bort från samling + Sök spår + Albumordning + Längst först + Kortast först + Spår + Tonhöjd + Återställ + Hoppa över tystnad + Insomningstimer + %1$d min + Slutet av spåret + %1$s kvar + Equalizer + Basförstärkning + Equalizern är inte tillgänglig på den här enheten + Soundtracks + Aktivera i spel + Fortsätt spela soundtracket medan ett spel körs + Inga soundtracks installerade än. + Sök bland soundtracks + Lägg till en soundtrackmapp + Inga ljudfiler i den mappen + Total längd + %1$d spår / %2$s + Skiva %1$s + Blanda + Föregående + Spela + Pausa + Nästa + Upprepning av + Upprepa alla + Upprepa ett + Volym + Inga ljudfiler i detta soundtrack diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index e483bfead0..bd7ccd6ad8 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -3653,4 +3653,67 @@ หิมะสีแดงชาด + ซาวด์แทร็ก + เพลง + ตัวเลือกการเล่น + รายการโปรด + คอลเลกชัน + ยังไม่มีคอลเลกชัน แตะไอคอนบุ๊กมาร์กเพื่อสร้าง + บันทึกแล้ว + สร้างคอลเลกชัน + จัดระเบียบรายการที่บันทึกไว้ + ใหม่ + สร้าง + ชื่อคอลเลกชัน + ป้อนชื่อที่ไม่ซ้ำกับคอลเลกชันอื่น + จัดการ + เปลี่ยนชื่อ + เพิ่มแทร็ก + เพิ่ม (%1$d) + เอาแทร็กออก + ลบคอลเลกชัน + ลบ %1$s หรือไม่? + แทร็กยังอยู่ในอุปกรณ์ของคุณ จะลบเฉพาะคอลเลกชัน + เลือก + เลือกทั้งหมด + ยกเลิกการเลือกทั้งหมด + เลือกแล้ว %1$d รายการ + เพิ่มในคอลเลกชัน + เพิ่มในรายการโปรด + เอาออกจากคอลเลกชัน + ค้นหาแทร็ก + ลำดับอัลบั้ม + ยาวที่สุดก่อน + สั้นที่สุดก่อน + แทร็ก + ระดับเสียง + รีเซ็ต + ข้ามช่วงเงียบ + ตั้งเวลาปิด + %1$d นาที + จบแทร็ก + เหลือ %1$s + อีควอไลเซอร์ + เพิ่มเสียงเบส + อุปกรณ์นี้ไม่รองรับอีควอไลเซอร์ + ซาวด์แทร็ก + เปิดใช้ขณะเล่นเกม + เล่นซาวด์แทร็กต่อไปขณะที่เกมทำงาน + ยังไม่มีซาวด์แทร็กที่ติดตั้ง + ค้นหาซาวด์แทร็ก + เพิ่มโฟลเดอร์ซาวด์แทร็ก + ไม่พบไฟล์เสียงในโฟลเดอร์นั้น + ความยาวทั้งหมด + %1$d แทร็ก / %2$s + ดิสก์ %1$s + สุ่ม + ก่อนหน้า + เล่น + หยุดชั่วคราว + ถัดไป + ปิดการเล่นซ้ำ + เล่นซ้ำทั้งหมด + เล่นซ้ำหนึ่งเพลง + ระดับเสียง + ไม่พบไฟล์เสียงในซาวด์แทร็กนี้ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 479e767c1b..889d71ef48 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -3683,4 +3683,67 @@ Kızıl Kar + Oyun müzikleri + Müzik + Oynatma seçenekleri + Favoriler + Koleksiyonlar + Henüz koleksiyon yok. Oluşturmak için yer imi simgesine dokun. + Kaydedilenler + Koleksiyon oluştur + Kayıtlarını düzenle + Yeni + Oluştur + Koleksiyon adı + Başka bir koleksiyonun kullanmadığı bir ad gir + Yönet + Yeniden adlandır + Parça ekle + Ekle (%1$d) + Parçaları kaldır + Koleksiyonu sil + %1$s silinsin mi? + Parçalar cihazında kalır. Yalnızca koleksiyon kaldırılır. + Seç + Tümünü seç + Tüm seçimleri kaldır + %1$d seçildi + Koleksiyona ekle + Favorilere ekle + Koleksiyondan kaldır + Parça ara + Albüm sırası + Önce en uzun + Önce en kısa + Parçalar + Perde + Sıfırla + Sessizliği atla + Uyku zamanlayıcısı + %1$d dk + Parçanın sonu + %1$s kaldı + Ekolayzır + Bas güçlendirme + Ekolayzır bu cihazda kullanılamıyor + Oyun müzikleri + Oyun içinde etkinleştir + Oyun çalışırken oyun müziği çalmaya devam etsin + Henüz oyun müziği yüklenmedi. + Oyun müziklerinde ara + Oyun müziği klasörü ekle + Bu klasörde ses dosyası yok + Toplam süre + %1$d parça / %2$s + Disk %1$s + Karıştır + Önceki + Oynat + Duraklat + Sonraki + Tekrar kapalı + Tümünü tekrarla + Birini tekrarla + Ses düzeyi + Bu oyun müziğinde ses dosyası yok diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index ea4e958377..670d07f991 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -3761,4 +3761,67 @@ Багряний сніг + Саундтреки + Музика + Параметри відтворення + Улюблене + Колекції + Колекцій ще немає. Торкніться значка закладки, щоб створити. + Збережено + Створити колекцію + Упорядкуйте свої збережені треки + Нова + Створити + Назва колекції + Введіть назву, яку не використовує жодна інша колекція + Керувати + Перейменувати + Додати треки + Додати (%1$d) + Вилучити треки + Видалити колекцію + Видалити %1$s? + Треки залишаються на вашому пристрої. Буде видалено лише колекцію. + Вибрати + Вибрати все + Скасувати вибір + Вибрано: %1$d + Додати до колекції + Додати до улюбленого + Вилучити з колекції + Пошук треків + Порядок в альбомі + Спочатку найдовші + Спочатку найкоротші + Треки + Висота тону + Скинути + Пропускати тишу + Таймер сну + %1$d хв + Кінець треку + Залишилось %1$s + Еквалайзер + Підсилення басів + Еквалайзер недоступний на цьому пристрої + Саундтреки + Вмикати в грі + Відтворювати саундтрек, поки запущено гру + Саундтреки ще не встановлено. + Пошук саундтреків + Додати теку саундтреку + У цій теці немає аудіофайлів + Загальна тривалість + Треків: %1$d / %2$s + Диск %1$s + Перемішати + Назад + Відтворити + Пауза + Далі + Повтор вимкнено + Повторювати все + Повторювати один + Гучність + У цьому саундтреку немає аудіофайлів diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index e6b9a21732..a85d7b4c88 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -3653,4 +3653,67 @@ Tuyết đỏ thẫm + Nhạc nền + Nhạc + Tùy chọn phát + Yêu thích + Bộ sưu tập + Chưa có bộ sưu tập nào. Chạm vào biểu tượng dấu trang để tạo. + Đã lưu + Tạo bộ sưu tập + Sắp xếp các bài đã lưu + Mới + Tạo + Tên bộ sưu tập + Nhập tên chưa được bộ sưu tập nào khác sử dụng + Quản lý + Đổi tên + Thêm bài hát + Thêm (%1$d) + Xóa bài hát + Xóa bộ sưu tập + Xóa %1$s? + Các bài hát vẫn còn trên thiết bị của bạn. Chỉ bộ sưu tập bị xóa. + Chọn + Chọn tất cả + Bỏ chọn tất cả + Đã chọn %1$d + Thêm vào bộ sưu tập + Thêm vào yêu thích + Xóa khỏi bộ sưu tập + Tìm bài hát + Thứ tự album + Dài nhất trước + Ngắn nhất trước + Bài hát + Cao độ + Đặt lại + Bỏ qua khoảng lặng + Hẹn giờ ngủ + %1$d phút + Hết bài + Còn %1$s + Bộ cân bằng âm + Tăng âm trầm + Thiết bị này không có bộ cân bằng âm + Nhạc nền + Bật trong game + Tiếp tục phát nhạc nền khi game đang chạy + Chưa có nhạc nền nào được cài đặt. + Tìm nhạc nền + Thêm thư mục nhạc nền + Không có tệp âm thanh trong thư mục đó + Tổng thời lượng + %1$d bài / %2$s + Đĩa %1$s + Phát ngẫu nhiên + Trước + Phát + Tạm dừng + Tiếp + Tắt lặp lại + Lặp lại tất cả + Lặp lại một bài + Âm lượng + Không có tệp âm thanh trong nhạc nền này diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 67e815130d..38946ef8c7 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -3657,4 +3657,67 @@ 猩红之雪 + 原声音乐 + 音乐 + 播放选项 + 收藏 + 合集 + 还没有合集。点按书签图标即可创建。 + 已保存 + 创建合集 + 整理你的收藏 + 新建 + 创建 + 合集名称 + 请输入未被其他合集使用的名称 + 管理 + 重命名 + 添加曲目 + 添加(%1$d) + 移除曲目 + 删除合集 + 删除 %1$s? + 曲目仍保留在你的设备上,只会删除合集。 + 选择 + 全选 + 取消全选 + 已选择 %1$d 项 + 添加到合集 + 添加到收藏 + 从合集中移除 + 搜索曲目 + 专辑顺序 + 最长优先 + 最短优先 + 曲目 + 音调 + 重置 + 跳过静音 + 睡眠定时 + %1$d 分钟 + 曲目结束 + 剩余 %1$s + 均衡器 + 低音增强 + 此设备不支持均衡器 + 原声音乐 + 在游戏中启用 + 游戏运行时继续播放原声音乐 + 尚未安装任何原声音乐。 + 搜索原声音乐 + 添加原声音乐文件夹 + 该文件夹中没有音频文件 + 总时长 + %1$d 首曲目 / %2$s + 第 %1$s 张 + 随机播放 + 上一首 + 播放 + 暂停 + 下一首 + 关闭重复 + 全部重复 + 单曲重复 + 音量 + 此原声音乐中没有音频文件 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index f97f66c3a1..b81f12305a 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -3656,4 +3656,67 @@ 緋紅之雪 + 原聲帶 + 音樂 + 播放選項 + 最愛 + 合集 + 暫時未有合集。點按書籤圖示即可建立。 + 已儲存 + 建立合集 + 整理你的收藏 + 新增 + 建立 + 合集名稱 + 請輸入未被其他合集使用的名稱 + 管理 + 重新命名 + 新增曲目 + 新增(%1$d) + 移除曲目 + 刪除合集 + 刪除 %1$s? + 曲目仍會保留在你的裝置上,只會刪除合集。 + 選取 + 全選 + 取消全選 + 已選取 %1$d 項 + 加入合集 + 加入最愛 + 從合集中移除 + 搜尋曲目 + 專輯順序 + 最長優先 + 最短優先 + 曲目 + 音調 + 重設 + 略過靜音 + 睡眠計時器 + %1$d 分鐘 + 曲目結束 + 剩餘 %1$s + 等化器 + 重低音增強 + 此裝置不支援等化器 + 原聲帶 + 在遊戲中啟用 + 遊戲運行時繼續播放原聲帶 + 尚未安裝任何原聲帶。 + 搜尋原聲帶 + 新增原聲帶資料夾 + 該資料夾中沒有音訊檔案 + 總長度 + %1$d 首曲目 / %2$s + 第 %1$s 張 + 隨機播放 + 上一首 + 播放 + 暫停 + 下一首 + 關閉重複 + 全部重複 + 單曲重複 + 音量 + 此原聲帶中沒有音訊檔案 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index ee48c655e2..da5e460fc2 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -3656,4 +3656,67 @@ 緋紅之雪 + 原聲帶 + 音樂 + 播放選項 + 我的最愛 + 合集 + 尚無合集。點選書籤圖示即可建立。 + 已儲存 + 建立合集 + 整理你的收藏 + 新增 + 建立 + 合集名稱 + 請輸入未被其他合集使用的名稱 + 管理 + 重新命名 + 新增曲目 + 新增(%1$d) + 移除曲目 + 刪除合集 + 刪除 %1$s? + 曲目仍會保留在你的裝置上,只會刪除合集。 + 選取 + 全選 + 取消全選 + 已選取 %1$d 項 + 加入合集 + 加入我的最愛 + 從合集中移除 + 搜尋曲目 + 專輯順序 + 最長優先 + 最短優先 + 曲目 + 音調 + 重設 + 略過靜音 + 睡眠計時器 + %1$d 分鐘 + 曲目結束 + 剩餘 %1$s + 等化器 + 重低音增強 + 此裝置不支援等化器 + 原聲帶 + 在遊戲中啟用 + 遊戲執行時繼續播放原聲帶 + 尚未安裝任何原聲帶。 + 搜尋原聲帶 + 新增原聲帶資料夾 + 該資料夾中沒有音訊檔案 + 總長度 + %1$d 首曲目 / %2$s + 第 %1$s 張 + 隨機播放 + 上一首 + 播放 + 暫停 + 下一首 + 關閉重複 + 全部重複 + 單曲重複 + 音量 + 此原聲帶中沒有音訊檔案 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 734bfbb25e..ce55a06e1e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3999,5 +3999,69 @@ Scarlet Snow White surfaces with red accents. + Soundtracks + Music + Playback options + Favorites + Collections + No collections yet. Tap the bookmark icon to create one. + Saved + Create a collection + Organise your saves + New + Create + Collection name + Enter a name that no other collection uses + Manage + Rename + Add tracks + Add (%1$d) + Remove tracks + Delete collection + Delete %1$s? + The tracks stay on your device. Only the collection is removed. + Select + Select all + Deselect all + %1$d selected + Add to collection + Add to favorites + Remove from collection + Search tracks + Album order + Longest first + Shortest first + Tracks + Pitch + Reset + Skip silence + Sleep timer + %1$d min + End of track + %1$s left + Equalizer + Bass boost + The equalizer is not available on this device + Soundtracks + Enable ingame + Keep the soundtrack playing while a game runs + No soundtracks installed yet. + Search soundtracks + Add a soundtrack folder + No audio files found in that folder + Total length + %1$d Tracks / %2$s + Disc %1$s + Shuffle + Previous + Play + Pause + Next + Repeat off + Repeat all + Repeat one + Volume + No audio files found in this soundtrack + Launch unavailable No web browser is available to open this link. diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackCollectionsTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackCollectionsTest.kt new file mode 100644 index 0000000000..6aa9bb1640 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackCollectionsTest.kt @@ -0,0 +1,43 @@ +package com.droiddeck.launcher.frontend + +import com.droiddeck.launcher.frontend.SoundtrackCollections.Collection +import com.droiddeck.launcher.frontend.SoundtrackCollections.TrackRef +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class SoundtrackCollectionsTest { + private fun ref(path: String) = TrackRef(path, path, "", "", 0) + + @Test fun toggledAddsThenRemoves() { + val once = SoundtrackCollections.toggled(emptyList(), ref("a")) + assertEquals(listOf("a"), once.map { it.path }) + assertTrue(SoundtrackCollections.toggled(once, ref("a")).isEmpty()) + } + + @Test fun mergedSkipsDuplicatesAndKeepsOrder() { + val result = SoundtrackCollections.merged(listOf(ref("a"), ref("b")), listOf(ref("b"), ref("c"), ref("c"))) + assertEquals(listOf("a", "b", "c"), result.map { it.path }) + } + + @Test fun cleanNameTrimsAndCollapsesSpaces() = assertEquals("My mix", SoundtrackCollections.cleanName(" My mix ")) + + @Test fun nameTakenIgnoresCaseAndExcludedId() { + val list = listOf(Collection(2_000_000_001, "Chill", emptyList())) + assertTrue(SoundtrackCollections.nameTaken(list, "chill")) + assertFalse(SoundtrackCollections.nameTaken(list, "chill", except = 2_000_000_001)) + assertFalse(SoundtrackCollections.nameTaken(list, "Focus")) + } + + @Test fun nextIdStartsAboveFavoritesAndGrows() { + assertEquals(SoundtrackCollections.FAVORITES_ID + 1, SoundtrackCollections.nextId(emptyList())) + val list = listOf(Collection(2_000_000_005, "x", emptyList())) + assertEquals(2_000_000_006, SoundtrackCollections.nextId(list)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackOrderTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackOrderTest.kt new file mode 100644 index 0000000000..167d2c96b9 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackOrderTest.kt @@ -0,0 +1,34 @@ +package com.droiddeck.launcher.frontend + +import java.io.File +import org.junit.Assert.assertEquals +import org.junit.Test + +class SoundtrackOrderTest { + private fun track(name: String, disc: Int, number: Int) = Soundtrack.Track(File("/music/$name"), name, disc, number, 1000L) + + @Test fun savedOrderIsAppliedAndRenumbered() { + val disc = mapOf(1 to listOf(track("a", 1, 1), track("b", 1, 2), track("c", 1, 3))) + val result = SoundtrackOrder.ordered(disc, listOf("/music/c", "/music/a", "/music/b")) + assertEquals(listOf("c", "a", "b"), result.getValue(1).map { it.title }) + assertEquals(listOf(1, 2, 3), result.getValue(1).map { it.number }) + } + + @Test fun unknownTracksKeepTheirOrderAfterKnownOnes() { + val disc = mapOf(1 to listOf(track("a", 1, 1), track("b", 1, 2), track("c", 1, 3))) + val result = SoundtrackOrder.ordered(disc, listOf("/music/c")) + assertEquals(listOf("c", "a", "b"), result.getValue(1).map { it.title }) + } + + @Test fun discsStayApart() { + val disc = mapOf(1 to listOf(track("a", 1, 1), track("b", 1, 2)), 2 to listOf(track("c", 2, 1), track("d", 2, 2))) + val result = SoundtrackOrder.ordered(disc, listOf("/music/d", "/music/b", "/music/a", "/music/c")) + assertEquals(listOf("b", "a"), result.getValue(1).map { it.title }) + assertEquals(listOf("d", "c"), result.getValue(2).map { it.title }) + } + + @Test fun emptyOrderChangesNothing() { + val disc = mapOf(1 to listOf(track("a", 1, 1), track("b", 1, 2))) + assertEquals(disc, SoundtrackOrder.ordered(disc, emptyList())) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackTest.kt new file mode 100644 index 0000000000..ed96285429 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackTest.kt @@ -0,0 +1,151 @@ +package com.droiddeck.launcher.frontend + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import java.io.File + +class SoundtrackTest { + private fun raw( + folder: String, name: String, disc: Int? = null, track: Int? = null, title: String? = null, size: Long = 1000L, + ) = Soundtrack.Raw(File("/music/album/${if (folder.isEmpty()) "" else "$folder/"}$name"), folder, disc, track, title, null, 60_000L, size) + + @Test fun titlesDropArtistAlbumAndNumber() { + assertEquals("Once Upon a Time", Soundtrack.cleanTitle("toby fox - UNDERTALE Soundtrack - 01 Once Upon a Time.mp3")) + assertEquals("ANOTHER HIM", Soundtrack.cleanTitle("001 ANOTHER HIM.flac")) + assertEquals("Chapter 5 Logo", Soundtrack.cleanTitle("166 Chapter 5 Logo.mp3")) + assertEquals("Query-", Soundtrack.cleanTitle("094 Query-.mp3")) + assertEquals("Ruins", Soundtrack.cleanTitle("Ruins.ogg")) + } + + @Test fun flatAlbumIsOneDiscOrderedByNumber() { + val disc = Soundtrack.group( + listOf(raw("", "toby fox - X - 10 Ten.mp3"), raw("", "toby fox - X - 02 Two.mp3"), raw("", "toby fox - X - 01 One.mp3")), + ) + assertEquals(listOf(0), disc.keys.toList()) + assertEquals(listOf("One", "Two", "Ten"), disc.getValue(0).map { it.title }) + assertEquals(listOf(1, 2, 3), disc.getValue(0).map { it.number }) + } + + @Test fun subfoldersBecomeDiscs() { + val disc = Soundtrack.group( + listOf(raw("2", "041 B.mp3"), raw("1", "001 A.mp3"), raw("10", "200 C.mp3"), raw("1", "002 A2.mp3")), + ) + assertEquals(listOf(1, 2, 3), disc.keys.toList()) + assertEquals(listOf("A", "A2"), disc.getValue(1).map { it.title }) + assertEquals(listOf("B"), disc.getValue(2).map { it.title }) + assertEquals(listOf("C"), disc.getValue(3).map { it.title }) + } + + @Test fun losslessCopyReplacesLossyDuplicateAndKeepsItsFolder() { + val disc = Soundtrack.group( + listOf( + raw("", "001 ANOTHER HIM.flac", size = 4_130_000L), + raw("", "002 Beginning.flac", size = 4_870_000L), + raw("1", "001 ANOTHER HIM.mp3", size = 1_940_000L), + raw("1", "002 Beginning.mp3", size = 2_320_000L), + raw("2", "041 Faint Glow.mp3"), + ), + ) + assertEquals(listOf(1, 2), disc.keys.toList()) + assertEquals(listOf("flac", "flac"), disc.getValue(1).map { it.file.extension }) + assertEquals(listOf("ANOTHER HIM", "Beginning"), disc.getValue(1).map { it.title }) + assertEquals(listOf("Faint Glow"), disc.getValue(2).map { it.title }) + } + + @Test fun tagsDecideDiscsAndFileNamesDecideOrder() { + val disc = Soundtrack.group( + listOf( + raw("3+4", "088 Late.mp3", disc = 4, track = 1, title = "Old wooden rafters"), + raw("3+4", "001 Early.mp3", disc = 3, track = 2, title = "Second"), + raw("3+4", "002 Early.mp3", disc = 3, track = 1, title = "First"), + ), + ) + assertEquals(listOf(3, 4), disc.keys.toList()) + assertEquals(listOf("Second", "First"), disc.getValue(3).map { it.title }) + assertEquals("Old wooden rafters", disc.getValue(4).single().title) + } + + @Test fun sameTagsCollapseDuplicates() { + val disc = Soundtrack.group( + listOf( + raw("", "a.flac", disc = 1, track = 1, title = "Song", size = 5000L), + raw("1", "a.mp3", disc = 1, track = 1, title = "Song", size = 900L), + ), + ) + assertEquals(1, disc.getValue(1).size) + assertEquals("flac", disc.getValue(1).single().file.extension) + } + + @Test fun renamedPunctuationStillMatchesAcrossFormats() { + val disc = Soundtrack.group( + listOf( + raw("", "094 Query?.flac", size = 5000L), + raw("3+4", "094 Query-.mp3", size = 900L), + raw("3+4", "095 Quiz!.mp3", size = 900L), + ), + ) + assertEquals(2, disc.getValue(0).size + disc.filterKeys { it != 0 }.values.sumOf { it.size }) + assertEquals(listOf("flac", "mp3"), disc.values.flatten().map { it.file.extension }) + } + + @Test fun sameTitleWithDifferentNumbersStaysSeparate() { + val disc = Soundtrack.group(listOf(raw("", "01 Fanfare.mp3"), raw("", "07 Fanfare.mp3"))) + assertEquals(2, disc.values.flatten().size) + } + + @Test fun folderDiscsKeepTheirFolderNameAsLabel() { + val disc = Soundtrack.group( + listOf(raw("3+4", "088 A.mp3", track = 1), raw("3+4", "165 B.mp3", track = 78), raw("5", "166 C.mp3", track = 1), raw("Bonus", "300 D.mp3")), + ) + assertEquals(listOf("3+4", "5", "3"), disc.values.map { it.first().discLabel }.let { it.take(2) + disc.getValue(3).first().discLabel }) + assertEquals(listOf("A", "B"), disc.getValue(1).map { it.title }) + } + + @Test fun tagsFromTheDroppedDuplicateFillTheKeptOne() { + val disc = Soundtrack.group( + listOf( + raw("", "165 Concert for you.flac", size = 90_000L), + raw("3+4", "165 Concert for you.mp3", track = 78, title = "Concert for you", size = 98_000L), + raw("", "088 Flashback (Excerpt).flac", size = 4_800_000L), + raw("3+4", "088 Flashback (Excerpt).mp3", track = 1, title = "Flashback (Excerpt)", size = 1_280_000L), + ), + ) + val tracks = disc.values.flatten() + assertEquals(listOf("Flashback (Excerpt)", "Concert for you"), tracks.map { it.title }) + assertEquals(listOf("flac", "flac"), tracks.map { it.file.extension }) + } + + @Test fun emptyInputGivesNothing() { + assertTrue(Soundtrack.group(emptyList()).isEmpty()) + } + + @Test fun lengthFormatting() { + assertEquals("0:48", Soundtrack.formatLength(48_000L)) + assertEquals("1:20", Soundtrack.formatLength(80_000L)) + assertEquals("4:15:37", Soundtrack.formatLength((4 * 3600 + 15 * 60 + 37) * 1000L)) + } + + @Test fun shortcutLinksRoundTrip() { + assertEquals(391540, SoundtrackShortcuts.parse(SoundtrackShortcuts.uri(391540))) + assertEquals(-5, SoundtrackShortcuts.parse(SoundtrackShortcuts.uri(-5))) + assertNull(SoundtrackShortcuts.parse("droiddeck://game/12")) + assertNull(SoundtrackShortcuts.parse(null)) + } + + @Test fun addedSoundtracksNeverCollideWithSteamIds() { + assertTrue(AddedSoundtracks.idOf("/storage/emulated/0/Music/Album") < 0) + } + + @Test fun addedIdsStayStableWhenAnotherFolderIsRemoved() { + assertEquals("Aa".hashCode(), "BB".hashCode()) + val first = AddedSoundtracks.Entry("/m/Aa", "A") + val second = AddedSoundtracks.Entry("/m/BB", "B") + val assigned = AddedSoundtracks.assignIds(listOf(first, second)) + assertTrue(assigned[0].id != assigned[1].id) + assertTrue(assigned.all { it.id < 0 }) + val after = AddedSoundtracks.assignIds(assigned.drop(1)) + assertEquals(assigned[1].id, after[0].id) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackTracksTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackTracksTest.kt new file mode 100644 index 0000000000..c601653ca7 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackTracksTest.kt @@ -0,0 +1,29 @@ +package com.droiddeck.launcher.frontend + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class SoundtrackTracksTest { + private class T(val title: String, val ms: Long) + private val items = listOf(T("banana", 300), T("Apple", 100), T("cherry", 200)) + private fun sorted(s: SoundtrackTracks.Sort) = SoundtrackTracks.sort(items, s, { it.title }, { it.ms }).map { it.title } + + @Test fun defaultKeepsOrder() = assertEquals(listOf("banana", "Apple", "cherry"), sorted(SoundtrackTracks.Sort.DEFAULT)) + @Test fun titleAscIgnoresCase() = assertEquals(listOf("Apple", "banana", "cherry"), sorted(SoundtrackTracks.Sort.TITLE_ASC)) + @Test fun titleDesc() = assertEquals(listOf("cherry", "banana", "Apple"), sorted(SoundtrackTracks.Sort.TITLE_DESC)) + @Test fun longestFirst() = assertEquals(listOf("banana", "cherry", "Apple"), sorted(SoundtrackTracks.Sort.LONGEST)) + @Test fun shortestFirst() = assertEquals(listOf("Apple", "cherry", "banana"), sorted(SoundtrackTracks.Sort.SHORTEST)) + + @Test fun blankQueryMatchesEverything() = assertTrue(SoundtrackTracks.matches(" ", "anything")) + @Test fun wordsMayHitDifferentFields() = assertTrue(SoundtrackTracks.matches("main theme", "Main Menu", "Theme Composer")) + @Test fun everyWordMustMatch() = assertFalse(SoundtrackTracks.matches("main boss", "Main Menu", "Composer")) + @Test fun matchIsCaseInsensitive() = assertTrue(SoundtrackTracks.matches("MENU", "main menu")) + + @Test fun rankOrdersExactPrefixContains() { + assertEquals(0, SoundtrackTracks.rank("Menu", "menu")) + assertEquals(1, SoundtrackTracks.rank("men", "Menu Theme")) + assertEquals(2, SoundtrackTracks.rank("theme", "Menu Theme")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/DragTargetTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/DragTargetTest.kt new file mode 100644 index 0000000000..3a35e77f23 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/DragTargetTest.kt @@ -0,0 +1,20 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Test + +class DragTargetTest { + @Test fun smallMovesStayInPlace() = assertEquals(5, dragTarget(20f, 100f, 5, 0, 9)) + + @Test fun halfRowMovesToNextSlot() { + assertEquals(6, dragTarget(60f, 100f, 5, 0, 9)) + assertEquals(4, dragTarget(-60f, 100f, 5, 0, 9)) + } + + @Test fun longMovesSkipSeveralRows() = assertEquals(8, dragTarget(310f, 100f, 5, 0, 9)) + + @Test fun staysInsideTheDisc() { + assertEquals(9, dragTarget(900f, 100f, 5, 0, 9)) + assertEquals(2, dragTarget(-900f, 100f, 5, 2, 9)) + } +} diff --git a/docs/development/soundtracks.md b/docs/development/soundtracks.md new file mode 100644 index 0000000000..a1b11a3997 --- /dev/null +++ b/docs/development/soundtracks.md @@ -0,0 +1,78 @@ +# Soundtracks + +Steam soundtracks get their own tab under Library, a built-in music player, and an Android media session. + +## Where soundtracks live + +Steam installs a soundtrack to `/steamapps/music/`, next to a normal `appmanifest_.acf`. This holds for the internal Steam library and for a second library folder. + +`Library.steamGames()` skips any manifest whose install directory exists only under `steamapps/music`. `Library.soundtracks()` returns exactly those entries, marked with `SteamGame.soundtrack`. While the Music tab is enabled, games and soundtracks therefore never mix in the Library tab, the launch drawer, game file sync or component preparation. + +Folders added by hand (Soundtracks tab, plus button) are stored in `added-soundtracks.json` and carry a negative app id, so they cannot collide with a Steam app id. + +## Turning it off + +Setup > Launcher > Soundtracks. When off, the tab disappears and installed Steam soundtracks show in Library again, as they did before. + +## Tracks, discs and duplicates + +`Soundtrack.load()` walks the folder (four levels deep) for mp3, flac, ogg, opus, wav, m4a and aac. Tags come from `MediaMetadataRetriever` and are cached per folder in `files/soundtrack-index`, keyed by path, size and modification time. + +`Soundtrack.group()` is pure and unit tested: + +1. The same track in several formats collapses to one. Identity is disc and track number when both tags exist, otherwise the cleaned title. Lossless wins over lossy. +2. Disc comes from the disc tag, otherwise from the subfolder (natural order), labelled with the folder name when it is numeric (for example `3+4`). A folder with no subfolders is one disc and shows no disc headers. Tags missing on the kept copy are filled from its duplicates, since FLAC files often use tag names Android does not read. +3. Tracks sort by the number at the start of the file name, then by track tag, then by name. This matches Valve's soundtrack documentation, which says the Steam music player takes play order from file names and not from metadata. Numbers shown on screen are positions inside the disc. +4. Titles come from the tag, otherwise from the file name with the artist, album and track number removed. + +## Cover art + +Steam's own library cache image first, then `AlbumArtwork`, `cover`, `folder` and similar files in the soundtrack folder. When none exists, the picture embedded in the first track that has one is used, so the grid shows it without opening the album. The player page shows the embedded picture of the track that is playing and falls back to the album cover for tracks without one. The media notification and the system media panel follow the same rule: while a track plays, its embedded picture replaces the item artwork in place, which does not restart playback, unless a cover was chosen in the art changer. The SteamGridDB artwork changer applies to Steam soundtracks like any other Steam entry. + +## Player page + +The layout follows Steam's soundtrack page and uses the DroidDeck theme colors and shapes, so every theme works. Cover, title, artist and total length sit on the left with seek, shuffle, previous, play or pause, next, repeat and volume. The track list with disc headers sits on the right. Portrait stacks the two. The action buttons (game files, shortcut, edit art, uninstall) use the same wide pill style as Steam's See More button. + +Controller: d-pad moves between buttons and rows, A confirms, B goes back, the sliders respond to left and right. + +Shortcuts use `droiddeck://soundtrack/` and open the soundtrack page. + +## Playback and Android media controls + +`SoundtrackService` is a media3 `MediaSessionService` with an `ExoPlayer`. It runs as a foreground service of type `mediaPlayback`, so playback keeps going when DroidDeck is closed and the notification and lock screen controls show the cover, title and artist. `SoundtrackController` connects a `MediaController` to it and exposes Compose state. + +Launching a game pauses the music unless Enable ingame is on (see Playing during games). Audio focus and headphone unplug are handled by ExoPlayer. + +Added dependencies: `androidx.media3:media3-exoplayer` and `androidx.media3:media3-session` 1.3.1. + +## Playback options + +The player page has a Playback options button that opens a panel with: + +- Speed and pitch, from 0.5x to 2x in 0.05 steps, applied through ExoPlayer's playback parameters. +- Skip silence. +- A sleep timer for 15, 30 or 60 minutes or the end of the current track. The timer runs in `SoundtrackService`, so it still fires when DroidDeck is closed. +- An equalizer with the device presets, one slider per band, and bass boost where the device supports it. The effects are attached to the player's audio session in the service. + +Settings are saved in `soundtrack_settings` and sent to the service whenever the controller connects. The last album, track and position are saved too, so the play button on an album resumes where it stopped. The position is saved on track changes, pauses and seeks. + +## Playing during games + +Setup › Launcher has an Enable ingame toggle, shown while soundtracks are on. When it is off, launching a game pauses the soundtrack. When it is on, the soundtrack keeps playing and the service stops requesting audio focus, so the game's own audio mixes with it. The setting is sent to the service with the `INGAME` session command and is read again when the service starts. + +## Searching and sorting + +Inside a soundtrack, a search field above the track list filters by title, artist and album, and a sort button orders the list by album order, title or length. Track numbers always count from 1 by position in the list shown. + +Custom (added) soundtracks, collections and Favorites can be reordered: select tracks first (long-press one, or use the select button), then with Album order selected and no search text, long-press a selected track and drag it. The order of an added soundtrack is stored in `soundtrack-order.json` and applied by `Soundtrack.load` within each disc; a collection stores its order in `soundtrack-collections.json`. Steam soundtracks cannot be reordered. The Music tab search also looks up tracks: soundtracks and collections whose names match come first, followed by a Tracks section. + +## Favorites and collections + +- The heart under the transport controls adds or removes the current track from Favorites. The bookmark button next to it opens the Saved panel to add the track to a collection or create one. +- The Music tab has a Collections chip. Favorites is the first entry under it. The bookmark in the Music header opens the same Saved panel to open or create a collection. +- Long-press a track to select. The selection bar has Select all, Deselect all, Add to collection, Add to favorites and, on a collection page, Remove from collection. +- A collection page has a Manage button to rename, add tracks, remove tracks or delete. Favorites cannot be renamed or deleted. +- Collection pages have Manage, Playback options, Shortcut and Edit art. Edit art changes the cover only, from a track cover or an image of your own, and is stored in `soundtrack-art/`. Added soundtracks have the same Edit art, with the images in their folder and the first track cover as the choices; Steam soundtracks keep the Steam art editor. +- Collections are stored in `soundtrack-collections.json` in the app files directory as snapshots of path, title, artist, album, length and cover. Tracks whose files are gone are skipped when a collection is played. +- Collection and Favorites playback does not overwrite the saved resume position of an album. + From cd945a520a65d3c5e087fbb9ede131dcc57b083a Mon Sep 17 00:00:00 2001 From: K11MCH1 <81425424+K11MCH1@users.noreply.github.com> Date: Sat, 14 Nov 2026 00:37:56 +0900 Subject: [PATCH 56/57] fix(dircache): Steam no longer deadlocks when a library below calls back in (#2560) With "Run without proot" on, the Steam client hung about a second after login and aborted three minutes later with "fatal stalled cross-thread pipe". The directory cache holds its lock while it adds an inotify watch. Without proot that call reaches the native userland hook, whose inotify_add_watch creates a missing directory with mkdir() by name. That mkdir resolves to the cache's own wrapper, which waits for the same lock on the same thread. Steam's IPC threads then queue behind it. The cache now counts the locks each thread holds. While a thread holds one, calls that come back into the cache (opendir, the change wrappers, created files, missing-name checks, closedir of a stream it did not open) go straight to the next library. The same guard covers the hook's remove(), which calls unlink() by name while the cache's remove wrapper holds its operation lock. --- tools/linuxfs/preload/dircache.c | 84 ++++++++++++++++------------ tools/tests/test_dircache_preload.py | 34 ++++++++++- 2 files changed, 81 insertions(+), 37 deletions(-) diff --git a/tools/linuxfs/preload/dircache.c b/tools/linuxfs/preload/dircache.c index f6951497f0..a94717bd78 100644 --- a/tools/linuxfs/preload/dircache.c +++ b/tools/linuxfs/preload/dircache.c @@ -83,6 +83,19 @@ static int notify = -1; static int forked; static struct { dev_t dev; int fuse; } devs[8]; static int ndevs; +// Libraries preloaded after this one can call back in while a lock is held (the native userland +// hook's inotify_add_watch calls mkdir() by name); such calls go straight to the next library. +static __thread int holding; + +static void take(pthread_mutex_t *m) { + pthread_mutex_lock(m); + holding++; +} + +static void give(pthread_mutex_t *m) { + holding--; + pthread_mutex_unlock(m); +} static long long now_ns(void) { struct timespec t; @@ -109,32 +122,32 @@ static int enabled(void) { } static int eligible(const char *path) { - if (path == NULL || path[0] != '/' || !enabled()) return 0; + if (holding || path == NULL || path[0] != '/' || !enabled()) return 0; const char *s = strstr(path, "/steamapps"); return s && (s[10] == '/' || s[10] == 0); } static int on_fuse(dev_t dev, const char *path) { - pthread_mutex_lock(&lock); + take(&lock); for (int i = 0; i < ndevs; i++) { if (devs[i].dev == dev) { int fuse = devs[i].fuse; - pthread_mutex_unlock(&lock); + give(&lock); return fuse; } } - pthread_mutex_unlock(&lock); + give(&lock); struct statfs fs; int saved = errno; int fuse = statfs(path, &fs) == 0 && (unsigned long)fs.f_type == FUSE_MAGIC; errno = saved; - pthread_mutex_lock(&lock); + take(&lock); if (ndevs < 8) { devs[ndevs].dev = dev; devs[ndevs].fuse = fuse; ndevs++; } - pthread_mutex_unlock(&lock); + give(&lock); return fuse; } @@ -404,7 +417,7 @@ __attribute__((constructor)) static void resolve(void) { #pragma GCC diagnostic pop static DIR *hit(const struct stat *st, struct handle *h, long long now) { - pthread_mutex_lock(&lock); + take(&lock); if (!changing) pump(NULL, 0); int slot = find(st->st_dev, st->st_ino); if (slot >= 0 && same(table[slot], st) && now - table[slot]->filled < DIR_TTL_NS && records(table[slot]) == 0) { @@ -413,7 +426,7 @@ static DIR *hit(const struct stat *st, struct handle *h, long long now) { h->snap->used = now; DIR *d = wrap(h); if (d) { - pthread_mutex_unlock(&lock); + give(&lock); return d; } unref(h->snap); @@ -421,7 +434,7 @@ static DIR *hit(const struct stat *st, struct handle *h, long long now) { } else if (slot >= 0) { drop(slot); } - pthread_mutex_unlock(&lock); + give(&lock); return NULL; } @@ -462,11 +475,11 @@ static int above(struct handle *h, const char *path) { } static int track(struct handle *h, const char *path) { - pthread_mutex_lock(&lock); + take(&lock); h->wd = watch(path, WATCHED); DIR *d = h->wd >= 0 && above(h, path) ? wrap(h) : NULL; if (d == NULL) let_go(h->wd, h->up, h->nup); - pthread_mutex_unlock(&lock); + give(&lock); return d != NULL; } @@ -486,11 +499,11 @@ static void filling(struct handle *h, DIR *real, const struct stat *st, long lon } static void untrack(struct handle *h) { - pthread_mutex_lock(&lock); + take(&lock); int i = registered((DIR *)h); if (i >= 0) __atomic_store_n(&handles[i], NULL, __ATOMIC_RELEASE); let_go(h->wd, h->up, h->nup); - pthread_mutex_unlock(&lock); + give(&lock); } DIR *opendir(const char *path) { @@ -553,11 +566,11 @@ static void finish(struct handle *h) { h->fill = NULL; int current = stat(h->path, &st) == 0 && same(l, &st); if (current) l->folds = folds(h->path, &st); - pthread_mutex_lock(&lock); + take(&lock); if (!changing) pump(NULL, 0); if (current && !__atomic_load_n(&h->dirty, __ATOMIC_RELAXED)) install(l); else destroy(l); - pthread_mutex_unlock(&lock); + give(&lock); } static struct dirent64 *entry(struct handle *h) { @@ -624,7 +637,8 @@ int readdir_r(DIR *d, struct dirent *out, struct dirent **result) { int closedir(DIR *d) { NEXT(closedir); - pthread_mutex_lock(&lock); + if (holding && registered(d) < 0) return next_closedir(d); + take(&lock); int i = registered(d); struct handle *h = i >= 0 ? handles[i] : NULL; if (h) { @@ -632,7 +646,7 @@ int closedir(DIR *d) { if (h->snap) unref(h->snap); let_go(h->wd, h->up, h->nup); } - pthread_mutex_unlock(&lock); + give(&lock); if (h == NULL) return next_closedir(d); int r = 0; if (h->real) r = next_closedir(h->real); @@ -704,10 +718,10 @@ static int watching(const char *path) { } static void begin(void) { - pthread_mutex_lock(&lock); + take(&lock); pump(NULL, 0); changing = 1; - pthread_mutex_unlock(&lock); + give(&lock); } static void before(struct side *s) { @@ -796,10 +810,10 @@ static int patch(struct side *s, int what, uint32_t event, int ok, int error, co } static void end(struct expect *x, int nx) { - pthread_mutex_lock(&lock); + take(&lock); pump(x, nx); changing = 0; - pthread_mutex_unlock(&lock); + give(&lock); } int bl_dircache_create(int dirfd, const char *path, int flags, mode_t mode, @@ -809,17 +823,17 @@ int bl_dircache_create(int dirfd, const char *path, int flags, mode_t mode, struct side s; if (!(flags & O_CREAT) || (dirfd != AT_FDCWD && (path == NULL || path[0] != '/')) || !watching(path) || !split(path, &s)) return real(dirfd, path, flags, mode); - pthread_mutex_lock(&oplock); + take(&oplock); begin(); before(&s); int fd = real(dirfd, path, flags, mode); int saved = errno; struct expect x; - pthread_mutex_lock(&lock); + take(&lock); int nx = patch(&s, ADDED, IN_CREATE, fd >= 0, saved, path, &x); - pthread_mutex_unlock(&lock); + give(&lock); end(&x, nx); - pthread_mutex_unlock(&oplock); + give(&oplock); errno = saved; return fd; } @@ -829,18 +843,18 @@ int bl_dircache_create(int dirfd, const char *path, int flags, mode_t mode, NEXT(name); \ struct side s; \ if (!watching(path) || !split(path, &s)) return call; \ - pthread_mutex_lock(&oplock); \ + take(&oplock); \ begin(); \ before(&s); \ int r = call; \ int saved = errno; \ struct expect x; \ - pthread_mutex_lock(&lock); \ + take(&lock); \ int nx = patch(&s, what, event, r == 0, saved, what == ADDED ? path : NULL, &x); \ if (r == 0 && what == REMOVED) forget_below(path); \ - pthread_mutex_unlock(&lock); \ + give(&lock); \ end(&x, nx); \ - pthread_mutex_unlock(&oplock); \ + give(&oplock); \ errno = saved; \ return r; \ } @@ -864,7 +878,7 @@ ONE_PATH(remove, REMOVED, IN_DELETE, bl_descriptor_remove(path, next_remove)) struct side a, b; \ int track_a = gone && watching(from) && split(from, &a), track_b = watching(to) && split(to, &b); \ if (!track_a && !track_b) return call(from, to); \ - pthread_mutex_lock(&oplock); \ + take(&oplock); \ begin(); \ if (track_a) before(&a); \ if (track_b) before(&b); \ @@ -872,16 +886,16 @@ ONE_PATH(remove, REMOVED, IN_DELETE, bl_descriptor_remove(path, next_remove)) int saved = errno; \ struct expect x[2]; \ int nx = 0; \ - pthread_mutex_lock(&lock); \ + take(&lock); \ if (track_a) nx += patch(&a, REMOVED, IN_MOVED_FROM, r == 0, saved, NULL, &x[nx]); \ if (track_b) { \ if (track_a && strcmp(a.dir, b.dir) == 0) b.known = stat(b.dir, &b.before) == 0; \ nx += patch(&b, ADDED, event, r == 0, saved, to, &x[nx]); \ } \ if (r == 0 && gone) { forget_below(from); forget_below(to); } \ - pthread_mutex_unlock(&lock); \ + give(&lock); \ end(x, nx); \ - pthread_mutex_unlock(&oplock); \ + give(&oplock); \ errno = saved; \ return r; \ } @@ -931,13 +945,13 @@ int bl_dircache_absent(const char *path) { for (const char *c = s.name; *c; c++) if ((unsigned char)*c >= 0x80) return 0; long long now = now_ns(); - pthread_mutex_lock(&lock); + take(&lock); int absent = 0; if (!changing) { pump(NULL, 0); absent = listed_absent(s.dir, s.name, now); } - pthread_mutex_unlock(&lock); + give(&lock); return absent; } diff --git a/tools/tests/test_dircache_preload.py b/tools/tests/test_dircache_preload.py index 42db6817ce..f7b2d9008a 100644 --- a/tools/tests/test_dircache_preload.py +++ b/tools/tests/test_dircache_preload.py @@ -83,9 +83,25 @@ int inotify_add_watch(int fd, const char *path, uint32_t mask) { errno = ENOSPC; return -1; } + if (getenv("NESTED") && (mask & IN_ONLYDIR)) { + static DIR *(*uncounted)(const char *); + if (!uncounted) uncounted = dlsym(RTLD_NEXT, "opendir"); + mkdir(path, 0755); + DIR *d = uncounted("/proc/self/fd"); + while (d && readdir(d)) {} + if (d) closedir(d); + } return next(fd, path, mask); } +int remove(const char *path) { + static int (*next)(const char *); + if (!next) next = dlsym(RTLD_NEXT, "remove"); + if (!getenv("NESTED")) return next(path); + if (unlink(path) == 0) return 0; + return errno == EISDIR ? rmdir(path) : -1; +} + int statfs(const char *path, struct statfs *out) { static int (*next)(const char *, struct statfs *); if (!next) next = dlsym(RTLD_NEXT, "statfs"); @@ -337,9 +353,9 @@ class DirCachePreloadTest(unittest.TestCase): environment.update(env or {}) return environment - def run_program(self, *args, program=None, env=None): + def run_program(self, *args, program=None, env=None, timeout=60): result = subprocess.run([str(program or self.steam), *map(str, args)], env=self.environment(env), - capture_output=True, text=True, check=True, timeout=60) + capture_output=True, text=True, check=True, timeout=timeout) return result.stdout.splitlines() def run_paused(self, *args, between, env=None): @@ -675,6 +691,20 @@ class DirCachePreloadTest(unittest.TestCase): env={"BL_NO_DIR_CACHE": "1"}) self.assertEqual(["-1 2", "-1 2", "2"], out[1:]) + def test_a_preload_below_calling_back_while_a_folder_is_watched_does_not_hang(self): + common = self.lib / "common/Game" + common.mkdir(parents=True) + (common / "game.exe").touch() + out = self.run_program("list", self.staging, "list", common, "list", common, "opens", + env={"NESTED": "1"}, timeout=20) + self.assertEqual(["a.bundle,b.bundle", "game.exe", "game.exe", "2"], out) + + def test_a_preload_below_removing_through_unlink_does_not_hang(self): + s = self.staging + out = self.run_program("list", s, "remove", s / "a.bundle", "list", s, "raw", s, "opens", + env={"NESTED": "1"}, timeout=20) + self.assertEqual(["a.bundle,b.bundle", "b.bundle", "b.bundle", "1"], out) + def test_can_be_turned_off(self): out = self.run_program("list", self.staging, "list", self.staging, "opens", env={"BL_NO_DIR_CACHE": "1"}) self.assertEqual("2", out[-1]) From 1b65508f56c729f5ff525d08a9ebc6c5567b33cd Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 13 Nov 2026 11:42:55 -0500 Subject: [PATCH 57/57] feat(ui): reorder tabs, shelve them in More or hide them (#2569) * feat(ui): reorder tabs, shelve them in More or hide them * fix(ui): back from shelved tabs, startup tab and panel More count --- .../main/java/com/droiddeck/launcher/App.kt | 1 + .../droiddeck/launcher/FrontEndActivity.kt | 1 + .../com/droiddeck/launcher/agent/AgentTab.kt | 2 +- .../launcher/session/SessionPrefs.kt | 20 +- .../launcher/session/SettingsReset.kt | 2 +- .../droiddeck/launcher/ui/DualScreenPanel.kt | 16 +- .../droiddeck/launcher/ui/FrontEndContent.kt | 4 + .../com/droiddeck/launcher/ui/FrontEndRail.kt | 30 +-- .../droiddeck/launcher/ui/FrontEndScreen.kt | 15 +- .../droiddeck/launcher/ui/FrontEndSetup.kt | 7 +- .../com/droiddeck/launcher/ui/MorePage.kt | 98 ++++++++++ .../java/com/droiddeck/launcher/ui/NavTabs.kt | 91 +++++++++ .../com/droiddeck/launcher/ui/TabsSettings.kt | 142 ++++++++++++++ app/src/main/res/values-ar/strings.xml | 2 - app/src/main/res/values-b+es+419/strings.xml | 2 - app/src/main/res/values-bg/strings.xml | 2 - app/src/main/res/values-cs/strings.xml | 2 - app/src/main/res/values-da/strings.xml | 2 - app/src/main/res/values-de/strings.xml | 2 - app/src/main/res/values-el/strings.xml | 2 - app/src/main/res/values-es/strings.xml | 2 - app/src/main/res/values-fi/strings.xml | 2 - app/src/main/res/values-fr/strings.xml | 2 - app/src/main/res/values-hi/strings.xml | 2 - app/src/main/res/values-hu/strings.xml | 2 - app/src/main/res/values-in/strings.xml | 2 - app/src/main/res/values-it/strings.xml | 2 - app/src/main/res/values-ja/strings.xml | 2 - app/src/main/res/values-ko/strings.xml | 2 - app/src/main/res/values-ms/strings.xml | 2 - app/src/main/res/values-nb/strings.xml | 2 - app/src/main/res/values-nl/strings.xml | 2 - app/src/main/res/values-pl/strings.xml | 2 - app/src/main/res/values-pt-rPT/strings.xml | 2 - app/src/main/res/values-pt/strings.xml | 2 - app/src/main/res/values-ro/strings.xml | 2 - app/src/main/res/values-ru/strings.xml | 2 - app/src/main/res/values-sv/strings.xml | 2 - app/src/main/res/values-th/strings.xml | 2 - app/src/main/res/values-tr/strings.xml | 2 - app/src/main/res/values-uk/strings.xml | 2 - app/src/main/res/values-vi/strings.xml | 2 - app/src/main/res/values-zh-rCN/strings.xml | 2 - app/src/main/res/values-zh-rHK/strings.xml | 2 - app/src/main/res/values-zh-rTW/strings.xml | 2 - app/src/main/res/values/strings.xml | 13 +- .../com/droiddeck/launcher/ui/NavTabsTest.kt | 178 ++++++++++++++++++ 47 files changed, 584 insertions(+), 100 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/MorePage.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index 1801f34b5a..6ecd72d5f5 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -44,6 +44,7 @@ class App : Application() { CrashHandler.install(this) com.droiddeck.launcher.agent.AgentHost.refresh(this) com.droiddeck.launcher.agent.AgentTab.load(this) + com.droiddeck.launcher.ui.NavTabs.load(this) com.droiddeck.launcher.ui.AgentPet.install(this) if (com.droiddeck.launcher.agent.AgentTab.visible) com.droiddeck.launcher.lab.LabNotice.openOnInstall = "agent" com.droiddeck.launcher.lab.LabNotice.started(this) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 765c7b23f9..c8ce1e4ae8 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -3207,6 +3207,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet if (!ok) android.widget.Toast.makeText(this, R.string.setup_reset_settings_partial, android.widget.Toast.LENGTH_LONG).show() com.droiddeck.launcher.ui.Motion.refresh(this) com.droiddeck.launcher.agent.AgentTab.load(this) + com.droiddeck.launcher.ui.NavTabs.load(this) if (!switchLauncherIcon(LauncherIcon.DARK)) recreate() } }, "reset-settings").start() diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt index b779288f3e..7392473c72 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.setValue import com.droiddeck.launcher.session.SessionPrefs object AgentTab { - var shown by mutableStateOf(false) + var shown by mutableStateOf(true) private set val visible: Boolean get() = shown && AgentHost.available diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index f55d994e1c..4c567fd1b6 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -265,7 +265,7 @@ object SessionPrefs { prefs(context).edit().putBoolean("railLabels", show).apply() } - fun agentTab(context: Context): Boolean = prefs(context).getBoolean("agentTab", false) + fun agentTab(context: Context): Boolean = prefs(context).getBoolean("agentTab", true) fun setAgentTab(context: Context, show: Boolean) { prefs(context).edit().putBoolean("agentTab", show).apply() @@ -289,6 +289,24 @@ object SessionPrefs { prefs(context).edit().putString("storesTabHidden", hidden.joinToString(",")).apply() } + fun navTabOrder(context: Context): List = idList(prefs(context).getString("navTabOrder", null)) + + fun setNavTabOrder(context: Context, order: List) { + prefs(context).edit().putString("navTabOrder", order.joinToString(",")).apply() + } + + fun navTabShelved(context: Context): Set = idList(prefs(context).getString("navTabShelved", "soundtracks,agent")).toSet() + + fun setNavTabShelved(context: Context, keys: Set) { + prefs(context).edit().putString("navTabShelved", keys.joinToString(",")).apply() + } + + fun navTabHidden(context: Context): Set = idList(prefs(context).getString("navTabHidden", null)).toSet() + + fun setNavTabHidden(context: Context, keys: Set) { + prefs(context).edit().putString("navTabHidden", keys.joinToString(",")).apply() + } + private fun idList(raw: String?): List = raw.orEmpty().split(',').map { it.trim() }.filter { it.isNotEmpty() } val STORES_SORTS = listOf("lastPlayed", "recentlyInstalled", "titleAsc", "titleDesc", "sizeDesc", "sizeAsc", "releaseDateDesc") diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index 6849c621c9..7e4053a14a 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -18,7 +18,7 @@ object SettingsReset { "storesInstallLanguage", "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "__KEEP_droidDeckHud__", "__KEEP_droidDeckHudPos__", "backHold", "backActionsInverted", "backDoubleTapMs", "touch", "osc", "shape", "steamController", "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", - "stretch16x9", "picturePosition", "railLabels", "agentTab", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", + "stretch16x9", "picturePosition", "railLabels", "agentTab", "navTabOrder", "navTabShelved", "navTabHidden", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "ramCapMb", "vramCapMb", "zramClient", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt index b46afbb977..df4e4a8d1b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt @@ -59,6 +59,8 @@ class DualPanelModel( val appScale: Int, val onSelect: (String) -> Unit, val onResume: () -> Unit, + val title: String = selected, + val moreDownloads: Int = 0, ) object DualScreenPanel { @@ -322,7 +324,7 @@ internal fun DualPanelContent(model: DualPanelModel) { Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { Text(stringResource(R.string.app_name), fontSize = 15.sp, fontWeight = FontWeight.Bold, color = pal.signal) Spacer(Modifier.size(12.dp)) - val (label, _) = railLabelIcon(model.selected) + val (label, _) = railLabelIcon(model.title) Text(stringResource(label), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, modifier = Modifier.weight(1f), maxLines = 1, overflow = TextOverflow.Ellipsis) PanelClock() @@ -336,7 +338,7 @@ internal fun DualPanelContent(model: DualPanelModel) { for (row in model.keys.chunked(columns)) { Row(Modifier.fillMaxWidth().height(tileHeight), horizontalArrangement = Arrangement.spacedBy(gap)) { for (key in row) PanelTile(key, key == model.selected, key in model.badges, - if (key == "stores") model.storeDownloads else 0, Modifier.weight(1f)) { model.onSelect(key) } + if (key == "stores") model.storeDownloads else if (key == NavTabs.MORE) model.moreDownloads else 0, Modifier.weight(1f)) { model.onSelect(key) } repeat(columns - row.size) { Spacer(Modifier.weight(1f)) } } } @@ -400,12 +402,10 @@ private fun PanelClock() { } @Composable -internal fun DualPanelPublisher(s: FrontEndState, selected: String, onSelect: (String) -> Unit, a: FrontEndActions) { - val badges = buildSet { - if (setupNeedsAttention(s)) add("setup") - if (s.updates.hasUpdate) add("updates") - } - val model = DualPanelModel(navigationKeys(s), selected, badges, s.storeDownloadsActive, s.running, s.theme, s.appScale, onSelect, a.onResume) +internal fun DualPanelPublisher(s: FrontEndState, selected: String, title: String, onSelect: (String) -> Unit, a: FrontEndActions) { + val keys = navigationKeys(s) + val badges = keys.filter { railBadge(s, it) }.toSet() + val model = DualPanelModel(keys, selected, badges, s.storeDownloadsActive, s.running, s.theme, s.appScale, onSelect, a.onResume, title, railCount(s, NavTabs.MORE)) androidx.compose.runtime.SideEffect { DualScreenPanel.model = model } androidx.compose.runtime.DisposableEffect(Unit) { onDispose { DualScreenPanel.model = null } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt index b99ee02316..26d0506a73 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt @@ -273,6 +273,10 @@ private fun Content( DesktopPage(s, a, modifier, onSelect) return } + if (selected == NavTabs.MORE) { + MorePage(s, a, onSelect, modifier.padding(horizontal = padH).padding(top = padV)) + return + } if (selected == "agent") { AgentPage(modifier.padding(horizontal = padH).padding(top = padV)) return diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt index 87d8ac6644..5f1b3dfaee 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -51,6 +51,7 @@ import androidx.compose.material.icons.outlined.AutoAwesome import androidx.compose.material.icons.outlined.DesktopWindows import androidx.compose.material.icons.outlined.Layers import androidx.compose.material.icons.outlined.LocalMall +import androidx.compose.material.icons.outlined.MoreHoriz import androidx.compose.material.icons.outlined.SportsEsports import androidx.compose.material.icons.outlined.Storefront import androidx.compose.material.icons.outlined.SystemUpdate @@ -124,16 +125,7 @@ internal fun BottomBar( } } -internal fun navigationKeys(s: FrontEndState) = buildList { - add("steam"); add("games") - if (s.soundtracksEnabled) add("soundtracks") - if (s.gameStoresEnabled) add("stores") - add("desktop") - if (com.droiddeck.launcher.agent.AgentTab.visible) add("agent") - add("components") - if (s.isHomeApp) add("android-apps") - add("setup"); add("updates") -} +internal fun navigationKeys(s: FrontEndState) = NavTabs.bar(s) internal object RailLabels { var shown by mutableStateOf(true) @@ -208,12 +200,26 @@ internal fun railLabelIcon(key: String): Pair = when (key) { "agent" -> R.string.rail_agent to Icons.Outlined.AutoAwesome "android-apps" -> R.string.rail_apps to Icons.Outlined.Apps "setup" -> R.string.rail_setup to Icons.Outlined.Tune + NavTabs.MORE -> R.string.rail_more to Icons.Outlined.MoreHoriz else -> R.string.rail_updates to Icons.Outlined.SystemUpdate } internal fun setupNeedsAttention(s: FrontEndState): Boolean = !s.ready || (s.available != null && s.available != s.installed) || PhantomProcessLimit.blocksSteam(s.phantomProcessStatus) || com.droiddeck.launcher.sync.Syncthing.needsAttention +internal fun railBadge(s: FrontEndState, key: String, setupNeedsAttention: Boolean = setupNeedsAttention(s)): Boolean = when (key) { + "setup" -> setupNeedsAttention + "updates" -> s.updates.hasUpdate + NavTabs.MORE -> NavTabs.more(s).any { it != NavTabs.MORE && railBadge(s, it, setupNeedsAttention) } + else -> false +} + +internal fun railCount(s: FrontEndState, key: String): Int = when (key) { + "stores" -> s.storeDownloadsActive + NavTabs.MORE -> if ("stores" in NavTabs.more(s)) s.storeDownloadsActive else 0 + else -> 0 +} + @Composable private fun NavigationItems( s: FrontEndState, shown: String, compact: Boolean, iconOnly: Boolean, height: Dp, width: Dp, @@ -224,8 +230,8 @@ private fun NavigationItems( val (label, icon) = railLabelIcon(key) key(key) { RailItem(stringResource(label), icon, key, shown == key, compact, iconOnly, height, width, - badge = (key == "setup" && setupNeedsAttention) || (key == "updates" && s.updates.hasUpdate), - count = if (key == "stores") s.storeDownloadsActive else 0, + badge = railBadge(s, key, setupNeedsAttention), + count = railCount(s, key), place = place, onFocus = { onFocusSelect(key) }) { onSelect(key) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 2d2baaff3f..c936d13c74 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -468,7 +468,9 @@ fun FrontEndScreen(s: FrontEndState, a: FrontEndActions, page: (@Composable () - @OptIn(ExperimentalComposeUiApi::class) @Composable private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Composable () -> Unit)?, frontFocus: FrontFocus) { - var selected by rememberSaveable { mutableStateOf(if (s.shortcutPicker) "games" else "steam") } + var selected by rememberSaveable { + mutableStateOf(if (s.shortcutPicker) "games" else if (NavTabs.place(s, "steam") == TabPlace.HIDDEN) navigationKeys(s).first { it != "components" } else "steam") + } LaunchedEffect(s.shortcutPicker) { if (s.shortcutPicker) selected = "games" } LaunchedEffect(s.navigate) { val target = s.navigate ?: return@LaunchedEffect @@ -575,6 +577,10 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com ) { selected = if (selected.startsWith("rom:")) "emu:" + selected.removePrefix("rom:").substringBefore(':') else "desktop" } + val backToMore = s.pageKey == null && Hops.origin == null && selected in NavTabs.more(s) + BackHandler(enabled = !processSettingsPageVisible && backToMore) { + selected = NavTabs.MORE + } LaunchedEffect(s.isHomeApp) { if (!s.isHomeApp && selected == "android-apps") selected = "steam" } LaunchedEffect(s.soundtracksEnabled) { if (!s.soundtracksEnabled && (selected == "soundtracks" || selected.startsWith("sound:"))) selected = "games" @@ -587,7 +593,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com } remember { Motion.refresh(ctx); true } - val railSelection = when { + val openTab = when { Hops.origin != null && s.pageKey == Hops.origin?.page -> Hops.origin!!.dest s.pageKey == "performance" -> "steam" s.pageKey == "controller-mapping" -> "setup" @@ -596,6 +602,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com selected.startsWith("emu:") || selected.startsWith("rom:") || selected.startsWith("user:") || selected == "store" -> "desktop" else -> s.pageKey ?: selected } + val railSelection = if (openTab in NavTabs.more(s)) NavTabs.MORE else openTab val railSelectionNow = androidx.compose.runtime.rememberUpdatedState(railSelection) var railPicks by remember { mutableStateOf(0) } val showRailPage: (String, Boolean) -> Unit = { key, focusContent -> @@ -711,7 +718,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com focusWithinFrames({ frontFocus.last == r.control && anyFocused }) { frontFocus.items[r.control] ?: frontFocus.paneEntry() } } var screenAt by remember { mutableStateOf(Offset.Zero) } - if (s.dualScreen) DualPanelPublisher(s, railSelection, { key -> + if (s.dualScreen) DualPanelPublisher(s, railSelection, openTab, { key -> if (processSettingsPageVisible) return@DualPanelPublisher if (inputModeManager.inputMode != InputMode.Keyboard) inputModeManager.requestInputMode(InputMode.Keyboard) focusManager.clearFocus(force = true) @@ -834,7 +841,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com ) } } - val hasBackTarget = (s.pageKey != null && page != null) || + val hasBackTarget = backToMore || (s.pageKey != null && page != null) || (s.pageKey == null && Hops.origin?.page == selected) || ((s.pageKey == null || page == null) && (selected.startsWith("emu:") || selected.startsWith("rom:") || selected.startsWith("user:") || selected == "store")) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index fa78998cf4..aa08d07f17 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -91,6 +91,7 @@ private const val LAUNCHER_TAB = 2 internal object SetupTabs { var openLauncher = false + var focusTabs = false var openOverview = false } private const val GLASSES_TAB = 6 @@ -456,10 +457,9 @@ internal fun SetupPanel( remember { RailLabels.load(railContext) } ToggleRow(host, "rail-labels", stringResource(R.string.setup_rail_labels), stringResource(R.string.setup_rail_labels_hint), RailLabels.shown) { RailLabels.set(railContext, it) } LanguageRow(host, s.language, a.onLanguage) - ToggleRow(host, "show-stores", stringResource(R.string.setup_stores), null, s.gameStoresEnabled, onChange = a.onGameStoresEnabled) - ToggleRow(host, "show-soundtracks", stringResource(R.string.setup_soundtracks), null, s.soundtracksEnabled, onChange = a.onSoundtracksEnabled) if (s.soundtracksEnabled) ToggleRow(host, "soundtracks-ingame", stringResource(R.string.setup_soundtracks_ingame), stringResource(R.string.setup_soundtracks_ingame_hint), s.soundtracksIngame, onChange = a.onSoundtracksIngame) } + TabsSettingsGroup(host, s, a) } val device: @Composable () -> Unit = { SettingsGroup(stringResource(R.string.setup_group_device)) { @@ -598,9 +598,6 @@ internal fun SetupPanel( ToggleRow(host, "agent-commands", stringResource(R.string.setup_agent_commands), null, s.agentCommands) { a.onAgentCommands() } if (com.droiddeck.launcher.agent.AgentHost.available) { val agentContext = androidx.compose.ui.platform.LocalContext.current - ToggleRow(host, "agent-tab", stringResource(R.string.setup_agent_tab), null, com.droiddeck.launcher.agent.AgentTab.shown) { - com.droiddeck.launcher.agent.AgentTab.set(agentContext, it) - } ToggleRow(host, "agent-pet", stringResource(R.string.setup_agent_pet), stringResource(R.string.setup_agent_pet_hint), AgentPet.enabled) { AgentPet.set(agentContext, it) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/MorePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/MorePage.kt new file mode 100644 index 0000000000..b4d6952413 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/MorePage.kt @@ -0,0 +1,98 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R + +@Composable +internal fun MorePage(s: FrontEndState, a: FrontEndActions, onSelect: (String) -> Unit, modifier: Modifier) { + val keys = NavTabs.more(s) + val open: (String) -> Unit = { key -> if (key == "components") a.onComponents(true) else onSelect(key) } + Column(modifier.verticalScroll(rememberScrollState())) { + PageHeader(stringResource(R.string.rail_more)) { + Spacer(Modifier.weight(1f)) + SecondaryButton(stringResource(R.string.more_edit_tabs), compact = true) { + SetupTabs.openLauncher = true + SetupTabs.focusTabs = true + onSelect("setup") + } + } + BoxWithConstraints(Modifier.fillMaxWidth()) { + val gap = 12.dp + val columns = ((maxWidth + gap) / (160.dp + gap)).toInt().coerceIn(2, 5) + Column(verticalArrangement = Arrangement.spacedBy(gap)) { + keys.chunked(columns).forEachIndexed { r, row -> + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(gap)) { + row.forEachIndexed { c, key -> + MoreTile(s, key, first = r == 0 && c == 0, Modifier.weight(1f)) { open(key) } + } + repeat(columns - row.size) { Spacer(Modifier.weight(1f)) } + } + } + } + } + } +} + +@Composable +private fun MoreTile(s: FrontEndState, key: String, first: Boolean, modifier: Modifier, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val (label, icon) = railLabelIcon(key) + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val shape = RoundedCornerShape(18.dp) + val count = railCount(s, key) + Box( + contentAlignment = Alignment.Center, + modifier = modifier + .then(if (first) Modifier.paneEntry() else Modifier.paneItem("more:$key")) + .testTag("more-$key") + .height(112.dp).clip(shape) + .background(if (hot) pal.signal.copy(alpha = 0.12f) else colors.surface) + .glideBorder(hot, shape, pal.signal, pal.line) + .hoverable(src) + .clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Tab, onClick = onClick) + .controllerConfirm(onClick = onClick), + ) { + Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(8.dp)) { + Icon(icon, contentDescription = null, tint = if (hot) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(30.dp)) + Text(stringResource(label), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.padding(horizontal = 8.dp)) + } + if (railBadge(s, key)) Box(Modifier.align(Alignment.TopEnd).padding(12.dp).size(9.dp).clip(CircleShape).background(AttentionAmber)) + if (count > 0) Box(Modifier.align(Alignment.TopEnd).padding(10.dp)) { CountPill(count) } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt b/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt new file mode 100644 index 0000000000..af16570d97 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt @@ -0,0 +1,91 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.agent.AgentHost +import com.droiddeck.launcher.agent.AgentTab +import com.droiddeck.launcher.session.SessionPrefs + +internal enum class TabPlace { BAR, MORE, HIDDEN } + +internal object NavTabs { + const val MORE = "more" + val FEATURES = setOf("stores", "soundtracks", "agent") + val ALL = listOf("steam", "games", "soundtracks", "stores", "desktop", "agent", "components", "android-apps", "setup", "updates") + + var order by mutableStateOf(ALL) + private set + var shelved by mutableStateOf(emptySet()) + private set + var hidden by mutableStateOf(emptySet()) + private set + + fun load(context: Context) { + order = arrange(SessionPrefs.navTabOrder(context)) + shelved = SessionPrefs.navTabShelved(context).intersect(ALL.toSet()) + hidden = SessionPrefs.navTabHidden(context).intersect(ALL.toSet()) - FEATURES - "setup" + } + + fun arrange(saved: List): List { + val listed = saved.filter { it in ALL }.distinct() + val missing = ALL.filterNot { it in listed } + val out = listed.toMutableList() + for (key in missing) { + val before = ALL.subList(0, ALL.indexOf(key)).lastOrNull { it in out } + out.add(if (before == null) 0 else out.indexOf(before) + 1, key) + } + return out + } + + fun available(s: FrontEndState, key: String): Boolean = when (key) { + "android-apps" -> s.isHomeApp + "agent" -> AgentHost.available + else -> true + } + + fun hideable(key: String) = key != "setup" + + fun place(s: FrontEndState, key: String): TabPlace = when { + featureOff(s, key) || key in hidden -> TabPlace.HIDDEN + key in shelved -> TabPlace.MORE + else -> TabPlace.BAR + } + + private fun featureOff(s: FrontEndState, key: String) = when (key) { + "stores" -> !s.gameStoresEnabled + "soundtracks" -> !s.soundtracksEnabled + "agent" -> !AgentTab.shown + else -> false + } + + fun listed(s: FrontEndState) = order.filter { available(s, it) } + + fun more(s: FrontEndState) = listed(s).filter { place(s, it) == TabPlace.MORE } + + fun bar(s: FrontEndState): List { + val shown = listed(s).filter { place(s, it) == TabPlace.BAR } + return if (more(s).isEmpty()) shown else shown + MORE + } + + fun move(context: Context, s: FrontEndState, key: String, step: Int) { + val visible = listed(s) + val at = visible.indexOf(key) + val other = visible.getOrNull(at + step) ?: return + val next = order.toMutableList() + val i = next.indexOf(key) + val j = next.indexOf(other) + next[i] = other + next[j] = key + order = next + SessionPrefs.setNavTabOrder(context, next) + } + + fun setPlace(context: Context, key: String, place: TabPlace) { + shelved = if (place == TabPlace.MORE) shelved + key else shelved - key + hidden = if (place == TabPlace.HIDDEN && hideable(key) && key !in FEATURES) hidden + key else hidden - key + SessionPrefs.setNavTabShelved(context, shelved) + SessionPrefs.setNavTabHidden(context, hidden) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt new file mode 100644 index 0000000000..3b964d8983 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt @@ -0,0 +1,142 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.relocation.BringIntoViewRequester +import androidx.compose.foundation.relocation.bringIntoViewRequester +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.KeyboardArrowDown +import androidx.compose.material.icons.outlined.KeyboardArrowUp +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.key +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.agent.AgentTab + +@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) +@Composable +internal fun TabsSettingsGroup(host: MenuHost, s: FrontEndState, a: FrontEndActions) { + val ctx = LocalContext.current + val reveal = remember { BringIntoViewRequester() } + LaunchedEffect(Unit) { + if (!SetupTabs.focusTabs) return@LaunchedEffect + SetupTabs.focusTabs = false + androidx.compose.runtime.withFrameNanos { } + reveal.bringIntoView() + } + val shown = stringResource(R.string.tabs_place_bar) + val more = stringResource(R.string.tabs_place_more) + val hidden = stringResource(R.string.tabs_place_hidden) + val keys = NavTabs.listed(s) + fun pick(key: String, place: TabPlace) { + when (key) { + "stores" -> if ((place != TabPlace.HIDDEN) != s.gameStoresEnabled) a.onGameStoresEnabled(place != TabPlace.HIDDEN) + "soundtracks" -> if ((place != TabPlace.HIDDEN) != s.soundtracksEnabled) a.onSoundtracksEnabled(place != TabPlace.HIDDEN) + "agent" -> if ((place != TabPlace.HIDDEN) != AgentTab.shown) AgentTab.set(ctx, place != TabPlace.HIDDEN) + } + NavTabs.setPlace(ctx, key, place) + } + Box(Modifier.bringIntoViewRequester(reveal)) { + SettingsGroup(stringResource(R.string.setup_group_tabs)) { + keys.forEachIndexed { index, tab -> + key(tab) { + val options = buildList { + add(TabPlace.BAR to shown) + add(TabPlace.MORE to more) + if (NavTabs.hideable(tab)) add(TabPlace.HIDDEN to hidden) + } + TabRow( + host, tab, NavTabs.place(s, tab), options, + canUp = index > 0, canDown = index < keys.lastIndex, + onMove = { step -> NavTabs.move(ctx, s, tab, step) }, + onPick = { pick(tab, it) }, + ) + } + } + } + } +} + +@Composable +private fun TabRow( + host: MenuHost, tab: String, place: TabPlace, options: List>, + canUp: Boolean, canDown: Boolean, onMove: (Int) -> Unit, onPick: (TabPlace) -> Unit, +) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val (labelRes, icon) = railLabelIcon(tab) + val label = stringResource(labelRes) + val open = host.open == "tab-$tab" + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.fillMaxWidth() + .background(if (open) pal.signal.copy(alpha = 0.10f) else androidx.compose.ui.graphics.Color.Transparent) + .padding(start = 14.dp, end = 10.dp, top = 6.dp, bottom = 6.dp), + ) { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.weight(1f).alpha(if (place == TabPlace.HIDDEN) 0.5f else 1f), + ) { + Icon(icon, contentDescription = null, tint = colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) + Spacer(Modifier.width(12.dp)) + Text(label, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + MoveButton(Icons.Outlined.KeyboardArrowUp, stringResource(R.string.tabs_move_up, label), canUp, "tab-up-$tab") { onMove(-1) } + MoveButton(Icons.Outlined.KeyboardArrowDown, stringResource(R.string.tabs_move_down, label), canDown, "tab-down-$tab") { onMove(1) } + ChoiceChip(host, "tab-$tab", label, options, place, onPick = onPick) + } + Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) +} + +@Composable +private fun MoveButton(icon: ImageVector, description: String, enabled: Boolean, tag: String, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.testTag(tag).size(40.dp).clip(CircleShape) + .background(colors.surfaceVariant) + .glideBorder(hot, CircleShape, pal.signal, pal.line2) + .alpha(if (enabled) 1f else 0.35f) + .hoverable(src) + .clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button) { if (enabled) onClick() } + .controllerConfirm { if (enabled) onClick() } + .semantics { contentDescription = description }, + ) { Icon(icon, contentDescription = null, tint = if (hot) pal.signal else colors.onBackground, modifier = Modifier.size(20.dp)) } +} diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index f92ce94ee7..e3d78e199b 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2292,7 +2292,6 @@ المتاجر Steam مخصَّص - المتاجر فئة سرعة التنزيل متوازن سريع @@ -3882,7 +3881,6 @@ المعادل تعزيز الجهير المعادل غير متاح على هذا الجهاز - الموسيقى التصويرية تفعيل أثناء اللعب استمر في تشغيل الموسيقى التصويرية أثناء تشغيل اللعبة لا توجد موسيقى تصويرية مثبّتة بعد. diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 5139e4953d..bcd645f8f2 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2261,7 +2261,6 @@ Tiendas Steam Personalizados - Tiendas Nivel de velocidad de descarga Equilibrado Rápido @@ -3737,7 +3736,6 @@ Ecualizador Refuerzo de graves El ecualizador no está disponible en este dispositivo - Bandas sonoras Activar en el juego Mantén la banda sonora sonando mientras se ejecuta un juego Aún no hay bandas sonoras instaladas. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 4b446b2140..ce0b441579 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2192,7 +2192,6 @@ Магазини Steam Персонализирана - Магазини Скорост на изтегляне Балансирано Бързо @@ -3726,7 +3725,6 @@ Еквалайзер Усилване на басите Еквалайзерът не е наличен на това устройство - Саундтраци Включи в играта Саундтракът да продължи да свири, докато върви игра Все още няма инсталирани саундтраци. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 365c2f1083..d8a5d60f28 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2242,7 +2242,6 @@ Obchody Steam Vlastní - Obchody Úroveň rychlosti stahování Vyvážené Rychlé @@ -3804,7 +3803,6 @@ Ekvalizér Zesílení basů Ekvalizér není na tomto zařízení k dispozici - Soundtracky Povolit ve hře Nechat soundtrack hrát během hry Zatím nejsou nainstalovány žádné soundtracky. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 83ee1c91f4..2b47c9f391 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2192,7 +2192,6 @@ Butikker Steam Brugerdefineret - Butikker Downloadhastighed Afbalanceret Hurtig @@ -3726,7 +3725,6 @@ Equalizer Bassforstærkning Equalizeren er ikke tilgængelig på denne enhed - Soundtracks Aktivér i spil Lad soundtracket spille, mens et spil kører Ingen soundtracks installeret endnu. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 3ed4aa1f1b..c2d0dcb4fc 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2184,7 +2184,6 @@ Stores Steam Eigene - Stores Download-Tempo Ausgewogen Schnell @@ -3726,7 +3725,6 @@ Equalizer Bassverstärkung Der Equalizer ist auf diesem Gerät nicht verfügbar - Soundtracks Im Spiel aktivieren Soundtrack während eines Spiels weiterspielen Noch keine Soundtracks installiert. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index d9e2ac10e8..203a3716a2 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2192,7 +2192,6 @@ Καταστήματα Steam Προσαρμοσμένο - Καταστήματα Επίπεδο ταχύτητας λήψης Ισορροπημένο Ταχύ @@ -3726,7 +3725,6 @@ Ισοσταθμιστής Ενίσχυση μπάσων Ο ισοσταθμιστής δεν είναι διαθέσιμος σε αυτή τη συσκευή - Soundtrack Ενεργοποίηση εντός παιχνιδιού Η μουσική συνεχίζει να παίζει όσο εκτελείται ένα παιχνίδι Δεν υπάρχουν εγκατεστημένα soundtrack ακόμη. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 7fa671b3ce..104948fff5 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2217,7 +2217,6 @@ Tiendas Steam Personalizados - Tiendas Nivel de velocidad de descarga Equilibrado Rápido @@ -3765,7 +3764,6 @@ Ecualizador Refuerzo de graves El ecualizador no está disponible en este dispositivo - Bandas sonoras Activar en el juego Mantén la banda sonora sonando mientras se ejecuta un juego Aún no hay bandas sonoras instaladas. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 222896d3e6..98ea9d8301 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2192,7 +2192,6 @@ Kaupat Steam Mukautettu - Kaupat Latausnopeuden taso Tasapainotettu Nopea @@ -3726,7 +3725,6 @@ Taajuuskorjain Bassonkorostus Taajuuskorjain ei ole käytettävissä tällä laitteella - Soundtrackit Ota käyttöön pelin aikana Pidä soundtrack soimassa pelin aikana Soundtrackeja ei ole vielä asennettu. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 20c091baca..e830f0cea4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2217,7 +2217,6 @@ Boutiques Steam Personnalisé - Boutiques Niveau de vitesse de téléchargement Équilibré Rapide @@ -3765,7 +3764,6 @@ Égaliseur Renforcement des basses L\'égaliseur n\'est pas disponible sur cet appareil - Bandes originales Activer en jeu Garder la bande originale active pendant une partie Aucune bande originale installée pour le moment. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 4046306fe4..bb3173d10d 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2192,7 +2192,6 @@ स्टोर Steam कस्टम - स्टोर डाउनलोड स्पीड टियर बैलेंस्ड फ़ास्ट @@ -3726,7 +3725,6 @@ इक्वलाइज़र बास बूस्ट इस डिवाइस पर इक्वलाइज़र उपलब्ध नहीं है - साउंडट्रैक गेम के दौरान चालू करें गेम चलते समय साउंडट्रैक बजता रखें अभी तक कोई साउंडट्रैक इंस्टॉल नहीं है। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 4a2c408ac7..7ecc8c8e57 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2192,7 +2192,6 @@ Áruházak Steam Egyéni - Áruházak Letöltési sebességi szint Kiegyensúlyozott Gyors @@ -3726,7 +3725,6 @@ Hangszínszabályzó Mélyhangerősítés A hangszínszabályzó nem érhető el ezen az eszközön - Soundtrackek Engedélyezés játék közben A soundtrack szóljon tovább játék közben Még nincs telepített soundtrack. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index d71b8f83f1..6a0a20ea14 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2167,7 +2167,6 @@ Toko Steam Khusus - Toko Tingkat kecepatan unduhan Seimbang Cepat @@ -3696,7 +3695,6 @@ Ekualiser Penguat bass Ekualiser tidak tersedia di perangkat ini - Soundtrack Aktifkan saat bermain Tetap putar soundtrack saat game berjalan Belum ada soundtrack yang terpasang. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e5a9d021e2..792b2c47a1 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2209,7 +2209,6 @@ Negozi Steam Personalizzati - Negozi Livello di velocità di download Bilanciato Veloce @@ -3765,7 +3764,6 @@ Equalizzatore Potenziamento bassi L\'equalizzatore non è disponibile su questo dispositivo - Colonne sonore Attiva in gioco Mantieni la colonna sonora in riproduzione durante una partita Nessuna colonna sonora installata. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index bd0e241e4e..459c1d805f 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2167,7 +2167,6 @@ ストア Steam カスタム - ストア ダウンロード速度レベル バランス 高速 @@ -3696,7 +3695,6 @@ イコライザー 低音ブースト このデバイスではイコライザーを使用できません - サウンドトラック ゲーム中も有効にする ゲーム実行中もサウンドトラックを再生し続けます インストール済みのサウンドトラックはまだありません。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 4fadd28078..e6b6c42ecf 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2167,7 +2167,6 @@ 스토어 Steam 사용자 정의 - 스토어 다운로드 속도 단계 균형 빠름 @@ -3696,7 +3695,6 @@ 이퀄라이저 베이스 부스트 이 기기에서는 이퀄라이저를 사용할 수 없습니다 - 사운드트랙 게임 중 사용 게임이 실행되는 동안 사운드트랙 계속 재생 설치된 사운드트랙이 아직 없습니다. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index cf509abbf8..fac7d2314f 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2167,7 +2167,6 @@ Kedai Steam Tersuai - Kedai Tahap kelajuan muat turun Seimbang Pantas @@ -3696,7 +3695,6 @@ Penyama Peningkat bes Penyama tidak tersedia pada peranti ini - Runut bunyi Dayakan dalam permainan Teruskan memainkan runut bunyi semasa permainan berjalan Belum ada runut bunyi dipasang. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 4605b7306f..65ddcd49c4 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2192,7 +2192,6 @@ Butikker Steam Egendefinert - Butikker Nedlastingshastighetsnivå Balansert Rask @@ -3726,7 +3725,6 @@ Equalizer Bassforsterkning Equalizeren er ikke tilgjengelig på denne enheten - Lydspor Aktiver i spill Fortsett å spille lydsporet mens et spill kjører Ingen lydspor installert ennå. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 558e70e934..8cbd96dd31 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2192,7 +2192,6 @@ Winkels Steam Aangepast - Winkels Niveau voor downloadsnelheid Gebalanceerd Snel @@ -3726,7 +3725,6 @@ Equalizer Basversterking De equalizer is niet beschikbaar op dit apparaat - Soundtracks In-game inschakelen Laat de soundtrack doorspelen terwijl een game draait Nog geen soundtracks geïnstalleerd. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 76cf52a264..a829fda88b 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2242,7 +2242,6 @@ Sklepy Steam Własna - Sklepy Poziom szybkości pobierania Zbalansowany Szybki @@ -3804,7 +3803,6 @@ Korektor Wzmocnienie basów Korektor nie jest dostępny na tym urządzeniu - Ścieżki dźwiękowe Włącz w grze Odtwarzaj ścieżkę dźwiękową podczas działania gry Brak zainstalowanych ścieżek dźwiękowych. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 5df34b54fd..c2ee78a1c1 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2209,7 +2209,6 @@ Lojas Steam Personalizados - Lojas Nível de velocidade de transferência Equilibrado Rápido @@ -3765,7 +3764,6 @@ Equalizador Reforço de graves O equalizador não está disponível neste dispositivo - Bandas sonoras Ativar durante o jogo Continuar a reproduzir a banda sonora enquanto um jogo está em execução Ainda não há bandas sonoras instaladas. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index be24a67375..59b5af3105 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2209,7 +2209,6 @@ Lojas Steam Personalizado - Lojas Nível de velocidade de download Equilibrado Rápido @@ -3765,7 +3764,6 @@ Equalizador Reforço de graves O equalizador não está disponível neste dispositivo - Trilhas sonoras Ativar durante o jogo Continuar tocando a trilha sonora enquanto um jogo está em execução Nenhuma trilha sonora instalada ainda. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 059d8c8d45..4795221220 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2217,7 +2217,6 @@ Magazine Steam Personalizat - Magazine Nivelul vitezei de descărcare Echilibrat Rapid @@ -3765,7 +3764,6 @@ Egalizator Amplificare bas Egalizatorul nu este disponibil pe acest dispozitiv - Coloane sonore Activează în joc Continuă redarea coloanei sonore cât timp rulează un joc Nicio coloană sonoră instalată încă. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 34bb4b9cb1..55d3431388 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2325,7 +2325,6 @@ Магазины Steam Свои - Магазины Уровень скорости загрузки Сбалансированный Быстрый @@ -3887,7 +3886,6 @@ Эквалайзер Усиление баса Эквалайзер недоступен на этом устройстве - Саундтреки Включить в игре Продолжать воспроизведение саундтрека во время игры Саундтреки ещё не установлены. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 1fcbc9a807..fedeebf4c6 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2192,7 +2192,6 @@ Butiker Steam Egna - Butiker Nedladdningshastighet Balanserad Snabb @@ -3726,7 +3725,6 @@ Equalizer Basförstärkning Equalizern är inte tillgänglig på den här enheten - Soundtracks Aktivera i spel Fortsätt spela soundtracket medan ett spel körs Inga soundtracks installerade än. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index bd7ccd6ad8..0f72c64631 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2167,7 +2167,6 @@ สโตร์ Steam กำหนดเอง - สโตร์ ระดับความเร็วการดาวน์โหลด สมดุล เร็ว @@ -3696,7 +3695,6 @@ อีควอไลเซอร์ เพิ่มเสียงเบส อุปกรณ์นี้ไม่รองรับอีควอไลเซอร์ - ซาวด์แทร็ก เปิดใช้ขณะเล่นเกม เล่นซาวด์แทร็กต่อไปขณะที่เกมทำงาน ยังไม่มีซาวด์แทร็กที่ติดตั้ง diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 889d71ef48..1700875b0b 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2184,7 +2184,6 @@ Mağazalar Steam Özel - Mağazalar İndirme hızı katmanı Dengeli Hızlı @@ -3726,7 +3725,6 @@ Ekolayzır Bas güçlendirme Ekolayzır bu cihazda kullanılamıyor - Oyun müzikleri Oyun içinde etkinleştir Oyun çalışırken oyun müziği çalmaya devam etsin Henüz oyun müziği yüklenmedi. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 670d07f991..de74d56817 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2242,7 +2242,6 @@ Магазини Steam Власна - Магазини Рівень швидкості завантаження Збалансований Швидкий @@ -3804,7 +3803,6 @@ Еквалайзер Підсилення басів Еквалайзер недоступний на цьому пристрої - Саундтреки Вмикати в грі Відтворювати саундтрек, поки запущено гру Саундтреки ще не встановлено. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a85d7b4c88..05c9403f13 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2167,7 +2167,6 @@ Cửa hàng game Steam Tùy chỉnh - Cửa hàng Mức tốc độ tải Cân bằng Nhanh @@ -3696,7 +3695,6 @@ Bộ cân bằng âm Tăng âm trầm Thiết bị này không có bộ cân bằng âm - Nhạc nền Bật trong game Tiếp tục phát nhạc nền khi game đang chạy Chưa có nhạc nền nào được cài đặt. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 38946ef8c7..d775759045 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2248,7 +2248,6 @@ 游戏商店 Steam 自定义 - 游戏商店 下载速度档位 均衡 快速 @@ -3700,7 +3699,6 @@ 均衡器 低音增强 此设备不支持均衡器 - 原声音乐 在游戏中启用 游戏运行时继续播放原声音乐 尚未安装任何原声音乐。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index b81f12305a..a7b17a7383 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2167,7 +2167,6 @@ 商店 Steam 自訂 - 商店 下載速度等級 平衡 快速 @@ -3699,7 +3698,6 @@ 等化器 重低音增強 此裝置不支援等化器 - 原聲帶 在遊戲中啟用 遊戲運行時繼續播放原聲帶 尚未安裝任何原聲帶。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index da5e460fc2..a73fbfecb1 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2167,7 +2167,6 @@ 遊戲商店 Steam 自訂 - 遊戲商店 下載速度等級 平衡 快速 @@ -3699,7 +3698,6 @@ 等化器 重低音增強 此裝置不支援等化器 - 原聲帶 在遊戲中啟用 遊戲執行時繼續播放原聲帶 尚未安裝任何原聲帶。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ce55a06e1e..732b549ba2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1569,6 +1569,14 @@ Apps Setup Updates + More + Edit tabs + Tabs + Shown + In More + Hidden + Move %1$s up + Move %1$s down %1$d%% Resume %1$s Shows up as /root/ROMs in each session. Internal storage is at /root/Storage. @@ -2585,7 +2593,6 @@ Stores Steam Custom - Stores Download speed tier Balanced Fast @@ -2689,7 +2696,6 @@ Sort Sidebar labels Show names under the sidebar icons. Turn off for a slimmer sidebar. - Agent tab Agent pet DeeDee floats over the launcher and games and shows what the agent is doing. Over other apps @@ -4042,8 +4048,7 @@ Equalizer Bass boost The equalizer is not available on this device - Soundtracks - Enable ingame + Music while playing Keep the soundtrack playing while a game runs No soundtracks installed yet. Search soundtracks diff --git a/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt new file mode 100644 index 0000000000..41f8333147 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt @@ -0,0 +1,178 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.Modifier +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.hasTestTag +import androidx.compose.ui.test.hasText +import androidx.compose.ui.test.onNodeWithTag +import androidx.compose.ui.test.performClick +import androidx.compose.ui.unit.dp +import androidx.test.core.app.ApplicationProvider +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], qualifiers = "w1200dp-h752dp-land", application = android.app.Application::class) +class NavTabsTest { + @get:Rule val compose = createRobolectricComposeRule() + private val ctx: Context = ApplicationProvider.getApplicationContext() + + @Before @After fun reset() { + ctx.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() + NavTabs.load(ctx) + com.droiddeck.launcher.agent.AgentTab.load(ctx) + } + + @Test fun musicStartsInMore() { + assertEquals(listOf("steam", "games", "stores", "desktop", "components", "setup", "updates", NavTabs.MORE), navigationKeys(state())) + assertEquals(listOf("soundtracks"), NavTabs.more(state())) + assertEquals(setOf("soundtracks", "agent"), NavTabs.shelved) + assertTrue(com.droiddeck.launcher.agent.AgentTab.shown) + } + + @Test fun showingMusicOnceKeepsItShownAfterReload() { + NavTabs.setPlace(ctx, "soundtracks", TabPlace.BAR) + NavTabs.load(ctx) + assertEquals(listOf("steam", "games", "soundtracks", "stores", "desktop", "components", "setup", "updates"), navigationKeys(state())) + } + + @Test fun shelvedTabsLeaveTheBarAndAddMoreAtTheEnd() { + NavTabs.setPlace(ctx, "stores", TabPlace.MORE) + NavTabs.setPlace(ctx, "components", TabPlace.MORE) + val s = state() + assertEquals(listOf("soundtracks", "stores", "components"), NavTabs.more(s)) + assertEquals(NavTabs.MORE, navigationKeys(s).last()) + assertFalse("stores" in navigationKeys(s)) + } + + @Test fun hiddenTabsAreNowhereAndSetupCannotBeHidden() { + NavTabs.setPlace(ctx, "updates", TabPlace.HIDDEN) + NavTabs.setPlace(ctx, "setup", TabPlace.HIDDEN) + val s = state() + assertFalse("updates" in navigationKeys(s)) + assertFalse("updates" in NavTabs.more(s)) + assertTrue("setup" in navigationKeys(s)) + } + + @Test fun disabledStoresFeatureReadsAsHidden() { + assertEquals(TabPlace.HIDDEN, NavTabs.place(state(storesOn = false), "stores")) + } + + @Test fun movingSwapsWithTheNextVisibleTabAndPersists() { + NavTabs.setPlace(ctx, "soundtracks", TabPlace.BAR) + NavTabs.move(ctx, state(), "stores", -1) + assertEquals(listOf("steam", "games", "stores", "soundtracks"), navigationKeys(state()).take(4)) + NavTabs.load(ctx) + assertEquals(listOf("steam", "games", "stores", "soundtracks"), navigationKeys(state()).take(4)) + } + + @Test fun tabsMissingFromASavedOrderSlotInAfterTheirDefaultNeighbour() { + assertEquals(listOf("updates", "steam", "games", "soundtracks", "stores", "desktop", "agent", "components", "android-apps", "setup"), + NavTabs.arrange(listOf("updates", "steam"))) + assertEquals(listOf("games", "soundtracks", "steam", "setup", "stores", "desktop", "agent", "components", "android-apps", "updates"), + NavTabs.arrange(listOf("games", "steam", "setup", "stores", "desktop", "components", "android-apps", "updates", "bogus"))) + } + + @Test fun moreCarriesTheDownloadCountAndBadgesOfShelvedTabs() { + NavTabs.setPlace(ctx, "stores", TabPlace.MORE) + NavTabs.setPlace(ctx, "setup", TabPlace.MORE) + val s = state(downloads = 3, setupReady = false) + assertEquals(3, railCount(s, NavTabs.MORE)) + assertTrue(railBadge(s, NavTabs.MORE)) + NavTabs.setPlace(ctx, "stores", TabPlace.BAR) + assertEquals(0, railCount(s, NavTabs.MORE)) + assertEquals(3, railCount(s, "stores")) + } + + @Test fun sideRailShowsTheDownloadCountOnMoreWhenStoresIsShelved() { + NavTabs.setPlace(ctx, "stores", TabPlace.MORE) + val s = state(downloads = 2) + compose.setContent { + DroidDeckTheme { + CompositionLocalProvider(LocalFrontFocus provides FrontFocus()) { + Box(Modifier.height(752.dp)) { SideRail(s, "steam", {}, {}, actions(), Modifier) } + } + } + } + compose.onNodeWithTag("rail-stores").assertDoesNotExist() + compose.onNode(hasTestTag("rail-more")).assertIsDisplayed() + compose.onNode(hasText("2") and hasParentTag("rail-more"), useUnmergedTree = true).assertIsDisplayed() + } + + @Test fun morePageListsShelvedTabsWithTheirCount() { + NavTabs.setPlace(ctx, "stores", TabPlace.MORE) + NavTabs.setPlace(ctx, "components", TabPlace.MORE) + val s = state(downloads = 4) + compose.setContent { + DroidDeckTheme { + CompositionLocalProvider(LocalFrontFocus provides FrontFocus()) { + FocusGlideHost { Box(Modifier.fillMaxSize()) { MorePage(s, actions(), {}, Modifier.fillMaxSize()) } } + } + } + } + compose.onNodeWithTag("more-stores").assertIsDisplayed() + compose.onNodeWithTag("more-components").assertIsDisplayed() + compose.onNode(hasText("4") and hasParentTag("more-stores"), useUnmergedTree = true).assertIsDisplayed() + } + + @Test fun backFromAShelvedTabReturnsToMore() { + NavTabs.setPlace(ctx, "desktop", TabPlace.MORE) + var back: androidx.activity.OnBackPressedDispatcher? = null + compose.mainClock.autoAdvance = false + compose.setContent { + back = androidx.activity.compose.LocalOnBackPressedDispatcherOwner.current?.onBackPressedDispatcher + DroidDeckTheme { FrontEndScreen(state(), actions(), page = null) } + } + compose.mainClock.advanceTimeBy(2_000) + compose.onNodeWithTag("rail-more").performClick() + compose.mainClock.advanceTimeBy(2_000) + compose.onNodeWithTag("more-desktop").performClick() + compose.mainClock.advanceTimeBy(2_000) + compose.onNodeWithTag("more-desktop").assertDoesNotExist() + compose.runOnIdle { back!!.onBackPressed() } + compose.mainClock.advanceTimeBy(2_000) + compose.onNodeWithTag("more-desktop").assertIsDisplayed() + } + + @Test fun startupWithSteamHiddenNeverLandsOnABareComponentsSelection() { + NavTabs.setPlace(ctx, "steam", TabPlace.HIDDEN) + repeat(NavTabs.ALL.size) { NavTabs.move(ctx, state(), "components", -1) } + assertEquals("components", navigationKeys(state()).first()) + compose.mainClock.autoAdvance = false + compose.setContent { DroidDeckTheme { FrontEndScreen(state(), actions(), page = null) } } + compose.mainClock.advanceTimeBy(2_000) + compose.onNode(hasText(ctx.getString(com.droiddeck.launcher.R.string.content_page_gone))).assertDoesNotExist() + compose.onNode(hasTestTag("rail-games") and androidx.compose.ui.test.isSelected()).assertExists() + } + + private fun hasParentTag(tag: String) = androidx.compose.ui.test.hasAnyAncestor(hasTestTag(tag)) + + private fun state(storesOn: Boolean = true, downloads: Int = 0, setupReady: Boolean = true) = FrontEndState( + installed = "r9", ready = setupReady, available = null, busy = false, stage = "", percent = -1, + desktopInstalled = true, offlineAccount = null, offline = false, frameGenLabel = "", romsDir = null, logsEnabled = false, + steamGames = emptyList(), emulators = emptyList(), running = null, + gameStoresEnabled = storesOn, storeDownloadsActive = downloads, + ) + + private fun actions() = FrontEndActions( + onPlay = {}, onPlayDesktopUi = {}, onSteamGame = {}, onDesktop = {}, onEmulator = {}, onRom = {}, onResume = {}, + onSteamSettings = {}, onDesktopSettings = {}, onInstallPackage = {}, onRemovePackage = {}, + onRuntime = {}, onFrameGenPick = {}, onImportLossless = {}, onProtons = {}, onComponents = {}, + onPerformance = {}, onRoms = {}, onFiles = {}, onLogs = {}, onOffline = {}, + onWirelessAdbPair = { _, _, _, _ -> }, onWirelessAdbApply = { _, _, _, _ -> }, + onSetPhantomProcessLimit = { _, _ -> }, onRemoveDesktop = {}, + ) +}