From 392562bfaeedadef785718cee8154fdd91c7e9e6 Mon Sep 17 00:00:00 2001 From: rainleee <50471668+rainleee@users.noreply.github.com> Date: Sat, 14 Nov 2026 01:47:31 +0900 Subject: [PATCH 1/5] fix(session): the Steam UI on the Mali bridge stops flickering (#2506) * fix(session): the Steam UI on the Mali bridge stops flickering On the Mali bridge Steam's own web helper layout makes the Deck UI footer and overlays flicker (Mali-G78 MP14). When the browser UI is on the GPU, default to ANGLE on Vulkan without Chromium's Vulkan compositing. Values set by the user still win, and the software UI path is unchanged. * fix(session): keep empty Mali bridge CEF settings as set --- .../overlay/usr/local/bin/droiddeck-session | 3 ++ tools/tests/test_session_webhelper_layout.py | 28 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index fbea003241..bbfe862b1d 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -1538,6 +1538,9 @@ case $mode in _bl_cef=(-cef-disable-gpu -cef-disable-gpu-compositing) echo "== steam: browser UI in software (Mali bridge)" elif [ "${_bl_cef[0]}" = -cef-force-gpu ]; then + # With Steam's own web helper layout the Deck UI's footer and overlays flicker on the bridge + # (Mali-G78 MP14). ANGLE on Vulkan without Chromium's Vulkan compositing draws them steadily. + : "${BL_VKBRIDGE_CEF_ANGLE=vulkan}" "${BL_VKBRIDGE_CEF_VULKAN=0}" _bl_cef=(-cef-force-gpu -cef-use-gl=angle -cef-use-angle="${BL_VKBRIDGE_CEF_ANGLE:-vulkan}") fi [ "${BL_VKBRIDGE_CEF_LOG:-0}" = 1 ] && _bl_cef+=(-cef-enable-logging=stderr -cef-v=1) diff --git a/tools/tests/test_session_webhelper_layout.py b/tools/tests/test_session_webhelper_layout.py index f14afd61da..0a6ba0b27f 100644 --- a/tools/tests/test_session_webhelper_layout.py +++ b/tools/tests/test_session_webhelper_layout.py @@ -43,6 +43,34 @@ class WebhelperLayoutTest(unittest.TestCase): def test_the_steam_block_uses_it(self): self.assertIn("BL_WEBHELPER_ARGS=$(bl_webhelper_layout)", SESSION.read_text()) + def test_the_gpu_ui_on_the_bridge_defaults_to_angle_on_vulkan_without_vulkan_compositing(self): + text = SESSION.read_text() + gpu = text.index('elif [ "${_bl_cef[0]}" = -cef-force-gpu ]; then') + software = text.rindex('_bl_cef=(-cef-disable-gpu -cef-disable-gpu-compositing)', 0, gpu) + defaults = text.index(': "${BL_VKBRIDGE_CEF_ANGLE=vulkan}" "${BL_VKBRIDGE_CEF_VULKAN=0}"', gpu) + self.assertLess(software, gpu) + self.assertLess(defaults, text.index("BL_WEBHELPER_ARGS=$(bl_webhelper_layout)", gpu)) + self.assertLess(defaults, text.index("\n fi\n", gpu)) + + def test_the_defaults_give_way_to_settings(self): + script = ': "${BL_VKBRIDGE_CEF_ANGLE=vulkan}" "${BL_VKBRIDGE_CEF_VULKAN=0}"\n' + layout_function() + "bl_webhelper_layout\n" + env = {k: v for k, v in os.environ.items() if k not in KEYS} + run = lambda **s: subprocess.run(["bash", "-c", "set -u\n" + script], env={**env, **s}, + capture_output=True, text=True, check=True).stdout.strip() + self.assertEqual(run(), "--use-gl=angle --use-angle=vulkan") + self.assertEqual(run(BL_VKBRIDGE_CEF_VULKAN="1"), + "--use-gl=angle --use-angle=vulkan +Vulkan +VulkanFromANGLE +DefaultANGLEVulkan") + self.assertEqual(run(BL_VKBRIDGE_CEF_ANGLE="gl"), "--use-gl=angle --use-angle=gl") + + def test_empty_settings_are_kept_as_set(self): + script = ': "${BL_VKBRIDGE_CEF_ANGLE=vulkan}" "${BL_VKBRIDGE_CEF_VULKAN=0}"\n' + layout_function() + "bl_webhelper_layout\n" + env = {k: v for k, v in os.environ.items() if k not in KEYS} + run = lambda **s: subprocess.run(["bash", "-c", "set -u\n" + script], env={**env, **s}, + capture_output=True, text=True, check=True).stdout.strip() + self.assertEqual(run(BL_VKBRIDGE_CEF_ANGLE=""), "stock") + self.assertEqual(run(BL_VKBRIDGE_CEF_VULKAN=""), + "--use-gl=angle --use-angle=vulkan +Vulkan +VulkanFromANGLE +DefaultANGLEVulkan") + if __name__ == "__main__": unittest.main() From 69b612be1f6aa3741ec49022f46dee8b7423da6c Mon Sep 17 00:00:00 2001 From: KeegantheVeganat0r <58369898+KeegantheVeganat0r@users.noreply.github.com> Date: Fri, 13 Nov 2026 17:06:10 +0000 Subject: [PATCH 2/5] Fix Agent controls in the session drawer (#2568) * Open full agent controls from compact composer * Keep session drawer agent controls keyboard free * Keep agent controls inline beside close * Preserve Agent page Lab ABI compatibility * Open session drawer editor with controls closed * Consume Agent editor focus requests * Keep session editor open during focus transition --- .../com/droiddeck/launcher/ui/AgentPage.kt | 65 ++++++++++++++----- .../droiddeck/launcher/ui/SessionOverlay.kt | 3 +- 2 files changed, 51 insertions(+), 17 deletions(-) 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 ed036a4933..8a8bea8046 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -129,6 +129,18 @@ private const val COMPOSER_SLIDE_MS = 350L @Composable internal fun AgentPage( modifier: Modifier, inputModifier: Modifier = Modifier, visible: Boolean = true, startTyping: Boolean = true, hidesPet: Boolean = true, +) = AgentPageContent(modifier, inputModifier, visible, startTyping, hidesPet, showControlsWithoutKeyboard = false) + +@Composable +internal fun AgentPageWithControls( + modifier: Modifier, inputModifier: Modifier = Modifier, visible: Boolean = true, startTyping: Boolean = true, + showControlsWithoutKeyboard: Boolean, +) = AgentPageContent(modifier, inputModifier, visible, startTyping, hidesPet = true, showControlsWithoutKeyboard = showControlsWithoutKeyboard) + +@Composable +private fun AgentPageContent( + modifier: Modifier, inputModifier: Modifier, visible: Boolean, startTyping: Boolean, hidesPet: Boolean, + showControlsWithoutKeyboard: Boolean, ) { val context = LocalContext.current val view = LocalView.current @@ -227,7 +239,7 @@ internal fun AgentPage( } } androidx.compose.animation.AnimatedVisibility(!hidden, enter = expandVertically() + fadeIn(), exit = shrinkVertically() + fadeOut()) { - AgentComposer(composer, draft, inputModifier, panel, togglePanel) { setup = true } + AgentComposer(composer, draft, inputModifier, panel, togglePanel, showControlsWithoutKeyboard) { setup = true } } } } @@ -240,6 +252,7 @@ private class ComposerState(typing: Boolean) { var typing by mutableStateOf(typing) var focusRequests by mutableIntStateOf(0) private set + private var consumedFocusRequests by mutableIntStateOf(0) /** Opened and waiting for the text field to take focus; focus passes through nothing on the way. */ var opening = false @@ -248,6 +261,12 @@ private class ComposerState(typing: Boolean) { opening = true focusRequests++ } + + fun hasUnconsumedFocusRequest() = focusRequests > consumedFocusRequests + + fun consumeFocusRequest() { + consumedFocusRequests = focusRequests + } } @Composable @@ -492,12 +511,14 @@ internal fun liveUsed(limit: AgentHost.Limit) = if (limit.resetsAt > 0 && limit. @Composable private fun AgentComposer( - composer: ComposerState, draftState: MutableState, inputModifier: Modifier, panel: AgentPanel, onPanel: (AgentPanel) -> Unit, onSetup: () -> Unit, + composer: ComposerState, draftState: MutableState, inputModifier: Modifier, panel: AgentPanel, onPanel: (AgentPanel) -> Unit, + showControlsWithoutKeyboard: Boolean, onSetup: () -> Unit, ) { val context = LocalContext.current var draft by draftState var labOpen by rememberSaveable { mutableStateOf(false) } if (AgentHost.lab == null) labOpen = false + var controlsOpen by rememberSaveable { mutableStateOf(false) } var hadFocus by remember { mutableStateOf(false) } val send = send@{ val text = draft.trim() @@ -538,15 +559,25 @@ private fun AgentComposer( 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) } + AgentEditor(composer, draftState, inputModifier, panel, onPanel, onSetup, controlsOpen, { controlsOpen = it }, + highlightControls = showControlsWithoutKeyboard, send = send) + } else AgentReadingBar(composer, draft, inputModifier, labOpen, onLab = { labOpen = !labOpen }) { + if (showControlsWithoutKeyboard) { + controlsOpen = false + composer.typing = true + composer.opening = true + } else { + controlsOpen = true + composer.open() + } + } } } /** 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, + composer: ComposerState, draft: String, inputModifier: Modifier, labOpen: Boolean, onLab: () -> Unit, onControls: () -> Unit, ) { val context = LocalContext.current val colors = MaterialTheme.colorScheme @@ -569,7 +600,7 @@ private fun AgentReadingBar( 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) + HeaderAction(Icons.Outlined.MoreHoriz, stringResource(R.string.agent_more), size = 36.dp, tag = "agent-controls", onClick = onControls) if (working) Box( contentAlignment = Alignment.Center, modifier = Modifier.padding(start = 4.dp).size(36.dp).clip(CircleShape).background(pal.error.copy(alpha = 0.22f)) @@ -582,7 +613,7 @@ private fun AgentReadingBar( @Composable private fun AgentEditor( composer: ComposerState, draftState: MutableState, inputModifier: Modifier, panel: AgentPanel, onPanel: (AgentPanel) -> Unit, - onSetup: () -> Unit, send: () -> Unit, + onSetup: () -> Unit, menu: Boolean, onMenu: (Boolean) -> Unit, highlightControls: Boolean = false, send: () -> Unit, ) { val context = LocalContext.current val colors = MaterialTheme.colorScheme @@ -608,12 +639,11 @@ private fun AgentEditor( for (path in AgentAttachments.pending.toList()) AttachmentChip(path) { AgentAttachments.pending.remove(path) } } var focused by remember { mutableStateOf(false) } - var menu by rememberSaveable { mutableStateOf(false) } val field = remember { FocusRequester() } - LaunchedEffect(composer.focusRequests) { if (composer.focusRequests > 0) runCatching { field.requestFocus() } } + LaunchedEffect(composer.focusRequests) { if (composer.hasUnconsumedFocusRequest()) 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), + .border(if (focused || highlightControls) 2.dp else 1.dp, if (focused || highlightControls) pal.primary else pal.line, Shape16).padding(6.dp), ) { 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) @@ -631,21 +661,21 @@ private fun AgentEditor( 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.History, stringResource(R.string.agent_history), size = 32.dp, tag = "agent-history") { onMenu(false); onPanel(AgentPanel.HISTORY) } + HeaderAction(Icons.Outlined.Memory, stringResource(R.string.agent_processes), size = 32.dp, tag = "agent-processes") { onMenu(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 + onMenu(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 + onMenu(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 } + HeaderAction(if (menu) Icons.Outlined.Close else Icons.Outlined.MoreHoriz, stringResource(R.string.agent_more), size = 32.dp, tag = "agent-menu") { onMenu(!menu) } } Row(verticalAlignment = Alignment.Bottom) { if (LocalActivityResultRegistryOwner.current != null) AttachButton() @@ -658,7 +688,10 @@ private fun AgentEditor( draft, { draft = it }, Modifier.fillMaxWidth().focusRequester(field).onFocusChanged { focused = it.isFocused - if (it.isFocused) composer.opening = false + if (it.isFocused) { + composer.consumeFocusRequest() + composer.opening = false + } }.testTag("agent-input").then(inputModifier), textStyle = TextStyle(fontSize = 16.sp, color = colors.onSurface), cursorBrush = SolidColor(pal.primary), 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 94f4ff1a3c..92ba3727e1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -558,11 +558,12 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont tabModifier = { key -> focus.track(page, "glasses-tab-$key").testTag("glasses-tab-$key") }, ) { selectedGlassesTab = it } // The agent's chat scrolls itself and keeps its composer at the bottom, so it takes the height left. - if (page == SessionDrawerPage.AGENT) AgentPage( + if (page == SessionDrawerPage.AGENT) AgentPageWithControls( Modifier.weight(1f).fillMaxWidth().padding(top = 8.dp, start = 14.dp, end = 14.dp), inputModifier = focus.track(page, "agent-input"), visible = open, startTyping = false, + showControlsWithoutKeyboard = true, ) else Column( modifier = Modifier.weight(1f).fillMaxWidth().verticalScroll(pageScroll.getValue(page)), ) { CompositionLocalProvider(LocalChipMinWidth provides 96.dp, LocalCompactSettings provides true) { From 58af2e136b31db2a916620c147485611b1798613 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 13 Nov 2026 12:32:24 -0500 Subject: [PATCH 3/5] feat(storage): name, select and remove every prefix and store game (#2565) * feat(storage): name, select and remove every prefix and store game * feat(storage): bulk remove picks prefixes, shader caches or both * fix(storage): count and clear a game's shader cache in every library * fix(storage): guard shared prefixes, batches and active downloads * fix(storage): count each shader cache once across games * fix(storage): hold store uninstalls against downloads and keep every shortcut's options * fix(stores): keep download cleanup and uninstall from overlapping * fix(stores): wait for an installer's file discard before uninstalling * fix(stores): a reinstall waits for the cancelled download's file cleanup * fix(storage): fast first scan, readable 4:3 layout and every shader cache counted * fix(storage): keep store sizes current and track discards from failing jobs * fix(stores): uninstall waits for a cancelled update's cleanup * test(stores): a reinstall waits for a failed job's discard --- .../droiddeck/launcher/frontend/AddedGames.kt | 11 + .../launcher/session/SessionPrefs.kt | 5 + .../launcher/storage/SteamStorage.kt | 36 ++ .../droiddeck/launcher/storage/StorageScan.kt | 121 +++++- .../launcher/storage/StorageState.kt | 99 ++++- .../launcher/stores/StoreInstalls.kt | 62 ++- .../droiddeck/launcher/stores/StoresState.kt | 36 +- .../launcher/stores/download/DownloadQueue.kt | 89 ++++- .../com/droiddeck/launcher/ui/StoragePage.kt | 377 +++++++++++++++--- app/src/main/res/values-ar/strings.xml | 15 +- app/src/main/res/values-b+es+419/strings.xml | 15 +- app/src/main/res/values-bg/strings.xml | 15 +- app/src/main/res/values-cs/strings.xml | 15 +- app/src/main/res/values-da/strings.xml | 15 +- app/src/main/res/values-de/strings.xml | 15 +- app/src/main/res/values-el/strings.xml | 15 +- app/src/main/res/values-es/strings.xml | 15 +- app/src/main/res/values-fi/strings.xml | 15 +- app/src/main/res/values-fr/strings.xml | 15 +- app/src/main/res/values-hi/strings.xml | 15 +- app/src/main/res/values-hu/strings.xml | 15 +- app/src/main/res/values-in/strings.xml | 15 +- app/src/main/res/values-it/strings.xml | 15 +- app/src/main/res/values-ja/strings.xml | 15 +- app/src/main/res/values-ko/strings.xml | 15 +- app/src/main/res/values-ms/strings.xml | 15 +- app/src/main/res/values-nb/strings.xml | 15 +- app/src/main/res/values-nl/strings.xml | 15 +- app/src/main/res/values-pl/strings.xml | 15 +- app/src/main/res/values-pt-rPT/strings.xml | 15 +- app/src/main/res/values-pt/strings.xml | 15 +- app/src/main/res/values-ro/strings.xml | 15 +- app/src/main/res/values-ru/strings.xml | 15 +- app/src/main/res/values-sv/strings.xml | 15 +- app/src/main/res/values-th/strings.xml | 15 +- app/src/main/res/values-tr/strings.xml | 15 +- app/src/main/res/values-uk/strings.xml | 15 +- app/src/main/res/values-vi/strings.xml | 15 +- app/src/main/res/values-zh-rCN/strings.xml | 15 +- app/src/main/res/values-zh-rHK/strings.xml | 15 +- app/src/main/res/values-zh-rTW/strings.xml | 15 +- app/src/main/res/values/strings.xml | 15 +- .../launcher/storage/SteamStorageTest.kt | 31 ++ .../download/DownloadQueueRemovalTest.kt | 276 +++++++++++++ .../ui/StorageComponentsBulkConfirmTest.kt | 2 +- 45 files changed, 1494 insertions(+), 146 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/download/DownloadQueueRemovalTest.kt 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 d0f4ea80a0..c4d443184d 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -529,6 +529,17 @@ object AddedGames { } } + class Listed(val appId: Long, val name: String, val launchOptions: String) + + fun listed(context: Context): List? = runCatching { + val file = File(context.filesDir, "session/added-games.json") + if (!file.isFile) return null + val entries = org.json.JSONArray(file.readText()) + (0 until entries.length()).mapNotNull { i -> + entries.optJSONObject(i)?.takeIf { it.has("appid") }?.let { Listed(it.optLong("appid") and 0xFFFFFFFFL, it.optString("name"), it.optString("launch")) } + } + }.getOrNull() + fun writeListing(context: Context, games: List, extra: List = listOfNotNull(com.droiddeck.launcher.stores.epic.EpicClient.steamListing(context))): File { val file = File(context.filesDir, "session/added-games.json").apply { parentFile?.mkdirs() } 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 4c567fd1b6..cf7b324eac 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -1281,6 +1281,11 @@ object SessionPrefs { fun addedGameStoredAppId(context: Context, folderPath: String): Long? = prefs(context).getLong("addedAppId:$folderPath", 0L).takeIf { it != 0L } + fun addedGameFolders(context: Context): Map = prefs(context).all.mapNotNull { (key, value) -> + val id = (value as? Long)?.takeIf { key.startsWith("addedAppId:") && it != 0L } ?: return@mapNotNull null + (id and 0xFFFFFFFFL) to key.removePrefix("addedAppId:") + }.toMap() + fun followStoreGame(context: Context, key: String, folderPath: String, gone: (String) -> Boolean) = synchronized(addedGameLock) { val p = prefs(context) val previous = p.getString("storeFolder:$key", null) 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 2111bfdee1..62ba45fd9c 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt @@ -155,6 +155,42 @@ object SteamStorage { fun leftoverId(name: String): Int? = name.toLongOrNull()?.takeIf { it in 1 until (1L shl 31) }?.toInt() + fun shortcutId(name: String): Long? = name.toLongOrNull() + ?.takeIf { it in Int.MIN_VALUE until 0 || it in (1L shl 31) until (1L shl 32) }?.and(0xFFFFFFFFL) + + private val COMPAT_PATH = Regex("""STEAM_COMPAT_DATA_PATH=(?:"([^"]*)"|'([^']*)'|(\S+))""") + private val COMPAT_ID = Regex("""/compatdata/(-?\d+)/*$""") + + fun sharedPrefixId(launchOptions: String): Long? { + val path = COMPAT_PATH.find(launchOptions)?.groupValues?.drop(1)?.firstOrNull { it.isNotEmpty() } ?: return null + return COMPAT_ID.find(path.trim())?.groupValues?.get(1)?.let(::shortcutId) + } + + private val GAME_FOLDER = Regex("""Z:\\\\(?:[^"\\]+\\\\)*?(?:steamapps\\\\common|Games\\\\Stores\\\\[^"\\]+)\\\\([^"\\]+)""") + + fun gameFolderHint(prefix: File): String? = runCatching { + listOf("pfx/system.reg", "pfx/user.reg").map { File(prefix, it) }.filter { it.isFile && it.length() < 64L * 1024 * 1024 } + .flatMap { f -> f.useLines { lines -> lines.flatMap { GAME_FOLDER.findAll(it).map { m -> m.groupValues[1] } }.toList() } } + .groupingBy { it }.eachCount().maxByOrNull { it.value }?.key + }.getOrNull() + + class Shortcut(val name: String, val launchOptions: List) + + fun shortcuts(root: File): Map? = runCatching { + val userdata = File(root, "userdata") + val users = if (userdata.exists()) userdata.listFiles() ?: return null else emptyArray() + users.mapNotNull { File(it, "config/shortcuts.vdf").takeIf(File::isFile) }.flatMap { file -> + val vdf = com.droiddeck.launcher.frontend.SteamAppInfo.readMap(java.nio.ByteBuffer.wrap(file.readBytes()).order(java.nio.ByteOrder.LITTLE_ENDIAN), null) + (vdf["shortcuts"] as? Map<*, *>)?.values?.filterIsInstance>()?.mapNotNull { s -> + fun value(key: String) = s.entries.firstOrNull { (it.key as? String).equals(key, ignoreCase = true) }?.value as? String + val id = value("appid")?.toLongOrNull()?.and(0xFFFFFFFFL) ?: return@mapNotNull null + id to Shortcut(value("AppName") ?: "", listOfNotNull(value("LaunchOptions"))) + }.orEmpty() + }.groupBy({ it.first }, { it.second }).mapValues { (_, all) -> + Shortcut(all.firstOrNull { it.name.isNotEmpty() }?.name.orEmpty(), all.flatMap { it.launchOptions }) + } + }.getOrNull() + fun isStubPrefix(prefix: File): Boolean = prefix.walkTopDown().onEnter { !java.nio.file.Files.isSymbolicLink(it.toPath()) } .none { it.isFile && it.name != "steam_autocloud.vdf" && !java.nio.file.Files.isSymbolicLink(it.toPath()) } } 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 3a7c52db38..dc07daabaf 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt @@ -18,7 +18,7 @@ enum class Bucket { GAMES, GAME_DATA, TOOLS, COMPONENTS, STORES, DESKTOP, SYSTEM class GameUsage( val appId: Int, val name: String, val art: File?, val library: String, val internal: Boolean, val lastPlayed: Long, - val game: Long, val prefix: Long, val shaders: Long, val workshop: Long, val shaderDir: File?, + val game: Long, val prefix: Long, val shaders: Long, val workshop: Long, val shaderDirs: List, val x64: Boolean = false, val prefixDir: File? = null, ) { val data: Long get() = prefix + shaders + workshop @@ -33,7 +33,16 @@ class ToolUsage( val games: Int, val isDefault: Boolean, val manifests: List, val dirs: List, ) -class Leftover(val appId: Int, val prefix: File?, val shaders: File?, val bytes: Long, val safe: Boolean) +class Leftover(val appId: Long, val prefix: File?, val shaders: File?, val bytes: Long, val safe: Boolean, val shortcut: Boolean = false, val name: String? = null, val prefixBytes: Long = 0) + +enum class PrefixOwner { SHARED, LAUNCHER, GAME, UNKNOWN } + +class KeptPrefix( + val dir: File, val owner: PrefixOwner, val name: String?, val bytes: Long, val library: String, val x64: Boolean, val users: List = emptyList(), + val shaders: File? = null, val shaderBytes: Long = 0, +) + +class StoreGameUsage(val game: com.droiddeck.launcher.stores.InstalledStoreGame, val bytes: Long, val internal: Boolean) class ComponentUsage( val comp: String, val version: String, val bytes: Long, val inUse: Boolean, @@ -59,9 +68,11 @@ class StorageReport( val components: List, val flatpakApps: List, val flatpakRuntimes: Long, - val otherPrefixes: Long, + val kept: List, val leftoversChecked: Boolean, + val storeGames: List = emptyList(), ) { + val otherPrefixes: Long get() = kept.sumOf { it.bytes } val droiddeck: Long get() = buckets.values.sum() val installedShaders: Long get() = games.sumOf { it.shaders } val unusedTools: List get() = tools.filter { it.state == ToolState.UNUSED } @@ -91,7 +102,16 @@ object StorageScan { fun steamRoot(context: Context) = SessionPrefs.steamRoot(context, "arm64") + fun measure(file: File): Long = Walker().measure(file) + fun scan(context: Context): StorageReport { + val phases = ArrayList() + var mark = android.os.SystemClock.elapsedRealtime() + fun phase(name: String) { + val now = android.os.SystemClock.elapsedRealtime() + phases.add("$name ${now - mark}") + mark = now + } val walker = Walker() val files = context.filesDir val rootfs = LinuxRuntime.rootDir(context) @@ -99,6 +119,7 @@ object StorageScan { val x64Root = SessionPrefs.steamRoot(context, "x86_64").takeIf { SteamStorage.x64ClientPresent(it) } val clients = listOfNotNull("arm64", "x86_64".takeIf { x64Root != null }) fun canonical(f: File) = runCatching { f.canonicalPath }.getOrDefault(f.path) + phase("setup") val art = clients.associate { arch -> (arch == "x86_64") to runCatching { Library.steamGames(context, arch = arch) }.getOrDefault(emptyList()).associateBy { it.appId } } @@ -106,6 +127,7 @@ object StorageScan { class Lib(val root: File, val label: String, val internal: Boolean, val data: File, val listing: SteamStorage.Listing?, val x64: Boolean) { val manifests: List? get() = listing?.manifests } + phase("steam games") val libs = clients.flatMap { arch -> val x64 = arch == "x86_64" val primary = canonical(SessionPrefs.steamRoot(context, arch)) @@ -123,6 +145,7 @@ object StorageScan { val clientIds = libs.groupBy { it.x64 }.mapValues { (_, own) -> own.flatMap { it.listing?.ids.orEmpty() }.toSet() } fun installedGames(x64: Boolean) = libs.filter { it.x64 == x64 }.flatMap { it.manifests.orEmpty() } .filter { !SteamStorage.isTool(it) && it.installed }.map { it.appId.toString() }.toSet() + phase("libraries") val armUse = runCatching { SteamStorage.compatMappings(File(steamRoot, "config/config.vdf").readText()) }.getOrNull() ?.let { SteamStorage.ToolUse(it, installedGames(false)) } val x64Vdf = x64Root?.let { File(it, "config/config.vdf") } @@ -132,8 +155,10 @@ object StorageScan { val uses = listOfNotNull(armUse, x64Use) fun gamesOn(tool: String) = uses.sumOf { it.games(tool) } + val libraryDataRoots = File(files, "steam-libraries").listFiles().orEmpty().filter { it.isDirectory } val tools = LinkedHashMap() val games = ArrayList() + val countedShaders = HashSet() for (lib in libs) { for (m in lib.manifests.orEmpty()) { val dir = m.installDir @@ -176,17 +201,19 @@ object StorageScan { val compatRoot = File(lib.data, "steamapps/compatdata").takeIf { it.isDirectory } ?: File(lib.root, "steamapps/compatdata") val prefixDir = File(compatRoot, m.appId.toString()).takeIf { it.isDirectory } val prefix = prefixDir?.let { walker.measure(it) } ?: 0 - val shaderDir = File(lib.data, "steamapps/shadercache/${m.appId}").takeIf { it.isDirectory } - val shaders = shaderDir?.let { walker.measure(it) } ?: 0 + val shaderDirs = ((listOf(lib) + libs.filter { it !== lib && it.x64 == lib.x64 }).map { it.data } + libraryDataRoots) + .map { File(it, "steamapps/shadercache/${m.appId}") }.filter { it.isDirectory }.distinctBy { canonical(it) } + val shaders = shaderDirs.filter { countedShaders.add(canonical(it)) }.sumOf { walker.measure(it) } val workshop = File(lib.root, "steamapps/workshop/content/${m.appId}").takeIf { it.isDirectory }?.let { walker.measure(it) } ?: 0 val known = art[lib.x64]?.get(m.appId) games.add(GameUsage( m.appId, known?.name ?: m.name, known?.art, lib.label, lib.internal, m.lastPlayed, - gameBytes, prefix, shaders, workshop, shaderDir, lib.x64, prefixDir, + gameBytes, prefix, shaders, workshop, shaderDirs, lib.x64, prefixDir, )) } } + phase("manifests and games") File(steamRoot, "compatibilitytools.d").listFiles()?.sortedBy { it.name }?.forEach { dir -> if (!dir.isDirectory) return@forEach val bytes = walker.measure(dir) @@ -206,6 +233,7 @@ object StorageScan { ) } + phase("compat tools") val leftovers = ArrayList() for (lib in libs) { if (!everyLibraryRead) break @@ -217,16 +245,22 @@ object StorageScan { for (id in (prefixes.keys + caches.keys).sorted()) { val prefix = prefixes[id] val cache = caches[id] - val bytes = (prefix?.let { walker.measure(it) } ?: 0) + (cache?.let { walker.measure(it) } ?: 0) + val prefixBytes = prefix?.let { walker.measure(it) } ?: 0 + val bytes = prefixBytes + (cache?.let { walker.measure(it) } ?: 0) val safe = prefix == null || SteamStorage.isStubPrefix(prefix) - leftovers.add(Leftover(id, prefix, cache, bytes, safe)) + val name = if (safe) null else runCatching { + com.droiddeck.launcher.frontend.SteamAppInfo.info(context, id, File(if (lib.x64) x64Root ?: steamRoot else steamRoot, "appcache/appinfo.vdf"))?.name + }.getOrNull()?.ifEmpty { null } + leftovers.add(Leftover(id.toLong(), prefix, cache, bytes, safe, name = name, prefixBytes = prefixBytes)) } } + phase("leftovers") val logs = SessionPaths.sessionFolders(context).filter { it != SessionPaths.current() } + listOf(File(LinuxRuntime.logDir(context), SessionPaths.TOOLS_DIR)).filter { it.exists() } val logBytes = logs.sumOf { walker.measure(it) } + phase("logs") val flatpakDir = File(rootfs, "root/.local/share/flatpak") val flatpakNames = runCatching { FlatpakManager.installedApps(context) }.getOrDefault(emptyList()).associate { it.id to it.name } val flatpakApps = File(flatpakDir, "app").listFiles().orEmpty().filter { it.isDirectory }.map { dir -> @@ -234,6 +268,7 @@ object StorageScan { }.sortedByDescending { it.bytes } val flatpakRuntimes = File(flatpakDir, "runtime").takeIf { it.isDirectory }?.let { walker.measure(it) } ?: 0 + phase("flatpak") val componentsDir = File(files, "components") val stored = runCatching { ComponentsManager.stored(context) }.onFailure { Log.w("StorageScan", "components", it) }.getOrNull() val components = stored?.let { st -> @@ -241,10 +276,70 @@ object StorageScan { st.originals.map { ComponentUsage(it.comp, it.protonVersion, it.size, it.kept, protonId = it.protonId, protonName = it.protonName) } }.orEmpty() - val otherPrefixes = libs.flatMap { lib -> - File(lib.data, "steamapps/compatdata").listFiles().orEmpty().filter { it.isDirectory && SteamStorage.leftoverId(it.name) == null } - }.sumOf { walker.measure(it) } + phase("components") + val added = com.droiddeck.launcher.frontend.AddedGames.listed(context) + val shortcuts = listOfNotNull(steamRoot, x64Root).map { SteamStorage.shortcuts(it) } + val ownersRead = added != null && shortcuts.all { it != null } + val live = HashMap() + shortcuts.forEach { it?.forEach { (id, s) -> live[id] = s.name } } + added?.forEach { live[it.appId] = it.name } + val folders = SessionPrefs.addedGameFolders(context) + val removedFolders = SessionPrefs.removedAddedGames(context).toSet() + folders.forEach { (id, path) -> if (id !in live && path !in removedFolders && File(path).exists()) live[id] = File(path).name } + val launchers = mapOf( + com.droiddeck.launcher.runtime.BattleNet.APP_ID to com.droiddeck.launcher.stores.Store.BATTLENET.label, + com.droiddeck.launcher.stores.ubisoft.UbisoftConnect.APP_ID to com.droiddeck.launcher.stores.Store.UBISOFT.label, + com.droiddeck.launcher.stores.epic.EpicClient.shortcutAppId to Library.EPIC_LAUNCHER_NAME, + ) + val users = HashMap>() + fun shares(own: Long, name: String, launchOptions: String) { + SteamStorage.sharedPrefixId(launchOptions)?.takeIf { it != own }?.let { users.getOrPut(it) { LinkedHashSet() }.add(name) } + } + added?.forEach { shares(it.appId, it.name, it.launchOptions) } + shortcuts.forEach { it?.forEach { (id, s) -> s.launchOptions.forEach { shares(id, s.name, it) } } } + phase("added games and shortcuts") + val kept = ArrayList() + for (lib in libs) { + val dirs = File(lib.data, "steamapps/compatdata").listFiles().orEmpty().filter { it.isDirectory && SteamStorage.leftoverId(it.name) == null } + val caches = File(lib.data, "steamapps/shadercache").listFiles().orEmpty() + .mapNotNull { f -> SteamStorage.shortcutId(f.name)?.takeIf { f.isDirectory }?.let { it to f } }.toMap() + for (dir in dirs) { + val bytes = walker.measure(dir) + val id = SteamStorage.shortcutId(dir.name) + val cache = id?.let { caches[it] } + val cacheBytes = cache?.let { walker.measure(it) } ?: 0 + when { + dir.name == "0" -> kept.add(KeptPrefix(dir, PrefixOwner.SHARED, null, bytes, lib.label, lib.x64)) + id != null && (id in launchers || id in users) -> kept.add(KeptPrefix(dir, PrefixOwner.LAUNCHER, + launchers[id] ?: live[id]?.ifEmpty { null }, bytes, lib.label, lib.x64, users[id].orEmpty().toList(), cache, cacheBytes)) + id != null && id in live -> kept.add(KeptPrefix(dir, PrefixOwner.GAME, live[id]?.ifEmpty { null }, bytes, lib.label, lib.x64, shaders = cache, shaderBytes = cacheBytes)) + id != null && ownersRead -> { + leftovers.add(Leftover(id, dir, cache, bytes + cacheBytes, SteamStorage.isStubPrefix(dir), + shortcut = true, name = folders[id]?.let { File(it).name } ?: SteamStorage.gameFolderHint(dir), prefixBytes = bytes)) + } + else -> kept.add(KeptPrefix(dir, PrefixOwner.UNKNOWN, id?.toString() ?: dir.name, bytes, lib.label, lib.x64)) + } + } + if (!ownersRead) continue + val prefixIds = dirs.mapNotNullTo(HashSet()) { SteamStorage.shortcutId(it.name) } + for ((id, cache) in caches) { + if (id in prefixIds || id in live || id in launchers || id in users) continue + leftovers.add(Leftover(id, null, cache, walker.measure(cache), true, shortcut = true, name = folders[id]?.let { File(it).name })) + } + } + phase("kept prefixes") + val storeGames = (com.droiddeck.launcher.stores.StoreInstallRoot.gameFolders(context).mapNotNull { folder -> + com.droiddeck.launcher.stores.StoreGameSidecar.read(folder) + ?.takeIf { it.isInstalled || it.state == com.droiddeck.launcher.stores.StoreGameSidecar.STATE_UPDATING } + ?.let { com.droiddeck.launcher.stores.InstalledStoreGame(it, folder) } + } + runCatching { com.droiddeck.launcher.stores.battlenet.BattleNetBackend.installedGames(context) }.getOrDefault(emptyList())) + .map { g -> + val internal = g.folder.path.startsWith(files.path + "/") + StoreGameUsage(g, if (internal) walker.measure(g.folder) else -1L, internal) + }.sortedByDescending { it.bytes } + + phase("store games") val clientRoots = listOfNotNull(steamRoot, x64Root) val apps = clientRoots.map { File(it, "steamapps") } val privateRoots = File(files, "steam-libraries").listFiles().orEmpty().filter { it.isDirectory } @@ -269,6 +364,8 @@ object StorageScan { val componentBytes = m(componentsDir) val droiddeck = m(files) + m(context.cacheDir) - rootfsBytes - privateBytes - componentBytes + (privateBytes - toolsPrivate - privatePrefixes - privateShaders) + phase("totals") + Log.i("StorageScan", "scan ms: " + phases.joinToString(", ")) val stat = StatFs(files.path) return StorageReport( System.currentTimeMillis(), stat.totalBytes, stat.availableBytes, @@ -284,7 +381,7 @@ object StorageScan { ), prefixes, shaders, workshop, flatpak, games.sortedByDescending { it.total }, tools.values.toList(), leftovers, logs, logBytes, - components, flatpakApps, flatpakRuntimes, otherPrefixes, everyLibraryRead, + components, flatpakApps, flatpakRuntimes, kept, everyLibraryRead, storeGames, ) } } diff --git a/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt b/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt index 331c5b402f..40a48a3669 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt @@ -13,6 +13,7 @@ import com.droiddeck.launcher.files.FileOps import com.droiddeck.launcher.runtime.FlatpakManager import com.droiddeck.launcher.session.ComponentsManager import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.stores.StoreGameSidecar enum class CleanItem { OLD_TOOLS, LEFTOVERS, LEFTOVERS_UNSURE, LOGS, UNUSED_CUSTOM, UNUSED_COMPONENTS, SHADERS } @@ -27,6 +28,45 @@ object StorageState { private set var cleaning by mutableStateOf(false) private set + var storeBatch by mutableStateOf(false) + private set + val busy: Boolean get() = cleaning || storeBatch + private var refreshAgain = false + val storeSizes = androidx.compose.runtime.mutableStateMapOf() + private var measuringStores = false + + private fun sizeKey(usage: StoreGameUsage): String = with(usage.game) { + "${folder.path}|${sidecar.installVersion}|${sidecar.installedAt}|${StoreGameSidecar.file(folder).lastModified()}" + } + + fun storeBytes(usage: StoreGameUsage): Long = if (usage.bytes >= 0) usage.bytes else storeSizes[sizeKey(usage)] ?: -1L + + private fun measureStoreGames(app: Context) { + val current = report ?: return + if (measuringStores) return + val wanted = current.storeGames.filter { it.bytes < 0 && sizeKey(it) !in storeSizes }.map { sizeKey(it) to it.game.folder } + if (wanted.isEmpty()) return + measuringStores = true + Thread({ + val started = android.os.SystemClock.elapsedRealtime() + for ((key, folder) in wanted) { + val bytes = runCatching { StorageScan.measure(folder) }.getOrDefault(0L) + main.post { storeSizes[key] = bytes } + } + Log.i(TAG, "measured ${wanted.size} store games on removable storage in ${android.os.SystemClock.elapsedRealtime() - started} ms") + main.post { + measuringStores = false + measureStoreGames(app) + } + }, "storage-store-sizes").start() + } + + private fun publish(app: Context, result: StorageReport) { + report = result + val live = result.storeGames.mapTo(HashSet()) { sizeKey(it) } + storeSizes.keys.retainAll(live) + measureStoreGames(app) + } var lastFreed by mutableStateOf(null) var progress by mutableStateOf(null) private set @@ -48,16 +88,21 @@ object StorageState { fun refresh(context: Context, force: Boolean = false) { val current = report - if (scanning || cleaning) return + if (scanning || cleaning) { + if (force) refreshAgain = true + return + } if (!force && current != null && System.currentTimeMillis() - current.at < FRESH_MS) return + refreshAgain = false val app = context.applicationContext scanning = true Thread({ val result = runCatching { StorageScan.scan(app) } .onFailure { Log.w(TAG, "storage scan failed", it) }.getOrNull() main.post { - if (result != null) report = result + if (result != null) publish(app, result) scanning = false + if (refreshAgain) refresh(app, force = true) } }, "storage-scan").start() } @@ -84,7 +129,7 @@ object StorageState { fun safeBytes(report: StorageReport): Long = SAFE.sumOf { bytes(report, it) } fun clean(context: Context, items: Set, onDone: (Long?) -> Unit) { - if (cleaning || SessionState.running) { onDone(null); return } + if (busy || SessionState.running) { onDone(null); return } val app = context.applicationContext appContext = app cleaning = true @@ -101,7 +146,7 @@ object StorageState { } fun removeTool(context: Context, tool: ToolUsage, onDone: (Long?) -> Unit) { - if (tool.state != ToolState.UNUSED || cleaning || SessionState.running) { onDone(null); return } + if (tool.state != ToolState.UNUSED || busy || SessionState.running) { onDone(null); return } val app = context.applicationContext cleaning = true Thread({ @@ -119,7 +164,7 @@ object StorageState { } private fun act(context: Context, name: String, action: (Context, StorageReport) -> Boolean, onDone: (Long?) -> Unit = {}) { - if (cleaning || SessionState.running) { onDone(null); return } + if (busy || SessionState.running) { onDone(null); return } val app = context.applicationContext appContext = app cleaning = true @@ -137,8 +182,8 @@ object StorageState { } fun clearShaders(context: Context, appId: Int, x64: Boolean = false) = act(context, "shaders-$appId", { _, fresh -> - val dir = fresh.games.firstOrNull { it.appId == appId && it.x64 == x64 }?.shaderDir ?: return@act false - FileOps.delete(dir) + val dirs = fresh.games.firstOrNull { it.appId == appId && it.x64 == x64 }?.shaderDirs.orEmpty() + dirs.isNotEmpty() && dirs.map { FileOps.delete(it) }.all { it } }) fun resetPrefix(context: Context, game: GameUsage) = act(context, "prefix-${game.appId}", { _, fresh -> @@ -155,6 +200,41 @@ object StorageState { true }) + fun resetKept(context: Context, prefix: KeptPrefix) = act(context, "kept-${prefix.dir.name}", { _, fresh -> + val dir = fresh.kept.firstOrNull { it.dir.path == prefix.dir.path && it.owner == prefix.owner } + ?.takeIf { it.owner == PrefixOwner.SHARED || it.owner == PrefixOwner.GAME }?.dir ?: return@act false + check(FileOps.delete(dir)) { "cannot delete $dir" } + true + }) + + fun uninstallStoreGames(context: Context, games: List) { + if (busy || SessionState.running || games.isEmpty()) return + storeBatch = true + uninstallNext(context.applicationContext, games) + } + + private fun uninstallNext(app: Context, games: List) { + val rest = games.dropWhile { com.droiddeck.launcher.stores.download.DownloadQueue.isActive(it.game.key) } + val next = rest.firstOrNull() + if (next == null || SessionState.running) { + storeBatch = false + com.droiddeck.launcher.stores.StoresState.notifyLibraryChanged(app) + refresh(app, force = true) + return + } + com.droiddeck.launcher.stores.StoresState.uninstall(app, next.game) { uninstallNext(app, rest.drop(1)) } + } + + fun removeDirs(context: Context, dirs: List) = act(context, "remove-${dirs.size}", { _, fresh -> + val allowed = (fresh.games.flatMap { it.shaderDirs + listOfNotNull(it.prefixDir) } + fresh.leftovers.flatMap { listOfNotNull(it.prefix, it.shaders) } + + fresh.kept.filter { it.owner == PrefixOwner.SHARED || it.owner == PrefixOwner.GAME }.flatMap { listOfNotNull(it.dir, it.shaders) }).mapTo(HashSet()) { it.path } + val wanted = dirs.distinctBy { it.path } + val targets = wanted.filter { it.path in allowed } + if (targets.size < wanted.size) Log.w(TAG, "kept ${wanted.size - targets.size} folders that are no longer safe to remove") + targets.forEach { check(FileOps.delete(it)) { "cannot delete $it" } } + targets.isNotEmpty() + }) + fun removeComponent(context: Context, usage: ComponentUsage) = act(context, "component", { app, fresh -> val current = fresh.components.firstOrNull { it.packageFile == usage.packageFile && it.protonId == usage.protonId && it.comp == usage.comp && it.version == usage.version } ?: return@act false @@ -186,10 +266,11 @@ object StorageState { private fun finish(app: Context, freed: Long?, onDone: (Long?) -> Unit) { val rescanned = runCatching { StorageScan.scan(app) }.getOrNull() main.post { - if (rescanned != null) report = rescanned + if (rescanned != null) publish(app, rescanned) cleaning = false lastFreed = freed onDone(freed) + if (refreshAgain) refresh(app, force = true) } } @@ -201,7 +282,7 @@ object StorageState { CleanItem.LEFTOVERS -> report.leftovers.filter { it.safe }.forEach(::deleteLeftover) CleanItem.LEFTOVERS_UNSURE -> report.leftovers.filter { !it.safe }.forEach(::deleteLeftover) CleanItem.LOGS -> report.logs.forEach { FileOps.delete(it) } - CleanItem.SHADERS -> report.games.mapNotNull { it.shaderDir }.forEach { FileOps.delete(it) } + CleanItem.SHADERS -> report.games.flatMap { it.shaderDirs }.forEach { FileOps.delete(it) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt index c29ea41652..e792b67a94 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt @@ -89,16 +89,62 @@ object StoreInstalls { StoresState.logLine("uninstalled \"${game.sidecar.title}\"") } + private val discarding = HashMap() + + fun isDiscarding(folder: File): Boolean = synchronized(discarding) { folder.absolutePath in discarding } + + internal fun beginDiscard(folder: File) { synchronized(discarding) { discarding.merge(folder.absolutePath, 1, Int::plus) } } + + internal fun endDiscard(folder: File) { + synchronized(discarding) { + discarding.computeIfPresent(folder.absolutePath) { _, n -> (n - 1).takeIf { it > 0 } } + (discarding as Object).notifyAll() + } + } + + fun awaitDiscard(folder: File) { + synchronized(discarding) { while (folder.absolutePath in discarding) (discarding as Object).wait() } + } + + private val started = ThreadLocal?>() + + fun collectingDiscards(into: MutableList = ArrayList(), block: () -> Unit): List { + val previous = started.get() + started.set(into) + try { + block() + } finally { + started.set(previous) + previous?.addAll(into) + } + return into + } + fun discard(context: Context, folder: File, caches: List) { val app = context.applicationContext - Thread({ - val sidecar = StoreGameSidecar.read(folder) - val keep = sidecar?.isInstalled == true || sidecar?.state == StoreGameSidecar.STATE_UPDATING - caches.forEach { deleteTree(it) } - if (!keep) deleteTree(folder) - StoresState.logLine(if (keep) "removed update caches for ${folder.name}; verified file swaps are retained" else "removed ${folder.name}") - StoresState.notifyLibraryChanged(app) - }, "store-cancel-clean").start() + beginDiscard(folder) + val worker = Thread({ + try { + discardNow(app, folder, caches) + } finally { + endDiscard(folder) + } + }, "store-cancel-clean") + started.get()?.add(worker) + worker.start() + } + + @androidx.annotation.VisibleForTesting + internal var beforeDiscard: (File) -> Unit = {} + + private fun discardNow(app: Context, folder: File, caches: List) { + beforeDiscard(folder) + val sidecar = StoreGameSidecar.read(folder) + val keep = sidecar?.isInstalled == true || sidecar?.state == StoreGameSidecar.STATE_UPDATING + caches.forEach { deleteTree(it) } + if (!keep) deleteTree(folder) + StoresState.logLine(if (keep) "removed update caches for ${folder.name}; verified file swaps are retained" else "removed ${folder.name}") + StoresState.notifyLibraryChanged(app) } fun deleteTree(dir: File) { 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 40fedbded2..46de6eaab0 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt @@ -314,23 +314,37 @@ object StoresState { val key = "${game.sidecar.store.id}:${game.sidecar.id}" uninstalling[key] = 0f background("stores-uninstall", onFailure = { main.post { uninstalling.remove(key); onDone() } }) { - runCatching { backends[game.sidecar.store]?.uninstall(app, game) } - if (game.sidecar.store == Store.BATTLENET && com.droiddeck.launcher.runtime.BattleNet.games(app).any { it.folder.absolutePath == game.folder.absolutePath }) { + if (!com.droiddeck.launcher.stores.download.DownloadQueue.holdForRemovalWhenFree(key)) { + logLine("kept \"${game.sidecar.title}\": its download or update is still running") main.post { uninstalling.remove(key); onDone() } return@background } - StoreInstalls.uninstall(app, game, progress = { f -> main.post { if (key in uninstalling) uninstalling[key] = f } }, removed = { - main.post { - installed = installed.filterNot { it.folder.absolutePath == game.folder.absolutePath } - uninstalling.remove(key) - if (game.sidecar.store == Store.ITCH) com.droiddeck.launcher.stores.itch.ItchUpdates.applied(app, key) - if (game.sidecar.store == Store.GAMEJOLT) com.droiddeck.launcher.stores.gamejolt.GameJoltUpdates.applied(app, key) - } - }) - main.post(onDone) + try { + StoreInstalls.awaitDiscard(game.folder) + uninstallHeld(app, game, key, onDone) + } finally { + com.droiddeck.launcher.stores.download.DownloadQueue.releaseRemoval(key) + } } } + private fun uninstallHeld(app: Context, game: InstalledStoreGame, key: String, onDone: () -> Unit) { + runCatching { backends[game.sidecar.store]?.uninstall(app, game) } + if (game.sidecar.store == Store.BATTLENET && com.droiddeck.launcher.runtime.BattleNet.games(app).any { it.folder.absolutePath == game.folder.absolutePath }) { + main.post { uninstalling.remove(key); onDone() } + return + } + StoreInstalls.uninstall(app, game, progress = { f -> main.post { if (key in uninstalling) uninstalling[key] = f } }, removed = { + main.post { + installed = installed.filterNot { it.folder.absolutePath == game.folder.absolutePath } + uninstalling.remove(key) + if (game.sidecar.store == Store.ITCH) com.droiddeck.launcher.stores.itch.ItchUpdates.applied(app, key) + if (game.sidecar.store == Store.GAMEJOLT) com.droiddeck.launcher.stores.gamejolt.GameJoltUpdates.applied(app, key) + } + }) + main.post(onDone) + } + @Volatile var libraryListener: (() -> Unit)? = null fun notifyLibraryChanged(context: Context) { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt b/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt index 379161ebf1..19dc8ea178 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.stores.download import android.content.Context import android.util.Log import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.stores.StoreInstalls import com.droiddeck.launcher.stores.StoresState import java.util.concurrent.atomic.AtomicBoolean @@ -102,6 +103,55 @@ object DownloadQueue { private val lock = Any() private val items = LinkedHashMap() private val heldPaused = HashSet() + private val removing = HashSet() + private val cleaningUp = HashMap() + + fun holdForRemoval(key: String): Boolean = synchronized(lock) { + val item = items[key] + if (item?.entry?.isActive == true || item?.job != null || key in cleaningUp || key in removing) return@synchronized false + removing.add(key) + true + } + + fun releaseRemoval(key: String) { synchronized(lock) { removing.remove(key); (lock as Object).notifyAll() } } + + fun holdForRemovalWhenFree(key: String): Boolean = synchronized(lock) { + while (true) { + val item = items[key] + if (item?.entry?.isActive == true || item?.job != null) return@synchronized false + if (key !in cleaningUp && key !in removing) break + (lock as Object).wait() + } + removing.add(key) + true + } + + private fun beginCleanup(key: String): Boolean = synchronized(lock) { + if (key in removing) return@synchronized false + cleaningUp.merge(key, 1, Int::plus) + true + } + + private fun holdCleanup(key: String) { synchronized(lock) { cleaningUp.merge(key, 1, Int::plus) } } + + private fun endCleanup(key: String) { + synchronized(lock) { + cleaningUp.computeIfPresent(key) { _, n -> (n - 1).takeIf { it > 0 } } + (lock as Object).notifyAll() + } + } + + private fun cleanUpLater(context: Context, key: String, name: String, work: () -> Unit) { + Thread({ + try { + val deleting = ArrayList() + try { StoreInstalls.collectingDiscards(deleting, work) } finally { deleting.forEach { it.join() } } + } finally { + endCleanup(key) + advance(context) + } + }, name).start() + } fun holdPaused(key: String) = synchronized(lock) { heldPaused.add(key) } private var running = 0 @@ -131,6 +181,7 @@ object DownloadQueue { fun enqueue(context: Context, entry: DownloadEntry, factory: () -> DownloadJob) { val app = context.applicationContext synchronized(lock) { + if (entry.key in removing) { Log.i(TAG, "${entry.key}: being uninstalled"); return } items[entry.key]?.let { if (it.entry.isActive) { Log.i(TAG, "${entry.key}: already queued"); return } } items.remove(entry.key) val state = if (heldPaused.remove(entry.key)) DownloadState.PAUSED else DownloadState.QUEUED @@ -185,6 +236,7 @@ object DownloadQueue { val retry: (() -> Unit)? synchronized(lock) { val item = items[key] ?: return + if (key in removing) return if (item.entry.state != DownloadState.PAUSED && item.entry.state != DownloadState.FAILED) return retry = item.retry if (retry == null && item.factory == null) return @@ -206,23 +258,28 @@ object DownloadQueue { val app = context.applicationContext val item: Item val wasRunning: Boolean + var cleanup = false + var awaitDeletion: List = emptyList() synchronized(lock) { item = items[key] ?: return if (!item.entry.interruptible) return wasRunning = item.entry.state == DownloadState.RUNNING if (wasRunning) { item.cancelled.set(true) - item.job?.cancel(deleteFiles = true) + val deleting = StoreInstalls.collectingDiscards { runCatching { item.job?.cancel(deleteFiles = true) } } + if (deleting.isNotEmpty()) { holdCleanup(key); awaitDeletion = deleting } } if (!wasRunning) { + cleanup = beginCleanup(key) item.entry = item.entry.copy(state = DownloadState.CANCELLED, queuePosition = 0, finishedAt = System.currentTimeMillis()) renumber() publishLocked() } } - if (!wasRunning) { - Thread({ runCatching { item.factory?.invoke()?.cancel(deleteFiles = true) } }, "store-dl-cancel").start() + if (cleanup) { + cleanUpLater(app, key, "store-dl-cancel") { runCatching { item.factory?.invoke()?.cancel(deleteFiles = true) } } } + if (awaitDeletion.isNotEmpty()) cleanUpLater(app, key, "store-dl-cancel-wait") { awaitDeletion.forEach { it.join() } } StoresState.logLine("cancelled \"${item.entry.name}\"") StoreDownloadService.finish(app, key) advance(app) @@ -230,12 +287,16 @@ object DownloadQueue { } fun clear(context: Context, key: String) { - val item = synchronized(lock) { items[key] } ?: return - if (item.entry.state == DownloadState.RUNNING || item.entry.state == DownloadState.QUEUED) return - if (item.entry.state == DownloadState.FAILED || item.entry.state == DownloadState.PAUSED) { - Thread({ runCatching { item.factory?.invoke()?.cancel(deleteFiles = true) } }, "store-dl-clear").start() + val item: Item + val cleanup: Boolean + synchronized(lock) { + item = items[key] ?: return + if (item.entry.state == DownloadState.RUNNING || item.entry.state == DownloadState.QUEUED) return + cleanup = (item.entry.state == DownloadState.FAILED || item.entry.state == DownloadState.PAUSED) && beginCleanup(key) + items.remove(key) + publishLocked() } - synchronized(lock) { items.remove(key); publishLocked() } + if (cleanup) cleanUpLater(context.applicationContext, key, "store-dl-clear") { runCatching { item.factory?.invoke()?.cancel(deleteFiles = true) } } StoreDownloadService.finish(context.applicationContext, key) } @@ -298,7 +359,7 @@ object DownloadQueue { val next: Item synchronized(lock) { if (running >= parallel(context)) return - next = items.values.firstOrNull { it.entry.state == DownloadState.QUEUED } ?: return + next = items.values.firstOrNull { it.entry.state == DownloadState.QUEUED && it.entry.key !in cleaningUp } ?: return running++ next.entry = next.entry.copy(state = DownloadState.RUNNING, stage = DownloadStage.MANIFEST, queuePosition = 0) renumber() @@ -318,7 +379,15 @@ object DownloadQueue { val job = checkNotNull(item.factory).invoke() synchronized(lock) { item.job = job } StoresState.logLine("${item.entry.store.label}: fetching manifest for \"${item.entry.name}\"") - result = job.run(handle) + val deleting = ArrayList() + try { + StoreInstalls.collectingDiscards(deleting) { result = job.run(handle) } + } finally { + if (deleting.isNotEmpty()) { + holdCleanup(item.entry.key) + cleanUpLater(context, item.entry.key, "store-dl-run-discard") { deleting.forEach { it.join() } } + } + } if (result == null && !item.cancelled.get()) error = "install failed" } catch (t: Throwable) { error = t.message ?: t.javaClass.simpleName 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 68bcb8d27d..1333172d7a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt @@ -17,6 +17,7 @@ import androidx.compose.foundation.interaction.collectIsHoveredAsState import androidx.compose.foundation.interaction.collectIsPressedAsState 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.ExperimentalLayoutApi import androidx.compose.foundation.layout.FlowRow @@ -86,6 +87,9 @@ import com.droiddeck.launcher.storage.Bucket import com.droiddeck.launcher.storage.CleanItem import com.droiddeck.launcher.storage.ComponentUsage import com.droiddeck.launcher.storage.GameUsage +import com.droiddeck.launcher.storage.KeptPrefix +import com.droiddeck.launcher.storage.PrefixOwner +import com.droiddeck.launcher.storage.StoreGameUsage import com.droiddeck.launcher.storage.StorageReport import com.droiddeck.launcher.storage.StorageState import com.droiddeck.launcher.storage.ToolReason @@ -148,6 +152,7 @@ internal fun StoragePanel(s: FrontEndState, a: FrontEndActions) { "data" -> GameDataView(report, s.sessionRunning) { view = "overview" } "components" -> ComponentsView(report, s.sessionRunning) { view = "overview" } "desktop" -> DesktopView(report, s.sessionRunning) { view = "overview" } + "stores" -> StoreGamesView(report, s.sessionRunning) { view = "overview" } "tools" -> ToolsView(report, s.sessionRunning) { view = "overview" } else -> Overview(report, s.sessionRunning, onCleanUp = { cleanup = true }, onOpen = { view = it }) } @@ -260,12 +265,23 @@ private fun DefaultStorageGroup() { } } -@OptIn(ExperimentalLayoutApi::class) @Composable private fun Overview(report: StorageReport, sessionRunning: Boolean, onCleanUp: () -> Unit, onOpen: (String) -> Unit) { + val narrowPane = LocalNarrowPane.current + BoxWithConstraints(Modifier.fillMaxWidth()) { + val wide = !narrowPane && maxWidth >= WIDE_OVERVIEW + Column { OverviewContent(report, sessionRunning, wide, onCleanUp, onOpen) } + } +} + +private val WIDE_OVERVIEW = 700.dp +private val NARROW_ROW = 640.dp + +@OptIn(ExperimentalLayoutApi::class) +@Composable +private fun OverviewContent(report: StorageReport, sessionRunning: Boolean, wide: Boolean, onCleanUp: () -> Unit, onOpen: (String) -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current - val wide = !LocalNarrowPane.current val used = report.total - report.free val safe = StorageState.safeBytes(report) val low = report.free < StorageState.LOW_SPACE_BYTES @@ -275,7 +291,7 @@ private fun Overview(report: StorageReport, sessionRunning: Boolean, onCleanUp: val usage: @Composable (Modifier) -> Unit = { m -> Column(m) { FlowRow(verticalArrangement = Arrangement.spacedBy(4.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { Text(stringResource(R.string.storage_internal), fontSize = 17.sp, fontWeight = FontWeight.Bold, color = colors.onBackground) - Text("· " + stringResource(R.string.storage_used_of, gb(used), gb(report.total)), fontSize = 15.sp, color = colors.onSurfaceVariant) + Text(stringResource(R.string.storage_used_of, gb(used), gb(report.total)), fontSize = 15.sp, color = colors.onSurfaceVariant) Pill(stringResource(R.string.storage_free, gb(report.free)), if (low) AttentionAmber else pal.good) } val time = DateFormat.getTimeInstance(DateFormat.SHORT).format(Date(report.at)) @@ -294,7 +310,7 @@ private fun Overview(report: StorageReport, sessionRunning: Boolean, onCleanUp: Text(stringResource(R.string.storage_safe_now), fontSize = 13.sp, color = colors.onSurfaceVariant) Text(gb(safe), fontSize = 26.sp, fontWeight = FontWeight.Bold, color = if (safe > 0) pal.good else colors.onBackground) Text(stringResource(R.string.storage_safe_hint), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(bottom = 10.dp)) - PrimaryButton(stringResource(R.string.storage_clean_up), enabled = !sessionRunning && !StorageState.cleaning, compact = true, onClick = onCleanUp) + PrimaryButton(stringResource(R.string.storage_clean_up), enabled = !sessionRunning && !StorageState.busy, compact = true, onClick = onCleanUp) } } if (wide) Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(18.dp), modifier = summary) { usage(Modifier.weight(1f)) @@ -338,7 +354,8 @@ private fun Overview(report: StorageReport, sessionRunning: Boolean, onCleanUp: }, { m -> BucketCard(Bucket.STORES, Icons.Outlined.ShoppingBag, stringResource(R.string.storage_stores), - stringResource(R.string.storage_stores_hint), report.buckets.getValue(Bucket.STORES), m) + pluralStringResource(R.plurals.storage_games_installed, report.storeGames.size, report.storeGames.size), + report.buckets.getValue(Bucket.STORES), m) { onOpen("stores") } }, { m -> BucketCard(Bucket.DESKTOP, Icons.Outlined.Monitor, stringResource(R.string.storage_desktop), @@ -485,7 +502,7 @@ private fun CleanUpDialog(report: StorageReport, sessionRunning: Boolean, onDism } }, confirmButton = { - if (picked.isNotEmpty() && !sessionRunning && !StorageState.cleaning) { + if (picked.isNotEmpty() && !sessionRunning && !StorageState.busy) { FocusText(stringResource(R.string.storage_free_button, gb(total)), pal.signal) { StorageState.clean(ctx, picked) { onDismiss() } } @@ -501,8 +518,6 @@ private fun CleanUpDialog(report: StorageReport, sessionRunning: Boolean, onDism private fun CleanRow(item: CleanItem, report: StorageReport, on: Boolean, modifier: Modifier, onToggle: () -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current - val src = remember { MutableInteractionSource() } - val hot = src.collectIsFocusedAsState().value || src.collectIsHoveredAsState().value val unsureCount = report.leftovers.count { !it.safe } val safeCount = report.leftovers.count { it.safe } val oldTools = report.unusedTools.filter { it.reason != ToolReason.CUSTOM } @@ -517,6 +532,23 @@ private fun CleanRow(item: CleanItem, report: StorageReport, on: Boolean, modifi CleanItem.UNUSED_COMPONENTS -> Triple(stringResource(R.string.storage_item_components), unusedLabels.joinToString(", "), 1) CleanItem.SHADERS -> Triple(stringResource(R.string.storage_item_shaders), stringResource(R.string.storage_item_shaders_detail), 2) } + ToggleRow( + title, detail, StorageState.bytes(report, item), on, modifier, + when (tag) { + 0 -> stringResource(R.string.storage_tag_safe) to pal.good + 1 -> stringResource(R.string.storage_tag_unused) to colors.onSurfaceVariant + else -> stringResource(if (item == CleanItem.SHADERS) R.string.storage_tag_stutter else R.string.storage_tag_saves) to AttentionAmber + }, + onToggle, + ) +} + +@Composable +private fun ToggleRow(title: String, detail: String, bytes: Long, on: Boolean, modifier: Modifier, pill: Pair, onToggle: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = src.collectIsFocusedAsState().value || src.collectIsHoveredAsState().value val shape = RoundedCornerShape(12.dp) Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), @@ -535,16 +567,12 @@ private fun CleanRow(item: CleanItem, report: StorageReport, on: Boolean, modifi ) { if (on) Icon(Icons.Filled.Check, contentDescription = null, tint = Color.White, modifier = Modifier.size(16.dp)) } Column(Modifier.weight(1f)) { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { - Text(title, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false)) - when (tag) { - 0 -> Pill(stringResource(R.string.storage_tag_safe), pal.good) - 1 -> Pill(stringResource(R.string.storage_tag_unused), colors.onSurfaceVariant) - else -> Pill(stringResource(if (item == CleanItem.SHADERS) R.string.storage_tag_stutter else R.string.storage_tag_saves), AttentionAmber) - } + Text(title, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 2, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false)) + Pill(pill.first, pill.second) } Text(detail, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 2, overflow = TextOverflow.Ellipsis) } - Text(gb(StorageState.bytes(report, item)), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground) + Text(gb(bytes), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground) } } @@ -583,6 +611,8 @@ private fun GamesView(report: StorageReport, sessionRunning: Boolean, a: FrontEn Column(Modifier.fillMaxWidth().clip(Shape14).background(colors.surface).border(1.dp, pal.line, Shape14)) { if (games.isEmpty()) Text(stringResource(R.string.storage_no_games), fontSize = 14.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(16.dp)) games.forEachIndexed { i, g -> + BoxWithConstraints(Modifier.fillMaxWidth()) { + val narrow = maxWidth < NARROW_ROW Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.fillMaxWidth().padding(horizontal = 14.dp, vertical = 8.dp), @@ -594,13 +624,14 @@ private fun GamesView(report: StorageReport, sessionRunning: Boolean, a: FrontEn Text(gameName(g), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) Text( listOfNotNull( + stringResource(R.string.storage_game_parts, gb(g.game), gb(g.data)).takeIf { narrow }, g.library.takeIf { !g.internal }, if (g.lastPlayed > 0) stringResource(R.string.storage_played, DateFormat.getDateInstance(DateFormat.MEDIUM).format(Date(g.lastPlayed * 1000))) else stringResource(R.string.storage_never_played), ).joinToString(" · "), - fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, + fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = if (narrow) 2 else 1, overflow = TextOverflow.Ellipsis, ) } - Column(Modifier.weight(1f)) { + if (!narrow) Column(Modifier.weight(1f)) { Row(Modifier.fillMaxWidth().height(8.dp).clip(RoundedCornerShape(4.dp)).background(Color(0xFF0A0C0F))) { listOf(g.game to BucketColors.getValue(Bucket.GAMES), g.prefix to BucketColors.getValue(Bucket.GAME_DATA), (g.shaders + g.workshop) to Color(0xFFC5B8FF)) .forEach { (v, c) -> if (v > 0) Box(Modifier.weight(v.toFloat() / max).fillMaxHeight().background(c)) } @@ -615,6 +646,7 @@ private fun GamesView(report: StorageReport, sessionRunning: Boolean, a: FrontEn Text(gb(g.total), fontSize = 16.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, modifier = Modifier.widthIn(min = 72.dp)) SecondaryButton(stringResource(R.string.storage_uninstall), compact = true, enabled = !sessionRunning) { confirm = g } } + } if (i < games.lastIndex) Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) } } @@ -662,7 +694,7 @@ private fun ToolsView(report: StorageReport, sessionRunning: Boolean, onBack: () stringResource(R.string.storage_tools_detail, gb(report.tools.sumOf { it.bytes }), gb(unused.sumOf { it.bytes })), onBack, ) { if (unused.isNotEmpty()) PrimaryButton(stringResource(R.string.storage_remove_unused, gb(unused.sumOf { it.bytes })), compact = true, - enabled = !sessionRunning && !StorageState.cleaning) { confirmAll = true } + enabled = !sessionRunning && !StorageState.busy) { confirmAll = true } } if (sessionRunning) { Note(stringResource(R.string.storage_session_running)); Spacer(Modifier.height(4.dp)) } SectionTitle(stringResource(R.string.storage_in_use), null) @@ -731,26 +763,22 @@ private fun toolDetail(t: ToolUsage): String = when (t.reason) { private fun ToolList(tools: List, sessionRunning: Boolean, onRemove: (ToolUsage) -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current - Column(Modifier.fillMaxWidth().clip(Shape14).background(colors.surface).border(1.dp, pal.line, Shape14)) { + ListCard { tools.forEachIndexed { i, t -> - Row( - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), - modifier = Modifier.fillMaxWidth().heightIn(min = 56.dp).padding(horizontal = 14.dp, vertical = 8.dp), - ) { - Column(Modifier.weight(1f)) { - Text(t.name, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) - Text(toolDetail(t), fontSize = 12.5.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) - } - when (t.state) { - ToolState.IN_USE -> Pill(if (t.isDefault) stringResource(R.string.storage_tag_default) else pluralStringResource(R.plurals.storage_tag_games, t.games, t.games), pal.signal) - ToolState.REQUIRED -> Pill(stringResource(R.string.storage_tag_required), colors.onSurfaceVariant) - ToolState.UNUSED -> Pill(stringResource(R.string.storage_tag_not_used), AttentionAmber) - } - Text(gb(t.bytes), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, modifier = Modifier.widthIn(min = 70.dp)) - if (t.state == ToolState.UNUSED) SecondaryButton(stringResource(R.string.storage_remove), compact = true, enabled = !sessionRunning && !StorageState.cleaning) { onRemove(t) } - else Icon(Icons.Outlined.Lock, contentDescription = null, tint = colors.onSurfaceVariant, modifier = Modifier.size(16.dp)) - } - if (i < tools.lastIndex) Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + ItemRow( + t.name, toolDetail(t), t.bytes, i == tools.lastIndex, + pill = { + when (t.state) { + ToolState.IN_USE -> Pill(if (t.isDefault) stringResource(R.string.storage_tag_default) else pluralStringResource(R.plurals.storage_tag_games, t.games, t.games), pal.signal) + ToolState.REQUIRED -> Pill(stringResource(R.string.storage_tag_required), colors.onSurfaceVariant) + ToolState.UNUSED -> Pill(stringResource(R.string.storage_tag_not_used), AttentionAmber) + } + }, + action = { + if (t.state == ToolState.UNUSED) SecondaryButton(stringResource(R.string.storage_remove), compact = true, enabled = !sessionRunning && !StorageState.busy) { onRemove(t) } + else Icon(Icons.Outlined.Lock, contentDescription = null, tint = colors.onSurfaceVariant, modifier = Modifier.size(16.dp)) + }, + ) } } } @@ -811,24 +839,72 @@ private fun ListCard(content: @Composable () -> Unit) { } @Composable -private fun ItemRow(title: String, detail: String?, bytes: Long, last: Boolean, pill: (@Composable () -> Unit)? = null, action: (@Composable () -> Unit)? = null) { +private fun ItemRow( + title: String, detail: String?, bytes: Long, last: Boolean, pill: (@Composable () -> Unit)? = null, + selected: Boolean? = null, onSelect: () -> Unit = {}, selectable: Boolean = true, slot: Boolean = false, + stack: Boolean = pill != null, action: (@Composable () -> Unit)? = null, +) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current - Row( - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), - modifier = Modifier.fillMaxWidth().heightIn(min = 56.dp).padding(horizontal = 14.dp, vertical = 8.dp), - ) { - Column(Modifier.weight(1f)) { - Text(title, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) - if (detail != null) Text(detail, fontSize = 12.5.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + BoxWithConstraints(Modifier.fillMaxWidth()) { + val tight = maxWidth < NARROW_ROW + val narrow = tight && stack + val size = @Composable { + Text(if (bytes < 0) "…" else gb(bytes), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + modifier = if (narrow) Modifier else Modifier.widthIn(min = 70.dp)) + } + Column(Modifier.fillMaxWidth().heightIn(min = 56.dp).padding(horizontal = 14.dp, vertical = 8.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp)) { + if (selected != null) SelectBox(selected, selectable, onSelect) else if (slot) Spacer(Modifier.size(40.dp)) + Column(Modifier.weight(1f)) { + Text(title, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = if (narrow) 2 else 1, overflow = TextOverflow.Ellipsis) + if (detail != null) Text(detail, fontSize = 12.5.sp, color = colors.onSurfaceVariant, maxLines = if (tight) 2 else 1, overflow = TextOverflow.Ellipsis) + } + if (narrow) size() else { + pill?.invoke() + size() + action?.invoke() + } + } + if (narrow) Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End), + modifier = Modifier.fillMaxWidth(), + ) { + pill?.invoke() + action?.invoke() + } } - pill?.invoke() - Text(gb(bytes), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, modifier = Modifier.widthIn(min = 70.dp)) - action?.invoke() } if (!last) Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) } +@Composable +private fun SelectBox(on: Boolean, enabled: Boolean, onToggle: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = enabled && (src.collectIsFocusedAsState().value || src.collectIsHoveredAsState().value) + val shape = RoundedCornerShape(6.dp) + val edge = when { + on || hot -> pal.signal + enabled -> colors.onSurfaceVariant + else -> colors.onSurfaceVariant.copy(alpha = 0.35f) + } + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.size(40.dp).clip(RoundedCornerShape(10.dp)) + .background(if (hot) pal.signal.copy(alpha = 0.12f) else Color.Transparent) + .then(if (enabled) Modifier.hoverable(src) + .clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Checkbox, onClick = onToggle) + .controllerConfirm(onClick = onToggle) else Modifier), + ) { + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.size(22.dp).clip(shape).background(if (on) pal.signal else Color.Transparent).border(2.dp, edge, shape), + ) { if (on) Icon(Icons.Filled.Check, contentDescription = null, tint = Color.White, modifier = Modifier.size(16.dp)) } + } +} + @Composable private fun ConfirmDialog(title: String, body: String, confirm: String, danger: Boolean = true, onConfirm: () -> Unit, onDismiss: () -> Unit) { val colors = MaterialTheme.colorScheme @@ -846,22 +922,53 @@ private fun ConfirmDialog(title: String, body: String, confirm: String, danger: ) } +private class DataTarget(val key: String, val label: String, val prefixes: List>, val shaders: List>) + @Composable private fun GameDataView(report: StorageReport, sessionRunning: Boolean, onBack: () -> Unit) { val ctx = LocalContext.current - val busy = sessionRunning || StorageState.cleaning + val busy = sessionRunning || StorageState.busy var confirm by remember { mutableStateOf(null) } var confirmPrefix by remember { mutableStateOf(null) } - SubHeader(stringResource(R.string.storage_game_data), stringResource(R.string.storage_game_data_hint, gb(report.prefixes), gb(report.workshop), gb(report.shaders)), onBack) + var confirmKept by remember { mutableStateOf(null) } + var picked by remember { mutableStateOf(emptySet()) } + var confirmBulk by remember { mutableStateOf(false) } + val games = report.games.filter { it.data >= ONE_MB || it.prefixDir != null }.sortedByDescending { it.data } + val leftovers = report.leftovers.sortedByDescending { it.bytes } + val safe = leftovers.filter { it.safe } + val unsure = leftovers.filter { !it.safe } + val kept = report.kept.filter { it.bytes + it.shaderBytes >= ONE_MB }.sortedByDescending { it.bytes + it.shaderBytes } + val safeLabel = pluralStringResource(R.plurals.storage_item_leftovers_detail, safe.size, safe.size) + val gameNames = games.associate { gameKey(it) to gameName(it) } + val unsureNames = unsure.associate { leftoverKey(it) to leftoverName(it) } + val keptNames = kept.associate { it.dir.path to keptName(it) } + val targets = buildList { + games.forEach { g -> + add(DataTarget(gameKey(g), gameNames[gameKey(g)].orEmpty(), + listOfNotNull(g.prefixDir?.let { it to g.prefix }), g.shaderDirs.takeIf { g.shaders > 0 }.orEmpty().mapIndexed { i, d -> d to if (i == 0) g.shaders else 0L })) + } + if (safe.isNotEmpty()) add(DataTarget("safe", safeLabel, safe.mapNotNull { l -> l.prefix?.let { it to l.prefixBytes } }, safe.mapNotNull { l -> l.shaders?.let { it to l.bytes - l.prefixBytes } })) + unsure.forEach { l -> add(DataTarget("left:${leftoverKey(l)}", unsureNames[leftoverKey(l)].orEmpty(), listOfNotNull(l.prefix?.let { it to l.prefixBytes }), listOfNotNull(l.shaders?.let { it to l.bytes - l.prefixBytes }))) } + kept.filter { it.owner == PrefixOwner.SHARED || it.owner == PrefixOwner.GAME } + .forEach { k -> add(DataTarget("kept:${k.dir.path}", keptNames[k.dir.path].orEmpty(), listOf(k.dir to k.bytes), listOfNotNull(k.shaders?.let { it to k.shaderBytes }))) } + }.associateBy { it.key } + val chosen = picked.mapNotNull { targets[it] } + fun bytesOf(t: DataTarget, prefixes: Boolean, shaders: Boolean): Long = + (if (prefixes) t.prefixes.sumOf { it.second } else 0L) + (if (shaders) t.shaders.sumOf { it.second } else 0L) + fun toggle(key: String) { picked = if (key in picked) picked - key else picked + key } + SubHeader(stringResource(R.string.storage_game_data), stringResource(R.string.storage_game_data_hint, gb(report.prefixes), gb(report.workshop), gb(report.shaders)), onBack) { + if (chosen.isNotEmpty()) PrimaryButton(stringResource(R.string.storage_remove_selected, gb(chosen.sumOf { bytesOf(it, true, true) })), compact = true, enabled = !busy) { confirmBulk = true } + } ActionStatus() if (sessionRunning) { Note(stringResource(R.string.storage_session_running)); Spacer(Modifier.height(4.dp)) } - val games = report.games.filter { it.data >= ONE_MB || it.prefixDir != null }.sortedByDescending { it.data } SectionTitle(stringResource(R.string.storage_data_installed), gb(games.sumOf { it.data })) ListCard { if (games.isEmpty()) Text(stringResource(R.string.storage_no_games), fontSize = 14.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(16.dp)) games.forEachIndexed { i, g -> + val key = gameKey(g) ItemRow( gameName(g), stringResource(R.string.storage_data_parts, gb(g.prefix), gb(g.shaders), gb(g.workshop)), g.data, i == games.lastIndex, + selected = key in picked, selectable = !busy && (g.prefixDir != null || g.shaders > 0), onSelect = { toggle(key) }, stack = true, action = { Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { SecondaryButton(stringResource(R.string.storage_clear_shaders), compact = true, enabled = !busy && g.shaders >= ONE_MB) { StorageState.clearShaders(ctx, g.appId, g.x64) } @@ -871,33 +978,73 @@ private fun GameDataView(report: StorageReport, sessionRunning: Boolean, onBack: ) } } - val leftovers = report.leftovers.sortedByDescending { it.bytes } if (!report.leftoversChecked) { SectionTitle(stringResource(R.string.storage_data_leftovers), null) Note(stringResource(R.string.storage_leftovers_unchecked)) } if (leftovers.isNotEmpty()) { SectionTitle(stringResource(R.string.storage_data_leftovers), gb(leftovers.sumOf { it.bytes })) - val safe = leftovers.filter { it.safe } ListCard { if (safe.isNotEmpty()) ItemRow( - pluralStringResource(R.plurals.storage_item_leftovers_detail, safe.size, safe.size), null, safe.sumOf { it.bytes }, leftovers.none { !it.safe }, + safeLabel, null, safe.sumOf { it.bytes }, unsure.isEmpty(), pill = { Pill(stringResource(R.string.storage_tag_safe), LocalPalette.current.good) }, + selected = "safe" in picked, selectable = !busy, onSelect = { toggle("safe") }, action = { SecondaryButton(stringResource(R.string.storage_remove), compact = true, enabled = !busy) { StorageState.clean(ctx, setOf(CleanItem.LEFTOVERS)) { } } }, ) - val unsure = leftovers.filter { !it.safe } unsure.forEachIndexed { i, l -> + val key = "left:${leftoverKey(l)}" ItemRow( - stringResource(R.string.storage_steam_app, l.appId), stringResource(R.string.storage_leftover_unsure_detail), l.bytes, i == unsure.lastIndex, + leftoverName(l), stringResource(R.string.storage_leftover_unsure_detail), l.bytes, i == unsure.lastIndex, pill = { Pill(stringResource(R.string.storage_tag_saves), AttentionAmber) }, + selected = key in picked, selectable = !busy, onSelect = { toggle(key) }, action = { SecondaryButton(stringResource(R.string.storage_remove), compact = true, enabled = !busy) { confirm = l } }, ) } } } - if (report.otherPrefixes > 0) { - SectionTitle(stringResource(R.string.storage_data_other), null) - ListCard { ItemRow(stringResource(R.string.storage_data_other_title), stringResource(R.string.storage_data_other_detail), report.otherPrefixes, true) } + if (kept.isNotEmpty()) { + SectionTitle(stringResource(R.string.storage_data_other), gb(kept.sumOf { it.bytes + it.shaderBytes })) + ListCard { + kept.forEachIndexed { i, k -> + val resettable = k.owner == PrefixOwner.SHARED || k.owner == PrefixOwner.GAME + val key = "kept:${k.dir.path}" + ItemRow( + keptName(k), + listOfNotNull(when (k.owner) { + PrefixOwner.SHARED -> stringResource(R.string.storage_shared_prefix_detail) + PrefixOwner.LAUNCHER -> if (k.users.isEmpty()) stringResource(R.string.storage_launcher_prefix) + else stringResource(R.string.storage_launcher_used_by, k.users.distinct().joinToString(", ")) + PrefixOwner.GAME -> stringResource(R.string.storage_prefix_shaders, gb(k.bytes), gb(k.shaderBytes)) + PrefixOwner.UNKNOWN -> stringResource(R.string.storage_unknown_prefix_detail) + }, k.shaderBytes.takeIf { it >= ONE_MB && k.owner != PrefixOwner.GAME }?.let { stringResource(R.string.storage_bulk_shaders) + " " + gb(it).replace(' ', ' ') }).joinToString(" · "), + k.bytes + k.shaderBytes, i == kept.lastIndex, + pill = if (k.owner == PrefixOwner.LAUNCHER) { { Pill(stringResource(R.string.storage_tag_required), MaterialTheme.colorScheme.onSurfaceVariant) } } else null, + selected = if (resettable) key in picked else null, slot = true, selectable = !busy, onSelect = { toggle(key) }, + action = if (resettable) { + { SecondaryButton(stringResource(R.string.storage_reset_prefix), compact = true, enabled = !busy) { confirmKept = k } } + } else null, + ) + } + } + } + if (confirmBulk) BulkRemoveDialog( + chosen, + hasPrefixes = chosen.any { it.prefixes.isNotEmpty() }, hasShaders = chosen.any { it.shaders.isNotEmpty() }, + bytesOf = ::bytesOf, + onConfirm = { prefixes, shaders -> + StorageState.removeDirs(ctx, chosen.flatMap { (if (prefixes) it.prefixes.map { p -> p.first } else emptyList()) + (if (shaders) it.shaders.map { c -> c.first } else emptyList()) }) + picked = emptySet() + }, + onDismiss = { confirmBulk = false }, + ) + confirmKept?.let { k -> + ConfirmDialog( + stringResource(R.string.storage_reset_prefix_title, keptName(k)), + if (k.owner == PrefixOwner.SHARED) stringResource(R.string.storage_reset_shared_confirm, gb(k.bytes)) + else stringResource(R.string.storage_reset_prefix_confirm, gb(k.bytes), k.library), + stringResource(R.string.storage_reset_prefix), + onConfirm = { StorageState.resetKept(ctx, k) }, onDismiss = { confirmKept = null }, + ) } confirmPrefix?.let { g -> ConfirmDialog( @@ -908,19 +1055,125 @@ private fun GameDataView(report: StorageReport, sessionRunning: Boolean, onBack: } confirm?.let { l -> ConfirmDialog( - stringResource(R.string.storage_remove_title, stringResource(R.string.storage_steam_app, l.appId)), + stringResource(R.string.storage_remove_title, leftoverName(l)), stringResource(R.string.storage_leftover_confirm, gb(l.bytes)), stringResource(R.string.storage_remove), onConfirm = { StorageState.removeLeftover(ctx, l) }, onDismiss = { confirm = null }, ) } } +@Composable +private fun BulkRemoveDialog( + chosen: List, hasPrefixes: Boolean, hasShaders: Boolean, bytesOf: (DataTarget, Boolean, Boolean) -> Long, + onConfirm: (prefixes: Boolean, shaders: Boolean) -> Unit, onDismiss: () -> Unit, +) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + var prefixes by remember { mutableStateOf(hasPrefixes) } + var shaders by remember { mutableStateOf(hasShaders) } + val total = chosen.sumOf { bytesOf(it, prefixes, shaders) } + val first = remember { FocusRequester() } + LaunchedEffect(Unit) { runCatching { first.requestFocus() } } + AlertDialog( + properties = androidx.compose.ui.window.DialogProperties(usePlatformDefaultWidth = false), + modifier = Modifier.fillMaxWidth(0.62f).widthIn(min = 420.dp, max = 760.dp), + onDismissRequest = onDismiss, + title = { Text(stringResource(R.string.storage_remove_selected, gb(total))) }, + text = { + Column(Modifier.verticalScroll(rememberScrollState()), verticalArrangement = Arrangement.spacedBy(8.dp)) { + Text(chosen.joinToString("\n") { "• " + it.label }, fontSize = 14.sp, color = colors.onBackground) + Spacer(Modifier.height(4.dp)) + if (hasPrefixes) ToggleRow( + stringResource(R.string.storage_bulk_prefixes), stringResource(R.string.storage_bulk_prefixes_detail), + chosen.sumOf { bytesOf(it, true, false) }, prefixes, Modifier.focusRequester(first), + stringResource(R.string.storage_tag_saves) to AttentionAmber, + ) { prefixes = !prefixes } + if (hasShaders) ToggleRow( + stringResource(R.string.storage_bulk_shaders), stringResource(R.string.storage_item_shaders_detail), + chosen.sumOf { bytesOf(it, false, true) }, shaders, if (hasPrefixes) Modifier else Modifier.focusRequester(first), + stringResource(R.string.storage_tag_stutter) to AttentionAmber, + ) { shaders = !shaders } + } + }, + confirmButton = { + if (prefixes || shaders) FocusText(stringResource(R.string.storage_remove), colors.error) { onDismiss(); onConfirm(prefixes, shaders) } + }, + dismissButton = { FocusText(stringResource(R.string.common_cancel), colors.onBackground, onClick = onDismiss) }, + ) +} + +private fun gameKey(g: com.droiddeck.launcher.storage.GameUsage) = "game:${g.x64}:${g.appId}:${g.prefixDir?.path}" + +private fun leftoverKey(l: com.droiddeck.launcher.storage.Leftover) = l.prefix?.path ?: l.shaders?.path ?: l.appId.toString() + +@Composable +private fun keptName(k: KeptPrefix): String { + val name = when (k.owner) { + PrefixOwner.SHARED -> stringResource(R.string.storage_shared_prefix) + PrefixOwner.GAME -> k.name ?: stringResource(R.string.storage_data_other_title) + else -> k.name ?: k.dir.name + } + return if (k.x64) stringResource(R.string.storage_game_x64, name) else name +} + +@Composable +private fun leftoverName(l: com.droiddeck.launcher.storage.Leftover): String = when { + l.name != null -> l.name + l.shortcut -> stringResource(R.string.storage_shortcut_app, l.appId.toString()) + else -> stringResource(R.string.storage_steam_app, l.appId) +} + +@Composable +private fun StoreGamesView(report: StorageReport, sessionRunning: Boolean, onBack: () -> Unit) { + val ctx = LocalContext.current + val uninstalling = com.droiddeck.launcher.stores.StoresState.uninstalling + val busy = sessionRunning || StorageState.busy || uninstalling.isNotEmpty() + var confirm by remember { mutableStateOf>(emptyList()) } + var picked by remember { mutableStateOf(emptySet()) } + val games = report.storeGames + val chosen = games.filter { it.game.folder.path in picked && !com.droiddeck.launcher.stores.download.DownloadQueue.isActive(it.game.key) } + SubHeader(stringResource(R.string.storage_stores), + pluralStringResource(R.plurals.storage_games_installed, games.size, games.size) + " · " + gb(games.sumOf { StorageState.storeBytes(it).coerceAtLeast(0) }), onBack) { + if (chosen.isNotEmpty()) PrimaryButton(stringResource(R.string.storage_uninstall_selected, gb(chosen.sumOf { StorageState.storeBytes(it).coerceAtLeast(0) })), compact = true, enabled = !busy) { confirm = chosen } + } + ActionStatus() + if (sessionRunning) { Note(stringResource(R.string.storage_session_running)); Spacer(Modifier.height(4.dp)) } + ListCard { + if (games.isEmpty()) Text(stringResource(R.string.storage_no_games), fontSize = 14.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(16.dp)) + games.forEachIndexed { i, g -> + val removing = g.game.key in uninstalling + val downloading = com.droiddeck.launcher.stores.download.DownloadQueue.isActive(g.game.key) + val key = g.game.folder.path + ItemRow( + g.game.sidecar.title, + if (g.internal) g.game.sidecar.store.label else g.game.sidecar.store.label + " · " + stringResource(R.string.fm_drive_sd), + StorageState.storeBytes(g), i == games.lastIndex, + selected = key in picked && !downloading, selectable = !busy && !downloading, onSelect = { picked = if (key in picked) picked - key else picked + key }, + action = { + SecondaryButton(stringResource(if (removing) R.string.stores_uninstalling else R.string.storage_uninstall), compact = true, + enabled = !busy && !downloading) { confirm = listOf(g) } + }, + ) + } + } + if (confirm.isNotEmpty()) { + val list = confirm + val total = gb(list.sumOf { StorageState.storeBytes(it).coerceAtLeast(0) }) + ConfirmDialog( + if (list.size == 1) stringResource(R.string.stores_uninstall_title, list[0].game.sidecar.title) else stringResource(R.string.storage_uninstall_selected, total), + (if (list.size == 1) "" else list.joinToString("\n") { "• " + it.game.sidecar.title } + "\n\n") + stringResource(R.string.stores_uninstall_body_size, total), + stringResource(R.string.storage_uninstall), + onConfirm = { StorageState.uninstallStoreGames(ctx, list); picked = emptySet() }, onDismiss = { confirm = emptyList() }, + ) + } +} + @Composable internal fun ComponentsView(report: StorageReport, sessionRunning: Boolean, onBack: () -> Unit) { val ctx = LocalContext.current val pal = LocalPalette.current val colors = MaterialTheme.colorScheme - val busy = sessionRunning || StorageState.cleaning + val busy = sessionRunning || StorageState.busy var confirm by remember { mutableStateOf(null) } var confirmAll by remember { mutableStateOf(false) } val unused = report.unusedComponents @@ -978,7 +1231,7 @@ internal fun ComponentsView(report: StorageReport, sessionRunning: Boolean, onBa @Composable private fun DesktopView(report: StorageReport, sessionRunning: Boolean, onBack: () -> Unit) { val ctx = LocalContext.current - val busy = sessionRunning || StorageState.cleaning + val busy = sessionRunning || StorageState.busy var confirm by remember { mutableStateOf(null) } var confirmPrune by remember { mutableStateOf(false) } SubHeader(stringResource(R.string.storage_desktop), stringResource(R.string.storage_desktop_detail, gb(report.flatpak)), onBack) { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index e3d78e199b..1dcf934d12 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -3011,7 +3011,7 @@ اختيار مجلد… استخدم أي مجلد على بطاقة SD أو محرك USB توضع الألعاب في مجلد Games داخل الموقع المحدد. لا تُنقل الألعاب الحالية. - إلى أين يذهب + ما يشغل المساحة ألعاب Steam بيانات الألعاب البادئات %1$s · الورشة %2$s · الشيدرات %3$s @@ -3171,6 +3171,19 @@ محفوظة ألعاب خارج Steam وبادئة Steam المشتركة بادئات ألعاب أُضيفت من المتاجر أو يدويًا + بادئة Steam المشتركة + يشغّل Steam مساعدات Windows الخاصة به هنا + يحذفها (%1$s). ينشئ Steam بادئة جديدة في المرة التالية التي يحتاجها فيها. + تطبيق متجر والألعاب التي تعمل به + مستخدَمة بواسطة %1$s + لعبة خارج Steam %1$s + غير مطابقة لأي لعبة، لذا يُحتفظ بها + حذف المحدد · %1$s + إلغاء تثبيت المحدد · %1$s + بادئات Wine + تُفقد الحفظات والإعدادات داخلها، وتبقى حفظات Steam Cloud في حسابك. + ذاكرات الشيدرات المؤقتة + البادئة %1$s · الشيدرات %2$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 bcd645f8f2..cc5f0780fb 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2863,7 +2863,7 @@ Elegir carpeta… Usa cualquier carpeta de una tarjeta SD o unidad USB Los juegos se guardan en una carpeta Games dentro de la ubicación seleccionada. Los juegos existentes no se mueven. - Dónde va + Qué ocupa espacio Juegos de Steam Datos de juegos Prefijos %1$s · taller %2$s · shaders %3$s @@ -3002,6 +3002,19 @@ Conservados Juegos que no son de Steam y prefijo compartido de Steam Prefijos de juegos agregados desde tiendas o a mano + Prefijo compartido de Steam + Steam ejecuta aquí sus propias herramientas de Windows + Lo borra (%1$s). Steam crea uno nuevo la próxima vez que lo necesite. + Una app de tienda y los juegos que se ejecutan con ella + Usado por %1$s + Juego que no es de Steam %1$s + No coincide con ningún juego, así que se conserva + Quitar selección · %1$s + Desinstalar selección · %1$s + Prefijos de Wine + Se pierden las partidas y los ajustes que contienen; las partidas de Steam Cloud se conservan en tu cuenta. + Cachés de shaders + Prefijo %1$s · shaders %2$s Paquetes descargados Originales guardados No hay paquetes de componentes descargados. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index ce0b441579..dad41a96ac 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2895,7 +2895,7 @@ Избор на папка… Използвайте която и да е папка на SD карта или USB устройство Игрите отиват в папка Games в избраното място. Съществуващите игри не се преместват. - Къде отива + Какво заема място Игри от Steam Данни на игрите Префикси %1$s · workshop %2$s · шейдъри %3$s @@ -3027,6 +3027,19 @@ Запазени Игри извън Steam и споделен Steam префикс Префикси на игри, добавени през магазини или ръчно + Споделен Steam префикс + Steam изпълнява тук свои помощни програми за Windows + Изтрива го (%1$s). Steam създава нов следващия път, когато му потрябва. + Приложение магазин и игрите, които работят с него + Използва се от %1$s + Игра извън Steam %1$s + Не е свързан с игра, затова се запазва + Премахни избраните · %1$s + Деинсталирай избраните · %1$s + Префикси на Wine + Записите и настройките в тях се губят; записите в Steam Cloud остават в акаунта ви. + Кешове на шейдърите + Префикс %1$s · шейдъри %2$s Изтеглени пакети Запазени оригинали Няма изтеглени пакети с компоненти. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index d8a5d60f28..6fab61abc0 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2953,7 +2953,7 @@ Vybrat složku… Použít libovolnou složku na kartě SD nebo disku USB Hry se ukládají do složky Games ve vybraném umístění. Stávající hry se nepřesouvají. - Kam to jde + Co zabírá místo Hry ze Steamu Data her Prefixy %1$s · workshop %2$s · shadery %3$s @@ -3099,6 +3099,19 @@ Zachováno Hry mimo Steam a sdílený prefix Steamu Prefixy her přidaných přes obchody nebo ručně + Sdílený prefix Steamu + Steam zde spouští své pomocné programy pro Windows + Smaže ho (%1$s). Steam si vytvoří nový, až ho bude příště potřebovat. + Aplikace obchodu a hry, které s ní běží + Používá: %1$s + Hra mimo Steam %1$s + Nepatří k žádné hře, proto zůstává + Odebrat vybrané · %1$s + Odinstalovat vybrané · %1$s + Prefixy Wine + Uložené hry a nastavení v nich budou ztraceny; uložení ve Steam Cloud zůstanou ve vašem účtu. + Mezipaměti shaderů + Prefix %1$s · shadery %2$s Stažené balíky Zachované originály Nejsou stažené žádné balíky komponent. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 2b47c9f391..d124460541 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2895,7 +2895,7 @@ Vælg mappe… Brug en hvilken som helst mappe på et SD-kort eller USB-drev Spil placeres i en Games-mappe på den valgte placering. Eksisterende spil flyttes ikke. - Hvor det ender + Hvad bruger plads Steam-spil Spildata Præfikser %1$s · workshop %2$s · shaders %3$s @@ -3027,6 +3027,19 @@ Bevares Ikke-Steam-spil og delt Steam-præfiks Præfikser for spil tilføjet via butikker eller manuelt + Steams delte præfiks + Steam kører sine egne Windows-hjælpere her + Sletter det (%1$s). Steam opretter et nyt, næste gang det skal bruges. + En butiksapp og de spil, der kører med den + Bruges af %1$s + Ikke-Steam-spil %1$s + Ikke knyttet til et spil, så det bevares + Fjern valgte · %1$s + Afinstaller valgte · %1$s + Wine-prefixer + Gemte spil og indstillinger i dem går tabt; Steam Cloud-gemninger forbliver på din konto. + Shadercacher + Præfiks %1$s · shaders %2$s Hentede pakker Bevarede originaler Ingen komponentpakker hentet. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c2d0dcb4fc..d90b549827 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2895,7 +2895,7 @@ Ordner auswählen… Einen beliebigen Ordner auf einer SD-Karte oder einem USB-Laufwerk verwenden Spiele kommen in einen Games-Ordner am ausgewählten Ort. Vorhandene Spiele werden nicht verschoben. - Belegung + Was Speicher belegt Steam-Spiele Spieldaten Präfixe %1$s · Workshop %2$s · Shader %3$s @@ -3027,6 +3027,19 @@ Behalten Gemeinsame Präfixe von Nicht-Steam-Spielen und Steam Präfixe von Spielen aus Stores oder manuell hinzugefügter Spiele + Gemeinsames Präfix von Steam + Steam führt hier eigene Windows-Hilfsprogramme aus + Löscht es (%1$s). Steam erstellt ein neues, sobald es wieder eines braucht. + Eine Store-App und die Spiele, die damit laufen + Verwendet von %1$s + Nicht-Steam-Spiel %1$s + Keinem Spiel zugeordnet, daher bleibt es erhalten + Auswahl entfernen · %1$s + Auswahl deinstallieren · %1$s + Wine-Präfixe + Speicherstände und Einstellungen darin gehen verloren; Steam-Cloud-Speicherstände bleiben in deinem Konto. + Shader-Caches + Präfix %1$s · Shader %2$s Geladene Pakete Gesicherte Originale Keine geladenen Komponentenpakete. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 203a3716a2..ed829530da 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2895,7 +2895,7 @@ Επιλογή φακέλου… Χρησιμοποιήστε οποιονδήποτε φάκελο σε κάρτα SD ή μονάδα USB Τα παιχνίδια μπαίνουν σε φάκελο Games μέσα στην επιλεγμένη τοποθεσία. Τα υπάρχοντα παιχνίδια δεν μετακινούνται. - Πού πηγαίνει + Τι καταλαμβάνει χώρο Παιχνίδια Steam Δεδομένα παιχνιδιών Prefix %1$s · workshop %2$s · shaders %3$s @@ -3027,6 +3027,19 @@ Διατηρούνται Παιχνίδια εκτός Steam και κοινό prefix Steam Prefix παιχνιδιών που προστέθηκαν από καταστήματα ή χειροκίνητα + Κοινό prefix του Steam + Το Steam εκτελεί εδώ τα δικά του βοηθητικά προγράμματα Windows + Το διαγράφει (%1$s). Το Steam δημιουργεί νέο την επόμενη φορά που θα το χρειαστεί. + Μια εφαρμογή καταστήματος και τα παιχνίδια που τρέχουν με αυτήν + Χρησιμοποιείται από %1$s + Παιχνίδι εκτός Steam %1$s + Δεν αντιστοιχεί σε παιχνίδι, οπότε διατηρείται + Αφαίρεση επιλεγμένων · %1$s + Κατάργηση επιλεγμένων · %1$s + Prefix Wine + Οι αποθηκεύσεις και οι ρυθμίσεις μέσα τους χάνονται· οι αποθηκεύσεις Steam Cloud παραμένουν στον λογαριασμό σας. + Προσωρινές μνήμες shaders + Πρόθεμα %1$s · σκιαστές %2$s Ληφθέντα πακέτα Διατηρημένα αρχικά Δεν έχουν ληφθεί πακέτα στοιχείων. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 104948fff5..77899d06a2 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2924,7 +2924,7 @@ Elegir carpeta… Usa cualquier carpeta de una tarjeta SD o unidad USB Los juegos se guardan en una carpeta Games dentro de la ubicación seleccionada. Los juegos existentes no se mueven. - Dónde va + Qué ocupa espacio Juegos de Steam Datos de juegos Prefijos %1$s · taller %2$s · shaders %3$s @@ -3063,6 +3063,19 @@ Conservados Juegos que no son de Steam y prefijo compartido de Steam Prefijos de juegos añadidos desde tiendas o a mano + Prefijo compartido de Steam + Steam ejecuta aquí sus propias herramientas de Windows + Lo borra (%1$s). Steam crea uno nuevo la próxima vez que lo necesite. + Una app de tienda y los juegos que se ejecutan con ella + Usado por %1$s + Juego que no es de Steam %1$s + No coincide con ningún juego, así que se conserva + Quitar selección · %1$s + Desinstalar selección · %1$s + Prefijos de Wine + Se pierden las partidas y los ajustes que contienen; las partidas de Steam Cloud se conservan en tu cuenta. + Cachés de shaders + Prefijo %1$s · shaders %2$s Paquetes descargados Originales guardados No hay paquetes de componentes descargados. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 98ea9d8301..40e762bde1 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2895,7 +2895,7 @@ Valitse kansio… Käytä mitä tahansa kansiota SD-kortilla tai USB-asemalla Pelit tallennetaan valitun sijainnin Games-kansioon. Nykyisiä pelejä ei siirretä. - Mihin se menee + Mikä vie tilaa Steam-pelit Pelidata Etuliitteet %1$s · workshop %2$s · shaderit %3$s @@ -3027,6 +3027,19 @@ Säilytetään Muut kuin Steam-pelit ja jaettu Steam-etuliite Kauppojen kautta tai käsin lisättyjen pelien etuliitteet + Steamin jaettu etuliite + Steam suorittaa täällä omia Windows-apuohjelmiaan + Poistaa sen (%1$s). Steam luo uuden, kun tarvitsee sitä seuraavan kerran. + Kauppasovellus ja pelit, jotka toimivat sen kanssa + Käyttää: %1$s + Muu kuin Steam-peli %1$s + Ei vastaa mitään peliä, joten se säilytetään + Poista valitut · %1$s + Poista valittujen asennus · %1$s + Wine-prefixit + Niiden sisällä olevat tallennukset ja asetukset menetetään; Steam Cloud -tallennukset säilyvät tililläsi. + Shadervälimuistit + Etuliite %1$s · shaderit %2$s Ladatut paketit Säilytetyt alkuperäiset Komponenttipaketteja ei ole ladattu. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e830f0cea4..9883772cf6 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2924,7 +2924,7 @@ Choisir un dossier… Utiliser n\'importe quel dossier sur une carte SD ou une clé USB Les jeux sont placés dans un dossier Games à l\'emplacement sélectionné. Les jeux existants ne sont pas déplacés. - Où ça va + Ce qui prend de la place Jeux Steam Données de jeu Préfixes %1$s · atelier %2$s · shaders %3$s @@ -3063,6 +3063,19 @@ Conservés Jeux hors Steam et préfixe partagé de Steam Préfixes de jeux ajoutés depuis les boutiques ou à la main + Préfixe partagé de Steam + Steam y exécute ses propres utilitaires Windows + Le supprime (%1$s). Steam en crée un nouveau la prochaine fois qu\'il en a besoin. + Une app de boutique et les jeux qui tournent avec elle + Utilisé par %1$s + Jeu hors Steam %1$s + Associé à aucun jeu, il est donc conservé + Supprimer la sélection · %1$s + Désinstaller la sélection · %1$s + Préfixes Wine + Les sauvegardes et paramètres qu\'ils contiennent sont perdus ; les sauvegardes Steam Cloud restent dans votre compte. + Caches de shaders + Préfixe %1$s · shaders %2$s Paquets téléchargés Originaux conservés Aucun paquet de composant téléchargé. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index bb3173d10d..e5a3ae56f8 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2895,7 +2895,7 @@ फ़ोल्डर चुनें… SD कार्ड या USB ड्राइव पर कोई भी फ़ोल्डर इस्तेमाल करें गेम चुनी गई जगह के अंदर एक Games फ़ोल्डर में जाते हैं। मौजूदा गेम मूव नहीं किए जाते। - कहाँ जाता है + क्या जगह घेर रहा है Steam गेम गेम डेटा प्रीफ़िक्स %1$s · वर्कशॉप %2$s · शेडर %3$s @@ -3027,6 +3027,19 @@ रखा गया गैर-Steam गेम और साझा Steam प्रीफ़िक्स स्टोर से या हाथ से जोड़े गेम के प्रीफ़िक्स + Steam का साझा प्रीफ़िक्स + Steam यहाँ अपने Windows हेल्पर चलाता है + इसे डिलीट करता है (%1$s)। अगली बार ज़रूरत पड़ने पर Steam नया बना लेता है। + एक स्टोर ऐप और उसके साथ चलने वाले गेम + %1$s द्वारा इस्तेमाल + गैर-Steam गेम %1$s + किसी गेम से मेल नहीं खाता, इसलिए रखा जाता है + चुने गए हटाएँ · %1$s + चुने गए अनइंस्टॉल करें · %1$s + Wine प्रीफ़िक्स + इनके अंदर के सेव और सेटिंग खो जाते हैं; Steam Cloud सेव आपके अकाउंट में रहते हैं। + शेडर कैश + प्रीफ़िक्स %1$s · शेडर %2$s डाउनलोड किए पैकेज रखे गए मूल कोई कॉम्पोनेंट पैकेज डाउनलोड नहीं है। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 7ecc8c8e57..0d568a2536 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2895,7 +2895,7 @@ Mappa kiválasztása… Bármely mappa használata SD-kártyán vagy USB-meghajtón A játékok a kiválasztott helyen belüli Games mappába kerülnek. A meglévő játékok nem kerülnek áthelyezésre. - Hova kerül + Mi foglalja a helyet Steam-játékok Játékadatok Prefixek %1$s · workshop %2$s · shaderek %3$s @@ -3027,6 +3027,19 @@ Megtartva Nem Steam-es játékok és a megosztott Steam prefix Áruházból vagy kézzel hozzáadott játékok prefixei + A Steam megosztott prefixe + A Steam itt futtatja saját Windows-segédprogramjait + Törli (%1$s). A Steam újat hoz létre, amikor legközelebb szüksége lesz rá. + Egy áruházalkalmazás és a vele futó játékok + Használja: %1$s + Nem Steam-es játék: %1$s + Nem tartozik játékhoz, ezért megmarad + Kijelöltek eltávolítása · %1$s + Kijelöltek eltávolítása · %1$s + Wine-prefixek + A bennük lévő mentések és beállítások elvesznek; a Steam Cloud-mentések a fiókjában maradnak. + Shader-gyorsítótárak + Prefix %1$s · shaderek %2$s Letöltött csomagok Megtartott eredetiek Nincs letöltött összetevő-csomag. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 6a0a20ea14..2ea5450c1d 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2866,7 +2866,7 @@ Pilih folder… Gunakan folder apa pun di kartu SD atau drive USB Game akan disimpan di folder Games di dalam lokasi yang dipilih. Game yang sudah terpasang tidak dipindahkan. - Ke mana perginya + Yang memakai ruang Gim Steam Data gim Prefix %1$s · workshop %2$s · shader %3$s @@ -2998,6 +2998,19 @@ Disimpan Gim non-Steam dan prefix Steam bersama Prefix gim dari toko atau yang ditambahkan sendiri + Prefix Steam bersama + Steam menjalankan helper Windows-nya sendiri di sini + Menghapusnya (%1$s). Steam membuat yang baru saat membutuhkannya lagi. + Aplikasi toko dan gim yang berjalan dengannya + Dipakai oleh %1$s + Gim non-Steam %1$s + Tidak cocok dengan gim mana pun, jadi tetap disimpan + Hapus yang dipilih · %1$s + Hapus instalasi yang dipilih · %1$s + Prefix Wine + Save dan setelan di dalamnya akan hilang; save Steam Cloud tetap di akun Anda. + Cache shader + Prefix %1$s · shader %2$s Paket yang diunduh Berkas asli yang disimpan Tidak ada paket komponen yang diunduh. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 792b2c47a1..7d7b096e2a 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2924,7 +2924,7 @@ Scegli cartella… Usa qualsiasi cartella su una scheda SD o un\'unità USB I giochi vanno in una cartella Games all\'interno della posizione selezionata. I giochi esistenti non vengono spostati. - Dove finisce + Cosa occupa spazio Giochi Steam Dati dei giochi Prefissi %1$s · workshop %2$s · shader %3$s @@ -3063,6 +3063,19 @@ Conservati Giochi non Steam e prefisso condiviso di Steam Prefissi di giochi aggiunti dagli store o a mano + Prefisso condiviso di Steam + Steam esegue qui i propri strumenti Windows + Lo elimina (%1$s). Steam ne crea uno nuovo la prossima volta che serve. + Un\'app di uno store e i giochi che girano con essa + Usato da %1$s + Gioco non Steam %1$s + Non associato a nessun gioco, quindi viene conservato + Rimuovi selezionati · %1$s + Disinstalla selezionati · %1$s + Prefissi Wine + Salvataggi e impostazioni al loro interno vanno persi; i salvataggi di Steam Cloud restano nel tuo account. + Cache shader + Prefisso %1$s · shader %2$s Pacchetti scaricati Originali conservati Nessun pacchetto di componenti scaricato. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 459c1d805f..a289e0dbed 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2866,7 +2866,7 @@ フォルダーを選択… SDカードやUSBドライブの任意のフォルダーを使用します ゲームは選択した場所の中のGamesフォルダーに保存されます。既存のゲームは移動されません。 - 使用内訳 + 容量を使っているもの Steam ゲーム ゲームデータ プレフィックス %1$s · ワークショップ %2$s · シェーダー %3$s @@ -2998,6 +2998,19 @@ 保持 Steam 以外のゲームと Steam の共有プレフィックス ストアから、または手動で追加したゲームのプレフィックス + Steam の共有プレフィックス + Steam が独自の Windows ヘルパーをここで実行します + 削除します(%1$s)。次に必要になったとき Steam が新しく作成します。 + ストアアプリとそれで動くゲーム + %1$s が使用 + Steam 以外のゲーム %1$s + どのゲームにも一致しないため保持されます + 選択項目を削除 · %1$s + 選択項目をアンインストール · %1$s + Wineプレフィックス + その中のセーブデータと設定は失われます。Steam Cloudのセーブデータはアカウントに残ります。 + シェーダーキャッシュ + プレフィックス %1$s · シェーダー %2$s ダウンロード済みのパッケージ 保存済みの元ファイル ダウンロード済みのコンポーネントパッケージはありません。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index e6b6c42ecf..82fcb4bb83 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2866,7 +2866,7 @@ 폴더 선택… SD 카드나 USB 드라이브의 아무 폴더나 사용 게임은 선택한 위치 안의 Games 폴더에 저장됩니다. 기존 게임은 이동되지 않습니다. - 사용 내역 + 공간을 차지하는 항목 Steam 게임 게임 데이터 프리픽스 %1$s · 워크숍 %2$s · 셰이더 %3$s @@ -2998,6 +2998,19 @@ 유지 Steam이 아닌 게임과 Steam의 공유 프리픽스 스토어에서 추가했거나 직접 추가한 게임의 프리픽스 + Steam의 공유 프리픽스 + Steam이 자체 Windows 도우미를 여기서 실행합니다 + 삭제합니다(%1$s). 다음에 필요할 때 Steam이 새로 만듭니다. + 스토어 앱과 이 앱으로 실행되는 게임 + 사용 중: %1$s + Steam이 아닌 게임 %1$s + 일치하는 게임이 없어 유지됩니다 + 선택 항목 제거 · %1$s + 선택 항목 제거 · %1$s + Wine 프리픽스 + 그 안의 저장 파일과 설정은 사라지며, Steam Cloud 저장 파일은 계정에 남아 있습니다. + 셰이더 캐시 + 프리픽스 %1$s · 셰이더 %2$s 내려받은 패키지 저장된 원본 파일 내려받은 구성 요소 패키지가 없습니다. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index fac7d2314f..bdb95e029c 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2866,7 +2866,7 @@ Pilih folder… Gunakan mana-mana folder pada kad SD atau pemacu USB Permainan dimasukkan ke dalam folder Games di dalam lokasi yang dipilih. Permainan sedia ada tidak dipindahkan. - Ke mana perginya + Apa yang guna ruang Permainan Steam Data permainan Awalan %1$s · workshop %2$s · shader %3$s @@ -2998,6 +2998,19 @@ Disimpan Permainan bukan Steam dan awalan Steam dikongsi Awalan permainan daripada kedai atau yang ditambah sendiri + Awalan Steam dikongsi + Steam menjalankan pembantu Windowsnya sendiri di sini + Memadamnya (%1$s). Steam mencipta yang baharu apabila memerlukannya lagi. + Aplikasi kedai dan permainan yang berjalan dengannya + Digunakan oleh %1$s + Permainan bukan Steam %1$s + Tidak sepadan dengan mana-mana permainan, jadi ia disimpan + Alih keluar yang dipilih · %1$s + Nyahpasang yang dipilih · %1$s + Prefix Wine + Simpanan dan tetapan di dalamnya akan hilang; simpanan Steam Cloud kekal dalam akaun anda. + Cache shader + Awalan %1$s · shader %2$s Pakej yang dimuat turun Fail asal yang disimpan Tiada pakej komponen dimuat turun. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 65ddcd49c4..dbe9e0626d 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2895,7 +2895,7 @@ Velg mappe… Bruk en hvilken som helst mappe på et SD-kort eller en USB-enhet Spill legges i en Games-mappe på valgt plassering. Eksisterende spill flyttes ikke. - Hvor det ender + Hva som bruker plass Steam-spill Spilldata Prefikser %1$s · workshop %2$s · shaders %3$s @@ -3027,6 +3027,19 @@ Beholdes Ikke-Steam-spill og delt Steam-prefiks Prefikser for spill lagt til via butikker eller manuelt + Steams delte prefiks + Steam kjører sine egne Windows-hjelpere her + Sletter det (%1$s). Steam oppretter et nytt neste gang det trengs. + En butikkapp og spillene som kjører med den + Brukes av %1$s + Ikke-Steam-spill %1$s + Ikke knyttet til et spill, så det beholdes + Fjern valgte · %1$s + Avinstaller valgte · %1$s + Wine-prefikser + Lagringer og innstillinger i dem går tapt; Steam Cloud-lagringer blir værende på kontoen din. + Shadercacher + Prefiks %1$s · shaders %2$s Nedlastede pakker Beholdte originaler Ingen komponentpakker lastet ned. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 8cbd96dd31..eb9cb76b8b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2895,7 +2895,7 @@ Map kiezen… Gebruik een willekeurige map op een SD-kaart of USB-stick Games komen in een map Games op de gekozen locatie. Bestaande games worden niet verplaatst. - Waar het naartoe gaat + Wat ruimte inneemt Steam-games Gamegegevens Prefixen %1$s · workshop %2$s · shaders %3$s @@ -3027,6 +3027,19 @@ Bewaard Niet-Steam-games en gedeeld Steam-prefix Prefixen van games die via winkels of handmatig zijn toegevoegd + Gedeeld Steam-prefix + Steam voert hier eigen Windows-hulpmiddelen uit + Verwijdert het (%1$s). Steam maakt een nieuw aan zodra het er weer een nodig heeft. + Een winkel-app en de games die ermee draaien + Gebruikt door %1$s + Niet-Steam-game %1$s + Niet aan een game gekoppeld, dus het blijft bewaard + Selectie verwijderen · %1$s + Selectie verwijderen · %1$s + Wine-prefixen + Opgeslagen spellen en instellingen daarin gaan verloren; Steam Cloud-opslagen blijven in je account. + Shadercaches + Prefix %1$s · shaders %2$s Gedownloade pakketten Bewaarde originelen Geen componentpakketten gedownload. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a829fda88b..845213c387 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2953,7 +2953,7 @@ Wybierz folder… Użyj dowolnego folderu na karcie SD lub dysku USB Gry trafiają do folderu Games w wybranym miejscu. Istniejące gry nie są przenoszone. - Gdzie to trafia + Co zajmuje miejsce Gry Steam Dane gier Prefiksy %1$s · warsztat %2$s · shadery %3$s @@ -3099,6 +3099,19 @@ Zachowane Gry poza Steam i współdzielony prefiks Steam Prefiksy gier dodanych przez sklepy lub ręcznie + Współdzielony prefiks Steam + Steam uruchamia tu własne narzędzia pomocnicze Windows + Usuwa go (%1$s). Steam utworzy nowy, gdy znów będzie potrzebny. + Aplikacja sklepu i gry, które z nią działają + Używany przez: %1$s + Gra spoza Steam %1$s + Nie pasuje do żadnej gry, więc zostaje zachowany + Usuń wybrane · %1$s + Odinstaluj wybrane · %1$s + Prefiksy Wine + Zapisy i ustawienia w nich zostaną utracone; zapisy w Steam Cloud pozostają na Twoim koncie. + Pamięci podręczne shaderów + Prefiks %1$s · shadery %2$s Pobrane pakiety Zachowane oryginały Nie pobrano żadnych pakietów komponentów. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index c2ee78a1c1..d55c2d3a0b 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2924,7 +2924,7 @@ Escolher pasta… Utilize qualquer pasta num cartão SD ou unidade USB Os jogos vão para uma pasta Games dentro do local selecionado. Os jogos existentes não são movidos. - Para onde vai + O que ocupa espaço Jogos do Steam Dados dos jogos Prefixos %1$s · workshop %2$s · shaders %3$s @@ -3063,6 +3063,19 @@ Mantidos Jogos não Steam e prefixo partilhado do Steam Prefixos de jogos adicionados pelas lojas ou à mão + Prefixo partilhado do Steam + O Steam executa aqui os seus próprios auxiliares do Windows + Elimina-o (%1$s). O Steam cria um novo da próxima vez que precisar. + Uma app de loja e os jogos que correm com ela + Usado por %1$s + Jogo não Steam %1$s + Não corresponde a nenhum jogo, por isso é mantido + Remover seleção · %1$s + Desinstalar seleção · %1$s + Prefixos do Wine + Os guardados e as definições neles perdem-se; os guardados do Steam Cloud ficam na sua conta. + Caches de shaders + Prefixo %1$s · shaders %2$s Pacotes transferidos Originais mantidos Nenhum pacote de componentes transferido. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 59b5af3105..3ae6fd2f50 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2924,7 +2924,7 @@ Escolher pasta… Use qualquer pasta em um cartão SD ou unidade USB Os jogos vão para uma pasta Games dentro do local selecionado. Jogos existentes não são movidos. - Para onde vai + O que ocupa espaço Jogos da Steam Dados dos jogos Prefixos %1$s · workshop %2$s · shaders %3$s @@ -3063,6 +3063,19 @@ Mantidos Jogos não Steam e prefixo compartilhado da Steam Prefixos de jogos adicionados pelas lojas ou à mão + Prefixo compartilhado da Steam + A Steam executa aqui seus próprios auxiliares do Windows + Apaga o prefixo (%1$s). A Steam cria um novo na próxima vez que precisar. + Um app de loja e os jogos que rodam com ele + Usado por %1$s + Jogo não Steam %1$s + Não corresponde a nenhum jogo, então é mantido + Remover seleção · %1$s + Desinstalar seleção · %1$s + Prefixos do Wine + Salvamentos e configurações neles são perdidos; os salvamentos do Steam Cloud continuam na sua conta. + Caches de shaders + Prefixo %1$s · shaders %2$s Pacotes baixados Originais mantidos Nenhum pacote de componentes baixado. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 4795221220..27641656a9 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2924,7 +2924,7 @@ Alege un folder… Folosește orice folder de pe un card SD sau o unitate USB Jocurile sunt puse într-un folder Games din locația selectată. Jocurile existente nu sunt mutate. - Unde ajunge + Ce ocupă spațiu Jocuri Steam Datele jocurilor Prefixe %1$s · workshop %2$s · shadere %3$s @@ -3063,6 +3063,19 @@ Păstrate Jocuri non-Steam și prefixul Steam partajat Prefixele jocurilor din magazine sau adăugate manual + Prefixul Steam partajat + Steam rulează aici propriile utilitare Windows + Îl șterge (%1$s). Steam creează unul nou data viitoare când are nevoie. + O aplicație de magazin și jocurile care rulează cu ea + Folosit de %1$s + Joc non-Steam %1$s + Nu corespunde niciunui joc, deci este păstrat + Elimină selecția · %1$s + Dezinstalează selecția · %1$s + Prefixuri Wine + Salvările și setările din ele se pierd; salvările din Steam Cloud rămân în contul tău. + Cache-uri de shadere + Prefixe %1$s · shadere %2$s Pachete descărcate Originale păstrate Niciun pachet de componente descărcat. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 55d3431388..a99f40c703 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -3036,7 +3036,7 @@ Выбрать папку… Любая папка на SD-карте или USB-накопителе Игры помещаются в папку Games в выбранном месте. Установленные игры не перемещаются. - Куда уходит + Что занимает место Игры Steam Данные игр Префиксы %1$s · мастерская %2$s · шейдеры %3$s @@ -3182,6 +3182,19 @@ Сохранённые Игры не из Steam и общий префикс Steam Префиксы игр, добавленных магазинами или вручную + Общий префикс Steam + Steam запускает здесь свои вспомогательные программы Windows + Удаляет его (%1$s). Steam создаст новый, когда он снова понадобится. + Приложение магазина и игры, которые с ним работают + Используется: %1$s + Игра не из Steam %1$s + Не сопоставлен с игрой, поэтому сохраняется + Удалить выбранные · %1$s + Удалить выбранные · %1$s + Префиксы Wine + Сохранения и настройки в них будут потеряны; сохранения Steam Cloud остаются в вашем аккаунте. + Кэши шейдеров + Префикс %1$s · шейдеры %2$s Загруженные пакеты Сохранённые оригиналы Пакеты компонентов не загружены. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index fedeebf4c6..d686c8693a 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2895,7 +2895,7 @@ Välj mapp… Använd valfri mapp på ett SD-kort eller USB-minne Spel hamnar i en Games-mapp på den valda platsen. Befintliga spel flyttas inte. - Vart det tar vägen + Vad som tar plats Steam-spel Speldata Prefix %1$s · workshop %2$s · shaders %3$s @@ -3027,6 +3027,19 @@ Behålls Icke-Steam-spel och delat Steam-prefix Prefix för spel som lagts till via butiker eller manuellt + Steams delade prefix + Steam kör sina egna Windows-hjälpprogram här + Raderar det (%1$s). Steam skapar ett nytt nästa gång det behövs. + En butiksapp och spelen som körs med den + Används av %1$s + Icke-Steam-spel %1$s + Inte kopplat till något spel, så det behålls + Ta bort valda · %1$s + Avinstallera valda · %1$s + Wine-prefix + Sparningar och inställningar i dem går förlorade; Steam Cloud-sparningar finns kvar på ditt konto. + Shadercacheminnen + Prefix %1$s · shaders %2$s Hämtade paket Behållna original Inga komponentpaket hämtade. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 0f72c64631..596678df67 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2866,7 +2866,7 @@ เลือกโฟลเดอร์… ใช้โฟลเดอร์ใดก็ได้บนการ์ด SD หรือไดรฟ์ USB เกมจะอยู่ในโฟลเดอร์ Games ภายในตำแหน่งที่เลือก เกมที่มีอยู่จะไม่ถูกย้าย - ไปอยู่ที่ไหน + สิ่งที่ใช้พื้นที่ เกม Steam ข้อมูลเกม Prefix %1$s · เวิร์กชอป %2$s · เชเดอร์ %3$s @@ -2998,6 +2998,19 @@ เก็บไว้ เกมนอก Steam และ Prefix Steam ที่ใช้ร่วมกัน Prefix ของเกมจากสโตร์หรือที่เพิ่มเอง + Prefix Steam ที่ใช้ร่วมกัน + Steam รันตัวช่วย Windows ของตัวเองที่นี่ + ลบ prefix นี้ (%1$s) Steam จะสร้างใหม่เมื่อต้องใช้ครั้งถัดไป + แอปสโตร์และเกมที่ทำงานกับแอปนั้น + ใช้โดย %1$s + เกมนอก Steam %1$s + ไม่ตรงกับเกมใด จึงเก็บไว้ + นำรายการที่เลือกออก · %1$s + ถอนการติดตั้งรายการที่เลือก · %1$s + Wine prefix + เซฟและการตั้งค่าข้างในจะหายไป เซฟใน Steam Cloud ยังอยู่ในบัญชีของคุณ + แคชเชเดอร์ + Prefix %1$s · เชเดอร์ %2$s แพ็กเกจที่ดาวน์โหลด ต้นฉบับที่เก็บไว้ ยังไม่มีแพ็กเกจคอมโพเนนต์ที่ดาวน์โหลด diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 1700875b0b..7b6e1553a1 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2895,7 +2895,7 @@ Klasör seç… SD kart veya USB sürücüdeki herhangi bir klasörü kullanın Oyunlar, seçilen konumdaki bir Games klasörüne yüklenir. Mevcut oyunlar taşınmaz. - Nereye gidiyor + Yer kaplayanlar Steam oyunları Oyun verileri Önekler %1$s · atölye %2$s · gölgelendiriciler %3$s @@ -3027,6 +3027,19 @@ Korunan Steam dışı oyunlar ve Steam\'in ortak öneki Mağazalardan veya elle eklenen oyunların önekleri + Steam\'in ortak öneki + Steam kendi Windows yardımcılarını burada çalıştırır + Siler (%1$s). Steam bir dahaki ihtiyacında yenisini oluşturur. + Bir mağaza uygulaması ve onunla çalışan oyunlar + Kullanan: %1$s + Steam dışı oyun %1$s + Bir oyunla eşleşmedi, bu yüzden korunuyor + Seçilenleri kaldır · %1$s + Seçilenlerin yüklemesini kaldır · %1$s + Wine önekleri + İçindeki kayıtlar ve ayarlar kaybolur; Steam Cloud kayıtları hesabınızda kalır. + Gölgelendirici önbellekleri + Önek %1$s · gölgelendiriciler %2$s İndirilen paketler Kaydedilen orijinaller İndirilmiş bileşen paketi yok. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index de74d56817..2afbe7c796 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2953,7 +2953,7 @@ Вибрати папку… Будь-яка папка на SD-картці або USB-накопичувачі Ігри потрапляють у папку Games у вибраному місці. Наявні ігри не переміщуються. - Куди йде + Що займає місце Ігри Steam Дані ігор Префікси %1$s · майстерня %2$s · шейдери %3$s @@ -3099,6 +3099,19 @@ Збережено Не-Steam ігри та спільний префікс Steam Префікси ігор із магазинів або доданих вручну + Спільний префікс Steam + Steam запускає тут власні допоміжні програми Windows + Видаляє його (%1$s). Steam створить новий, коли він знову знадобиться. + Застосунок магазину та ігри, які з ним працюють + Використовується: %1$s + Не-Steam гра %1$s + Не зіставлено з грою, тому зберігається + Видалити вибрані · %1$s + Видалити вибрані · %1$s + Префікси Wine + Збереження й налаштування в них буде втрачено; збереження Steam Cloud залишаються у вашому обліковому записі. + Кеші шейдерів + Префікси %1$s · шейдери %2$s Завантажені пакети Збережені оригінали Жодного завантаженого пакета компонентів. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 05c9403f13..ea76ef9bc6 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2866,7 +2866,7 @@ Chọn thư mục… Dùng bất kỳ thư mục nào trên thẻ SD hoặc ổ USB Game được đặt vào thư mục Games bên trong vị trí đã chọn. Game hiện có không bị di chuyển. - Đi đâu + Mục chiếm bộ nhớ Game Steam Dữ liệu game Prefix %1$s · workshop %2$s · shader %3$s @@ -2998,6 +2998,19 @@ Đã giữ Game ngoài Steam và prefix Steam dùng chung Prefix của game từ cửa hàng hoặc thêm thủ công + Prefix Steam dùng chung + Steam chạy các trình hỗ trợ Windows riêng tại đây + Xóa prefix này (%1$s). Steam sẽ tạo prefix mới vào lần tới khi cần. + Một ứng dụng cửa hàng và các game chạy cùng nó + Được dùng bởi %1$s + Game ngoài Steam %1$s + Không khớp với game nào nên được giữ lại + Gỡ mục đã chọn · %1$s + Gỡ cài đặt mục đã chọn · %1$s + Prefix Wine + Bản lưu và thiết lập bên trong sẽ mất; bản lưu Steam Cloud vẫn ở trong tài khoản của bạn. + Bộ nhớ đệm shader + Prefix %1$s · shader %2$s Gói đã tải Bản gốc đã giữ Chưa tải gói thành phần nào. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d775759045..b84c613839 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2870,7 +2870,7 @@ 选择文件夹… 使用 SD 卡或 USB 驱动器上的任意文件夹 游戏会放在所选位置中的 Games 文件夹内。现有游戏不会被移动。 - 占用去向 + 占用空间的项目 Steam 游戏 游戏数据 前缀 %1$s · 创意工坊 %2$s · 着色器 %3$s @@ -3002,6 +3002,19 @@ 保留 非 Steam 游戏与 Steam 的共享前缀 从商店或手动添加的游戏的前缀 + Steam 的共享前缀 + Steam 在此运行其自带的 Windows 辅助程序 + 删除该前缀(%1$s)。Steam 下次需要时会新建一个。 + 商店应用及通过它运行的游戏 + 由 %1$s 使用 + 非 Steam 游戏 %1$s + 未匹配到游戏,因此保留 + 移除所选 · %1$s + 卸载所选 · %1$s + Wine 前缀 + 其中的存档和设置将丢失;Steam Cloud 存档仍保留在你的账户中。 + 着色器缓存 + 前缀 %1$s · 着色器 %2$s 已下载的包 已保存的原始文件 没有已下载的组件包。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index a7b17a7383..c8828521e1 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2866,7 +2866,7 @@ 選擇資料夾… 使用 SD 卡或 USB 儲存裝置上的任何資料夾 遊戲會放在所選位置內的 Games 資料夾中。現有遊戲不會移動。 - 空間去向 + 佔用空間的項目 Steam 遊戲 遊戲資料 前綴 %1$s · 工作坊 %2$s · 著色器 %3$s @@ -2998,6 +2998,19 @@ 保留 非 Steam 遊戲與 Steam 的共用前綴 從商店或手動新增的遊戲的前綴 + Steam 的共用前綴 + Steam 在此執行其自帶的 Windows 輔助程式 + 刪除該前綴(%1$s)。Steam 下次需要時會新建一個。 + 商店應用程式及透過它執行的遊戲 + 由 %1$s 使用 + 非 Steam 遊戲 %1$s + 未配對到任何遊戲,因此保留 + 移除所選 · %1$s + 解除安裝所選 · %1$s + Wine 前綴 + 其中的存檔和設定都會遺失;Steam Cloud 存檔仍保留在你的帳戶中。 + 著色器快取 + 前綴 %1$s · 著色器 %2$s 已下載的套件 已儲存的原始檔案 沒有已下載的組件套件。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index a73fbfecb1..5cacb7ee87 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2866,7 +2866,7 @@ 選擇資料夾… 使用 SD 卡或 USB 隨身碟上的任何資料夾 遊戲會放在所選位置內的 Games 資料夾中。現有遊戲不會移動。 - 空間去向 + 佔用空間的項目 Steam 遊戲 遊戲資料 前綴 %1$s · 工作坊 %2$s · 著色器 %3$s @@ -2998,6 +2998,19 @@ 保留 非 Steam 遊戲與 Steam 的共用前綴 從商店或手動新增的遊戲的前綴 + Steam 的共用前綴 + Steam 在此執行其自帶的 Windows 輔助程式 + 刪除該前綴(%1$s)。Steam 下次需要時會新建一個。 + 商店應用程式及透過它執行的遊戲 + 由 %1$s 使用 + 非 Steam 遊戲 %1$s + 未配對到任何遊戲,因此保留 + 移除所選 · %1$s + 解除安裝所選 · %1$s + Wine 前綴 + 其中的存檔和設定都會遺失;Steam Cloud 存檔仍保留在你的帳戶中。 + 著色器快取 + 前綴 %1$s · 著色器 %2$s 已下載的套件 已儲存的原始檔案 沒有已下載的元件套件。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 732b549ba2..e59c9e0bdc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3332,7 +3332,7 @@ Choose folder… Use any folder on an SD card or USB drive Games go into a Games folder inside the selected location. Existing games are not moved. - Where it goes + What’s using space Steam games Game data Prefixes %1$s · workshop %2$s · shaders %3$s @@ -3465,6 +3465,19 @@ Kept Non-Steam games and Steam’s shared prefix Prefixes of games added from stores or by hand + Steam’s shared prefix + Steam runs its own Windows helpers here + Deletes it (%1$s). Steam makes a new one the next time it needs it. + A store app and the games that run with it + Used by %1$s + Non-Steam game %1$s + Not matched to a game, so it is kept + Remove selected · %1$s + Uninstall selected · %1$s + Wine prefixes + Saves and settings inside them are lost; Steam Cloud saves stay in your account. + Shader caches + Prefix %1$s · shaders %2$s Downloaded packages Saved originals No component packages downloaded. 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 a3b6a8fa24..4740b58073 100644 --- a/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt @@ -181,6 +181,37 @@ class SteamStorageTest { assertEquals(452280, SteamStorage.leftoverId("452280")) } + @Test fun shortcutIdsReadBothSignedAndUnsignedFolderNames() { + assertEquals(3207321049L, SteamStorage.shortcutId("3207321049")) + assertEquals(2526420341L, SteamStorage.shortcutId("-1768546955")) + assertNull(SteamStorage.shortcutId("0")) + assertNull(SteamStorage.shortcutId("452280")) + assertNull(SteamStorage.shortcutId("pfx")) + assertNull(SteamStorage.shortcutId("4294967296")) + } + + @Test fun sharedPrefixComesFromTheCompatDataPathInLaunchOptions() { + assertEquals(2929927072L, SteamStorage.sharedPrefixId("STEAM_COMPAT_DATA_PATH=/root/.local/share/Steam/steamapps/compatdata/2929927072 %command%")) + assertEquals(2596113170L, SteamStorage.sharedPrefixId("STEAM_COMPAT_DATA_PATH=/x/compatdata/2596113170/ %command% --exec=\"launch WoW\"")) + assertNull(SteamStorage.sharedPrefixId("%command% -windowed")) + assertNull(SteamStorage.sharedPrefixId("STEAM_COMPAT_DATA_PATH=/x/compatdata/0 %command%")) + assertEquals(3000000002L, SteamStorage.sharedPrefixId("STEAM_COMPAT_DATA_PATH=\"/root/My Games/steamapps/compatdata/3000000002\" %command%")) + assertEquals(3000000002L, SteamStorage.sharedPrefixId("STEAM_COMPAT_DATA_PATH='/x/compatdata/3000000002/' %command%")) + } + + @Test fun gameFolderHintReadsTheFolderWineRecorded() { + val prefix = tmp.newFolder("compatdata", "3000000002") + File(prefix, "pfx").mkdirs() + File(prefix, "pfx/system.reg").writeText( + "\"Path\"=\"Z:\\\\usr\\\\local\\\\share\\\\fonts\\\\a.ttf\"\n" + + "\"A\"=\"Z:\\\\root\\\\Games\\\\Stores\\\\Ubisoft\\\\Tom Clancy's Splinter Cell\\\\\"\n" + + "\"B\"=\"Z:\\\\root\\\\Games\\\\Stores\\\\Ubisoft\\\\Tom Clancy's Splinter Cell\\\\system\\\\x.exe\"\n", + ) + File(prefix, "pfx/user.reg").writeText("\"C\"=\"Z:\\\\mnt\\\\droiddeck-lib\\\\1\\\\steamapps\\\\common\\\\198X\\\\198X.exe\"\n") + assertEquals("Tom Clancy's Splinter Cell", SteamStorage.gameFolderHint(prefix)) + assertNull(SteamStorage.gameFolderHint(tmp.newFolder("compatdata", "3000000003"))) + } + @Test fun stubPrefixes() { val stub = tmp.newFolder("compatdata", "10") assertTrue(SteamStorage.isStubPrefix(stub)) diff --git a/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadQueueRemovalTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadQueueRemovalTest.kt new file mode 100644 index 0000000000..5ad355f8ec --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadQueueRemovalTest.kt @@ -0,0 +1,276 @@ +package com.droiddeck.launcher.stores.download + +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreInstalls +import com.droiddeck.launcher.stores.StoresState +import java.io.File +import java.util.concurrent.CountDownLatch +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicInteger +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Assert.fail +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class DownloadQueueRemovalTest { + private val app get() = RuntimeEnvironment.getApplication() + + @After fun cleanRows() { DownloadQueue.dismissFinished() } + + private class BlockingCleanup { + val started = CountDownLatch(1) + val release = CountDownLatch(1) + val cancels = AtomicInteger() + fun job() = object : DownloadQueue.DownloadJob { + override fun run(handle: DownloadQueue.JobHandle): String? = throw IllegalStateException("fails on purpose") + override fun cancel(deleteFiles: Boolean) { + cancels.incrementAndGet() + started.countDown() + release.await(5, TimeUnit.SECONDS) + } + } + } + + private fun failedEntry(id: String, cleanup: BlockingCleanup): String { + val entry = DownloadEntry(Store.GOG, id, id) + DownloadQueue.enqueue(app, entry) { cleanup.job() } + val until = System.nanoTime() + TimeUnit.SECONDS.toNanos(5) + while (System.nanoTime() < until) { + if (DownloadQueue.entry(entry.key)?.state == DownloadState.FAILED) return entry.key + Thread.sleep(10) + } + fail("job never failed: ${DownloadQueue.entry(entry.key)}") + return entry.key + } + + private fun awaitHold(key: String) { + val until = System.nanoTime() + TimeUnit.SECONDS.toNanos(5) + while (System.nanoTime() < until) { + if (DownloadQueue.holdForRemoval(key)) return + Thread.sleep(10) + } + fail("removal hold never became available for $key") + } + + @Test fun aRemovalHoldIsExclusiveUntilReleased() { + val key = "gog:removal-hold-test" + assertTrue(DownloadQueue.holdForRemoval(key)) + assertFalse(DownloadQueue.holdForRemoval(key)) + DownloadQueue.releaseRemoval(key) + assertTrue(DownloadQueue.holdForRemoval(key)) + DownloadQueue.releaseRemoval(key) + } + + @Test fun clearingFirstKeepsRemovalOutUntilItsCleanupFinishes() { + val cleanup = BlockingCleanup() + val key = failedEntry("clear-then-hold", cleanup) + DownloadQueue.clear(app, key) + assertTrue(cleanup.started.await(5, TimeUnit.SECONDS)) + assertFalse(DownloadQueue.holdForRemoval(key)) + cleanup.release.countDown() + awaitHold(key) + DownloadQueue.releaseRemoval(key) + } + + @Test fun cancellingFirstKeepsRemovalOutUntilItsCleanupFinishes() { + val cleanup = BlockingCleanup() + val key = failedEntry("cancel-then-hold", cleanup) + DownloadQueue.cancel(app, key) + assertTrue(cleanup.started.await(5, TimeUnit.SECONDS)) + assertFalse(DownloadQueue.holdForRemoval(key)) + cleanup.release.countDown() + awaitHold(key) + DownloadQueue.releaseRemoval(key) + } + + @Test fun holdingFirstStopsClearAndCancelFromStartingCleanup() { + val cleared = BlockingCleanup() + val clearKey = failedEntry("hold-then-clear", cleared) + assertTrue(DownloadQueue.holdForRemoval(clearKey)) + DownloadQueue.clear(app, clearKey) + val cancelled = BlockingCleanup() + val cancelKey = failedEntry("hold-then-cancel", cancelled) + assertTrue(DownloadQueue.holdForRemoval(cancelKey)) + DownloadQueue.cancel(app, cancelKey) + assertFalse(cleared.started.await(300, TimeUnit.MILLISECONDS)) + assertFalse(cancelled.started.await(300, TimeUnit.MILLISECONDS)) + assertEquals(0, cleared.cancels.get() + cancelled.cancels.get()) + DownloadQueue.releaseRemoval(clearKey) + DownloadQueue.releaseRemoval(cancelKey) + cleared.release.countDown() + cancelled.release.countDown() + } + + @Test fun aReinstallWaitsForTheCancelledDownloadsCleanup() { + val cleanup = BlockingCleanup() + val key = failedEntry("reinstall-after-clear", cleanup) + DownloadQueue.clear(app, key) + assertTrue(cleanup.started.await(5, TimeUnit.SECONDS)) + val ran = CountDownLatch(1) + DownloadQueue.enqueue(app, DownloadEntry(Store.GOG, "reinstall-after-clear", "again")) { + object : DownloadQueue.DownloadJob { + override fun run(handle: DownloadQueue.JobHandle): String? { ran.countDown(); return "/done" } + override fun cancel(deleteFiles: Boolean) {} + } + } + assertFalse(ran.await(300, TimeUnit.MILLISECONDS)) + assertEquals(DownloadState.QUEUED, DownloadQueue.entry(key)?.state) + cleanup.release.countDown() + assertTrue(ran.await(5, TimeUnit.SECONDS)) + } + + @Test fun cleanupCollectsTheDeletionWorkerAnInstallerStarts() { + val folder = File(app.filesDir, "collected-discard").apply { mkdirs() } + File(folder, "part.bin").writeText("x") + val workers = StoreInstalls.collectingDiscards { StoreInstalls.discard(app, folder, emptyList()) } + assertEquals(1, workers.size) + workers.forEach { it.join(5000) } + assertFalse(folder.exists()) + assertFalse(StoreInstalls.isDiscarding(folder)) + } + + private fun idleUntil(condition: () -> Boolean): Boolean { + val until = System.nanoTime() + TimeUnit.SECONDS.toNanos(5) + while (System.nanoTime() < until) { + org.robolectric.shadows.ShadowLooper.idleMainLooper() + if (condition()) return true + Thread.sleep(10) + } + return false + } + + @Test fun uninstallWaitsForAnInstallersDiscardThenRemovesTheGame() { + val folder = File(app.filesDir, "discarding-game").apply { mkdirs() } + File(folder, "game.bin").writeText("x") + val game = InstalledStoreGame(StoreGameSidecar(Store.GOG, "discarding", "Discarding", exe = "game.bin"), folder) + StoreInstalls.beginDiscard(folder) + val done = CountDownLatch(1) + try { + StoresState.uninstall(app, game) { done.countDown() } + Thread.sleep(300) + org.robolectric.shadows.ShadowLooper.idleMainLooper() + assertEquals(1L, done.count) + assertTrue(File(folder, "game.bin").isFile) + } finally { + StoreInstalls.endDiscard(folder) + } + assertTrue(idleUntil { done.count == 0L }) + assertFalse(folder.exists()) + } + + @Test fun uninstallWaitsForACancelledUpdatesCleanupThenRemovesTheGame() { + val cleanup = BlockingCleanup() + val key = failedEntry("cancel-then-uninstall", cleanup) + val folder = File(app.filesDir, "cancel-then-uninstall").apply { mkdirs() } + File(folder, "game.bin").writeText("x") + val game = InstalledStoreGame(StoreGameSidecar(Store.GOG, "cancel-then-uninstall", "Cancelled", exe = "game.bin"), folder) + assertEquals(key, game.key) + DownloadQueue.cancel(app, key) + assertTrue(cleanup.started.await(5, TimeUnit.SECONDS)) + val done = CountDownLatch(1) + StoresState.uninstall(app, game) { done.countDown() } + Thread.sleep(300) + org.robolectric.shadows.ShadowLooper.idleMainLooper() + assertEquals(1L, done.count) + assertTrue(File(folder, "game.bin").isFile) + cleanup.release.countDown() + assertTrue(idleUntil { done.count == 0L }) + assertFalse(folder.exists()) + } + + private fun blockDiscards(): CountDownLatch { + val release = CountDownLatch(1) + StoreInstalls.beforeDiscard = { release.await(5, TimeUnit.SECONDS) } + return release + } + + @After fun restoreDiscards() { StoreInstalls.beforeDiscard = {} } + + @Test fun aDiscardStartedInsideARunningJobKeepsTheGameHeld() { + val folder = File(app.filesDir, "run-discard").apply { mkdirs() } + val release = blockDiscards() + val entry = DownloadEntry(Store.GOG, "run-discard", "run") + DownloadQueue.enqueue(app, entry) { + object : DownloadQueue.DownloadJob { + override fun run(handle: DownloadQueue.JobHandle): String? { + StoreInstalls.discard(app, folder, emptyList()) + return null + } + override fun cancel(deleteFiles: Boolean) {} + } + } + assertTrue(idleUntil { DownloadQueue.entry(entry.key)?.state == DownloadState.FAILED }) + assertFalse(DownloadQueue.holdForRemoval(entry.key)) + release.countDown() + awaitHold(entry.key) + DownloadQueue.releaseRemoval(entry.key) + } + + @Test fun aJobThatThrowsAfterStartingADiscardStillKeepsTheGameHeld() { + val folder = File(app.filesDir, "throw-after-discard").apply { mkdirs() } + val release = blockDiscards() + val entry = DownloadEntry(Store.GOG, "throw-after-discard", "throws") + DownloadQueue.enqueue(app, entry) { + object : DownloadQueue.DownloadJob { + override fun run(handle: DownloadQueue.JobHandle): String? { + StoreInstalls.discard(app, folder, emptyList()) + throw IllegalStateException("fails after discard") + } + override fun cancel(deleteFiles: Boolean) {} + } + } + assertTrue(idleUntil { DownloadQueue.entry(entry.key)?.state == DownloadState.FAILED }) + assertFalse(DownloadQueue.holdForRemoval(entry.key)) + val reinstalled = CountDownLatch(1) + DownloadQueue.enqueue(app, DownloadEntry(Store.GOG, "throw-after-discard", "again")) { + object : DownloadQueue.DownloadJob { + override fun run(handle: DownloadQueue.JobHandle): String? { reinstalled.countDown(); return "/done" } + override fun cancel(deleteFiles: Boolean) {} + } + } + assertFalse(reinstalled.await(300, TimeUnit.MILLISECONDS)) + assertEquals(DownloadState.QUEUED, DownloadQueue.entry(entry.key)?.state) + release.countDown() + assertTrue(reinstalled.await(5, TimeUnit.SECONDS)) + assertTrue(idleUntil { DownloadQueue.entry(entry.key)?.state == DownloadState.INSTALLED }) + } + + @Test fun cancellingARunningJobTwiceWaitsForEveryDiscard() { + val folder = File(app.filesDir, "double-cancel").apply { mkdirs() } + val release = blockDiscards() + val running = CountDownLatch(1) + val stop = CountDownLatch(1) + val entry = DownloadEntry(Store.GOG, "double-cancel", "twice") + DownloadQueue.enqueue(app, entry) { + object : DownloadQueue.DownloadJob { + override fun run(handle: DownloadQueue.JobHandle): String? { + running.countDown() + stop.await(5, TimeUnit.SECONDS) + return null + } + override fun cancel(deleteFiles: Boolean) { + if (deleteFiles) StoreInstalls.discard(app, folder, emptyList()) + } + } + } + assertTrue(running.await(5, TimeUnit.SECONDS)) + DownloadQueue.cancel(app, entry.key) + DownloadQueue.cancel(app, entry.key) + stop.countDown() + assertTrue(idleUntil { DownloadQueue.entry(entry.key)?.state != DownloadState.RUNNING }) + assertFalse(DownloadQueue.holdForRemoval(entry.key)) + release.countDown() + awaitHold(entry.key) + DownloadQueue.releaseRemoval(entry.key) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/StorageComponentsBulkConfirmTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/StorageComponentsBulkConfirmTest.kt index 3b47a84904..dec06e5ac4 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/StorageComponentsBulkConfirmTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/StorageComponentsBulkConfirmTest.kt @@ -37,7 +37,7 @@ class StorageComponentsBulkConfirmTest { components = components, flatpakApps = emptyList(), flatpakRuntimes = 0L, - otherPrefixes = 0L, + kept = emptyList(), leftoversChecked = true, ) From 13b05656aaf9285c5c9431a8baabcaaefd26c300 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 13 Nov 2026 13:15:24 -0500 Subject: [PATCH 4/5] feat(agent): GitHub sign-in floats its device code over the browser (#2570) * feat(agent): GitHub sign-in floats its device code over the browser * fix(agent): the device code falls back to the browser when nothing could open * fix(agent): dd-gh-login waits for DroidDeck to report whether the page opened --- app/src/main/AndroidManifest.xml | 11 ++ app/src/main/assets/agent/dd-gh-login | 41 ++++- .../droiddeck/launcher/DeviceCodeActivity.kt | 167 ++++++++++++++++++ .../com/droiddeck/launcher/agent/AgentHost.kt | 40 ++++- tools/agent/dd-gh-login | 41 ++++- tools/release/sign-apk.sh | 2 +- 6 files changed, 290 insertions(+), 12 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/DeviceCodeActivity.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1264c8211a..67240f4eb3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -118,6 +118,17 @@ + + "$inbox/device-code.part" && mv -f "$inbox/device-code.part" "$inbox/device-code" || return 1 + i=0 + while [ $i -lt 40 ] && [ -e "$inbox/device-code" ]; do + sleep 0.2 + i=$((i + 1)) + done + if [ -e "$inbox/device-code" ]; then + rm -f "$inbox/device-code" + return 1 + fi + # DroidDeck writes "ok" or "failed" once it has tried to open the page; no answer counts as failed. + i=0 + while [ $i -lt 50 ] && [ ! -e "$inbox/device-code.result" ]; do + sleep 0.2 + i=$((i + 1)) + done + result=$(cat "$inbox/device-code.result" 2>/dev/null) + rm -f "$inbox/device-code.result" + [ "$result" = ok ] +} + coproc GH { BROWSER=true gh auth login --hostname github.com --git-protocol https --web 2>&1; } gh_pid=$GH_PID 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) + # gh's own prompts would push the code out of the one line the setup card shows. + case "$line" in + *"one-time code"* | *"Press Enter"* | *"Open this URL"*) ;; + *) printf '%s\n' "$line" ;; + esac 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 + float_code "$code" || android-open "$url" fi done wait "$gh_pid" +status=$? +[ -n "$shown" ] && [ -n "$inbox" ] && [ -d "$inbox" ] && : > "$inbox/device-code" +exit $status diff --git a/app/src/main/java/com/droiddeck/launcher/DeviceCodeActivity.kt b/app/src/main/java/com/droiddeck/launcher/DeviceCodeActivity.kt new file mode 100644 index 0000000000..472521fe20 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/DeviceCodeActivity.kt @@ -0,0 +1,167 @@ +package com.droiddeck.launcher + +import android.app.ActivityOptions +import android.app.PictureInPictureParams +import android.content.ClipData +import android.content.ClipboardManager +import android.content.Context +import android.content.Intent +import android.content.res.Configuration +import android.net.Uri +import android.os.Bundle +import android.util.Rational +import androidx.activity.ComponentActivity +import androidx.activity.compose.BackHandler +import androidx.activity.compose.setContent +import androidx.compose.foundation.background +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.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.widthIn +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +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 com.droiddeck.launcher.core.AppLanguage +import com.droiddeck.launcher.ui.DroidDeckTheme +import com.droiddeck.launcher.ui.FitText +import com.droiddeck.launcher.ui.LocalPalette +import com.droiddeck.launcher.ui.PrimaryButton +import com.droiddeck.launcher.ui.SecondaryButton +import java.lang.ref.WeakReference + +/** Floats a sign-in code over the browser page that asks for it. */ +class DeviceCodeActivity : ComponentActivity() { + private var code by mutableStateOf("") + private var url = "" + private var display: Int? = null + private var inPip by mutableStateOf(false) + private var openPending = false + + override fun attachBaseContext(newBase: Context) = super.attachBaseContext(AppLanguage.wrap(newBase)) + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + current = WeakReference(this) + read(intent) + openPending = savedInstanceState == null + setContent { DroidDeckTheme { Float() } } + } + + override fun onNewIntent(intent: Intent) { + super.onNewIntent(intent) + setIntent(intent) + read(intent) + openPending = true + } + + override fun onDestroy() { + if (current?.get() === this) current = null + super.onDestroy() + } + + override fun onResume() { + super.onResume() + if (!openPending) return + if (isInPictureInPictureMode) { + openPage() + return + } + enterPip() + if (!inPip) { + openPage() + finish() + } + } + + override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration) { + super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig) + inPip = isInPictureInPictureMode + if (isInPictureInPictureMode && openPending) openPage() + } + + private fun read(intent: Intent) { + code = intent.getStringExtra(EXTRA_CODE).orEmpty() + url = intent.getStringExtra(EXTRA_URL).orEmpty() + display = intent.getIntExtra(EXTRA_DISPLAY, -1).takeIf { it > 0 } + copy() + } + + private fun copy() { + runCatching { getSystemService(ClipboardManager::class.java)?.setPrimaryClip(ClipData.newPlainText("GitHub", code)) } + } + + private fun enterPip() { + inPip = runCatching { + enterPictureInPictureMode(PictureInPictureParams.Builder().setAspectRatio(Rational(16, 9)).build()) + }.getOrDefault(false) + } + + private fun openPage() { + openPending = false + val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url)).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + val at = display + val opened = runCatching { + if (at == null) startActivity(intent) + else startActivity(intent, ActivityOptions.makeBasic().setLaunchDisplayId(at).toBundle()) + }.recoverCatching { startActivity(intent) }.isSuccess + com.droiddeck.launcher.agent.AgentHost.deviceCodeOpened(applicationContext, opened) + } + + @androidx.compose.runtime.Composable + private fun Float() { + val colors = MaterialTheme.colorScheme + val accent = LocalPalette.current.signal + BackHandler(enabled = !inPip) { enterPip() } + Box(Modifier.fillMaxSize().background(colors.background), contentAlignment = Alignment.Center) { + Column( + Modifier.widthIn(max = 520.dp).fillMaxWidth().padding(if (inPip) 8.dp else 24.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(if (inPip) 2.dp else 16.dp), + ) { + Text(stringResource(R.string.agent_step_github), style = MaterialTheme.typography.labelLarge, color = colors.onSurfaceVariant) + FitText(code, maxSize = if (inPip) 40.sp else 56.sp, fontWeight = FontWeight.Bold, color = accent, + modifier = Modifier.fillMaxWidth()) + Text(Uri.parse(url).let { it.host + it.path }, style = MaterialTheme.typography.labelMedium, color = colors.onSurfaceVariant, maxLines = 1) + if (!inPip) Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + PrimaryButton(stringResource(R.string.fm_copy), onClick = ::copy) + SecondaryButton(stringResource(R.string.common_close), onClick = ::finish) + } + } + } + } + + companion object { + private const val EXTRA_CODE = "code" + private const val EXTRA_URL = "url" + private const val EXTRA_DISPLAY = "display" + private var current: WeakReference? = null + + /** False when this device cannot float a window, so the caller opens the page itself. */ + fun show(context: Context, code: String, url: String, display: Int): Boolean { + if (!PairingGuideActivity.canFloat(context)) return false + val intent = Intent(context, DeviceCodeActivity::class.java) + .putExtra(EXTRA_CODE, code).putExtra(EXTRA_URL, url).putExtra(EXTRA_DISPLAY, display) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + return runCatching { + if (display > 0) context.startActivity(intent, ActivityOptions.makeBasic().setLaunchDisplayId(display).toBundle()) + else context.startActivity(intent) + }.isSuccess + } + + fun close() { + current?.get()?.finish() + } + } +} 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 1f78672f4a..2c22063f71 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt @@ -508,6 +508,7 @@ object AgentHost { appContext?.let { app -> claimLabRequest(app) claimOpenUrl(app) + claimDeviceCode(app) // proot comes from an add-on pack fetched after the app starts, so the runtime can become usable later. if (!available && state != State.WORKING) available = LinuxRuntime.hasRootfs(app) lab = LabProgress.read(LinuxRuntime.rootDir(app)) @@ -529,15 +530,43 @@ object AgentHost { val url = runCatching { claimed.readText().trim() }.getOrNull() claimed.delete() if (url == null || !(url.startsWith("https://") || url.startsWith("http://"))) return + if (!openUrl(app, url)) runCatching { File(app.filesDir, "$OPEN_URL.failed").writeText("") } + } + + /** dd-gh-login leaves " " here to float the code over the page, and an empty file when it ends. */ + private fun claimDeviceCode(app: Context) { + val request = File(app.filesDir, DEVICE_CODE) + if (!request.isFile) return + val claimed = File(app.filesDir, "$DEVICE_CODE.claimed") + if (!request.renameTo(claimed)) return + val parts = runCatching { claimed.readText().trim() }.getOrDefault("").split(' ', limit = 2) + claimed.delete() + val code = parts[0] + val url = parts.getOrNull(1)?.takeIf { it.startsWith("https://") } + if (code.isEmpty() || url == null) { + com.droiddeck.launcher.DeviceCodeActivity.close() + return + } + if (!com.droiddeck.launcher.DeviceCodeActivity.show(app, code, url, AgentAdb.browserDisplay)) deviceCodeOpened(app, openUrl(app, url)) + } + + /** Tells dd-gh-login whether the device page opened, so it can fall back to android-open. */ + fun deviceCodeOpened(app: Context, opened: Boolean) { + runCatching { + val part = File(app.filesDir, "$DEVICE_CODE.result.part") + part.writeText(if (opened) "ok" else "failed") + part.renameTo(File(app.filesDir, "$DEVICE_CODE.result")) + } + } + + private fun openUrl(app: Context, url: String): Boolean { val intent = android.content.Intent(android.content.Intent.ACTION_VIEW, android.net.Uri.parse(url)) .addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK) val options = android.app.ActivityOptions.makeBasic().setLaunchDisplayId(AgentAdb.browserDisplay).toBundle() - runCatching { app.startActivity(intent, options) } + return runCatching { app.startActivity(intent, options) } .recoverCatching { app.startActivity(intent) } - .onFailure { - Log.w(TAG, "could not open a sign-in link: ${it.javaClass.simpleName}") - runCatching { File(app.filesDir, "$OPEN_URL.failed").writeText("") } - } + .onFailure { Log.w(TAG, "could not open a sign-in link: ${it.javaClass.simpleName}") } + .isSuccess } /** @@ -593,6 +622,7 @@ object AgentHost { private const val RESUME = "agent/resume" private const val LAB_REQUEST = "agent/lab-request" private const val OPEN_URL = "agent/open-url" + private const val DEVICE_CODE = "agent/device-code" private const val LAB_CHAT_KEY = "lab_chat" /** The raw output of the latest turn, for working out what a CLI did when the chat shows nothing. */ private const val TURN_LOG = "agent/turn.log" diff --git a/tools/agent/dd-gh-login b/tools/agent/dd-gh-login index d3c7517e55..f9b0b7734a 100755 --- a/tools/agent/dd-gh-login +++ b/tools/agent/dd-gh-login @@ -1,17 +1,52 @@ #!/bin/bash -# Starts GitHub's device login and opens its approval page in Android. +# Starts GitHub's device login, floats its code over Android's browser and opens the approval page. +url=https://github.com/login/device +inbox=${DD_AGENT_INBOX:-} + +# DroidDeck takes $inbox/device-code within a few seconds when it can float the code. +float_code() { + [ -n "$inbox" ] && [ -d "$inbox" ] || return 1 + rm -f "$inbox/device-code.result" + printf '%s %s\n' "$1" "$url" > "$inbox/device-code.part" && mv -f "$inbox/device-code.part" "$inbox/device-code" || return 1 + i=0 + while [ $i -lt 40 ] && [ -e "$inbox/device-code" ]; do + sleep 0.2 + i=$((i + 1)) + done + if [ -e "$inbox/device-code" ]; then + rm -f "$inbox/device-code" + return 1 + fi + # DroidDeck writes "ok" or "failed" once it has tried to open the page; no answer counts as failed. + i=0 + while [ $i -lt 50 ] && [ ! -e "$inbox/device-code.result" ]; do + sleep 0.2 + i=$((i + 1)) + done + result=$(cat "$inbox/device-code.result" 2>/dev/null) + rm -f "$inbox/device-code.result" + [ "$result" = ok ] +} + coproc GH { BROWSER=true gh auth login --hostname github.com --git-protocol https --web 2>&1; } gh_pid=$GH_PID 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) + # gh's own prompts would push the code out of the one line the setup card shows. + case "$line" in + *"one-time code"* | *"Press Enter"* | *"Open this URL"*) ;; + *) printf '%s\n' "$line" ;; + esac 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 + float_code "$code" || android-open "$url" fi done wait "$gh_pid" +status=$? +[ -n "$shown" ] && [ -n "$inbox" ] && [ -d "$inbox" ] && : > "$inbox/device-code" +exit $status diff --git a/tools/release/sign-apk.sh b/tools/release/sign-apk.sh index 160d49b5ea..a7cfd8f531 100755 --- a/tools/release/sign-apk.sh +++ b/tools/release/sign-apk.sh @@ -27,7 +27,7 @@ if [ "$pkg" = "$P" ]; then else python3 "$here/axml_rename.py" "$in" "$work/renamed.apk" \ "$P=$pkg" "$P.androidx-startup=$pkg.androidx-startup" "$P.logs=$pkg.logs" \ - "$P.pairingguide=$pkg.pairingguide" "$P.pin=$pkg.pin" \ + "$P.pairingguide=$pkg.pairingguide" "$P.devicecode=$pkg.devicecode" "$P.pin=$pkg.pin" \ "$P.documents=$pkg.documents" "$P.home=$pkg.home" "$P.agent=$pkg.agent" \ "$P.vr_recovery=$pkg.vr_recovery" "$P.dualscreen=$pkg.dualscreen" "$P.typing=$pkg.typing" \ "$P.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION=$pkg.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION" From 8a37e71e108526a705c10bf756a2b8dae1cd8c70 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 13 Nov 2026 13:15:55 -0500 Subject: [PATCH 5/5] fix(agent): the agent's tools reach the running app's package and live adb port (#2571) --- .../com/droiddeck/launcher/agent/AgentHost.kt | 2 +- .../droiddeck/launcher/agent/AgentSetup.kt | 8 +++++++ .../launcher/agent/AgentBashrcTest.kt | 22 +++++++++++++++++++ tools/agent/setup | 4 +++- 4 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/agent/AgentBashrcTest.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 2c22063f71..63e60f3d5d 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt @@ -382,7 +382,7 @@ object AgentHost { val adb = AgentAdb.prepare(app) val env = listOf( "/usr/bin/env", "HOME=/root", "PATH=$GUEST_PATH", "LANG=C.UTF-8", - "ADB_SERIAL=${adb.serial}", "ADB_VENDOR_KEYS=${adb.vendorKeys}", + "ADB_SERIAL=${adb.serial}", "ADB_VENDOR_KEYS=${adb.vendorKeys}", "DROIDDECK_PACKAGE=${app.packageName}", "DD_AGENT=1", "DD_AGENT_INBOX=${File(app.filesDir, "agent").path}", "BROWSER=/root/.local/bin/android-open", "DD_BROWSER_DISPLAY=${AgentAdb.browserDisplay}", ) val shell = listOf( 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 a5f900d6f5..1ff5475b6e 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt @@ -191,6 +191,14 @@ object AgentSetup { 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)) + unpinAdbSerial(File(root, "root/.bashrc")) + } + + /** Older tools/agent/setup pinned the adb port in .bashrc, which overrides the live port DroidDeck passes. */ + internal fun unpinAdbSerial(bashrc: File) { + val text = runCatching { bashrc.readText() }.getOrNull() ?: return + val fixed = text.replace("ADB_SERIAL=127.0.0.1:5555 ", "ADB_SERIAL=\"\${ADB_SERIAL:-127.0.0.1:5555}\" ") + if (fixed != text) runCatching { bashrc.writeText(fixed) } } private fun copyAsset(app: Context, asset: String, target: File) { diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentBashrcTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentBashrcTest.kt new file mode 100644 index 0000000000..43f900f065 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentBashrcTest.kt @@ -0,0 +1,22 @@ +package com.droiddeck.launcher.agent + +import org.junit.Assert.assertEquals +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder + +class AgentBashrcTest { + @get:Rule val tmp = TemporaryFolder() + + @Test fun aPinnedAdbPortGivesWayToTheLiveOne() { + val bashrc = tmp.newFile(".bashrc") + bashrc.writeText("alias ll='ls -l'\n# droiddeck-agent-path\nexport PATH=\"\$HOME/.local/bin:\$PATH\" ADB_SERIAL=127.0.0.1:5555 BROWSER=\"\$HOME/.local/bin/android-open\"\n") + AgentSetup.unpinAdbSerial(bashrc) + assertEquals( + "alias ll='ls -l'\n# droiddeck-agent-path\nexport PATH=\"\$HOME/.local/bin:\$PATH\" ADB_SERIAL=\"\${ADB_SERIAL:-127.0.0.1:5555}\" BROWSER=\"\$HOME/.local/bin/android-open\"\n", + bashrc.readText(), + ) + AgentSetup.unpinAdbSerial(bashrc) + assertEquals(1, Regex("ADB_SERIAL=").findAll(bashrc.readText()).count()) + } +} diff --git a/tools/agent/setup b/tools/agent/setup index 5c2405d8d6..e3b649db5e 100755 --- a/tools/agent/setup +++ b/tools/agent/setup @@ -16,8 +16,10 @@ command -v claude >/dev/null || [ -x "$HOME/.local/bin/claude" ] || mkdir -p "$HOME/.local/bin" for tool in dd-agent dd-lab-build dd-gh-login android-open; do install -m755 "$here/$tool" "$HOME/.local/bin/$tool"; done +# DroidDeck passes the live loopback adb port; a fixed one here would go stale whenever wireless debugging is toggled. +sed -i 's|ADB_SERIAL=127.0.0.1:5555 |ADB_SERIAL="${ADB_SERIAL:-127.0.0.1:5555}" |' "$HOME/.bashrc" 2>/dev/null || true grep -q 'droiddeck-agent-path' "$HOME/.bashrc" 2>/dev/null || - printf '\n# droiddeck-agent-path\nexport PATH="$HOME/.local/bin:$PATH" ADB_SERIAL=127.0.0.1:5555 BROWSER="$HOME/.local/bin/android-open"\n' >> "$HOME/.bashrc" + printf '\n# droiddeck-agent-path\nexport PATH="$HOME/.local/bin:$PATH" ADB_SERIAL="${ADB_SERIAL:-127.0.0.1:5555}" BROWSER="$HOME/.local/bin/android-open"\n' >> "$HOME/.bashrc" # Google publishes aapt2 for x86-64 Linux only; it runs here under qemu-user with Ubuntu's x86-64 runtime. x86=$HOME/x86root