From 123c431b8eece6146e2e2c191c1652884d33661b Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 18:32:06 -0500 Subject: [PATCH 01/31] feat(ea, ubisoft): cloud saves and a kept Ubisoft Denuvo token (#2824) * feat(ubisoft): keep Denuvo game tokens per account and product until the game invalidates them * feat(ubisoft): sync cloud saves through Ubisoft's cloud save service * fix(xbox): turning cloud saves off passes the offline mode the game save runtime reads * fix(ubisoft): Ubisoft games list their shared prefix, so they get a saves and cloud tab * feat(ea): sync cloud saves through EA's cloud sync service * fix(ea): sync at EA launch and exit, keep one rule snapshot, and check the cloud copy under the write lock * fix(ubisoft): exact slot versions, scoped save export, and a Denuvo cache bound to its account * fix(ea): fresh rules per sync, checksums required, backup before restore, and sign-in shown on the saves tab * fix(ubisoft): launch-time sync on the shared prefix, saves scoped to the game, and Denuvo bound to each launch's account * fix(ea): back up only the saves a restore replaces, refuse truncated manifests, and need a master title id * fix(ubisoft): treat a slot whose bytes changed since the last sync as a conflict before uploading over it * fix(ea): one resolved save folder per sync, refuse case collisions, and walk each folder once * fix(ubisoft): sync only identified slots, keep live saves and backups safe, and tie a pending eviction to its account * fix(cloud): a forced download fetches every saved conflict and keeps the ones it could not write * test(ea): keep the cloud save cases in EaTest * fix(ubisoft): report only written slots, keep drift conflicts, read whole headers, and never rename a named eviction * fix(ea): keep real save folders in the inventory, back up any restored file, refuse duplicate or malformed cloud listings * fix(cloud): commit Ubisoft slots one at a time and stop on a newer cloud write, name skipped and blocked slots, keep unsent conflicts * fix(ubisoft): acknowledge an invalidation only once its marker is published and never serve a kept token after it * fix(cloud): a cloud request the launcher cannot write still starts the game and keeps the exit upload * fix(cloud): scope Ubisoft sync state to the account and product, compare alike slots, keep committed progress, and name partial slots * fix(ea): ask for sign-in after a rejected refresh, upload saves reached through folder aliases * fix(cloud): a launch that stops waiting for the cloud download claims it back, so no save is written once the game starts * fix(ubisoft): name the account in an invalidation marker and never hold the token lock across a pipe write * fix(ea): only invalid_grant asks for sign-in again, and case collisions count only among synced saves * test(epic): let the launcher's ask doubles take the claim flag * fix(ea): apply save rules in their order, match bare patterns inside the save folder, and resolve LocalLow and install folders * fix(ubisoft): stamp a fresh identifier into a new save that has none, so it can sync * fix(ubisoft): answer a burn ticket request as unavailable instead of leaving the game waiting * fix(cloud): read EA manifests with the XML parser, clear conflicts whose sides match, and bound the claim and stall tests --- .../droiddeck/launcher/FrontEndActivity.kt | 4 +- .../droiddeck/launcher/frontend/Library.kt | 1 + .../droiddeck/launcher/session/GameSaves.kt | 44 ++- .../launcher/session/SessionPrefs.kt | 2 + .../droiddeck/launcher/stores/CloudSaves.kt | 311 ++++++++++++++---- .../launcher/stores/CloudTransport.kt | 6 + .../launcher/stores/StoreLaunchRequests.kt | 15 +- .../droiddeck/launcher/stores/ea/EaAuth.kt | 25 +- .../droiddeck/launcher/stores/ea/EaCloud.kt | 265 +++++++++++++++ .../launcher/stores/ea/EaSaveRules.kt | 84 +++++ .../stores/ubisoft/UbisoftActivation.kt | 67 +++- .../launcher/stores/ubisoft/UbisoftCloud.kt | 220 +++++++++++++ .../launcher/stores/ubisoft/UbisoftLaunch.kt | 2 +- .../droiddeck/launcher/ui/FrontEndGames.kt | 6 + .../com/droiddeck/launcher/ui/GameDetail.kt | 24 +- app/src/main/res/values/strings.xml | 2 + app/src/main/rust/stores/src/ubisoft/ffi.rs | 28 ++ .../main/rust/stores/src/ubisoft/service.rs | 45 +++ .../launcher/stores/CloudSavesTest.kt | 211 +++++++++++- .../droiddeck/launcher/stores/ea/EaTest.kt | 187 +++++++++++ .../launcher/stores/ubisoft/MemorySlots.kt | 43 +++ .../launcher/stores/ubisoft/UbisoftTest.kt | 71 ++++ .../droiddeck/launcher/ui/CloudMessageTest.kt | 10 + .../usr/local/bin/droiddeck-store-launch | 61 ++-- .../overlay/usr/local/bin/droiddeck-xbox | 2 +- tools/tests/test_droiddeck_epic.py | 8 +- tools/tests/test_store_launch.py | 109 +++++- tools/tests/test_store_launch_ea.py | 2 +- tools/ubisoft-launcher/src/bridge.rs | 161 +++++++++ tools/ubisoft-launcher/src/launcher.rs | 45 ++- tools/ubisoft-launcher/src/main.rs | 70 +++- 31 files changed, 1999 insertions(+), 132 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ea/EaCloud.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ea/EaSaveRules.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftCloud.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/ubisoft/MemorySlots.kt create mode 100644 tools/ubisoft-launcher/src/bridge.rs diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 284970c9c..a8f165bc4 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1513,7 +1513,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet onComponents = { focusContent -> openComponents(focusContent) }, onGameComponents = { game -> openComponents(gameKey = game.profileKey) }, onComponentsTab = { tab -> openComponents(focusContent = true, tab = tab) }, - onSaveImport = { sg -> importSaves(sg.name) { GameSaves.game(sg) } }, + onSaveImport = { sg -> importSaves(sg.name) { GameSaves.game(this@FrontEndActivity, sg) } }, onAddonImport = { sg, target -> importAddons(sg.name, target) }, onAddonDelete = { target, name -> saveAction(getString(R.string.main_addons_deleting, name)) { @@ -1521,7 +1521,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet getString(R.string.main_addons_deleted, name) } }, - onSaveExport = { sg, layout -> exportSaves(sg.name, layout) { GameSaves.game(sg) } }, + onSaveExport = { sg, layout -> exportSaves(sg.name, layout) { GameSaves.game(this@FrontEndActivity, sg) } }, onPerformance = { refreshCores(); showComponents = false; showMapping = false; showPerformance = true }, performancePanel = { PerformanceHost(embedded = true) }, onRoms = { showRoms = true }, diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt index 7cc805177..26c9c9981 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -293,6 +293,7 @@ object Library { g.steamAppId ?: g.appId.toInt(), g.name, art.portrait ?: art.header, ADDED, g.gameId, hero = art.hero ?: art.header, lastPlayed = maxOf(lastPlayed, recordedPlay(context, g.gameId)), gameFiles = g.folder, protonPrefix = if (g.source == com.droiddeck.launcher.stores.Store.BATTLENET.id) File(com.droiddeck.launcher.runtime.BattleNet.prefix(context), "pfx").takeIf { it.isDirectory } + else if (g.source == com.droiddeck.launcher.stores.Store.UBISOFT.id) File(com.droiddeck.launcher.stores.ubisoft.UbisoftConnect.prefix(context), "pfx").takeIf { it.isDirectory } else protonPrefix(context, g.steamAppId?.toLong() ?: g.appId, libraries = roots), icon = art.icon?.takeIf { it.extension.lowercase() != "ico" }, source = g.source, storeId = g.storeId, diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameSaves.kt b/app/src/main/java/com/droiddeck/launcher/session/GameSaves.kt index 3a31da011..a1491ff85 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameSaves.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameSaves.kt @@ -25,7 +25,7 @@ object GameSaves { fun label(context: Context): String = context.getString(R.string.saves_layout_zip, app) } - data class Game(val game: Library.SteamGame, val prefix: File?, val saves: List) { + data class Game(val game: Library.SteamGame, val prefix: File?, val saves: List, val root: String? = null) { val launched get() = prefix?.let { File(it, "drive_c").isDirectory } == true } @@ -36,7 +36,28 @@ object GameSaves { fun savesDir(): File = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), "DroidDeck/Saves") private fun backupsDir(): File = File(savesDir(), "backups") - fun game(game: Library.SteamGame): Game = Game(game, game.protonPrefix, game.protonPrefix?.let { locate(it, game) } ?: emptyList()) + fun game(context: Context, game: Library.SteamGame): Game { + val root = if (ubisoft(game)) ubisoftRoot(context, game) else null + val saves = game.protonPrefix?.let { prefix -> if (ubisoft(game)) root?.let { ubisoftSaves(prefix, it) }.orEmpty() else locate(prefix, game) }.orEmpty() + return Game(game, game.protonPrefix, saves, root) + } + + fun saves(context: Context, prefix: File, game: Library.SteamGame): List = + if (ubisoft(game)) ubisoftRoot(context, game)?.let { ubisoftSaves(prefix, it) }.orEmpty() else locate(prefix, game) + + private fun ubisoftRoot(context: Context, game: Library.SteamGame): String? { + val product = game.gameFiles?.let { com.droiddeck.launcher.stores.StoreGameSidecar.read(it) }?.extra?.get("productId")?.toLongOrNull() ?: return null + val user = com.droiddeck.launcher.stores.ubisoft.UbisoftAuth.load(context)?.userId + if (user.isNullOrEmpty() || user.contains('/') || user.contains("..")) return null + return "Saved Games/Ubisoft/$user/$product" + } + + private fun ubisoft(game: Library.SteamGame) = game.source == com.droiddeck.launcher.stores.Store.UBISOFT.id + + private fun ubisoftSaves(prefix: File, rel: String): List { + val files = File(profile(prefix), rel).walkTopDown().filter { it.isFile }.toList() + return if (files.isEmpty()) emptyList() else listOf(SaveDir(rel, files.size, files.sumOf { it.length() })) + } private val SAVE_ROOTS = listOf("Documents/My Games", "Saved Games", "AppData/Roaming", "Documents", "AppData/Local", "AppData/LocalLow") @@ -109,9 +130,11 @@ object GameSaves { fun export(context: Context, game: Game, layout: Layout, dir: File): Pair { val prefix = game.prefix ?: error(context.getString(R.string.saves_not_launched, game.game.name)) + val roots = game.saves.map { it.relPath } + if (roots.isEmpty() && ubisoft(game.game)) error(context.getString(R.string.saves_none_found, game.game.name)) dir.mkdirs() val out = File(dir, "${safe(game.game.name)}_${stamp()}.zip") - val count = zipProfile(profile(prefix), game.saves.map { it.relPath }.ifEmpty { null }, layout, out) + val count = zipProfile(profile(prefix), roots.ifEmpty { null }, layout, out) if (count == 0) { out.delete(); error(context.getString(R.string.saves_none_found, game.game.name)) } return out to count } @@ -142,12 +165,21 @@ object GameSaves { if (!driveC.isDirectory) error(context.getString(R.string.saves_not_launched, game.game.name)) if (!looksLikeSaveZip(zip)) error(context.getString(R.string.saves_not_save_zip, zip.name)) + val scoped = if (ubisoft(game.game)) game.root ?: error(context.getString(R.string.saves_none_found, game.game.name)) else null + if (scoped != null) { + val base = File(profile(prefix), scoped).canonicalFile + val eligible = ZipInputStream(BufferedInputStream(zip.inputStream())).use { zis -> + generateSequence { zis.nextEntry }.any { e -> !e.isDirectory && remap(e.name)?.let { File(driveC, it).canonicalFile.path.startsWith(base.path + File.separator) } == true } + } + if (!eligible) error(context.getString(R.string.saves_not_save_zip, zip.name)) + } backupsDir().mkdirs() - val backup = File(backupsDir(), "${safe(game.game.name)}_${stamp()}.zip") - val backedUp = zipProfile(profile(prefix), null, Layout.GAMEHUB, backup) + val backup = File(backupsDir(), "${safe(game.game.name)}_${stamp()}_${System.currentTimeMillis()}.zip") + val backedUp = if (scoped != null && File(profile(prefix), scoped).walkTopDown().none { it.isFile }) 0 + else zipProfile(profile(prefix), scoped?.let(::listOf), Layout.GAMEHUB, backup) if (backedUp == 0) backup.delete() - val base = driveC.canonicalFile + val base = (if (scoped != null) File(profile(prefix), scoped) else driveC).canonicalFile var written = 0 ZipInputStream(BufferedInputStream(zip.inputStream())).use { zis -> var e = zis.nextEntry 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 d0da893c7..ed23e31bc 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -1484,6 +1484,8 @@ object SessionPrefs { (id and 0xFFFFFFFFL) to key.removePrefix("addedAppId:") }.toMap() + fun storeGameFolder(context: Context, key: String): String? = prefs(context).getString("storeFolder:$key", null) + 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/stores/CloudSaves.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt index 45b1be542..c2fd9890d 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt @@ -5,11 +5,20 @@ import android.content.SharedPreferences import android.util.Log import com.droiddeck.launcher.frontend.AddedGames import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.stores.ea.EaAuth +import com.droiddeck.launcher.stores.ea.EaCloud +import com.droiddeck.launcher.stores.ea.EaLibrary +import com.droiddeck.launcher.stores.ea.EaPrefs +import com.droiddeck.launcher.stores.ea.EaSaveRules import com.droiddeck.launcher.stores.epic.EpicApiClient import com.droiddeck.launcher.stores.epic.EpicCredentialStore import com.droiddeck.launcher.stores.epic.EpicPrefs import com.droiddeck.launcher.stores.gog.GogAuth import com.droiddeck.launcher.stores.gog.GogPrefs +import com.droiddeck.launcher.stores.ubisoft.UbisoftAuth +import com.droiddeck.launcher.stores.ubisoft.UbisoftCloud +import com.droiddeck.launcher.stores.ubisoft.UbisoftCloudTransport +import com.droiddeck.launcher.stores.ubisoft.UbisoftConnect import java.io.File import java.net.HttpURLConnection import java.net.URL @@ -32,19 +41,27 @@ object CloudSaves { if (detail.isNotEmpty()) " detail=\"$detail\"" else "" } - class Status(val supported: Boolean, val folder: File?, val lastSync: Long, val reason: String, val conflicts: List = emptyList()) + class Status(val supported: Boolean, val folder: File?, val lastSync: Long, val reason: String, val conflicts: List = emptyList(), val signedIn: Boolean = true) - private fun game(context: Context, store: Store, id: String): Pair? = - StoreInstallRoot.gameFolders(context).firstNotNullOfOrNull { f -> - StoreGameSidecar.read(f)?.takeIf { it.store == store && it.id == id && it.isInstalled }?.let { f to it } - } + private fun game(context: Context, store: Store, id: String): Pair? { + fun match(f: File) = StoreGameSidecar.read(f)?.takeIf { it.store == store && it.id == id && it.isInstalled }?.let { f to it } + return StoreInstallRoot.gameFolders(context).firstNotNullOfOrNull(::match) + ?: if (store != Store.UBISOFT) null + else com.droiddeck.launcher.session.SessionPrefs.storeGameFolder(context, "${store.id}:$id")?.let { match(File(it)) } + } + + fun supports(store: Store?): Boolean = store == Store.GOG || store == Store.EPIC || store == Store.EA || store == Store.UBISOFT fun prefix(context: Context, folder: File): File? { val appId = AddedGames.scan(context).firstOrNull { it.folder.absolutePath == folder.absolutePath }?.appId ?: return null return Library.protonPrefix(context, appId and 0xFFFFFFFFL) } - private fun prefs(context: Context, store: Store) = if (store == Store.GOG) GogPrefs.get(context) else EpicPrefs.get(context) + private fun prefs(context: Context, store: Store) = when (store) { + Store.GOG -> GogPrefs.get(context) + Store.EA -> EaPrefs.get(context) + else -> EpicPrefs.get(context) + } fun lastSync(context: Context, store: Store, id: String): Long = prefs(context, store).getLong("cloud_sync_$id", 0L) @@ -52,6 +69,7 @@ object CloudSaves { private const val TEMPLATE_NONE = "none" + private const val UBISOFT_TEMPLATE = "ubisoft" internal const val TEMPLATE_NONE_TTL_MS = 24 * 60 * 60 * 1000L internal fun noneTemplateIsCurrent(storedAtMs: Long, nowMs: Long) = @@ -64,6 +82,10 @@ object CloudSaves { fun template(context: Context, store: Store, id: String, folder: File, sidecar: StoreGameSidecar): String? { val p = prefs(context, store) + if (store == Store.EA) eaRules(context, id)?.let { fresh -> + if (fresh.isEmpty()) rememberNoCloud(p, id) else p.edit().putString("cloud_template_$id", fresh).remove("cloud_template_at_$id").apply() + return fresh + } var retryNone = false if (p.contains("cloud_template_$id")) { val cached = p.getString("cloud_template_$id", "") ?: "" @@ -89,7 +111,9 @@ object CloudSaves { val item = sidecar.extra["catalogItemId"].orEmpty() if (ns.isEmpty() || item.isEmpty()) "" else EpicApiClient.getCustomAttribute(token, ns, item, "CloudSaveFolder") } - Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT, Store.ROCKSTAR -> "" + Store.UBISOFT -> UBISOFT_TEMPLATE + Store.EA -> eaRules(context, id) ?: return null + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.ROCKSTAR -> "" } ?: return null p.edit() .putString("cloud_template_$id", fetched.ifEmpty { TEMPLATE_NONE }) @@ -146,18 +170,25 @@ object CloudSaves { val (folder, sidecar) = game(context, store, id) ?: return null to "not-installed" val template = template(context, store, id, folder, sidecar) ?: return null to "store-unreachable" if (template.isEmpty()) return null to "no-cloud-saves" + if (store == Store.UBISOFT) { + val user = UbisoftAuth.load(context)?.userId?.takeIf { it.isNotEmpty() } ?: return null to "not-signed-in" + val product = sidecar.extra["productId"]?.toLongOrNull() ?: return null to "unresolved" + return File(UbisoftConnect.prefix(context), "pfx/drive_c/users/steamuser/Saved Games/Ubisoft/$user/$product") to "ok" + } val pfx = prefix(context, folder) ?: return null to "no-prefix" val dir = when (store) { Store.GOG -> CloudSavePaths.gog(template, pfx, folder) Store.EPIC -> CloudSavePaths.epic(template, pfx, folder, EpicCredentialStore.load(context)?.accountId.orEmpty(), id) - Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT, Store.ROCKSTAR -> null + Store.EA -> if (sidecar.extra["masterTitleId"].isNullOrEmpty()) null + else EaSaveRules.parse(template)?.base()?.let(EaSaveRules::template)?.let { CloudSavePaths.gog(it, pfx, folder) } + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.UBISOFT, Store.ROCKSTAR -> null } return dir to (if (dir == null) "unresolved" else "ok") } fun status(context: Context, store: Store, id: String): Status { val (dir, reason) = saveFolder(context, store, id) - return Status(reason != "no-cloud-saves" && reason != "not-installed", dir, lastSync(context, store, id), reason, conflicts(context, store, id)) + return Status(reason != "no-cloud-saves" && reason != "not-installed", dir, lastSync(context, store, id), reason, conflicts(context, store, id, dir), signedIn(context, store)) } @@ -175,7 +206,33 @@ object CloudSaves { val account = EpicCredentialStore.load(context)?.accountId.orEmpty() if (token == null || account.isEmpty()) null else EpicCloud(account, id, token) } - Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT, Store.ROCKSTAR -> null + Store.UBISOFT -> { + val session = UbisoftAuth.current(context) + val product = StoreGameSidecar.read(folder)?.extra?.get("productId")?.toLongOrNull() + if (session == null || product == null) null else UbisoftCloudTransport(UbisoftCloud(session, product), session.userId) + } + Store.EA -> { + val sidecar = StoreGameSidecar.read(folder) + val rules = sidecar?.let { template(context, store, id, folder, it) }?.let(EaSaveRules::parse) + val base = rules?.base() + val token = EaAuth.accessToken(context) + val uid = EaAuth.load(context)?.userId.orEmpty() + val master = sidecar?.extra?.get("masterTitleId").orEmpty() + if (rules == null || base == null || token == null || uid.isEmpty() || master.isEmpty()) null + else EaCloud(token, uid, EaCloud.keys(master, sidecar?.extra?.get("multiplayerId").orEmpty()), base, rules, saveFolder(context, store, id).first) + } + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.ROCKSTAR -> null + } + + private fun signedIn(context: Context, store: Store): Boolean = when (store) { + Store.EA -> EaAuth.signedIn(context) + else -> true + } + + private fun eaRules(context: Context, id: String): String? { + val games = EaLibrary.cached(context) + if (games.isEmpty()) return null + return games.firstOrNull { it.offerId == id }?.cloudSaves.orEmpty() } private fun gogScopedToken(context: Context, id: String, clientId: String): String? { @@ -184,11 +241,15 @@ object CloudSaves { } - private fun baseline(context: Context, store: Store, id: String): Map? = - CloudPlan.fromJson(prefs(context, store).getString("cloud_baseline_$id", null)) + /** Ubisoft saves belong to an account and product, so their sync state is kept per save folder. */ + internal fun scope(store: Store, id: String, dir: File): String = + if (store == Store.UBISOFT) "$id:${dir.parentFile?.name.orEmpty()}:${dir.name}" else id - private fun saveBaseline(context: Context, store: Store, id: String, b: Map) = - prefs(context, store).edit().putString("cloud_baseline_$id", CloudPlan.toJson(b)).apply() + internal fun baseline(context: Context, store: Store, key: String): Map? = + CloudPlan.fromJson(prefs(context, store).getString("cloud_baseline_$key", null)) + + private fun saveBaseline(context: Context, store: Store, key: String, b: Map) = + prefs(context, store).edit().putString("cloud_baseline_$key", CloudPlan.toJson(b)).apply() internal class Migration(val baseline: Map, val moved: Int, val cleaned: Int, val failed: Int) @@ -260,30 +321,45 @@ object CloudSaves { if (result == null || result.failed == 0) p.edit().putInt("cloud_layout_$id", CLOUD_LAYOUT).apply() } - fun conflicts(context: Context, store: Store, id: String): List = - prefs(context, store).getString("cloud_conflicts_$id", "").orEmpty().split('\n').filter { it.isNotEmpty() } + fun conflicts(context: Context, store: Store, id: String, dir: File? = null): List = + if (store == Store.UBISOFT && dir == null) emptyList() else savedConflicts(context, store, dir?.let { scope(store, id, it) } ?: id) - private fun saveConflicts(context: Context, store: Store, id: String, names: Collection) = - prefs(context, store).edit().putString("cloud_conflicts_$id", names.joinToString("\n")).apply() + private fun savedConflicts(context: Context, store: Store, key: String): List = + prefs(context, store).getString("cloud_conflicts_$key", "").orEmpty().split('\n').filter { it.isNotEmpty() } - fun download(context: Context, store: Store, id: String, force: Boolean = false): Result = - sync(context, store, id, "down") { dir, cloud -> downWith(context, store, id, dir, cloud, force) } + private fun saveConflicts(context: Context, store: Store, key: String, names: Collection) = + prefs(context, store).edit().putString("cloud_conflicts_$key", names.joinToString("\n")).apply() + + private fun alike(cloud: CloudTransport, conflicts: List, local: Map, remote: Map): List = + if (cloud.contentDigests) emptyList() + else conflicts.filter { name -> + val r = remote[name] ?: return@filter false + val l = local[name] ?: return@filter false + runCatching { md5(cloud.get(r).first) }.getOrNull()?.equals(l.md5, ignoreCase = true) == true + } + + private fun settled(plan: CloudPlan.Plan, alike: List): CloudPlan.Plan = + if (alike.isEmpty()) plan else CloudPlan.Plan(plan.transfer, plan.conflicts - alike.toSet(), plan.same + alike, plan.refused) + + fun download(context: Context, store: Store, id: String, force: Boolean = false, claim: () -> Boolean = { true }): Result = + sync(context, store, id, "down") { dir, cloud -> downWith(context, store, id, dir, cloud, force, claim) } fun upload(context: Context, store: Store, id: String, force: Boolean = false): Result = sync(context, store, id, "up") { dir, cloud -> upWith(context, store, id, dir, cloud, force) } - fun downloadOrDefer(context: Context, store: Store, id: String): Result = - downloadOrDefer(context, store, id, Executor { Thread(it, "cloud-deferred").start() }) + fun downloadOrDefer(context: Context, store: Store, id: String, claim: () -> Boolean): Result = + downloadOrDefer(context, store, id, Executor { Thread(it, "cloud-deferred").start() }, claim) - internal fun downloadOrDefer(context: Context, store: Store, id: String, executor: Executor): Result { + internal fun downloadOrDefer(context: Context, store: Store, id: String, executor: Executor, claim: () -> Boolean = { true }): Result { val app = context.applicationContext val g = game(app, store, id) ?: return done(store, id, "down", Result("skipped", 0, 0, "not-installed")) if (!g.second.cloud) return done(store, id, "down", Result("skipped", 0, 0, "off")) - if (prefix(app, g.first)?.let { CloudSavePaths.profile(it).isDirectory } == true) return download(app, store, id) + val ready = { (if (store == Store.UBISOFT) File(UbisoftConnect.prefix(app), "pfx") else prefix(app, g.first))?.let { CloudSavePaths.profile(it).isDirectory } == true } + if (ready()) return download(app, store, id, claim = claim) executor.execute { val end = System.currentTimeMillis() + PREFIX_WAIT_MS while (System.currentTimeMillis() < end) { - if (prefix(app, g.first)?.let { CloudSavePaths.profile(it).isDirectory } == true) { download(app, store, id); return@execute } + if (ready()) { download(app, store, id); return@execute } Thread.sleep(2000) } done(store, id, "down", Result("skipped", 0, 0, "no-prefix")) @@ -304,8 +380,12 @@ object CloudSaves { if (dir != null && store == Store.GOG) migrateGogNested(context, id, g.first, dir) val cloud = if (dir != null) transport(context, store, id, g.first) else null when { + cloud is UbisoftCloudTransport && dir?.parentFile?.name != cloud.user -> Result("skipped", 0, 0, "account-changed") dir == null -> Result("skipped", 0, 0, reason) + cloud == null && store == Store.EA && signedIn(context, store) -> Result("failed", 0, 0, "sign-in-unreachable") cloud == null -> Result("skipped", 0, 0, "not-signed-in") + cloud is EaCloud && cloud.localDir?.canonicalPath != dir.canonicalPath -> Result("skipped", 0, 0, "rules-changed") + cloud is EaCloud && caseCollision(localFiles(dir).keys, cloud::wants) -> Result("failed", 0, 0, "case-collision") else -> body(dir, cloud).also { if (it.result == "ok") markSynced(context, store, id) } } } @@ -319,15 +399,32 @@ object CloudSaves { return done(store, id, way, result) } + internal fun caseCollision(names: Collection, wants: (String) -> Boolean): Boolean = + names.filter(wants).groupBy { it.lowercase() }.any { it.value.size > 1 } + private fun done(store: Store, id: String, way: String, r: Result): Result { Log.i(TAG, "cloud ${store.id} $id $way ${r.line}") StoresState.logLine("cloud ${store.id} $id $way ${r.line}") return r } - private fun localFiles(dir: File): Map = - if (!dir.isDirectory) emptyMap() - else dir.walkTopDown().filter { it.isFile }.associateBy { it.relativeTo(dir).path.replace(File.separatorChar, '/') } + private fun localFiles(dir: File): Map { + if (!dir.isDirectory) return emptyMap() + val root = runCatching { dir.toPath().toRealPath() }.getOrNull() ?: return emptyMap() + val found = LinkedHashMap() + fun walk(d: File, prefix: String, ancestry: Set) { + for (child in d.listFiles().orEmpty()) { + val real = runCatching { child.toPath().toRealPath() }.getOrNull() ?: continue + if (!real.startsWith(root)) continue + val name = prefix + child.name + if (child.isDirectory) { + if (real !in ancestry) walk(child, "$name/", ancestry + real) + } else if (child.isFile) found[name] = child + } + } + walk(dir, "", setOf(root)) + return found + } internal fun md5(f: File): String = md5(f.readBytes()) @@ -341,46 +438,85 @@ object CloudSaves { return files.associateBy { it.name } } - internal fun downWith(context: Context, store: Store, id: String, dir: File, cloud: CloudTransport, force: Boolean): Result { - val files = localFiles(dir) + internal fun downWith(context: Context, store: Store, id: String, dir: File, cloud: CloudTransport, force: Boolean, claim: () -> Boolean = { true }): Result { + val files = localFiles(dir).filterKeys(cloud::wants) val remote = remote(cloud) { it in files } val local = files.mapValues { CloudPlan.Local(md5(it.value)) } - val base = baseline(context, store, id) - val plan = CloudPlan.down(local, remote.mapValues { CloudPlan.Remote(it.value.md5, it.value.modifiedMs) }, base) - val take = if (force) plan.transfer + plan.conflicts else plan.transfer - if (take.isNotEmpty() && files.isNotEmpty()) backup(context, store, id, dir, "local") + val key = scope(store, id, dir) + val base = baseline(context, store, key) + val planned = CloudPlan.down(local, remote.mapValues { CloudPlan.Remote(it.value.md5, it.value.modifiedMs) }, base) + val alike = alike(cloud, planned.conflicts, local, remote) + val plan = settled(planned, alike) + val saved = savedConflicts(context, store, key).filter { it in remote && it !in alike && it !in plan.same } + val take = if (force) (plan.transfer + plan.conflicts + saved).distinct() else plan.transfer val next = HashMap(base.orEmpty()) var bytes = 0L + val written = HashSet() + val changed = ArrayList() + val blocked = ArrayList() + val fetched = LinkedHashMap>>() for (name in take) { val f = remote[name] ?: continue - val (data, modified) = cloud.get(f) + if (!File(dir, name).canonicalPath.startsWith(dir.canonicalPath + File.separator)) { blocked += name; continue } + fetched[name] = f to cloud.get(f) + } + if (fetched.isNotEmpty() && !claim()) return Result("skipped", 0, 0, "launch-moved-on") + val replaced = fetched.keys.mapNotNull { name -> files[name] ?: File(dir, name).takeIf { it.isFile } } + if (!backupReplaced(context, store, id, dir, replaced)) return Result("failed", 0, 0, "backup-failed") + for ((name, got) in fetched) { + val (f, content) = got + val (data, modified) = content val dest = File(dir, name) - if (!dest.canonicalPath.startsWith(dir.canonicalPath + File.separator)) continue + if ((if (dest.isFile) md5(dest) else null) != local[name]?.md5) { changed += name; continue } dest.parentFile?.mkdirs() dest.writeBytes(data) if (modified > 0) dest.setLastModified(modified) bytes += data.size + written += name next[name] = CloudPlan.Entry(md5(data), f.md5, if (modified > 0) modified else f.modifiedMs) } for (name in plan.same) remote[name]?.let { r -> next[name] = CloudPlan.Entry(local.getValue(name).md5, r.md5, r.modifiedMs) } - saveBaseline(context, store, id, next) - val left = if (force) emptyList() else plan.conflicts - saveConflicts(context, store, id, left) - return Result("ok", take.size, bytes, if (take.isEmpty()) "up-to-date" else "downloaded", left.size) + saveBaseline(context, store, key, next) + val left = (if (force) take.filter { it !in written } else plan.conflicts + saved.filter { it !in written } + changed) + .filter { it !in blocked }.distinct() + saveConflicts(context, store, key, left) + val reason = when { + take.isEmpty() -> "up-to-date" + changed.isNotEmpty() -> "changed-locally" + blocked.isNotEmpty() -> "blocked-path" + else -> "downloaded" + } + val detail = listOfNotNull( + changed.takeIf { it.isNotEmpty() }?.joinToString(prefix = "changed locally: "), + blocked.takeIf { it.isNotEmpty() }?.joinToString(prefix = "outside the save folder: "), + ).joinToString("; ") + return Result(if (written.size < take.size) "partial" else "ok", written.size, bytes, reason, left.size, detail) } internal fun upWith(context: Context, store: Store, id: String, dir: File, cloud: CloudTransport, force: Boolean): Result { - val base = baseline(context, store, id) ?: return Result("skipped", 0, 0, "no-baseline") - val files = localFiles(dir) + val key = scope(store, id, dir) + val base = baseline(context, store, key) ?: return Result("skipped", 0, 0, "no-baseline") + val files = localFiles(dir).filterKeys(cloud::wants).let { all -> if (cloud is UbisoftCloudTransport) all.filterValues(::markUbisoftSave) else all } if (files.isEmpty()) return Result("skipped", 0, 0, "nothing-local") val remote = remote(cloud) { it in files } val local = files.mapValues { CloudPlan.Local(md5(it.value)) } - val plan = CloudPlan.up(local, remote.mapValues { CloudPlan.Remote(it.value.md5, it.value.modifiedMs) }, base) - val send = CloudPlan.upSend(plan, force, cloud is GogCloud, files.keys) + val planned = CloudPlan.up(local, remote.mapValues { CloudPlan.Remote(it.value.md5, it.value.modifiedMs) }, base) + val alike = alike(cloud, planned.conflicts, local, remote) + val plan = settled(planned, alike) + val saved = savedConflicts(context, store, key).filter { it !in alike && it !in plan.same } + var send = CloudPlan.upSend(plan, force, cloud is GogCloud, files.keys) val next = HashMap(base) for (name in plan.same) remote[name]?.let { r -> next[name] = CloudPlan.Entry(local.getValue(name).md5, r.md5, r.modifiedMs) } + var drifted = emptyList() + var raced = emptyList() + if (send.isNotEmpty()) { + val copies = backupCloud(context, store, id, cloud, send.mapNotNull { remote[it] }) + if (cloud is UbisoftCloudTransport && !force) { + drifted = send.filter { name -> val synced = base[name]?.localMd5; synced != null && copies[name]?.let { it != synced } == true } + send = send - drifted.toSet() + } + } if (send.isNotEmpty()) { - backupCloud(context, store, id, cloud, send.mapNotNull { remote[it] }) val stamped = HashMap() val sentMd5 = HashMap() if (cloud is GogCloud) { @@ -394,19 +530,40 @@ object CloudSaves { } else { val data = send.associateWith { files.getValue(it).readBytes() } for ((name, bytes) in data) sentMd5[name] = md5(bytes) - stamped += cloud.put(data, send.associateWith { files.getValue(it).lastModified() }) + stamped += try { + cloud.put(data, send.associateWith { files.getValue(it).lastModified() }) + } catch (e: CloudChanged) { + raced = e.unsent + e.sent + } catch (e: Exception) { + val kept = send.mapNotNull { name -> cloud.committed(name)?.let { name to it } } + if (kept.isNotEmpty()) { + for ((name, r) in kept) next[name] = CloudPlan.Entry(sentMd5.getValue(name), r.md5, r.modifiedMs) + saveBaseline(context, store, key, next) + saveConflicts(context, store, key, saved - kept.map { it.first }.toSet()) + } + throw e + } + send = send.filter { it in stamped } for ((name, t) in stamped) if (t > 0) files[name]?.setLastModified(t) } - val after = remote(cloud) { it in send } + val after = if (send.all { cloud.committed(it) != null }) emptyMap() else remote(cloud) { it in send && cloud.committed(it) == null } for (name in send) { - val r = after[name] + val r = cloud.committed(name) ?: after[name] next[name] = CloudPlan.Entry(sentMd5.getValue(name), r?.md5, r?.modifiedMs ?: stamped[name] ?: -1L) } } - saveBaseline(context, store, id, next) - val left = if (force) emptyList() else plan.conflicts - saveConflicts(context, store, id, left) - return Result("ok", send.size, send.sumOf { files.getValue(it).length() }, if (send.isEmpty()) "up-to-date" else "uploaded", left.size) + saveBaseline(context, store, key, next) + val left = (if (force) (plan.conflicts + saved).filter { it !in send } + raced + else plan.conflicts + drifted + raced + saved.filter { it !in send && it in files }).distinct() + saveConflicts(context, store, key, left) + val reason = when { + raced.isNotEmpty() -> "changed-in-cloud" + send.isEmpty() -> "up-to-date" + else -> "uploaded" + } + return Result(if (raced.isEmpty()) "ok" else "partial", send.size, send.sumOf { files.getValue(it).length() }, reason, left.size, + if (raced.isEmpty()) "" else raced.joinToString(prefix = "changed in the cloud: ")) } @@ -441,23 +598,59 @@ object CloudSaves { private fun backupRoot(context: Context, store: Store, id: String) = File(context.filesDir, "stores/cloud-backups/${store.id}-${id.replace(Regex("[^A-Za-z0-9._-]"), "_")}") - private fun backup(context: Context, store: Store, id: String, dir: File, kind: String) { - val root = backupRoot(context, store, id) - runCatching { dir.copyRecursively(File(root, "$kind-${System.currentTimeMillis()}"), overwrite = true) } - prune(root, kind) + private fun markUbisoftSave(file: File): Boolean { + val head = ByteArray(40) + var filled = 0 + file.inputStream().use { input -> + while (filled < head.size) { + val n = input.read(head, filled, head.size - filled) + if (n < 0) break + filled += n + } + } + if (filled < head.size) return false + if (UbisoftCloud.mark(head) != null) return true + if (head.copyOfRange(8, 40).any { it != 0.toByte() }) return false + java.io.RandomAccessFile(file, "rw").use { it.seek(8); it.write(UbisoftCloud.freshMark().toByteArray(Charsets.ISO_8859_1)) } + return true } - private fun backupCloud(context: Context, store: Store, id: String, cloud: CloudTransport, files: List) { - if (files.isEmpty()) return + private fun backupCloud(context: Context, store: Store, id: String, cloud: CloudTransport, files: List): Map { + if (files.isEmpty()) return emptyMap() val root = backupRoot(context, store, id) val target = File(root, "cloud-${System.currentTimeMillis()}") + val copies = HashMap() for (f in files) { val dest = File(target, f.name) if (!dest.canonicalPath.startsWith(target.canonicalPath + File.separator)) continue dest.parentFile?.mkdirs() - dest.writeBytes(cloud.get(f).first) + val data = cloud.get(f).first + dest.writeBytes(data) + copies[f.name] = md5(data) } prune(root, "cloud") + return copies + } + + private fun backupReplaced(context: Context, store: Store, id: String, dir: File, replaced: List): Boolean { + if (replaced.isEmpty()) return true + val base = runCatching { dir.canonicalPath + File.separator }.getOrNull() ?: return false + val root = backupRoot(context, store, id) + val stamp = "${System.currentTimeMillis()}-${java.util.UUID.randomUUID().toString().take(8)}" + val staging = File(root, "staging-$stamp") + val copied = runCatching { + for (f in replaced) { + check(f.canonicalPath.startsWith(base)) + f.copyTo(File(staging, f.relativeTo(dir).path), overwrite = true) + } + check(staging.renameTo(File(root, "local-$stamp"))) + }.isSuccess + if (!copied) { + staging.deleteRecursively() + return false + } + prune(root, "local") + return true } private fun prune(root: File, kind: String) { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt index 2971bb61c..9e0ad9919 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt @@ -27,6 +27,10 @@ class CloudFile(val name: String, var modifiedMs: Long, var md5: String? = null, class CloudPut(val modifiedMs: Long, val md5: String?) interface CloudTransport { + /** False when [CloudFile.md5] is a version the service assigns rather than a digest of the content. */ + val contentDigests: Boolean get() = true + fun committed(name: String): CloudFile? = null + fun wants(name: String): Boolean = true fun list(): List fun details(file: CloudFile) {} fun get(file: CloudFile): Pair @@ -182,6 +186,8 @@ internal fun isoDate(s: String?): Long { class NoCloudSaves : Exception("no cloud saves") +class CloudChanged(val sent: Map, val unsent: List) : Exception("cloud saves changed since they were read") + internal fun splitGogName(name: String): Pair { val slash = name.indexOf('/') return if (slash <= 0 || slash == name.length - 1) null to name diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt index 9ec0dad5f..cc231dfcb 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt @@ -46,11 +46,18 @@ object StoreLaunchRequests { } private fun answer(app: Context, file: File) { + val resp = File(dir(app), "resp").apply { mkdirs() } + val rid = file.name.removeSuffix(".json") + val taken = File(resp, "$rid.taken") + val writing = File(resp, "$rid.writing") + if (!file.renameTo(taken)) return val request = try { - JSONObject(file.readText()).also { file.delete() } + JSONObject(taken.readText()) } catch (e: Exception) { + taken.delete() return } + val claim = { taken.renameTo(writing) } val reply = when (request.optString("op")) { "xbox-released" -> { com.droiddeck.launcher.stores.xbox.XboxRuntime.released(request.optString("lease")) @@ -108,7 +115,7 @@ object StoreLaunchRequests { else { lastLaunched = store to id CloudSaves.markDirty(app, store, id) - CloudSaves.downloadOrDefer(app, store, id).let { JSONObject().put("ok", it.ok).put("result", it.result).put("files", it.files).put("reason", it.reason) } + CloudSaves.downloadOrDefer(app, store, id, claim).let { JSONObject().put("ok", it.ok).put("result", it.result).put("files", it.files).put("reason", it.reason) } } } "cloud-up" -> { @@ -167,12 +174,14 @@ object StoreLaunchRequests { else -> JSONObject().put("ok", false).put("reason", "unknown-op") } try { - val resp = File(dir(app), "resp").apply { mkdirs() } val tmp = File(resp, file.name + ".tmp") tmp.writeText(reply.toString()) tmp.renameTo(File(resp, file.name)) } catch (e: Exception) { Log.w(TAG, "could not answer ${file.name}: ${e.message}") + } finally { + taken.delete() + writing.delete() } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaAuth.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaAuth.kt index 67fb8e655..a600c905b 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaAuth.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaAuth.kt @@ -17,7 +17,7 @@ object EaAuth { const val CLIENT_ID = "JUNO_PC_CLIENT" private const val CLIENT_SECRET = "4mRLtYMb6vq9qglomWEaT4ChxsXWcyqbQpuBNfMPOYOiDmYYQmjuaBsF2Zp0RyVeWkfqhE9TuGgAw7te" const val AUTH_URL = "https://accounts.ea.com/connect/auth" - private const val TOKEN_URL = "https://accounts.ea.com/connect/token" + internal var tokenUrl = "https://accounts.ea.com/connect/token" const val REDIRECT = "qrc:///html/login_successful.html" private const val REFRESH_MARGIN_MS = 5 * 60 * 1000L private val refreshLock = Any() @@ -41,8 +41,11 @@ object EaAuth { val personaId: String, val displayName: String, val eaId: String, + val rejected: Boolean = false, ) + private class Rejected(message: String) : IllegalStateException(message) + class Pending(val url: String, val verifier: String) internal fun fromJson(o: JSONObject): Account? { @@ -55,6 +58,7 @@ object EaAuth { personaId = o.optString("persona_id"), displayName = o.optString("display_name"), eaId = o.optString("ea_id"), + rejected = o.optBoolean("refresh_rejected"), ) } @@ -122,14 +126,15 @@ object EaAuth { private fun tokenCall(values: List>): JSONObject { val reply = EaHttp.request( - TOKEN_URL, "POST", + tokenUrl, "POST", mapOf("Content-Type" to "application/x-www-form-urlencoded"), EaHttp.form(values + listOf("client_id" to CLIENT_ID, "client_secret" to CLIENT_SECRET)).toByteArray(), follow = false, ) val json = runCatching { JSONObject(reply.text) }.getOrNull() if (!reply.ok || json == null || json.optString("access_token").isEmpty()) { - throw IllegalStateException("EA token request failed (${reply.status}): ${json?.optString("error_description")?.ifEmpty { json.optString("error") } ?: ""}") + val message = "EA token request failed (${reply.status}): ${json?.optString("error_description")?.ifEmpty { json.optString("error") } ?: ""}" + throw if (json?.optString("error") == "invalid_grant") Rejected(message) else IllegalStateException(message) } return json } @@ -162,6 +167,7 @@ object EaAuth { tokenCall(listOf("grant_type" to "refresh_token", "refresh_token" to a.refreshToken)) } catch (e: Exception) { Log.w(TAG, "refresh: ${e.message}") + if (e is Rejected) markRejected(context, a.refreshToken) return null } val access = token.getString("access_token") @@ -176,11 +182,24 @@ object EaAuth { val record = StoreAccounts.read(app, Store.EA) ?: return false record.put("access_token", access).put("expires_at", System.currentTimeMillis() + expiresIn * 1000) refresh.takeIf { it.isNotEmpty() }?.let { record.put("refresh_token", it) } + record.remove("refresh_rejected") player?.let { record.put("user_id", it.userId).put("persona_id", it.personaId).put("display_name", it.displayName).put("ea_id", it.eaId) } StoreAccounts.write(app, Store.EA, record) true } + private fun markRejected(context: Context, refresh: String) = synchronized(refreshLock) { + val app = context.applicationContext + val record = StoreAccounts.read(app, Store.EA) ?: return@synchronized + if (record.optString("refresh_token") != refresh) return@synchronized + StoreAccounts.write(app, Store.EA, record.put("refresh_rejected", true)) + } + + fun signedIn(context: Context): Boolean { + val a = load(context) ?: return false + return a.userId.isNotEmpty() && !(a.rejected && a.expiresAt <= System.currentTimeMillis()) + } + fun accessToken(context: Context): String? { val current = load(context) ?: return null if (fresh(current)) return current.accessToken diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaCloud.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaCloud.kt new file mode 100644 index 000000000..6c5242474 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaCloud.kt @@ -0,0 +1,265 @@ +package com.droiddeck.launcher.stores.ea + +import android.util.Base64 +import android.util.Xml +import com.droiddeck.launcher.stores.CloudFile +import com.droiddeck.launcher.stores.CloudTransport +import java.io.File +import java.io.StringReader +import java.security.MessageDigest +import java.time.Instant +import org.xmlpull.v1.XmlPullParser + +internal class EaCloud( + private val token: String, + private val uid: String, + private val keys: List, + private val base: String, + private val rules: EaSaveRules, + val localDir: File? = null, +) : CloudTransport { + class Entry(val size: Long, val href: String, val md5: String, val created: String, val modified: String, val localName: String) + + class Manifest(val lineage: String, val files: List, val snapshots: List) + + private class Signed(val url: String, val headers: Map) + + private class Request(val verb: String, val resource: String, val md5: String? = null, val type: String? = null) + + private var key: String? = null + private var found = false + private var listed: Map? = null + private val committed = HashMap() + + override fun wants(name: String): Boolean = rules.matches(base + name) + + override fun committed(name: String): CloudFile? = committed[name] + + override fun list(): List { + val manifest = pick() + val files = manifest?.files.orEmpty().mapNotNull { e -> + val path = EaSaveRules.normalize(e.localName) + if (!path.startsWith(base, ignoreCase = true) || !rules.matches(path)) return@mapNotNull null + val md5 = hex(e.md5) ?: error("EA listed ${path.substring(base.length)} without a valid checksum") + CloudFile(localName(path.substring(base.length)), parseTime(e.modified), md5, readLink = e.href) + } + val twins = files.groupBy { it.name.lowercase() }.values.firstOrNull { it.size > 1 } + check(twins == null) { "EA lists more than one save named ${twins!!.first().name} in different cases" } + listed = files.associate { it.name.lowercase() to it.md5 } + return files + } + + private fun localName(name: String): String { + var dir = localDir ?: return name + val parts = name.split('/') + val out = ArrayList() + for (part in parts) { + val match = dir.listFiles()?.filter { it.name.equals(part, ignoreCase = true) }.orEmpty() + check(match.size <= 1) { "The save folder holds more than one file named $part in different cases" } + val pick = match.singleOrNull() + if (pick == null) return (out + parts.drop(out.size)).joinToString("/") + out += pick.name + dir = pick + } + return out.joinToString("/") + } + + override fun get(file: CloudFile): Pair { + val href = file.readLink ?: error("EA has no data for ${file.name}") + return locked("read", key ?: keys.first()) { lock, _ -> + val signed = authorize(lock, listOf(Request("GET", href))).single() + val reply = EaHttp.request(signed.url, headers = signed.headers) + check(reply.ok) { "EA cloud save download answered ${reply.status}" } + val want = file.md5 ?: error("EA listed ${file.name} without a valid checksum") + check(hex(b64(md5(reply.body))) == want) { "EA cloud save ${file.name} failed its checksum" } + reply.body to file.modifiedMs + } + } + + override fun put(files: Map, modifiedMs: Map): Map { + if (key == null) pick() + check(found || keys.size == 1) { "EA has no cloud save record for this game yet; play it once in the EA app" } + val target = key ?: keys.first() + val seen = listed + return locked("write", target) { lock, body -> + val locked = manifestUrl(body)?.let { fetchManifest(it) } + check(locked != null || !found) { "EA's cloud save record disappeared" } + val current = locked ?: Manifest("{00000000-0000-0000-0000-000000000000}", emptyList(), emptyList()) + if (seen != null) for (name in files.keys) { + val entry = current.files.firstOrNull { EaSaveRules.normalize(it.localName).equals(base + name, ignoreCase = true) } + val now = entry?.let { hex(it.md5) ?: error("EA lists $name without a valid checksum") } + check(now == seen[name.lowercase()]) { "EA's cloud saves changed since they were read" } + } + val now = System.currentTimeMillis() + val added = files.map { (name, data) -> + val sum = md5(data) + val stamp = stamp(modifiedMs[name]?.takeIf { it > 0 } ?: now) + val old = current.files.firstOrNull { EaSaveRules.normalize(it.localName).equals(base + name, ignoreCase = true) } + Entry(data.size.toLong(), "content/${data.size}-${hexOf(sum)}", b64(sum), old?.created ?: stamp, stamp, base + name) to data + } + val names = added.map { it.first.localName.lowercase() }.toSet() + val next = Manifest(current.lineage, current.files.filter { EaSaveRules.normalize(it.localName).lowercase() !in names } + added.map { it.first }, current.snapshots) + val xml = write(next).toByteArray() + val xmlMd5 = b64(md5(xml)) + val requests = added.map { Request("PUT", it.first.href, it.first.md5, "application/octet-stream") } + Request("PUT", "manifest.xml", xmlMd5, "text/xml") + val signed = authorize(lock, requests) + for ((i, pair) in added.withIndex()) upload(signed[i], pair.second) + upload(signed.last(), xml) + found = true + for ((entry, _) in added) { + val name = entry.localName.substring(base.length) + committed[name] = CloudFile(name, parseTime(entry.modified), hex(entry.md5), readLink = entry.href) + } + listed = null + files.mapValues { (name, _) -> modifiedMs[name]?.takeIf { it > 0 } ?: now } + } + } + + private fun pick(): Manifest? { + for (candidate in keys) { + val manifest = locked("read", candidate, missing = { null }) { _, body -> manifestUrl(body)?.let { fetchManifest(it) } } + if (manifest != null) { + key = candidate + found = true + return manifest + } + } + key = keys.first() + found = false + return null + } + + private fun upload(signed: Signed, data: ByteArray) { + val reply = EaHttp.request(signed.url, "PUT", signed.headers, data) + check(reply.ok) { "EA cloud save upload answered ${reply.status}" } + } + + private fun fetchManifest(url: String): Manifest? { + val reply = EaHttp.request(url) + if (reply.status == 404) return null + check(reply.ok) { "EA cloud save manifest answered ${reply.status}" } + return parse(reply.text) + } + + private fun locked(kind: String, key: String, missing: (() -> T)? = null, body: (String, String) -> T): T { + val reply = EaHttp.request("$HOST/lock/$kind/$uid/$key", "POST", mapOf(AUTH to token, "Content-Type" to "application/xml"), ByteArray(0)) + if (reply.status == 404 && missing != null) return missing() + check(reply.ok) { "EA cloud saves answered ${reply.status}" } + val lock = reply.header(LOCK) ?: error("EA did not grant a cloud save lock") + try { + return body(lock, reply.text) + } finally { + runCatching { EaHttp.request("$HOST/lock/delete/$uid", "DELETE", mapOf(AUTH to token, LOCK to lock)) } + } + } + + private fun authorize(lock: String, requests: List): List { + val body = buildString { + append("") + for ((i, r) in requests.withIndex()) { + append("").append(r.verb).append("").append(escape(r.resource)).append("") + r.md5?.let { append("").append(it).append("") } + r.type?.let { append("").append(it).append("") } + append("") + } + append("") + } + val reply = EaHttp.request("$HOST/lock/authorize/$uid", "PUT", mapOf(AUTH to token, LOCK to lock, "Content-Type" to "application/xml"), body.toByteArray()) + check(reply.ok) { "EA cloud saves refused the transfer (${reply.status})" } + return signedRequests(reply.text, requests.size) + } + + companion object { + private const val HOST = "https://cloudsync.juno.ea.com" + private const val AUTH = "X-Origin-AuthToken" + private const val LOCK = "X-Origin-Sync-Lock" + private val REQUEST = Regex("]*\\bid=\"(\\d+)\"[^>]*>(.*?)", RegexOption.DOT_MATCHES_ALL) + private val HEADER = Regex("]*)/?>") + + fun keys(masterTitleId: String, multiplayerId: String): List = + if (multiplayerId.isNotEmpty()) listOf("${masterTitleId}_$multiplayerId") else listOf(masterTitleId, "${masterTitleId}_$masterTitleId") + + fun manifestUrl(lockBody: String): String? = Regex("([^<]+)").find(lockBody)?.groupValues?.get(1)?.let(::unescape) + + fun parse(xml: String): Manifest { + val p = Xml.newPullParser().apply { setInput(StringReader(xml)) } + var root: String? = null + var lineage: String? = null + var depth = 0 + var closed = false + val files = ArrayList() + val snapshots = ArrayList() + var file: Array? = null + var local: Entry? = null + runCatching { + while (p.next() != XmlPullParser.END_DOCUMENT) when (p.eventType) { + XmlPullParser.START_TAG -> { + depth++ + val at = { name: String -> p.getAttributeValue(null, name).orEmpty() } + when { + root == null -> { root = p.name; lineage = p.getAttributeValue(null, "lineage") } + depth == 2 && p.name == "file" -> { file = arrayOf(at("size"), at("href"), at("md5")); local = null } + depth == 3 && p.name == "localName" && file != null -> { + val f = file!! + val created = at("created") + val modified = at("lastModified") + local = Entry(f[0].toLongOrNull() ?: 0, f[1], f[2], created, modified, p.nextText()) + depth-- + } + depth == 2 && p.name == "snapshot" -> { snapshots += p.nextText(); depth-- } + } + } + XmlPullParser.END_TAG -> { + if (depth == 2 && p.name == "file") { local?.let(files::add); file = null } + depth-- + if (depth == 0) closed = true + } + } + }.onFailure { error("EA sent an incomplete cloud save manifest") } + check(root == "manifest" && depth == 0 && closed) { "EA sent an incomplete cloud save manifest" } + return Manifest(lineage ?: "{00000000-0000-0000-0000-000000000000}", files, snapshots) + } + + fun write(m: Manifest): String = buildString { + append("\n") + for (f in m.files) { + append(" \n") + append(" ") + append(escape(f.localName)).append("\n \n") + } + for (s in m.snapshots) append(" ").append(escape(s)).append("\n") + append("\n") + } + + private fun signedRequests(xml: String, count: Int): List { + val byId = REQUEST.findAll(xml).associate { m -> + val inner = m.groupValues[2] + val url = Regex("([^<]+)").find(inner)?.groupValues?.get(1)?.let(::unescape) ?: error("EA sent no transfer URL") + val headers = HEADER.findAll(inner).mapNotNull { h -> + val k = attr(h.groupValues[1], "key") ?: return@mapNotNull null + k to (attr(h.groupValues[1], "value") ?: "") + }.toMap() + m.groupValues[1].toInt() to Signed(url, headers) + } + return (0 until count).map { byId[it] ?: error("EA signed ${byId.size} of $count cloud save transfers") } + } + + fun stamp(ms: Long): String = Instant.ofEpochMilli(ms / 1000 * 1000).toString() + "Z" + + fun parseTime(s: String): Long = runCatching { Instant.parse(s.trimEnd('Z') + "Z").toEpochMilli() }.getOrDefault(-1L) + + private fun attr(attrs: String, name: String): String? = Regex("\\b$name=\"([^\"]*)\"").find(attrs)?.groupValues?.get(1)?.let(::unescape) + + private fun md5(data: ByteArray) = MessageDigest.getInstance("MD5").digest(data) + + private fun b64(sum: ByteArray) = Base64.encodeToString(sum, Base64.NO_WRAP) + + private fun hexOf(sum: ByteArray) = sum.joinToString("") { "%02x".format(it) } + + fun hex(b64: String): String? = runCatching { hexOf(Base64.decode(b64, Base64.DEFAULT)) }.getOrNull()?.takeIf { it.length == 32 } + + private fun escape(s: String) = s.replace("&", "&").replace("<", "<").replace(">", ">").replace("\"", """) + + private fun unescape(s: String) = EaSaveRules.unescape(s) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaSaveRules.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaSaveRules.kt new file mode 100644 index 000000000..b103473eb --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaSaveRules.kt @@ -0,0 +1,84 @@ +package com.droiddeck.launcher.stores.ea + +internal class EaSaveRules(private val rules: List>) { + val includes get() = rules.filter { it.first }.map { it.second } + val excludes get() = rules.filterNot { it.first }.map { it.second } + + fun base(): String? { + val dirs = includes.filterNot(::bare).map { pattern -> + val wild = pattern.indexOfFirst { it == '*' || it == '?' } + val fixed = if (wild < 0) pattern else pattern.substring(0, wild) + if (fixed.endsWith('/')) fixed else fixed.substringBeforeLast('/', "") + "/" + } + val parts = dirs.map { it.trimEnd('/').split('/') } + if (parts.isEmpty()) return null + val common = ArrayList() + for (i in parts.minOf { it.size }.let { 0 until it }) { + val seg = parts[0][i] + if (parts.all { it[i].equals(seg, ignoreCase = true) }) common += seg else break + } + if (common.isEmpty() || !VARIABLE.matches(common[0])) return null + return common.joinToString("/") + "/" + } + + fun matches(path: String): Boolean { + val p = normalize(path) + val inside = base()?.let { p.startsWith(it, ignoreCase = true) } ?: false + return rules.firstOrNull { (_, pattern) -> if (bare(pattern)) inside && hit(pattern, p.substringAfterLast('/')) else hit(pattern, p) }?.first ?: false + } + + private fun bare(pattern: String) = !pattern.startsWith('%') && '/' !in pattern + + private fun hit(pattern: String, path: String): Boolean = when { + pattern.endsWith('/') -> path.startsWith(pattern, ignoreCase = true) + pattern.any { it == '*' || it == '?' } -> glob(pattern).matches(path) + else -> path.equals(pattern, ignoreCase = true) + } + + private fun glob(pattern: String): Regex = Regex( + pattern.split('*').joinToString("[^/]*") { part -> part.split('?').joinToString("[^/]") { Regex.escape(it) } }, + RegexOption.IGNORE_CASE, + ) + + companion object { + private val VARIABLE = Regex("%[A-Za-z]+%") + private val RULE = Regex("<(include|exclude)\\b([^>]*)>([^<]*)", RegexOption.IGNORE_CASE) + private val ORDER = Regex("\\border\\s*=\\s*[\"']?(\\d+)") + private val TOKENS = mapOf( + "documents" to "%DOCUMENTS%", "savedgames" to "%SAVED_GAMES%", "appdata" to "%APPDATA%", + "localappdata" to "%LOCALAPPDATA%", "programdata" to "%PROGRAMDATA%", "userprofile" to "%USERPROFILE%", + "locallowappdata" to "%APPLICATION_DATA_LOCAL_LOW%", "installdir" to "%INSTALL%", + ) + + private val COMMENT = Regex("", RegexOption.DOT_MATCHES_ALL) + private val ENTITY = Regex("&(#x[0-9a-fA-F]+|#[0-9]+|lt|gt|quot|apos|amp);") + + fun normalize(path: String) = path.replace('\\', '/') + + fun parse(xml: String): EaSaveRules? { + val rules = RULE.findAll(COMMENT.replace(xml, "")).mapIndexed { index, rule -> + val order = ORDER.find(rule.groupValues[2])?.groupValues?.get(1)?.toIntOrNull() ?: index + Triple(order, rule.groupValues[1].equals("include", true), normalize(unescape(rule.groupValues[3]).trim())) + }.filter { it.third.isNotEmpty() }.sortedBy { it.first }.map { it.second to it.third }.toList() + if (rules.none { it.first }) return null + return EaSaveRules(rules) + } + + fun template(base: String): String? { + val variable = VARIABLE.find(base)?.takeIf { it.range.first == 0 } ?: return null + val token = TOKENS[variable.value.trim('%').lowercase()] ?: return null + return token + base.substring(variable.value.length) + } + + fun unescape(s: String): String = ENTITY.replace(s) { m -> + when (val e = m.groupValues[1]) { + "lt" -> "<" + "gt" -> ">" + "quot" -> "\"" + "apos" -> "'" + "amp" -> "&" + else -> runCatching { String(Character.toChars(if (e.startsWith("#x")) e.substring(2).toInt(16) else e.substring(1).toInt())) }.getOrDefault(m.value) + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftActivation.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftActivation.kt index d11fde421..06075ca15 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftActivation.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftActivation.kt @@ -15,23 +15,44 @@ object UbisoftActivation { private const val POLL_MS = 250L private const val IDLE_MS = 60_000L private val watching = HashMap() + private val owners = HashMap() + + private const val INVALIDATE = "denuvo-invalidate" fun bridge(context: Context, product: Long) = File(LinuxRuntime.rootDir(context), "root/.cache/droiddeck/ubisoft/bridge-$product") /** Starts answering the product's activations; stale requests are cleared before this returns. */ - fun watch(app: Context, product: Long) { + fun watch(app: Context, product: Long, owner: String?) { val dir = bridge(app, product) synchronized(watching) { val running = watching.containsKey(product) watching[product] = System.currentTimeMillis() + if (owner.isNullOrEmpty()) owners.remove(product) else owners[product] = owner if (running) return dir.mkdirs() - dir.listFiles()?.forEach { it.delete() } + dir.listFiles()?.forEach { if (it.name != INVALIDATE) it.delete() } } Thread({ var idleSince = 0L while (true) { - runCatching { dir.listFiles { f -> f.name.startsWith("denuvo-") && f.name.endsWith(".req") }?.forEach { answer(app, product, it) } } + runCatching { + val marker = File(dir, INVALIDATE) + val (owner, requests) = synchronized(watching) { + owners[product] to dir.listFiles { f -> f.name.startsWith("denuvo-") && f.name.endsWith(".req") }.orEmpty() + } + if (marker.exists()) { + val named = runCatching { marker.readText().trim() }.getOrNull()?.takeIf { it.isNotEmpty() } + val issuer = named ?: owner + if (invalidate(app, product, issuer)) marker.delete() + else if (named == null && issuer != null) runCatching { + val part = File(dir, "$INVALIDATE.part") + part.writeText(issuer) + check(part.renameTo(marker)) + } + } + val pending = marker.exists() + requests.forEach { answer(app, product, it, owner, pending) } + } .onFailure { StoresState.logLine("Ubisoft: activation for $product: ${it.javaClass.simpleName}") } val now = System.currentTimeMillis() if (SessionState.running) idleSince = 0L @@ -44,18 +65,31 @@ object UbisoftActivation { }, "ubisoft-activation-$product").start() } - private fun answer(app: Context, product: Long, request: File) { + private fun answer(app: Context, product: Long, request: File, owner: String?, pending: Boolean) { val challenge = runCatching { request.readBytes() }.getOrNull() ?: return request.delete() - val reply = File(request.parentFile, request.name.removeSuffix(".req") + ".rsp") - val token = activate(app, product, challenge) + val reply = File(request.parentFile, request.name.removeSuffix(".req").removeSuffix(".cache") + ".rsp") + val token = activate(app, product, challenge, owner, cached = request.name.endsWith(".cache.req") && !pending) val part = File(reply.path + ".part") part.writeBytes(token ?: ByteArray(0)) part.renameTo(reply) } - private fun activate(app: Context, product: Long, challenge: ByteArray): ByteArray? { + private fun invalidate(app: Context, product: Long, owner: String?): Boolean { + val user = owner ?: return false + val gone = TokenCache(cacheDir(app)).drop(user, product) + if (gone) StoresState.logLine("Ubisoft: activation for $product: kept game token dropped") + return gone + } + + private fun activate(app: Context, product: Long, challenge: ByteArray, owner: String?, cached: Boolean): ByteArray? { val s = UbisoftAuth.current(app) ?: return null.also { StoresState.logLine("Ubisoft: activation for $product: signed out") } + if (owner == null || s.userId != owner) return null.also { StoresState.logLine("Ubisoft: activation for $product: the signed-in account changed") } + val cache = TokenCache(cacheDir(app)) + if (cached) cache.get(s.userId, product)?.let { + StoresState.logLine("Ubisoft: activation for $product: kept ${it.size} B game token") + return it + } val answer = UbisoftNative.call("denuvo", JSONObject().put("ticket", s.ticket).put("sessionId", s.sessionId) .put("productId", product).put("challenge", hex(challenge))) answer?.optString("error")?.takeIf { it.isNotEmpty() }?.let { @@ -64,9 +98,28 @@ object UbisoftActivation { } val token = answer?.optString("token")?.takeIf { it.isNotEmpty() }?.let(::unhex) StoresState.logLine("Ubisoft: activation for $product: ${token?.size ?: 0} B game token") + if (token != null && !cache.put(s.userId, product, token)) StoresState.logLine("Ubisoft: activation for $product: game token not kept") return token } + private fun cacheDir(app: Context) = File(app.filesDir, "ubisoft/denuvo") + + internal class TokenCache(private val dir: File) { + private fun file(user: String, product: Long) = File(dir, "${user.filter { it.isLetterOrDigit() || it == '-' }}-$product.token") + + fun get(user: String, product: Long): ByteArray? = runCatching { file(user, product).readBytes() }.getOrNull()?.takeIf { it.isNotEmpty() } + + fun put(user: String, product: Long, token: ByteArray): Boolean = runCatching { + dir.mkdirs() + val target = file(user, product) + val part = File(target.path + ".part") + part.writeBytes(token) + check(part.renameTo(target)) + }.isSuccess + + fun drop(user: String, product: Long): Boolean = file(user, product).let { it.delete() || !it.exists() } + } + internal fun hex(b: ByteArray): String = b.joinToString("") { "%02x".format(it) } internal fun unhex(s: String): ByteArray? = diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftCloud.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftCloud.kt new file mode 100644 index 000000000..26001da37 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftCloud.kt @@ -0,0 +1,220 @@ +package com.droiddeck.launcher.stores.ubisoft + +import android.os.Build +import android.util.Base64 +import com.droiddeck.launcher.stores.CloudChanged +import com.droiddeck.launcher.stores.CloudFile +import com.droiddeck.launcher.stores.CloudTransport +import org.json.JSONArray +import org.json.JSONObject +import java.io.ByteArrayOutputStream +import java.net.HttpURLConnection +import java.net.URL +import java.security.MessageDigest +import java.time.Instant +import java.util.zip.Deflater +import java.util.zip.Inflater + +internal interface UbisoftSlots { + fun entity(): UbisoftCloud.Entity? + fun upload(slot: String, data: ByteArray) + fun update(entity: UbisoftCloud.Entity, slots: JSONArray) + fun download(slot: String): ByteArray? +} + +internal class UbisoftCloud(private val session: UbisoftAuth.Session, val product: Long) : UbisoftSlots { + class Slot(val id: Int, val filename: String, val hash: String, val size: Long, val modifiedMs: Long) + + class Entity(val json: JSONObject) { + val id: String get() = json.optString("entityId") + val revision: Int get() = json.optInt("revision") + val slots: List get() { + val list = json.optJSONObject("obj")?.optJSONArray("slots") ?: JSONArray() + return (0 until list.length()).mapNotNull { list.optJSONObject(it) }.map { + Slot(it.optInt("id"), it.optString("filename"), it.optString("hash"), it.optLong("size"), UbisoftAuth.parseTime(it.optString("lastModified"))) + } + } + } + + private val authorization get() = "ubi_v1 t=${session.ticket}" + + override fun entity(): Entity? { + val url = "https://public-ubiservices.ubi.com/v1/profiles/${session.profileId}/entities?name=${entityName(product)}" + val reply = UbisoftAuth.request(url, authorization = authorization, sessionId = session.sessionId) + check(reply.ok) { "Ubisoft cloud saves answered ${reply.status}" } + val list = JSONObject(reply.body).optJSONArray("entities") ?: return null + return (0 until list.length()).mapNotNull { list.optJSONObject(it) }.firstOrNull { it.optString("name") == entityName(product) }?.let(::Entity) + } + + override fun upload(slot: String, data: ByteArray) { + val packed = deflate(data) + val md5 = Base64.encodeToString(MessageDigest.getInstance("MD5").digest(packed), Base64.NO_WRAP) + val signed = signed("put", JSONArray().put(JSONObject().put("name", slot).put("size", packed.size).put("md5", md5))).single() + val c = URL(signed.getString("url")).openConnection() as HttpURLConnection + c.connectTimeout = 15_000 + c.readTimeout = 60_000 + c.requestMethod = "PUT" + c.doOutput = true + c.setFixedLengthStreamingMode(packed.size) + c.setRequestProperty("Content-MD5", md5) + try { + c.outputStream.use { it.write(packed) } + check(c.responseCode in 200..299) { "Ubisoft cloud save upload answered ${c.responseCode}" } + } finally { + c.disconnect() + } + } + + override fun update(entity: Entity, slots: JSONArray) { + val obj = JSONObject(entity.json.optJSONObject("obj")?.toString() ?: "{}") + .put("slots", slots).put("timestamp", (System.currentTimeMillis() / 1000).toString()).put("pc_name", Build.MODEL ?: "Android") + val body = JSONObject().put("revision", entity.revision).put("name", entity.json.optString("name")).put("type", "cloudSave") + .put("spaceId", entity.json.optString("spaceId")).put("tags", entity.json.optJSONArray("tags") ?: JSONArray()).put("obj", obj) + val reply = UbisoftAuth.request("https://public-ubiservices.ubi.com/v1/profiles/entities/${entity.id}", "PUT", + authorization, session.sessionId, body.toString()) + check(reply.ok) { "Ubisoft cloud save record answered ${reply.status}" } + } + + override fun download(slot: String): ByteArray? { + val signed = signed("get", JSONArray().put(JSONObject().put("name", slot))).single() + val c = URL(signed.getString("url")).openConnection() as HttpURLConnection + c.connectTimeout = 15_000 + c.readTimeout = 60_000 + return try { + when (c.responseCode) { + 404 -> null + in 200..299 -> c.inputStream.use(::inflate) + else -> error("Ubisoft cloud save download answered ${c.responseCode}") + } + } finally { + c.disconnect() + } + } + + private fun signed(method: String, items: JSONArray): List { + val answer = UbisoftNative.call("cloud-urls", JSONObject().put("ticket", session.ticket).put("sessionId", session.sessionId) + .put("productId", product).put("method", method).put("items", items)) ?: error("Ubisoft cloud saves are unavailable") + answer.optString("error").takeIf { it.isNotEmpty() }?.let { error(it) } + val requests = answer.getJSONArray("requests") + return (0 until requests.length()).map { requests.getJSONObject(it) } + } + + companion object { + private const val MAX_SAVE = 256L * 1024 * 1024 + + fun entityName(product: Long) = "upcCloudSaveUplayId_$product" + + private val MARK = Regex("[0-9a-f]{32}") + + internal fun freshMark(): String = java.util.UUID.randomUUID().toString().replace("-", "") + + internal fun mark(save: ByteArray): String? = + if (save.size < 40) null else String(save, 8, 32, Charsets.ISO_8859_1).takeIf { MARK.matches(it) } + + internal fun deflate(data: ByteArray): ByteArray { + val deflater = Deflater(Deflater.BEST_COMPRESSION) + deflater.setInput(data) + deflater.finish() + val out = ByteArrayOutputStream(data.size / 2 + 64) + val buffer = ByteArray(64 * 1024) + try { + while (!deflater.finished()) out.write(buffer, 0, deflater.deflate(buffer)) + } finally { + deflater.end() + } + return out.toByteArray() + } + + internal fun inflate(data: ByteArray): ByteArray = inflate(data.inputStream()) + + internal fun inflate(input: java.io.InputStream): ByteArray { + val inflater = Inflater() + val out = ByteArrayOutputStream(64 * 1024) + val buffer = ByteArray(64 * 1024) + val chunk = ByteArray(64 * 1024) + try { + while (!inflater.finished()) { + if (inflater.needsInput()) { + val read = input.read(chunk) + if (read < 0) error("Ubisoft cloud save is truncated") + inflater.setInput(chunk, 0, read) + continue + } + if (inflater.needsDictionary()) error("Ubisoft cloud save is truncated") + val n = inflater.inflate(buffer) + check(out.size().toLong() + n <= MAX_SAVE) { "Ubisoft cloud save is too large" } + out.write(buffer, 0, n) + } + } finally { + inflater.end() + } + return out.toByteArray() + } + + internal fun version(slot: Slot): String = "${slot.size}:${slot.modifiedMs}:${slot.hash}" + } +} + +internal class UbisoftCloudTransport(private val cloud: UbisoftSlots, val user: String) : CloudTransport { + private var listed: UbisoftCloud.Entity? = null + private val committed = HashMap() + + override val contentDigests: Boolean get() = false + + override fun committed(name: String): CloudFile? = committed[name] + + override fun wants(name: String): Boolean = name.endsWith(SUFFIX) && !name.contains('/') + + override fun list(): List { + val entity = cloud.entity() + listed = entity + return entity?.slots.orEmpty().map { CloudFile(it.filename + SUFFIX, it.modifiedMs, UbisoftCloud.version(it)) } + } + + override fun get(file: CloudFile): Pair { + val data = cloud.download(file.name.removeSuffix(SUFFIX)) ?: error("Ubisoft has no data for ${file.name}") + return data to file.modifiedMs + } + + override fun put(files: Map, modifiedMs: Map): Map { + var expected = listed ?: cloud.entity() ?: error("Ubisoft has no cloud save record for this game yet; play it once in Ubisoft Connect") + val marks = files.mapValues { (name, data) -> + check(name.endsWith(SUFFIX) && !name.contains('/')) { "$name is not a Ubisoft save slot" } + UbisoftCloud.mark(data) ?: error("$name has no save identifier for Ubisoft Connect") + } + val sent = LinkedHashMap() + try { + for ((name, data) in files) { + val slot = name.removeSuffix(SUFFIX) + val live = cloud.entity() ?: error("Ubisoft's cloud save record disappeared") + if (live.revision != expected.revision) throw CloudChanged(sent, files.keys.filter { it !in sent }) + val now = System.currentTimeMillis() + cloud.upload(slot, data) + val slots = JSONArray(live.json.optJSONObject("obj")?.optJSONArray("slots")?.toString() ?: "[]") + val entry = (0 until slots.length()).map { slots.getJSONObject(it) }.firstOrNull { it.optString("filename") == slot } + ?: JSONObject().put("filename", slot).also { if (slot.toIntOrNull() != null) it.put("id", slot.toInt()); slots.put(it) } + entry.put("hash", marks.getValue(name)).put("size", data.size).put("lastModified", Instant.ofEpochMilli(now).toString()) + cloud.update(live, slots) + val after = cloud.entity() + val mine = after?.let { committedSlot(live, it, slot, marks.getValue(name), data.size.toLong()) } + ?: throw CloudChanged(sent, files.keys.filter { it !in sent }) + sent[name] = now + committed[name] = CloudFile(name, mine.modifiedMs, UbisoftCloud.version(mine)) + expected = after + } + } finally { + listed = null + } + return sent + } + + companion object { + const val SUFFIX = ".save" + + internal fun committedSlot(before: UbisoftCloud.Entity, after: UbisoftCloud.Entity, filename: String, hash: String, size: Long): UbisoftCloud.Slot? { + fun others(e: UbisoftCloud.Entity) = e.slots.filter { it.filename != filename }.associate { it.filename to UbisoftCloud.version(it) } + if (others(before) != others(after)) return null + return after.slots.firstOrNull { it.filename == filename && it.hash == hash && it.size == size } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftLaunch.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftLaunch.kt index 279d3b3e4..4f284f77b 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftLaunch.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftLaunch.kt @@ -58,7 +58,7 @@ object UbisoftLaunch { } } ?: cached setup?.let { StoresState.logLine("Ubisoft: setup for $product: ${it.toString().take(1500)}") } - UbisoftActivation.watch(app, product) + UbisoftActivation.watch(app, product, s.userId) return JSONObject().put("ok", true) .put("productId", product) .put("ticket", native.optString("ticket")) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt index a276eb91e..ab0a80940 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt @@ -82,6 +82,12 @@ internal fun cloudMessage(context: android.content.Context, r: com.droiddeck.lau r.files == 0 -> context.getString(R.string.cloud_up_to_date) else -> context.getString(R.string.cloud_done, r.files) } + "partial" -> when { + r.conflicts > 0 && r.detail.isNotEmpty() -> context.getString(R.string.cloud_conflict_files_detail, r.conflicts, r.detail) + r.conflicts > 0 -> context.getString(R.string.cloud_conflict_files, r.conflicts) + r.detail.isNotEmpty() -> context.getString(R.string.cloud_partial, r.detail) + else -> context.getString(R.string.cloud_not_synced) + } "skipped" -> context.getString(when (r.reason) { "not-signed-in" -> R.string.cloud_signed_out "no-cloud-saves" -> R.string.cloud_none diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index b99a4331b..edd95faab 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -258,7 +258,7 @@ internal fun GameDetail( stringResource(R.string.game_tab_achievements_count, stringResource(R.string.achievements_title), achievementState.done, list.size) } ?: stringResource(R.string.achievements_title) GameTab.LAUNCH -> stringResource(R.string.game_tab_launch) - GameTab.SAVES -> stringResource(if (Store.byId(source).let { it == Store.GOG || it == Store.EPIC }) R.string.game_tab_saves_cloud else R.string.games_saves) + GameTab.SAVES -> stringResource(if (CloudSaves.supports(Store.byId(source))) R.string.game_tab_saves_cloud else R.string.games_saves) GameTab.ADDONS -> stringResource(R.string.game_tab_addons) GameTab.INSTALL -> stringResource(R.string.game_tab_install) } @@ -892,8 +892,10 @@ private fun ShortcutFields(game: Library.SteamGame, folder: File) { @Composable private fun SavesTab(g: Library.SteamGame, prefix: File, a: FrontEndActions) { - val saves by produceState?>(null, g.gameId) { - value = withContext(Dispatchers.IO) { runCatching { GameSaves.locate(prefix, g) }.getOrDefault(emptyList()) } + val context = LocalContext.current.applicationContext + var synced by remember(g.gameId) { mutableStateOf(0) } + val saves by produceState?>(null, g.gameId, synced) { + value = withContext(Dispatchers.IO) { runCatching { GameSaves.saves(context, prefix, g) }.getOrDefault(emptyList()) } } val found = saves val summary = when { @@ -911,9 +913,9 @@ private fun SavesTab(g: Library.SteamGame, prefix: File, a: FrontEndActions) { } Column(Modifier.fillMaxWidth().tabPanel(), verticalArrangement = Arrangement.spacedBy(2.dp)) { Text(summary, fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(bottom = 6.dp).readable().padding(4.dp)) - if (Store.byId(g.source).let { it == Store.GOG || it == Store.EPIC }) { + if (CloudSaves.supports(Store.byId(g.source))) { SectionLabel(stringResource(R.string.store_cloud_saves)) - CloudRows(g) + CloudRows(g) { synced++ } SectionLabel(stringResource(R.string.games_saves)) } MenuItem(stringResource(R.string.games_import_saves), checked = false) { a.onSaveImport(g) } @@ -969,14 +971,16 @@ private fun AddonRow(name: String, target: WowAddons.Target, a: FrontEndActions) } @Composable -private fun CloudRows(g: Library.SteamGame) { - val store = Store.byId(g.source)?.takeIf { it != Store.AMAZON && it != Store.EA } ?: return +private fun CloudRows(g: Library.SteamGame, onSynced: () -> Unit = {}) { + val store = Store.byId(g.source)?.takeIf { it != Store.AMAZON } ?: return val id = g.storeId ?: return val context = LocalContext.current.applicationContext var busy by remember(g.gameId) { mutableStateOf(null) } var tick by remember(g.gameId) { mutableStateOf(0) } + var refreshing by remember(g.gameId) { mutableStateOf(false) } val status by produceState(null, g.gameId, tick) { value = withContext(Dispatchers.IO) { runCatching { CloudSaves.status(context, store, id) }.getOrNull() } + refreshing = false } val folder = g.gameFiles var enabled by remember(g.gameId) { mutableStateOf(folder?.let { StoreGameSidecar.read(it)?.cloud } ?: true) } @@ -988,7 +992,7 @@ private fun CloudRows(g: Library.SteamGame) { busy = if (up) "up" else "down" Thread({ val r = if (up) CloudSaves.upload(context, store, id, force) else CloudSaves.download(context, store, id, force) - StoresState.post { busy = null; tick++; android.widget.Toast.makeText(context, cloudMessage(context, r), android.widget.Toast.LENGTH_SHORT).show() } + StoresState.post { refreshing = true; busy = null; tick++; onSynced(); android.widget.Toast.makeText(context, cloudMessage(context, r), android.widget.Toast.LENGTH_SHORT).show() } }, "cloud-manual").start() } MenuItem(stringResource(R.string.store_cloud_saves), checked = enabled && supported, enabled = supported, @@ -1000,11 +1004,13 @@ private fun CloudRows(g: Library.SteamGame) { StoresState.post { enabled = written?.cloud ?: enabled } }, "cloud-switch").start() } - val ready = st != null && supported && enabled && busy == null + val ready = st != null && supported && enabled && busy == null && !refreshing && st.folder != null && st.signedIn val pending = stringResource(R.string.cloud_pending) val summary = when { st == null || busy != null -> pending !supported -> stringResource(R.string.cloud_none) + !st.signedIn || st.reason == "not-signed-in" -> stringResource(R.string.cloud_signed_out) + st.folder == null -> stringResource(R.string.cloud_not_synced) conflict -> stringResource(R.string.cloud_conflict_files, st.conflicts.size) st.lastSync > 0 -> stringResource(R.string.cloud_last_sync, android.text.format.DateUtils.getRelativeTimeSpanString(st.lastSync).toString()) else -> stringResource(R.string.cloud_never) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 44e51c682..e697c0bb0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2898,6 +2898,8 @@ Already up to date Sign in to the store to sync saves Saves were not synced + Some saves were not synced · %1$s + Cloud conflict · %1$d files · %2$s installed in your library store diff --git a/app/src/main/rust/stores/src/ubisoft/ffi.rs b/app/src/main/rust/stores/src/ubisoft/ffi.rs index 30df1ccd4..9cfbb9780 100644 --- a/app/src/main/rust/stores/src/ubisoft/ffi.rs +++ b/app/src/main/rust/stores/src/ubisoft/ffi.rs @@ -75,6 +75,33 @@ fn denuvo(ticket: &str, session: &str, product: u32, challenge: &str) -> Result< }) } +fn cloud_urls(request: &serde_json::Value) -> Result { + let s = |k: &str| request.get(k).and_then(|v| v.as_str()).unwrap_or("").to_string(); + let product = request.get("productId").and_then(|v| v.as_u64()).unwrap_or(0) as u32; + let method = match s("method").as_str() { + "put" => super::service::CLOUD_PUT, + "get" => super::service::CLOUD_GET, + other => return Err(format!("unknown cloud save method {other}")), + }; + let items: Vec = request.get("items").and_then(|v| v.as_array()).ok_or("no items")?.iter().map(|i| super::service::CloudItem { + name: i.get("name").and_then(|v| v.as_str()).unwrap_or("").to_string(), + size: i.get("size").and_then(|v| v.as_u64()).unwrap_or(0), + md5_base64: i.get("md5").and_then(|v| v.as_str()).unwrap_or("").to_string(), + }).collect(); + if items.is_empty() || items.iter().any(|i| i.name.is_empty()) { + return Err("cloud save items need names".into()); + } + let (ticket, session) = (s("ticket"), s("sessionId")); + let rt = tokio::runtime::Builder::new_current_thread().enable_all().build().map_err(|e| e.to_string())?; + rt.block_on(async { + let mut d = super::demux::Demux::connect(&ticket).await?; + let (mut ownership, _) = super::service::Ownership::open(&mut d, &ticket, &session).await?; + let token = ownership.token(&mut d, product).await?; + let signed = super::service::cloudsave_urls(&mut d, &token, product, method, &items).await?; + Ok(json!({ "requests": signed.iter().map(|r| json!({ "url": r.url, "header": r.header })).collect::>() })) + }) +} + fn call(op: &str, request: &str) -> String { let parsed: serde_json::Value = serde_json::from_str(request).unwrap_or(serde_json::Value::Null); let s = |k: &str| parsed.get(k).and_then(|v| v.as_str()).unwrap_or("").to_string(); @@ -86,6 +113,7 @@ fn call(op: &str, request: &str) -> String { .and_then(|r| install::chunks(&r)) .map(|m| json!({ "chunks": install::chunks_json(&m.chunks), "setup": install::setup_json(&m) })) .unwrap_or_else(|e| json!({ "error": e })), + "cloud-urls" => cloud_urls(&parsed).unwrap_or_else(|e| json!({ "error": e })), "launch" => launch(&s("ticket"), &s("sessionId"), parsed.get("productId").and_then(|v| v.as_u64()).unwrap_or(0) as u32) .unwrap_or_else(|e| json!({ "error": e })), _ => json!({ "error": format!("unknown operation {op}") }), diff --git a/app/src/main/rust/stores/src/ubisoft/service.rs b/app/src/main/rust/stores/src/ubisoft/service.rs index bfdddc29a..de8e724d0 100644 --- a/app/src/main/rust/stores/src/ubisoft/service.rs +++ b/app/src/main/rust/stores/src/ubisoft/service.rs @@ -204,3 +204,48 @@ pub async fn denuvo_token(d: &mut Demux, ownership_token: &str, challenge: &[u8] let t = pb::fields(pb::sub(&rsp, 3).ok_or("no game token answer")?)?; pb::sub(&t, 1).filter(|b| !b.is_empty()).map(<[u8]>::to_vec).ok_or_else(|| "Ubisoft sent an empty game token".into()) } + +pub struct CloudItem { + pub name: String, + pub size: u64, + pub md5_base64: String, +} + +pub struct SignedRequest { + pub header: String, + pub url: String, +} + +pub const CLOUD_PUT: u64 = 1; +pub const CLOUD_GET: u64 = 2; + +pub async fn cloudsave_urls(d: &mut Demux, ownership_token: &str, product_id: u32, method: u64, items: &[CloudItem]) -> Result, String> { + let conn = d.open("cloudsave_service").await?; + let mut req = Msg::new().text(1, ownership_token).uint(2, product_id as u64).uint(3, method); + for item in items { + let mut entry = Msg::new().text(1, &item.name); + if method == CLOUD_PUT { + entry = entry.msg(2, Msg::new().uint(1, item.size).text(2, &item.md5_base64)); + } + req = req.msg(4, entry); + } + let raw = d.call(conn, Msg::new().msg(1, Msg::new().uint(1, 1).msg(2, req))).await?; + let rsp = pb::fields(pb::sub(&pb::fields(&raw)?, 1).ok_or("no cloud save answer")?)?; + let urls = pb::fields(pb::sub(&rsp, 2).ok_or("no cloud save URLs")?)?; + let status = pb::num(&urls, 1).unwrap_or(0); + if status != 1 { + return Err(format!("Ubisoft's cloud save service refused the request (status {status})")); + } + let mut out = Vec::new(); + for r in pb::subs(&urls, 2) { + let r = pb::fields(r)?; + out.push(SignedRequest { + header: pb::string(&r, 1).unwrap_or_default(), + url: pb::string(&r, 2).ok_or("cloud save URL missing")?, + }); + } + if out.len() != items.len() { + return Err(format!("Ubisoft signed {} of {} cloud save requests", out.len(), items.len())); + } + Ok(out) +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt index 9f1dcd2b0..f3944a803 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt @@ -1,5 +1,8 @@ package com.droiddeck.launcher.stores +import com.droiddeck.launcher.stores.ubisoft.MemorySlots +import com.droiddeck.launcher.stores.ubisoft.UbisoftCloud +import com.droiddeck.launcher.stores.ubisoft.UbisoftCloudTransport import java.io.File import java.util.concurrent.Executor import org.junit.Assert.assertArrayEquals @@ -20,10 +23,18 @@ class CloudSavesTest { private class Memory : CloudTransport { val files = HashMap>() val puts = ArrayList() + var onGet: (CloudFile) -> Unit = {} + var raceAfter = Int.MAX_VALUE override fun list() = files.map { (k, v) -> CloudFile(k, v.second, CloudSaves.md5(v.first)) } - override fun get(file: CloudFile) = files.getValue(file.name) - override fun put(files: Map, modifiedMs: Map): Map = - files.mapValues { (k, v) -> puts += k; this.files[k] = v to 99_000L; 99_000L } + override fun get(file: CloudFile) = files.getValue(file.name).also { onGet(file) } + override fun put(files: Map, modifiedMs: Map): Map { + val sent = LinkedHashMap() + for ((k, v) in files) { + if (sent.size >= raceAfter) throw CloudChanged(sent, files.keys.filter { it !in sent }) + puts += k; this.files[k] = v to 99_000L; sent[k] = 99_000L + } + return sent + } } private fun dir() = File(app.filesDir, "saves-${System.nanoTime()}").apply { mkdirs() } @@ -50,6 +61,72 @@ class CloudSavesTest { assertEquals("v1", File(kept, "slot0.sav").readText()) } + @Test fun aFolderAliasNeverHidesTheRealSaveFromARestore() { + val game = id; val dir = dir() + File(dir, "SaveData").mkdirs(); File(dir, "SaveData/slot.sav").writeText("local") + val link = runCatching { java.nio.file.Files.createSymbolicLink(File(dir, "Cache").toPath(), File(dir, "SaveData").toPath()) } + org.junit.Assume.assumeTrue(link.isSuccess) + val memory = Memory().apply { files["SaveData/slot.sav"] = "cloud".toByteArray() to 1000L } + val cloud = object : CloudTransport by memory { + override fun wants(name: String) = name.startsWith("SaveData/") + } + CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = true) + assertEquals("cloud", File(dir, "SaveData/slot.sav").readText()) + val kept = File(app.filesDir, "stores/cloud-backups/gog-$game").listFiles { f -> f.name.startsWith("local-") }!!.single() + assertEquals("local", File(kept, "SaveData/slot.sav").readText()) + } + + @Test fun aSaveReachedOnlyThroughAFolderAliasStillGoesUp() { + val game = id; val dir = dir() + File(dir, "Actual").mkdirs(); File(dir, "Actual/slot.sav").writeText("played") + val link = runCatching { java.nio.file.Files.createSymbolicLink(File(dir, "SaveData").toPath(), File(dir, "Actual").toPath()) } + org.junit.Assume.assumeTrue(link.isSuccess) + java.nio.file.Files.createSymbolicLink(File(dir, "Actual/loop").toPath(), dir.toPath()) + val memory = Memory() + val cloud = object : CloudTransport by memory { + override fun wants(name: String) = name.startsWith("SaveData/") + } + CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = false) + val r = CloudSaves.upWith(app, Store.GOG, game, dir, cloud, force = false) + assertEquals("uploaded", r.reason) + assertEquals(listOf("SaveData/slot.sav"), memory.puts) + assertEquals("played", String(memory.files.getValue("SaveData/slot.sav").first)) + } + + @Test fun onlySelectedSavesCanCollideByCase() { + val names = listOf("Logs/A.txt", "Logs/a.txt", "SaveGame/1") + assertFalse(CloudSaves.caseCollision(names) { !it.startsWith("Logs/") }) + assertTrue(CloudSaves.caseCollision(names) { true }) + assertTrue(CloudSaves.caseCollision(listOf("SaveGame/1", "savegame/1")) { it.lowercase().startsWith("savegame/") }) + } + + @Test fun aSavedConflictWhoseSidesNowMatchIsCleared() { + val game = id; val dir = dir() + val cloud = Memory().apply { files["slot0.sav"] = "v1".toByteArray() to 1000L } + CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = false) + cloud.files["slot0.sav"] = "v2".toByteArray() to 50_000L + File(dir, "slot0.sav").writeText("v2") + com.droiddeck.launcher.stores.gog.GogPrefs.get(app).edit().putString("cloud_conflicts_$game", "slot0.sav").apply() + assertEquals("up-to-date", CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = false).reason) + assertTrue(CloudSaves.conflicts(app, Store.GOG, game).isEmpty()) + com.droiddeck.launcher.stores.gog.GogPrefs.get(app).edit().putString("cloud_conflicts_$game", "slot0.sav").apply() + CloudSaves.upWith(app, Store.GOG, game, dir, cloud, force = false) + assertTrue(CloudSaves.conflicts(app, Store.GOG, game).isEmpty()) + } + + @Test fun aDownloadTheLaunchStoppedWaitingForWritesNothing() { + val game = id; val dir = dir() + File(dir, "slot0.sav").writeText("local") + val cloud = Memory().apply { files["slot0.sav"] = "v1".toByteArray() to 1000L } + val r = CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = true, claim = { false }) + assertEquals("skipped", r.result); assertEquals("launch-moved-on", r.reason) + assertEquals("local", File(dir, "slot0.sav").readText()) + assertFalse(File(app.filesDir, "stores/cloud-backups/gog-$game").exists()) + var claimed = 0 + assertEquals("ok", CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = true, claim = { claimed++; true }).result) + assertEquals(1, claimed); assertEquals("v1", File(dir, "slot0.sav").readText()) + } + @Test fun aFileChangedOnBothSidesIsLeftForTheUser() { val game = id; val dir = dir() val cloud = Memory().apply { files["slot0.sav"] = "v1".toByteArray() to 1000L } @@ -65,6 +142,134 @@ class CloudSavesTest { assertTrue(CloudSaves.conflicts(app, Store.GOG, game).isEmpty()) } + @Test fun aSlotTheGameRewritesDuringADownloadIsKeptAndNamedAsAConflict() { + val game = id; val dir = dir() + val cloud = Memory().apply { files["slot0.sav"] = "v1".toByteArray() to 1000L } + CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = false) + cloud.files["slot0.sav"] = "cloud v2".toByteArray() to 50_000L + cloud.onGet = { File(dir, "slot0.sav").writeText("game wrote") } + val r = CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = false) + assertEquals("partial", r.result); assertEquals("changed-locally", r.reason); assertEquals(1, r.conflicts) + assertTrue(r.detail.contains("slot0.sav")) + assertEquals("game wrote", File(dir, "slot0.sav").readText()) + assertEquals(listOf("slot0.sav"), CloudSaves.conflicts(app, Store.GOG, game)) + } + + @Test fun aCloudNameOutsideTheSaveFolderIsBlockedNotAConflict() { + val game = id; val dir = dir() + val cloud = Memory().apply { files["../escape.sav"] = "x".toByteArray() to 1000L } + val r = CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = false) + assertEquals("partial", r.result); assertEquals("blocked-path", r.reason); assertEquals(0, r.conflicts) + assertTrue(r.detail.contains("../escape.sav")) + assertFalse(File(dir.parentFile, "escape.sav").exists()) + assertTrue(CloudSaves.conflicts(app, Store.GOG, game).isEmpty()) + } + + @Test fun anUploadStoppedByANewerCloudWriteKeepsTheRestAsConflicts() { + val game = id; val dir = dir() + val cloud = Memory().apply { files["a.sav"] = "a1".toByteArray() to 1000L; files["b.sav"] = "b1".toByteArray() to 1000L } + CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = false) + File(dir, "a.sav").writeText("a2"); File(dir, "b.sav").writeText("b2") + cloud.raceAfter = 1 + val r = CloudSaves.upWith(app, Store.GOG, game, dir, cloud, force = false) + assertEquals("partial", r.result); assertEquals("changed-in-cloud", r.reason); assertEquals(1, r.files) + val unsent = listOf("a.sav", "b.sav").single { it !in cloud.puts } + assertEquals(listOf(unsent), CloudSaves.conflicts(app, Store.GOG, game)) + } + + @Test fun aForcedUploadKeepsConflictsForSlotsItDidNotSend() { + val game = id; val dir = dir() + val cloud = Memory().apply { files["slot0.sav"] = "v1".toByteArray() to 1000L; files["slot1.sav"] = "w1".toByteArray() to 1000L } + CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = false) + File(dir, "slot0.sav").writeText("local v2"); File(dir, "slot1.sav").delete() + cloud.files["slot0.sav"] = "cloud v2".toByteArray() to 50_000L + com.droiddeck.launcher.stores.gog.GogPrefs.get(app).edit().putString("cloud_conflicts_$game", "slot0.sav\nslot1.sav").apply() + CloudSaves.upWith(app, Store.GOG, game, dir, cloud, force = true) + assertEquals("local v2", String(cloud.files.getValue("slot0.sav").first)) + assertEquals(listOf("slot1.sav"), CloudSaves.conflicts(app, Store.GOG, game)) + } + + private fun ubisoftDir(user: String, root: File = File(app.filesDir, "ubi-${System.nanoTime()}")) = File(root, "$user/77").apply { mkdirs() } + + @Test fun aSlotBothSidesSavedAlikeIsNotAConflictWhenTheCloudNamesOnlyAVersion() { + val game = id; val dir = ubisoftDir("u1") + val slots = MemorySlots().apply { store("1", MemorySlots.save("a1")) } + assertEquals("ok", CloudSaves.downWith(app, Store.UBISOFT, game, dir, UbisoftCloudTransport(slots, "u1"), force = false).result) + File(dir, "1.save").writeBytes(MemorySlots.save("a2")) + slots.store("1", MemorySlots.save("a2")) + val down = CloudSaves.downWith(app, Store.UBISOFT, game, dir, UbisoftCloudTransport(slots, "u1"), force = false) + assertEquals(0, down.conflicts) + assertTrue(CloudSaves.conflicts(app, Store.UBISOFT, game, dir).isEmpty()) + val up = CloudSaves.upWith(app, Store.UBISOFT, game, dir, UbisoftCloudTransport(slots, "u1"), force = false) + assertEquals("up-to-date", up.reason); assertEquals(0, up.conflicts) + File(dir, "1.save").writeBytes(MemorySlots.save("a3 local")) + slots.store("1", MemorySlots.save("a3 cloud")) + assertEquals(1, CloudSaves.downWith(app, Store.UBISOFT, game, dir, UbisoftCloudTransport(slots, "u1"), force = false).conflicts) + } + + @Test fun aNewUbisoftSaveWithAnEmptyIdentifierIsStampedAndUploaded() { + val game = id; val dir = ubisoftDir("u1") + val slots = MemorySlots().apply { store("1", MemorySlots.save("a1")) } + CloudSaves.downWith(app, Store.UBISOFT, game, dir, UbisoftCloudTransport(slots, "u1"), force = false) + File(dir, "2.save").writeBytes("UBISAVE0".toByteArray() + ByteArray(32) + "fresh slot".toByteArray()) + File(dir, "3.save").writeBytes("UBISAVE0".toByteArray() + "not-an-identifier-but-not-empty!".toByteArray()) + val up = CloudSaves.upWith(app, Store.UBISOFT, game, dir, UbisoftCloudTransport(slots, "u1"), force = false) + assertEquals("uploaded", up.reason) + val stamped = UbisoftCloud.mark(File(dir, "2.save").readBytes()) + assertTrue(stamped != null) + assertEquals("fresh slot", String(File(dir, "2.save").readBytes().copyOfRange(40, 50))) + assertEquals(stamped, UbisoftCloud.mark(slots.data.getValue("2"))) + assertFalse("3" in slots.data) + assertEquals("not-an-identifier-but-not-empty!", String(File(dir, "3.save").readBytes().copyOfRange(8, 40))) + } + + @Test fun aSlotCommittedBeforeALaterOneFailsReachesTheBaseline() { + val game = id; val dir = ubisoftDir("u1") + val slots = MemorySlots().apply { store("1", MemorySlots.save("a1")); store("2", MemorySlots.save("b1")) } + CloudSaves.downWith(app, Store.UBISOFT, game, dir, UbisoftCloudTransport(slots, "u1"), force = false) + File(dir, "1.save").writeBytes(MemorySlots.save("a2")); File(dir, "2.save").writeBytes(MemorySlots.save("b2")) + slots.uploadsLeft = 1 + assertTrue(runCatching { CloudSaves.upWith(app, Store.UBISOFT, game, dir, UbisoftCloudTransport(slots, "u1"), force = false) } + .exceptionOrNull() is java.io.IOException) + val base = CloudSaves.baseline(app, Store.UBISOFT, CloudSaves.scope(Store.UBISOFT, game, dir))!! + val sent = listOf("1", "2").single { slots.data.getValue(it).contentEquals(MemorySlots.save(if (it == "1") "a2" else "b2")) } + val kept = if (sent == "1") "2" else "1" + assertEquals(CloudSaves.md5(File(dir, "$sent.save")), base.getValue("$sent.save").localMd5) + assertEquals(CloudSaves.md5(MemorySlots.save(if (kept == "1") "a1" else "b1")), base.getValue("$kept.save").localMd5) + slots.uploadsLeft = Int.MAX_VALUE + val r = CloudSaves.upWith(app, Store.UBISOFT, game, dir, UbisoftCloudTransport(slots, "u1"), force = false) + assertEquals("ok", r.result); assertEquals(1, r.files); assertEquals(0, r.conflicts) + } + + @Test fun ubisoftConflictsBelongToTheAccountAndProductThatHadThem() { + val game = id; val root = File(app.filesDir, "ubi-${System.nanoTime()}") + val a = ubisoftDir("uA", root); val b = ubisoftDir("uB", root) + val cloudB = Memory().apply { files["slot0.save"] = "b1".toByteArray() to 1000L } + CloudSaves.downWith(app, Store.UBISOFT, game, b, cloudB, force = false) + File(b, "slot0.save").writeText("b local") + val cloudA = Memory().apply { files["slot0.save"] = "a1".toByteArray() to 1000L } + CloudSaves.downWith(app, Store.UBISOFT, game, a, cloudA, force = false) + File(a, "slot0.save").writeText("a local") + cloudA.files["slot0.save"] = "a2".toByteArray() to 50_000L + assertEquals(1, CloudSaves.downWith(app, Store.UBISOFT, game, a, cloudA, force = false).conflicts) + assertEquals(listOf("slot0.save"), CloudSaves.conflicts(app, Store.UBISOFT, game, a)) + assertTrue(CloudSaves.conflicts(app, Store.UBISOFT, game, b).isEmpty()) + CloudSaves.downWith(app, Store.UBISOFT, game, b, cloudB, force = true) + assertEquals("b local", File(b, "slot0.save").readText()) + com.droiddeck.launcher.stores.epic.EpicPrefs.get(app).edit().putString("cloud_conflicts_$game", "slot0.save").apply() + assertTrue(CloudSaves.conflicts(app, Store.UBISOFT, game, ubisoftDir("uC", root)).isEmpty()) + assertTrue(CloudSaves.conflicts(app, Store.UBISOFT, game).isEmpty()) + } + + @Test fun aUbisoftGameAddedFromAnotherFolderIsFoundForCloudSaves() { + val game = id + val folder = File(app.filesDir, "Elsewhere/Anno-$game").apply { mkdirs() } + File(folder, "Anno.exe").writeText("MZ") + StoreGameSidecar(Store.UBISOFT, game, "Anno", "Anno.exe", extra = mapOf("productId" to "77")).write(folder) + com.droiddeck.launcher.session.SessionPrefs.followStoreGame(app, "ubisoft:$game", folder.path) { true } + assertEquals("not-signed-in", CloudSaves.status(app, Store.UBISOFT, game).reason) + } + @Test fun aDirtyMarkStaysUntilAnUploadGoesThroughOrIsSkippedForGood() { val gameId = "1207664643" val folder = File(StoreInstallRoot.storeDir(StoreInstallRoot.internalRoot(app), Store.GOG), "ELDERBORN-mark").apply { mkdirs() } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt index b9deb11a1..2a3ed5ce6 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt @@ -1,6 +1,7 @@ package com.droiddeck.launcher.stores.ea import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.CloudSaves import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreGameSidecar import com.droiddeck.launcher.stores.StoreLaunch @@ -413,4 +414,190 @@ class EaTest { assertTrue(!EaAuth.storeRefreshed(app, "late", 3600, "r3")) assertNull(EaAuth.load(app)) } + + private fun tokenServer(status: String, error: String = "invalid_grant"): java.net.ServerSocket { + val server = java.net.ServerSocket(0) + Thread { + runCatching { + server.accept().use { socket -> + val input = socket.getInputStream() + val head = StringBuilder() + while (!head.endsWith("\r\n\r\n")) head.append(input.read().takeIf { it >= 0 }?.toChar() ?: break) + val length = Regex("(?i)content-length: *(\\d+)").find(head)?.groupValues?.get(1)?.toInt() ?: 0 + repeat(length) { input.read() } + val body = """{"error":"$error"}""".toByteArray() + socket.getOutputStream().apply { + write("HTTP/1.1 $status\r\nContent-Type: application/json\r\nContent-Length: ${body.size}\r\nConnection: close\r\n\r\n".toByteArray()) + write(body) + flush() + } + } + } + }.apply { isDaemon = true; start() } + return server + } + + @Test fun aRejectedRefreshAsksForSignInWhileAnUnreachableOneKeepsTheSessionForARetry() { + val app = org.robolectric.RuntimeEnvironment.getApplication() + val real = EaAuth.tokenUrl + try { + com.droiddeck.launcher.stores.StoreAccounts.write(app, Store.EA, + JSONObject().put("access_token", "old").put("refresh_token", "r").put("expires_at", 1L).put("user_id", "1")) + EaAuth.tokenUrl = "http://127.0.0.1:1/" + assertNull(EaAuth.accessToken(app)) + assertTrue(CloudSaves.status(app, Store.EA, "x").signedIn) + tokenServer("503 Service Unavailable", "temporarily_unavailable").use { server -> + EaAuth.tokenUrl = "http://127.0.0.1:${server.localPort}/" + assertNull(EaAuth.accessToken(app)) + } + assertTrue(CloudSaves.status(app, Store.EA, "x").signedIn) + tokenServer("400 Bad Request", "invalid_client").use { server -> + EaAuth.tokenUrl = "http://127.0.0.1:${server.localPort}/" + assertNull(EaAuth.accessToken(app)) + } + assertTrue(CloudSaves.status(app, Store.EA, "x").signedIn) + tokenServer("400 Bad Request").use { server -> + EaAuth.tokenUrl = "http://127.0.0.1:${server.localPort}/" + assertNull(EaAuth.accessToken(app)) + } + assertFalse(CloudSaves.status(app, Store.EA, "x").signedIn) + assertTrue(EaAuth.storeRefreshed(app, "new", 3600, "r2")) + assertTrue(CloudSaves.status(app, Store.EA, "x").signedIn) + } finally { + EaAuth.tokenUrl = real + EaAuth.signOut(app) + } + } + + private val heat = """ +%Documents%/Need for Speed Heat/SaveGame/savegame/ +%Documents%/Need for Speed Heat/SaveGame/wraps/ +%Documents%/Need for Speed Heat/settings/PROFILEOPTIONS +""" + + @Test fun rulesFindTheFolderTheyShareAndPickOnlyTheirFiles() { + val rules = EaSaveRules.parse(heat)!! + assertEquals("%Documents%/Need for Speed Heat/", rules.base()) + assertEquals("%DOCUMENTS%/Need for Speed Heat/", EaSaveRules.template(rules.base()!!)) + assertTrue(rules.matches("%Documents%/Need for Speed Heat/SaveGame/savegame/1")) + assertTrue(rules.matches("%documents%\\need for speed heat\\settings\\PROFILEOPTIONS")) + assertFalse(rules.matches("%Documents%/Need for Speed Heat/settings/PROFILEOPTIONS.bak")) + assertFalse(rules.matches("%Documents%/Need for Speed Heat/Logs/crash.txt")) + } + + @Test fun globsStayInsideTheirFolderAndExcludesWin() { + val bf = EaSaveRules.parse("""%Documents%/Battlefield 6/settings/*.xml + %Documents%/Battlefield 6/settings/*.sav""")!! + assertEquals("%Documents%/Battlefield 6/settings/", bf.base()) + assertTrue(bf.matches("%Documents%/Battlefield 6/settings/a.sav")) + assertFalse(bf.matches("%Documents%/Battlefield 6/settings/sub/a.sav")) + val le = EaSaveRules.parse(""" + %Documents%/BioWare/Mass Effect Legendary Edition/Config/ + %Documents%/BioWare/Mass Effect Legendary Edition/""")!! + assertTrue(le.matches("%Documents%/BioWare/Mass Effect Legendary Edition/Save/ME1/x.pcsav")) + assertFalse(le.matches("%Documents%/BioWare/Mass Effect Legendary Edition/Config/GamerSettings.ini")) + assertNull(EaSaveRules.parse("")) + assertNull(EaSaveRules.parse("""C:/Games/x/""")!!.base()) + } + + @Test fun rulesApplyInTheirOrderAndTheFirstMatchDecides() { + val rules = EaSaveRules.parse(""" +%Documents%/Game/Config/ +%Documents%/Game/Config/keys.ini +%Documents%/Game/""")!! + assertTrue(rules.matches("%Documents%/Game/Config/keys.ini")) + assertFalse(rules.matches("%Documents%/Game/Config/video.ini")) + assertTrue(rules.matches("%Documents%/Game/Save/1.sav")) + } + + @Test fun aBarePatternMatchesFileNamesInsideTheSaveFolder() { + val dig = EaSaveRules.parse(""" +%Documents%/My Games/SteamWorld Dig/controls.cfg +%Documents%/My Games/SteamWorld Dig/settings.xml +*.xml +%Documents%/My Games/SteamWorld Dig/profile.dat""")!! + assertEquals("%Documents%/My Games/SteamWorld Dig/", dig.base()) + assertTrue(dig.matches("%Documents%/My Games/SteamWorld Dig/profile1.xml")) + assertFalse(dig.matches("%Documents%/My Games/SteamWorld Dig/settings.xml")) + assertFalse(dig.matches("%Documents%/Other Game/profile1.xml")) + val witness = EaSaveRules.parse("""%AppData%/The Witness/**.png""")!! + assertEquals("%AppData%/The Witness/", witness.base()) + assertTrue(witness.matches("%AppData%/The Witness/shot.png")) + } + + @Test fun localLowAndInstallFoldersResolveToTheirTemplates() { + val fe = EaSaveRules.parse("""%LocalLowAppData%/Zoink Games/Fe/SystemSettings.sav +%LocalLowAppData%/Zoink Games/Fe/Save1.sav""")!! + assertEquals("%APPLICATION_DATA_LOCAL_LOW%/Zoink Games/Fe/", EaSaveRules.template(fe.base()!!)) + val castle = EaSaveRules.parse("""%InstallDir%/x86/Lost_Castle_Data/lc_game_data +%InstallDir%/x64/Lost_Castle_Data/lc_game_data""")!! + assertEquals("%INSTALL%/", EaSaveRules.template(castle.base()!!)) + assertTrue(castle.matches("%InstallDir%/x64/Lost_Castle_Data/lc_game_data")) + assertFalse(castle.matches("%InstallDir%/x64/Lost_Castle_Data/other")) + } + + @Test fun aManifestWithSingleQuotedAttributesKeepsEveryField() { + val m = EaCloud.parse(""" + %Documents%/A & B/1 + s1""") + val f = m.files.single() + assertEquals(12L, f.size); assertEquals("content/12-ab", f.href); assertEquals("q+w==", f.md5) + assertEquals("2022-10-17T23:51:04ZZ", f.created); assertEquals("2022-10-18T00:00:00ZZ", f.modified) + assertEquals("%Documents%/A & B/1", f.localName) + assertEquals("{1}", m.lineage); assertEquals(listOf("s1"), m.snapshots) + assertTrue(runCatching { EaCloud.parse("") }.isFailure) + } + + @Test fun aManifestKeepsItsFilesSnapshotsAndEaTimestampsThroughAWrite() { + val xml = """ + + %Documents%/Need for Speed Heat/SaveGame/savegame/1 + + 80cmnqT/rIKQRmciINSVhQ== +""" + val m = EaCloud.parse(xml) + assertEquals(1, m.files.size) + assertEquals("c7996be80a6e38d1f8ef28866b114f8b", EaCloud.hex(m.files[0].md5)) + assertEquals(1666050664000L, EaCloud.parseTime(m.files[0].modified)) + assertEquals("2022-10-17T23:51:04ZZ", EaCloud.stamp(1666050664123L)) + val again = EaCloud.parse(EaCloud.write(m)) + assertEquals(m.files.single().localName, again.files.single().localName) + assertEquals(m.files.single().href, again.files.single().href) + assertEquals(m.files.single().created, again.files.single().created) + assertEquals(m.files.single().modified, again.files.single().modified) + assertEquals(m.files.single().size, again.files.single().size) + assertEquals(m.files.single().md5, again.files.single().md5) + assertEquals(listOf("80cmnqT/rIKQRmciINSVhQ=="), again.snapshots) + assertEquals(m.lineage, again.lineage) + } + + @Test fun commentedRulesAreIgnoredAndNamesKeepTheirSpaces() { + val rules = EaSaveRules.parse(""" + + %Documents%/Game/ """)!! + assertEquals(listOf("%Documents%/Game/"), rules.includes) + assertTrue(rules.excludes.isEmpty()) + assertTrue(rules.matches("%Documents%/Game/Config/a.ini")) + assertEquals("%Documents%/Game/slot.sav ", EaSaveRules.normalize("%Documents%\\Game\\slot.sav ")) + } + + @Test fun aTruncatedManifestIsRefused() { + val cut = runCatching { EaCloud.parse("""""") } + assertTrue(cut.isFailure) + val open = runCatching { EaCloud.parse("""%Documents%/a""") } + assertTrue(open.isFailure) + } + + @Test fun snapshotEntitiesAreDecodedOnceAndWrittenBackTheSame() { + val m = EaCloud.parse("""abc+def""") + assertEquals(listOf("abc+def"), m.snapshots) + assertEquals(listOf("abc+def"), EaCloud.parse(EaCloud.write(m)).snapshots) + } + + @Test fun cloudKeysFollowTheMultiplayerId() { + assertEquals(listOf("195133_195133"), EaCloud.keys("195133", "195133")) + assertEquals(listOf("52209", "52209_52209"), EaCloud.keys("52209", "")) + assertEquals("https://x/y?a=1&b=2", EaCloud.manifestUrl("https://x/y?a=1&b=2")) + assertTrue(CloudSaves.supports(Store.EA)) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/MemorySlots.kt b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/MemorySlots.kt new file mode 100644 index 000000000..e32909ee7 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/MemorySlots.kt @@ -0,0 +1,43 @@ +package com.droiddeck.launcher.stores.ubisoft + +import com.droiddeck.launcher.stores.CloudSaves +import org.json.JSONArray +import org.json.JSONObject +import java.time.Instant + +internal class MemorySlots : UbisoftSlots { + private var record = JSONObject().put("entityId", "e1").put("name", UbisoftCloud.entityName(77L)).put("revision", 1) + .put("obj", JSONObject().put("slots", JSONArray())) + private var clock = 1_700_000_000_000L + val data = HashMap() + var uploadsLeft = Int.MAX_VALUE + var afterUpdate: (JSONArray) -> Unit = {} + + override fun entity() = UbisoftCloud.Entity(JSONObject(record.toString())) + + override fun upload(slot: String, data: ByteArray) { + if (uploadsLeft-- <= 0) throw java.io.IOException("upload failed") + this.data[slot] = data + } + + override fun update(entity: UbisoftCloud.Entity, slots: JSONArray) { + afterUpdate(slots) + record = JSONObject(record.toString()).put("revision", record.getInt("revision") + 1).put("obj", JSONObject().put("slots", slots)) + } + + override fun download(slot: String) = data[slot] + + fun store(slot: String, bytes: ByteArray) { + data[slot] = bytes + val slots = JSONArray(record.getJSONObject("obj").getJSONArray("slots").toString()) + val entry = (0 until slots.length()).map { slots.getJSONObject(it) }.firstOrNull { it.optString("filename") == slot } + ?: JSONObject().put("filename", slot).put("id", slot.toInt()).also { slots.put(it) } + clock += 60_000L + entry.put("hash", UbisoftCloud.mark(bytes)).put("size", bytes.size).put("lastModified", Instant.ofEpochMilli(clock).toString()) + record = JSONObject(record.toString()).put("revision", record.getInt("revision") + 1).put("obj", JSONObject().put("slots", slots)) + } + + companion object { + fun save(tag: String): ByteArray = ("UBISAVE0" + CloudSaves.md5(tag.toByteArray()) + tag).toByteArray() + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt index aecf4ca77..b0aea6866 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt @@ -5,6 +5,7 @@ import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreGameSidecar import com.droiddeck.launcher.stores.StoreLaunch import org.json.JSONArray +import java.io.File import org.json.JSONObject import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertEquals @@ -98,4 +99,74 @@ class UbisoftTest { assertArrayEquals(bytes, UbisoftActivation.unhex("00017fff802a")) assertNull(UbisoftActivation.unhex("abc")) } + + @Test fun aSaveNamesItsUbisoftIdentifierInItsHeader() { + val mark = "4ef5bf634b40daa577aaeaa52c2283a9" + val save = byteArrayOf(0x24, 2, 0, 0, 0, 0, 0, 0) + mark.toByteArray() + ByteArray(64) { it.toByte() } + assertEquals(mark, UbisoftCloud.mark(save)) + assertNull(UbisoftCloud.mark(ByteArray(8) + ByteArray(32) + ByteArray(16))) + assertNull(UbisoftCloud.mark(ByteArray(39))) + } + + @Test fun cloudSaveBodiesSurviveTheZlibHop() { + val save = ByteArray(200_000) { (it % 251).toByte() } + assertArrayEquals(save, UbisoftCloud.inflate(UbisoftCloud.deflate(save))) + assertEquals(0x78, UbisoftCloud.deflate(save)[0].toInt()) + val packed = UbisoftCloud.deflate(save) + val cut = runCatching { UbisoftCloud.inflate(packed.copyOf(packed.size / 2)) } + assertTrue(cut.isFailure) + } + + @Test fun aSlotVersionChangesWithItsSizeTimeOrIdentifier() { + val a = UbisoftCloud.Slot(1, "1", "4ef5bf634b40daa577aaeaa52c2283a9", 2414, 1_689_224_156_000) + assertEquals("2414:1689224156000:4ef5bf634b40daa577aaeaa52c2283a9", UbisoftCloud.version(a)) + assertTrue(UbisoftCloud.version(a) != UbisoftCloud.version(UbisoftCloud.Slot(1, "1", a.hash, 2414, a.modifiedMs + 1))) + } + + @Test fun aSlotCommitCountsOnlyWhenNoOtherSlotMovedAndOursLanded() { + fun entity(revision: Int, vararg slots: Triple) = UbisoftCloud.Entity(JSONObject().put("revision", revision) + .put("obj", JSONObject().put("slots", JSONArray().apply { + for ((name, hash, size) in slots) put(JSONObject().put("filename", name).put("hash", hash).put("size", size).put("lastModified", "2026-01-01T00:00:00Z")) + }))) + val a = "4ef5bf634b40daa577aaeaa52c2283a9"; val b = "0123456789abcdef0123456789abcdef"; val c = "fedcba9876543210fedcba9876543210" + val before = entity(4, Triple("1", a, 10), Triple("2", b, 20)) + assertEquals(c, UbisoftCloudTransport.committedSlot(before, entity(5, Triple("1", c, 11), Triple("2", b, 20)), "1", c, 11)?.hash) + assertNull(UbisoftCloudTransport.committedSlot(before, entity(6, Triple("1", c, 11), Triple("2", a, 21)), "1", c, 11)) + assertNull(UbisoftCloudTransport.committedSlot(before, entity(6, Triple("1", b, 30), Triple("2", b, 20)), "1", c, 11)) + assertNull(UbisoftCloudTransport.committedSlot(before, entity(6, Triple("1", c, 11)), "1", c, 11)) + } + + @Test fun aSlotTheCloudRewritesBeforeItIsVerifiedStaysUnsent() { + val slots = MemorySlots().apply { store("1", MemorySlots.save("a1")) } + val transport = UbisoftCloudTransport(slots, "u1") + transport.list() + slots.afterUpdate = { list -> list.getJSONObject(0).put("hash", UbisoftCloud.mark(MemorySlots.save("other device"))) } + val changed = runCatching { transport.put(mapOf("1.save" to MemorySlots.save("a2"))) }.exceptionOrNull() as com.droiddeck.launcher.stores.CloudChanged + assertTrue(changed.sent.isEmpty()) + assertEquals(listOf("1.save"), changed.unsent) + assertNull(transport.committed("1.save")) + } + + @Test fun ubisoftCloudSavesAreSupported() { + assertTrue(com.droiddeck.launcher.stores.CloudSaves.supports(Store.UBISOFT)) + assertTrue(!com.droiddeck.launcher.stores.CloudSaves.supports(Store.AMAZON)) + } + + @Test fun keptGameTokensBelongToOneAccountAndProductUntilDropped() { + val root = kotlin.io.path.createTempDirectory().toFile() + val dir = File(root, "cache") + val cache = UbisoftActivation.TokenCache(dir) + assertNull(cache.get("u-1", 109)) + assertTrue(cache.put("u-1", 109, byteArrayOf(1, 2, 3))) + assertArrayEquals(byteArrayOf(1, 2, 3), cache.get("u-1", 109)) + assertNull(cache.get("u-1", 82)) + assertNull(cache.get("u-2", 109)) + assertTrue(cache.put("../u-1", 82, byteArrayOf(4))) + assertEquals(listOf("cache"), root.list()!!.toList()) + assertTrue(dir.listFiles()!!.all { it.parentFile == dir }) + assertTrue(cache.drop("u-1", 109)) + assertNull(cache.get("u-1", 109)) + assertTrue(cache.drop("u-1", 109)) + root.deleteRecursively() + } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/CloudMessageTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/CloudMessageTest.kt index 2bf7360ed..0ada7eba2 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/CloudMessageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/CloudMessageTest.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.ui import com.droiddeck.launcher.R import com.droiddeck.launcher.stores.CloudSaves import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner @@ -25,6 +26,15 @@ class CloudMessageTest { assertEquals(ctx.getString(R.string.cloud_not_synced), msg("failed", 0, 0, "SocketTimeoutException")) } + @Test fun aPartialSyncNamesTheSlotsItLeft() { + fun partial(conflicts: Int, detail: String) = cloudMessage(ctx, CloudSaves.Result("partial", 0, 0L, "blocked-path", conflicts, detail)) + assertEquals(ctx.getString(R.string.cloud_partial, "outside the save folder: ../x.save"), partial(0, "outside the save folder: ../x.save")) + assertEquals(ctx.getString(R.string.cloud_conflict_files_detail, 2, "changed locally: 1.save, 2.save"), partial(2, "changed locally: 1.save, 2.save")) + assertTrue(partial(1, "changed locally: 1.save").contains("1.save")) + assertEquals(ctx.getString(R.string.cloud_conflict_files, 1), partial(1, "")) + assertEquals(ctx.getString(R.string.cloud_not_synced), partial(0, "")) + } + @Test fun okResultsSayWhatHappened() { assertEquals(ctx.getString(R.string.cloud_up_to_date), msg("ok", 0, 0, "up-to-date")) assertEquals(ctx.getString(R.string.cloud_done, 3), msg("ok", 3, 0, "uploaded")) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch index 1a5bc2711..5031cb93d 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch @@ -116,7 +116,7 @@ def through_client(folder, sidecar, timeout=CLIENT_TIMEOUT): return str(answer.get("reason") or "failed") -def ask(channel, request, timeout=TIMEOUT): +def ask(channel, request, timeout=TIMEOUT, claim=False): req_dir, resp_dir = channel / "req", channel / "resp" req_dir.mkdir(parents=True, exist_ok=True) resp_dir.mkdir(parents=True, exist_ok=True) @@ -125,19 +125,33 @@ def ask(channel, request, timeout=TIMEOUT): tmp.write_text(json.dumps(request)) os.rename(tmp, req_dir / (rid + ".json")) answer = resp_dir / (rid + ".json") - deadline = time.monotonic() + timeout - while time.monotonic() < deadline: + + def wait(seconds): + deadline = time.monotonic() + seconds + while time.monotonic() < deadline: + try: + value = json.loads(answer.read_text()) + answer.unlink() + return value + except (OSError, ValueError): + time.sleep(0.05) + return None + + value = wait(timeout) + if value is not None: + return value + for pending in (req_dir / (rid + ".json"), resp_dir / (rid + ".taken")): + abandoned = pending.with_name(rid + ".abandoned") try: - value = json.loads(answer.read_text()) - answer.unlink() - return value - except (OSError, ValueError): - time.sleep(0.05) - try: - (req_dir / (rid + ".json")).unlink() - except OSError: - pass - return None + os.rename(pending, abandoned) + except OSError: + continue + try: + abandoned.unlink() + except OSError: + pass + return None + return wait(CLAIMED_TIMEOUT) if claim else None def windows_path(unix): @@ -255,7 +269,8 @@ def create_prefix(compat_data, proton, timeout=120): CLOUD_TIMEOUT = 15.0 -CLOUD_STORES = ("gog", "epic") +CLAIMED_TIMEOUT = 120.0 +CLOUD_STORES = ("gog", "epic", "ea", "ubisoft") STORE_GAME = 10 RAN = 11 RAN_FAILED = 12 @@ -304,11 +319,14 @@ def exited(argv, code=0): if found is not None and launch_dir and str(found[1].get("store")) == "ea": ask(Path(launch_dir) / "stores", {"op": "ea-exited", "store": "ea", "id": str(found[1].get("id"))}, timeout=1.0) log("ea %s exited" % found[1].get("id")) - return 0 if found is None or not launch_dir or not cloud_on(found[1]): return 0 store, game = str(found[1].get("store")), str(found[1].get("id")) - ask(Path(launch_dir) / "stores", {"op": "cloud-up", "store": store, "id": game}, timeout=1.0) + try: + ask(Path(launch_dir) / "stores", {"op": "cloud-up", "store": store, "id": game}, timeout=1.0) + except OSError as error: + log("cloud %s %s up not requested (%s)" % (store, game, type(error).__name__)) + return 0 log("cloud %s %s up requested" % (store, game)) return 0 @@ -1601,7 +1619,7 @@ def main(argv): compat_data = os.environ.get("STEAM_COMPAT_DATA_PATH", "").rstrip("/") prefix_id = os.path.basename(compat_data) if compat_data else "" launch_dir = os.environ.get("DD_LAUNCH_DIR", "") - if launch_dir and cloud_on(sidecar): + if launch_dir and cloud_on(sidecar) and store != "ea": made = create_prefix(compat_data, os.environ.get("DD_STORE_PROTON", "")) if made != "present": log("cloud %s %s prefix=%s" % (store, game, made)) @@ -1670,13 +1688,16 @@ def main(argv): log("epic prefix=%s %s" % (prefix_id or "?", provision_prefix(compat_data))) if store == "ea": prepare_ea(folder, sidecar, compat_data, launch_dir) - return STORE_GAME if not cloud_on(sidecar): if store in CLOUD_STORES: log("cloud %s %s down result=skipped reason=off" % (store, game)) - return 0 + return STORE_GAME if store == "ea" else 0 if launch_dir: - answer = ask(Path(launch_dir) / "stores", {"op": "cloud-down", "store": store, "id": game}, timeout=CLOUD_TIMEOUT) + try: + answer = ask(Path(launch_dir) / "stores", {"op": "cloud-down", "store": store, "id": game}, timeout=CLOUD_TIMEOUT, claim=True) + except OSError as error: + log("cloud %s %s down result=failed reason=%s" % (store, game, type(error).__name__)) + return STORE_GAME if answer is None: log("cloud %s %s down result=timeout" % (store, game)) else: diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox index ca7032cdc..143aa07c2 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox @@ -518,7 +518,7 @@ def launch(command, env): context.chmod(0o600) owned_env = dict(env, DROIDDECK_XBOX_ACTIVE='1', DROIDDECK_XBOX_COMMAND_FILE=str(context), XODUS_SOCKET=reply['socket'], XODUS_BRIDGE_PORT=str(port), XODUS_BRIDGE_KEY=key, - XODUS_LOG='off', RUST_LOG='off', XODUS_SAVE_SYNC='auto' if sidecar.get('cloud', True) else 'off') + XODUS_LOG='off', RUST_LOG='off', XODUS_SAVE_SYNC='auto' if sidecar.get('cloud', True) else 'none') for name in ('DROIDDECK_XBOX_CREDENTIAL_SOCKET', 'DROIDDECK_XBOX_CREDENTIAL_PORT', 'DROIDDECK_XBOX_CREDENTIAL_KEY'): owned_env.pop(name, None) if reply.get('playfab'): diff --git a/tools/tests/test_droiddeck_epic.py b/tools/tests/test_droiddeck_epic.py index 6849db9c1..e78de6280 100644 --- a/tools/tests/test_droiddeck_epic.py +++ b/tools/tests/test_droiddeck_epic.py @@ -1318,7 +1318,7 @@ class StoreLaunchClientTest(unittest.TestCase): (self.folder / ".droiddeck-store.json").write_text(json.dumps(sidecar)) with mock.patch.dict(os.environ, {"DD_LAUNCH_DIR": str(self.tmp / "launch"), "STEAM_COMPAT_DATA_PATH": ""}), \ mock.patch.dict(S, {"client_wanted": lambda: calls.append("wanted") or True, - "ask": lambda channel, request, timeout=0: calls.append(request["op"]) or {"ok": True}}): + "ask": lambda channel, request, timeout=0, claim=False: calls.append(request["op"]) or {"ok": True}}): S["main"]([str(self.folder / ".droiddeck-launch.bat")]) self.assertNotIn("wanted", calls) self.assertNotIn("epic-code", calls) @@ -1341,7 +1341,7 @@ class StoreLaunchClientTest(unittest.TestCase): with mock.patch.dict(os.environ, env), \ mock.patch.dict(S, {"client_wanted": lambda: True, "through_client": lambda folder, sidecar, timeout=0: calls.append("client") or "timeout", - "ask": lambda channel, request, timeout=0: calls.append(request["op"]) or {"ok": True, "code": True}}): + "ask": lambda channel, request, timeout=0, claim=False: calls.append(request["op"]) or {"ok": True, "code": True}}): S["main"]([str(self.folder / ".droiddeck-launch.bat")]) self.assertEqual(["client", "epic-code", "cloud-down"], calls) @@ -1356,7 +1356,7 @@ class StoreLaunchClientTest(unittest.TestCase): (self.folder / ".droiddeck-epic-code").write_text("stale") with mock.patch.dict(os.environ, {"DD_LAUNCH_DIR": str(self.tmp / "launch"), "STEAM_COMPAT_DATA_PATH": ""}), \ mock.patch.dict(S, {"client_wanted": lambda: True, "through_client": through, - "ask": lambda channel, request, timeout=0: calls.append(request["op"]) or {"ok": True}}): + "ask": lambda channel, request, timeout=0, claim=False: calls.append(request["op"]) or {"ok": True}}): S["main"]([str(self.folder / ".droiddeck-launch.bat")]) self.assertEqual(["client", "cloud-down"], calls) self.assertFalse((self.folder / ".droiddeck-epic-code").exists()) @@ -1368,7 +1368,7 @@ class StoreLaunchClientTest(unittest.TestCase): with mock.patch.dict(os.environ, {"DD_LAUNCH_DIR": str(self.tmp / "launch"), "DROIDDECK_EPIC_HANDLED": "1", "STEAM_COMPAT_DATA_PATH": ""}), \ mock.patch.dict(S, {"client_wanted": lambda: calls.append("wanted") or True, - "ask": lambda channel, request, timeout=0: calls.append(request["op"]) or {"ok": True}}): + "ask": lambda channel, request, timeout=0, claim=False: calls.append(request["op"]) or {"ok": True}}): S["main"]([str(self.folder / ".droiddeck-launch.bat")]) self.assertEqual(["cloud-down"], calls) self.assertTrue((self.folder / ".droiddeck-epic-args").exists()) diff --git a/tools/tests/test_store_launch.py b/tools/tests/test_store_launch.py index 1ce1659ea..84ce7dcfa 100644 --- a/tools/tests/test_store_launch.py +++ b/tools/tests/test_store_launch.py @@ -106,6 +106,62 @@ class Asking(unittest.TestCase): self.assertIsNone(store.ask(channel, {'op': 'epic-code'}, timeout=0.2)) self.assertEqual([], list((channel / 'req').iterdir())) + def test_a_cloud_download_the_launcher_stops_waiting_for_loses_its_claim(self): + with tempfile.TemporaryDirectory() as root: + channel = Path(root) / 'stores' + taken = [] + handed = threading.Event() + + def app(): + deadline = time.monotonic() + 5 + while not taken and time.monotonic() < deadline: + for request in (channel / 'req').glob('*.json') if (channel / 'req').is_dir() else []: + target = channel / 'resp' / (request.stem + '.taken') + os.rename(request, target) + taken.append(target) + handed.set() + time.sleep(0.02) + + t = threading.Thread(target=app, daemon=True) + t.start() + try: + self.assertIsNone(store.ask(channel, {'op': 'cloud-down'}, timeout=2.0, claim=True)) + finally: + t.join(5) + self.assertTrue(handed.is_set(), 'the app never took the request') + with self.assertRaises(OSError): + os.rename(taken[0], taken[0].with_suffix('.writing')) + + def test_a_claimed_cloud_download_is_waited_for(self): + with tempfile.TemporaryDirectory() as root: + channel = Path(root) / 'stores' + handed = threading.Event() + + def app(): + deadline = time.monotonic() + 5 + while time.monotonic() < deadline: + names = list((channel / 'req').glob('*.json')) if (channel / 'req').is_dir() else [] + if names: + handed.set() + writing = channel / 'resp' / (names[0].stem + '.writing') + os.rename(names[0], writing) + time.sleep(0.6) + tmp = channel / 'resp' / (names[0].name + '.tmp') + tmp.write_text(json.dumps({'ok': True, 'result': 'ok'})) + os.rename(tmp, channel / 'resp' / names[0].name) + writing.unlink() + return + time.sleep(0.02) + + t = threading.Thread(target=app, daemon=True) + t.start() + try: + answer = store.ask(channel, {'op': 'cloud-down'}, timeout=0.2, claim=True) + finally: + t.join(5) + self.assertTrue(handed.is_set(), 'the app never took the request') + self.assertEqual({'ok': True, 'result': 'ok'}, answer) + def test_a_stale_code_is_dropped_before_asking(self): with tempfile.TemporaryDirectory() as root: folder = game(root) @@ -214,7 +270,7 @@ class CloudHooks(unittest.TestCase): try: original = store.ask asked = [] - store.ask = lambda channel, request, timeout=5.0: asked.append((request, timeout)) or {'ok': True, 'files': 2, 'reason': 'ok'} + store.ask = lambda channel, request, timeout=5.0, claim=False: asked.append((request, timeout)) or {'ok': True, 'files': 2, 'reason': 'ok'} self.assertEqual(store.STORE_GAME, store.main([bat])) self.assertEqual(0, store.main(['--exited', bat])) finally: @@ -225,6 +281,55 @@ class CloudHooks(unittest.TestCase): self.assertEqual(store.CLOUD_TIMEOUT, asked[1][1]) self.assertEqual('cloud-up', asked[2][0]['op']) + def test_a_cloud_request_that_cannot_be_written_still_starts_the_game_and_uploads_on_exit(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='ubisoft', ident='space-1') + sc = json.loads((folder / '.droiddeck-store.json').read_text()); sc['extra'] = {'productId': '109'} + (folder / '.droiddeck-store.json').write_text(json.dumps(sc)) + bat = str(folder / '.droiddeck-launch.bat') + asked = [] + + def ask(channel, request, timeout=5.0, claim=False): + asked.append(request['op']) + if request['op'] in ('cloud-down', 'cloud-up'): + raise PermissionError(13, 'read-only') + return {'ok': True} + + lines = [] + with patch.dict(os.environ, {'DD_LAUNCH_DIR': str(Path(root) / 'session')}), patch.object(store, 'ask', side_effect=ask), patch.object(store, 'prepare_ubisoft', return_value='ready'), patch.object(store, 'create_prefix', return_value='present'), patch.object(store, 'log', side_effect=lines.append): + self.assertEqual(store.STORE_GAME, store.main([bat])) + self.assertEqual(0, store.main(['--exited', bat])) + self.assertEqual(['cloud-down', 'cloud-up'], [op for op in asked if op.startswith('cloud-')]) + self.assertIn('cloud ubisoft space-1 down result=failed reason=PermissionError', lines) + self.assertIn('cloud ubisoft space-1 up not requested (PermissionError)', lines) + def test_an_ea_game_with_cloud_saves_asks_after_its_preparation_and_exit(self): + ident = 'Origin.OFR.50.0002694' + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='ea', ident=ident) + bat = str(folder / '.droiddeck-launch.bat') + asked = [] + env = {'DD_LAUNCH_DIR': str(Path(root) / 'session')} + record = lambda channel, request, timeout=5.0, claim=False: asked.append(request) or {'result': 'ok'} + with patch.dict(os.environ, env), \ + patch.object(store, 'prepare_ea', side_effect=lambda *a: asked.append({'op': 'prepared'})), \ + patch.object(store, 'create_prefix', side_effect=AssertionError('EA prepares its own prefix')), \ + patch.object(store, 'ask', side_effect=record): + self.assertEqual(store.STORE_GAME, store.main([bat])) + self.assertEqual(['prepared', 'cloud-down'], [r['op'] for r in asked]) + self.assertEqual({'op': 'cloud-down', 'store': 'ea', 'id': ident}, asked[1]) + self.assertEqual(0, store.main(['--exited', bat])) + self.assertEqual(['ea-exited', 'cloud-up'], [r['op'] for r in asked[2:]]) + self.assertEqual({'op': 'cloud-up', 'store': 'ea', 'id': ident}, asked[3]) + sidecar = json.loads((folder / store.SIDECAR).read_text()) + sidecar['cloud'] = False + (folder / store.SIDECAR).write_text(json.dumps(sidecar)) + asked.clear() + with patch.dict(os.environ, env), patch.object(store, 'prepare_ea'), patch.object(store, 'ask', side_effect=record): + self.assertEqual(store.STORE_GAME, store.main([bat])) + self.assertEqual([], asked) + self.assertEqual(0, store.main(['--exited', bat])) + self.assertEqual(['ea-exited'], [r['op'] for r in asked]) + def test_a_first_launch_creates_the_prefix_before_the_cloud_download(self): with tempfile.TemporaryDirectory() as root: folder = game(root, store_id='epic', ident='fa4240e5') @@ -244,7 +349,7 @@ class CloudHooks(unittest.TestCase): env = {'DD_LAUNCH_DIR': root, 'STEAM_COMPAT_DATA_PATH': str(compat), 'DD_STORE_PROTON': str(proton)} with patch.dict(os.environ, env), patch.object(store.subprocess, 'run', side_effect=run), \ - patch.object(store, 'ask', side_effect=lambda channel, request, timeout=5.0: order.append(request) or {'result': 'ok'}): + patch.object(store, 'ask', side_effect=lambda channel, request, timeout=5.0, claim=False: order.append(request) or {'result': 'ok'}): self.assertEqual(store.STORE_GAME, store.main([str(folder / store.LAUNCHER)])) self.assertEqual([str(proton), 'run', 'cmd.exe', '/d', '/c', 'exit'], order[0]) self.assertEqual({'op': 'cloud-down', 'store': 'epic', 'id': 'fa4240e5'}, order[-1]) diff --git a/tools/tests/test_store_launch_ea.py b/tools/tests/test_store_launch_ea.py index 0f73f92f8..1dd912f0a 100644 --- a/tools/tests/test_store_launch_ea.py +++ b/tools/tests/test_store_launch_ea.py @@ -147,7 +147,7 @@ class EaHook(unittest.TestCase): folder.mkdir() asked = {} - def fake_ask(channel, request, timeout=5.0): + def fake_ask(channel, request, timeout=5.0, claim=False): asked.update(request) return {'ok': True, 'lsx': True, 'license': 'ok v4', 'licenses': [{'path': 'ProgramData/L/x.dlf', 'data': base64.b64encode(b'z').decode()}]} diff --git a/tools/ubisoft-launcher/src/bridge.rs b/tools/ubisoft-launcher/src/bridge.rs new file mode 100644 index 000000000..361acb743 --- /dev/null +++ b/tools/ubisoft-launcher/src/bridge.rs @@ -0,0 +1,161 @@ +//! The file bridge DroidDeck answers Denuvo activations through. + +use std::path::Path; +use std::sync::{Condvar, Mutex}; +use std::thread; +use std::time::Duration; + +pub const INVALIDATE: &str = "denuvo-invalidate"; + +pub fn publish_invalidation(dir: &Path, account: &str, tries: u32, pause: Duration) -> bool { + let marker = dir.join(INVALIDATE); + let part = dir.join(format!("{INVALIDATE}.upc")); + for attempt in 0..tries { + if marker.is_file() { + return true; + } + if std::fs::write(&part, account.as_bytes()).is_ok() && std::fs::rename(&part, &marker).is_ok() { + return true; + } + let _ = std::fs::remove_file(&part); + if attempt + 1 < tries { + thread::sleep(pause); + } + } + false +} + +#[derive(Default)] +pub struct Generation { + state: Mutex<(u64, usize)>, + idle: Condvar, +} + +impl Generation { + pub fn current(&self) -> u64 { + self.state.lock().unwrap().0 + } + + pub fn invalidate(&self, wait: Duration, acknowledge: impl FnOnce() -> T) -> T { + let mut state = self.state.lock().unwrap(); + state.0 += 1; + let _ = self.idle.wait_timeout_while(state, wait, |s| s.1 > 0).unwrap(); + acknowledge() + } + + pub fn serve(&self, seen: u64, reply: impl FnOnce() -> T) -> Option { + { + let mut state = self.state.lock().unwrap(); + if state.0 != seen { + return None; + } + state.1 += 1; + } + let out = reply(); + self.state.lock().unwrap().1 -= 1; + self.idle.notify_all(); + Some(out) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use std::sync::Arc; + use std::time::Instant; + + fn dir(name: &str) -> std::path::PathBuf { + let d = std::env::temp_dir().join(format!("upc-bridge-{name}-{}", std::process::id())); + let _ = std::fs::remove_dir_all(&d); + std::fs::create_dir_all(&d).unwrap(); + d + } + + #[test] + fn an_invalidation_is_published_as_the_marker() { + let d = dir("publish"); + assert!(publish_invalidation(&d, "user-a", 1, Duration::ZERO)); + assert_eq!(std::fs::read(d.join(INVALIDATE)).unwrap(), b"user-a"); + assert!(!d.join("denuvo-invalidate.upc").exists()); + } + + #[test] + fn a_marker_naming_its_account_is_kept() { + let d = dir("named"); + std::fs::write(d.join(INVALIDATE), b"user-a").unwrap(); + assert!(publish_invalidation(&d, "user-b", 1, Duration::ZERO)); + assert_eq!(std::fs::read(d.join(INVALIDATE)).unwrap(), b"user-a"); + } + + #[test] + fn a_marker_that_cannot_be_written_is_reported_after_every_try() { + let d = dir("missing").join("gone"); + let started = Instant::now(); + assert!(!publish_invalidation(&d, "user-a", 3, Duration::from_millis(20))); + assert!(started.elapsed() >= Duration::from_millis(40)); + assert!(!d.join(INVALIDATE).exists()); + } + + #[test] + fn a_marker_written_while_retrying_counts() { + let d = dir("late").join("bridge"); + let later = d.clone(); + let maker = thread::spawn(move || { + thread::sleep(Duration::from_millis(30)); + std::fs::create_dir_all(later).unwrap(); + }); + assert!(publish_invalidation(&d, "user-a", 50, Duration::from_millis(10))); + maker.join().unwrap(); + assert!(d.join(INVALIDATE).is_file()); + } + + #[test] + fn a_kept_token_asked_for_before_an_invalidation_is_not_served_after_it() { + let g = Generation::default(); + let seen = g.current(); + assert_eq!(g.invalidate(Duration::from_secs(1), || "acknowledged"), "acknowledged"); + assert_eq!(g.serve(seen, || "token"), None); + assert_eq!(g.serve(g.current(), || "token"), Some("token")); + } + + #[test] + fn a_reply_being_served_holds_the_acknowledgement_back() { + let g = Arc::new(Generation::default()); + let order = Arc::new(Mutex::new(Vec::new())); + let seen = g.current(); + let (g2, o2) = (g.clone(), order.clone()); + let served = g.serve(seen, || { + let ack = thread::spawn(move || g2.invalidate(Duration::from_secs(5), || o2.lock().unwrap().push("acknowledged"))); + thread::sleep(Duration::from_millis(50)); + order.lock().unwrap().push("token"); + ack + }); + served.unwrap().join().unwrap(); + assert_eq!(*order.lock().unwrap(), vec!["token", "acknowledged"]); + } + + #[test] + fn a_reply_that_stalls_never_blocks_other_connections_or_the_acknowledgement_for_long() { + let g = Arc::new(Generation::default()); + let seen = g.current(); + let (entered, inside) = std::sync::mpsc::channel(); + let (release, held) = std::sync::mpsc::channel::<()>(); + let stalled = { + let g = g.clone(); + thread::spawn(move || g.serve(seen, move || { + entered.send(()).unwrap(); + let _ = held.recv(); + })) + }; + inside.recv().unwrap(); + let started = Instant::now(); + assert_eq!(g.current(), seen); + assert_eq!(g.serve(seen, || "other"), Some("other")); + assert!(started.elapsed() < Duration::from_millis(200)); + assert_eq!(g.invalidate(Duration::from_millis(100), || "acknowledged"), "acknowledged"); + assert!(started.elapsed() < Duration::from_millis(450)); + assert_eq!(g.serve(seen, || "late"), None); + release.send(()).unwrap(); + assert!(stalled.join().unwrap().is_some()); + } +} diff --git a/tools/ubisoft-launcher/src/launcher.rs b/tools/ubisoft-launcher/src/launcher.rs index 343708dba..d993ebe9f 100644 --- a/tools/ubisoft-launcher/src/launcher.rs +++ b/tools/ubisoft-launcher/src/launcher.rs @@ -338,6 +338,8 @@ pub fn announced(body: &[u8]) -> Option<(Option, Option)> { pub enum AuxReq<'a> { Init(u64), Activate(u64, &'a [u8]), + Invalidate(u64), + BurnTicket(u64), Other(u64), } @@ -348,8 +350,14 @@ pub fn aux_request(body: &[u8]) -> AuxReq<'_> { let Some(activate) = pb::sub(&f, 3) else { return if pb::has(&f, 2) { AuxReq::Init(rid) } else { AuxReq::Other(rid) }; }; - let token = pb::fields(activate) - .and_then(|a| pb::sub(&a, 2).and_then(pb::fields)) + let Some(a) = pb::fields(activate) else { return AuxReq::Other(rid) }; + if pb::has(&a, 1) && !pb::has(&a, 2) { + return AuxReq::Invalidate(rid); + } + if pb::has(&a, 3) && !pb::has(&a, 2) { + return AuxReq::BurnTicket(rid); + } + let token = pb::sub(&a, 2).and_then(pb::fields) .and_then(|t| t.iter().find_map(|(n, v)| match v { Value::Bytes(b) if *n == 2 => Some(*b), _ => None })); match token { Some(t) => AuxReq::Activate(rid, t), @@ -365,6 +373,15 @@ pub fn aux_init(rid: u64, pid: u32) -> Vec { Msg::new().uint(1, rid).msg(2, init).0 } +pub fn aux_invalidated(rid: u64) -> Vec { + Msg::new().uint(1, rid).msg(3, Msg::new()).0 +} + +pub fn aux_no_burn_ticket(rid: u64) -> Vec { + let answer = Msg::new().uint(2, 3).uint(3, 3); + Msg::new().uint(1, rid).msg(3, Msg::new().msg(3, answer)).0 +} + pub fn aux_token(rid: u64, game_token: &[u8]) -> Vec { let answer = Msg::new().uint(2, 1).uint(3, 0).bytes(4, game_token).bytes(5, b""); Msg::new().uint(1, rid).msg(3, Msg::new().msg(2, answer)).0 @@ -476,6 +493,30 @@ mod tests { assert!(matches!(aux_request(&Msg::new().uint(1, 1).msg(2, Msg::new().uint(1, 109)).0), AuxReq::Init(1))); } + #[test] + fn an_invalidation_is_recognised_and_acknowledged_with_an_empty_activation() { + let req = Msg::new().uint(1, 5).msg(3, Msg::new().msg(1, Msg::new())); + assert!(matches!(aux_request(&req.0), AuxReq::Invalidate(5))); + let rsp = pb::fields(&aux_invalidated(5)).unwrap().into_iter().map(|(n, _)| n).collect::>(); + assert_eq!(rsp, vec![1, 3]); + assert_eq!(pb::sub(&pb::fields(&aux_invalidated(5)).unwrap(), 3), Some(&b""[..])); + let burn = Msg::new().uint(1, 6).msg(3, Msg::new().msg(3, Msg::new().bytes(2, b"t"))); + assert!(matches!(aux_request(&burn.0), AuxReq::BurnTicket(6))); + } + + #[test] + fn a_burn_ticket_request_is_answered_with_a_connection_error() { + let rsp = aux_no_burn_ticket(6); + let top = pb::fields(&rsp).unwrap(); + assert_eq!(pb::num(&top, 1), Some(6)); + let activate = pb::fields(pb::sub(&top, 3).unwrap()).unwrap(); + assert!(!pb::has(&activate, 2)); + let burn = pb::fields(pb::sub(&activate, 3).unwrap()).unwrap(); + assert_eq!(pb::num(&burn, 2), Some(3)); + assert_eq!(pb::num(&burn, 3), Some(3)); + assert!(!pb::has(&burn, 4)); + } + #[test] fn orbit_init_answers_with_the_save_folder() { let (rsp, what) = config().orbit(&[0x08, 0x01, 0x62, 0x03, 0x08, 0xcd, 0x01]).unwrap(); diff --git a/tools/ubisoft-launcher/src/main.rs b/tools/ubisoft-launcher/src/main.rs index 0b7126a91..e4442d703 100644 --- a/tools/ubisoft-launcher/src/main.rs +++ b/tools/ubisoft-launcher/src/main.rs @@ -4,6 +4,7 @@ #![cfg_attr(windows, windows_subsystem = "windows")] +mod bridge; mod launcher; mod pb; #[cfg(windows)] @@ -22,12 +23,13 @@ fn main() { #[cfg(windows)] mod service { + use crate::bridge::{self, Generation}; use crate::launcher::{self, AuxReq, Config, SessionReq}; use crate::win::{self, Handle}; use std::fs::OpenOptions; use std::io::Write; - use std::path::PathBuf; - use std::sync::atomic::{AtomicU32, Ordering}; + use std::path::{Path, PathBuf}; + use std::sync::atomic::{AtomicBool, AtomicU32, Ordering}; use std::sync::{Arc, Mutex}; use std::thread; use std::time::{Duration, Instant}; @@ -36,6 +38,9 @@ mod service { const ANNOUNCE_WAIT: Duration = Duration::from_secs(120); const RESTART_WAIT: Duration = Duration::from_secs(15); const DENUVO_WAIT: Duration = Duration::from_secs(90); + const SERVE_WAIT: Duration = Duration::from_secs(10); + const MARKER_TRIES: u32 = 25; + const MARKER_PAUSE: Duration = Duration::from_millis(200); struct State { cfg: Config, @@ -43,6 +48,8 @@ mod service { log: Mutex>, event: Handle, game: AtomicU32, + stale_token: AtomicBool, + generation: Generation, started: Instant, } @@ -175,7 +182,8 @@ mod service { state.say("session: closed"); } - fn denuvo(state: &State, rid: u64, challenge: &[u8]) -> Option> { + /// The game token for an activation, with the invalidation count it was asked under when it may be a kept one. + fn denuvo(state: &State, rid: u64, challenge: &[u8], fresh: bool) -> Option<(Vec, Option)> { if state.cfg.bridge.is_empty() { return None; } @@ -185,12 +193,20 @@ mod service { let _ = std::fs::remove_file(&rsp); let part = dir.join(format!("denuvo-{rid}.req.part")); std::fs::write(&part, challenge).ok()?; - std::fs::rename(&part, dir.join(format!("denuvo-{rid}.req"))).ok()?; + let seen = state.generation.current(); + let stale = state.stale_token.swap(false, Ordering::SeqCst) || fresh; + let kind = if stale { "req" } else { "cache.req" }; + if std::fs::rename(&part, dir.join(format!("denuvo-{rid}.{kind}"))).is_err() { + if stale { + state.stale_token.store(true, Ordering::SeqCst); + } + return None; + } let deadline = Instant::now() + DENUVO_WAIT; while Instant::now() < deadline { if let Ok(token) = std::fs::read(&rsp) { let _ = std::fs::remove_file(&rsp); - return (!token.is_empty()).then_some(token); + return (!token.is_empty()).then_some((token, (!stale).then_some(seen))); } thread::sleep(Duration::from_millis(200)); } @@ -207,14 +223,48 @@ mod service { } AuxReq::Activate(rid, challenge) => { state.say(&format!("aux: activation {rid} with a {} B challenge", challenge.len())); - match denuvo(state, rid, challenge) { - Some(token) => { - send(&pipe, &launcher::aux_token(rid, &token)); + let mut fresh = false; + loop { + let Some((token, seen)) = denuvo(state, rid, challenge, fresh) else { + state.say(&format!("aux: no game token for activation {rid}")); + break; + }; + let answer = || send(&pipe, &launcher::aux_token(rid, &token)); + let served = match seen { + Some(g) => state.generation.serve(g, answer).is_some(), + None => { + answer(); + true + } + }; + if served { state.say(&format!("aux: activation {rid} answered ({} B)", token.len())); + break; } - None => state.say(&format!("aux: no game token for activation {rid}")), + state.say(&format!("aux: kept token for activation {rid} came back after an invalidation; asking afresh")); + fresh = true; } } + AuxReq::Invalidate(rid) => { + state.stale_token.store(true, Ordering::SeqCst); + let published = state.generation.invalidate(SERVE_WAIT, || { + let published = state.cfg.bridge.is_empty() + || bridge::publish_invalidation(Path::new(&state.cfg.bridge), &state.cfg.user_id, MARKER_TRIES, MARKER_PAUSE); + if published { + send(&pipe, &launcher::aux_invalidated(rid)); + } + published + }); + if published { + state.say(&format!("aux: token invalidated by request {rid}")); + } else { + state.say(&format!("aux: invalidation {rid} not acknowledged; the kept token could not be marked stale")); + } + } + AuxReq::BurnTicket(rid) => { + send(&pipe, &launcher::aux_no_burn_ticket(rid)); + state.say(&format!("aux: burn ticket {rid} answered as unavailable")); + } AuxReq::Other(rid) => state.say(&format!("aux: request {rid} not handled ({} B)", req.len())), } } @@ -304,6 +354,8 @@ mod service { log: Mutex::new(log), event: win::inheritable_event(), game: AtomicU32::new(0), + stale_token: AtomicBool::new(false), + generation: Generation::default(), started: Instant::now(), }); state.say(&format!("product {} on {}*", state.cfg.product, state.prefix)); From adf13d0bdd0149f7b369d2df6ce99c5ea92e58e8 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 18 Nov 2026 21:58:57 -0500 Subject: [PATCH 02/31] feat(session): manage memory automatically and remove the manual memory controls (#2853) Memory in the Steam session is kept above a floor by a monitor instead of the zRAM, RAM cap and VRAM cap settings, which are removed. --- .../droiddeck/launcher/FrontEndActivity.kt | 16 - .../droiddeck/launcher/core/DeviceReport.kt | 3 - .../launcher/session/SessionFiles.kt | 4 +- .../launcher/session/SessionPrefs.kt | 23 - .../launcher/session/SessionService.kt | 7 +- .../session/SessionSuspendController.kt | 37 +- .../launcher/session/SettingsReset.kt | 2 +- .../launcher/ui/PerformanceDialog.kt | 38 - .../droiddeck/launcher/ui/SettingsIndex.kt | 4 - app/src/main/res/values-ar/strings.xml | 12 - app/src/main/res/values-b+es+419/strings.xml | 12 - app/src/main/res/values-bg/strings.xml | 12 - app/src/main/res/values-cs/strings.xml | 12 - app/src/main/res/values-da/strings.xml | 12 - app/src/main/res/values-de/strings.xml | 12 - app/src/main/res/values-el/strings.xml | 12 - app/src/main/res/values-es/strings.xml | 12 - app/src/main/res/values-fi/strings.xml | 12 - app/src/main/res/values-fr/strings.xml | 12 - app/src/main/res/values-hi/strings.xml | 12 - app/src/main/res/values-hu/strings.xml | 12 - app/src/main/res/values-in/strings.xml | 12 - app/src/main/res/values-it/strings.xml | 12 - app/src/main/res/values-ja/strings.xml | 12 - app/src/main/res/values-ko/strings.xml | 12 - app/src/main/res/values-ms/strings.xml | 12 - app/src/main/res/values-nb/strings.xml | 12 - app/src/main/res/values-nl/strings.xml | 12 - app/src/main/res/values-pl/strings.xml | 12 - app/src/main/res/values-pt-rPT/strings.xml | 12 - app/src/main/res/values-pt/strings.xml | 12 - app/src/main/res/values-ro/strings.xml | 12 - app/src/main/res/values-ru/strings.xml | 12 - app/src/main/res/values-sv/strings.xml | 12 - app/src/main/res/values-th/strings.xml | 12 - app/src/main/res/values-tr/strings.xml | 12 - app/src/main/res/values-uk/strings.xml | 12 - app/src/main/res/values-vi/strings.xml | 12 - app/src/main/res/values-zh-rCN/strings.xml | 12 - app/src/main/res/values-zh-rHK/strings.xml | 12 - app/src/main/res/values-zh-rTW/strings.xml | 12 - app/src/main/res/values/strings.xml | 12 - .../session/SessionSuspendControllerTest.kt | 67 +- docs/development/low-memory.md | 196 ++-- docs/development/vram-budget.md | 28 - docs/settings-map.md | 4 - tools/components/recipes.json | 3 +- tools/gpuload/build.sh | 13 +- .../layer/VK_LAYER_DROIDDECK_vram_cap.json | 20 - .../gpuload/src/vk_layer_droiddeck_vramcap.c | 206 ---- tools/gpuload/src/vramcap_budget.h | 32 - tools/gpuload/tests/test_vramcap_budget.c | 154 --- .../overlay/usr/local/bin/droiddeck-game-env | 17 - .../overlay/usr/local/bin/droiddeck-session | 567 +++++------ tools/linuxfs/preload/zram.c | 197 +++- tools/release/runtime_inputs.py | 3 +- tools/tests/test_client_zram_focus.py | 247 +---- tools/tests/test_game_environment.py | 17 - tools/tests/test_memory_pressure.py | 923 ++++++------------ tools/tests/test_zram_preload.py | 157 ++- 60 files changed, 1117 insertions(+), 2264 deletions(-) delete mode 100644 docs/development/vram-budget.md delete mode 100644 tools/gpuload/layer/VK_LAYER_DROIDDECK_vram_cap.json delete mode 100644 tools/gpuload/src/vk_layer_droiddeck_vramcap.c delete mode 100644 tools/gpuload/src/vramcap_budget.h delete mode 100644 tools/gpuload/tests/test_vramcap_budget.c diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index a8f165bc4..56787a714 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -180,10 +180,6 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet private var fsyncFirst by mutableStateOf(false) private var gamescopeRealtime by mutableStateOf(false) private var paceCores by mutableStateOf(true) - private var ramCapMb by mutableStateOf(0) - private var zramClient by mutableStateOf(true) - private var zramIdle by mutableStateOf(true) - private var vramCapMb by mutableStateOf(0) private var gpuClockPin by mutableStateOf(false) private var prootNoSeccomp by mutableStateOf(false) private var prootFastPath by mutableStateOf(true) @@ -2745,10 +2741,6 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet fsyncFirst = fsyncFirst, gamescopeRealtime = gamescopeRealtime, gpuClockPin = gpuClockPin, - ramCapMb = ramCapMb, vramCapMb = vramCapMb, zramClient = zramClient, zramIdle = zramIdle, - deviceRamMb = (android.app.ActivityManager.MemoryInfo() - .also((getSystemService(ACTIVITY_SERVICE) as android.app.ActivityManager)::getMemoryInfo).totalMem / (1024 * 1024)).toInt(), - ramCapAvailable = com.droiddeck.launcher.core.ZramSupport.supported(), prootNoSeccomp = prootNoSeccomp, prootFastPath = prootFastPath, nativeUserland = nativeUserland, cursorComposite = cursorComposite, guestHostname = guestHostname, phantomWarning = phantomWarning, onClientOverride = { on -> SessionPrefs.setClientCpusOverride(this, on); clientOverride = on }, @@ -2763,10 +2755,6 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet onFsyncFirst = { on -> SessionPrefs.setFsyncFirst(this, on); fsyncFirst = on }, onGamescopeRealtime = { on -> SessionPrefs.setGamescopeRealtime(this, on); gamescopeRealtime = on }, onGpuClockPin = { on -> SessionPrefs.setGpuClockPin(this, on); gpuClockPin = on }, - onRamCapMb = { mb -> SessionPrefs.setRamCapMb(this, mb); ramCapMb = mb }, - onZramClient = { on -> SessionPrefs.setZramClient(this, on); zramClient = on }, - onZramIdle = { on -> SessionPrefs.setZramIdle(this, on); zramIdle = on }, - onVramCapMb = { mb -> SessionPrefs.setVramCapMb(this, mb); vramCapMb = mb }, onProotNoSeccomp = { on -> SessionPrefs.setProotNoSeccomp(this, on); prootNoSeccomp = on }, onProotFastPath = { on -> SessionPrefs.setProotFastPath(this, on); prootFastPath = on }, onNativeUserland = { on -> SessionPrefs.setNativeUserland(this, on); nativeUserland = on }, @@ -3065,10 +3053,6 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet fsyncFirst = SessionPrefs.fsyncFirst(this) gamescopeRealtime = SessionPrefs.gamescopeRealtime(this) paceCores = SessionPrefs.paceCores(this) - ramCapMb = SessionPrefs.ramCapMb(this) - zramClient = SessionPrefs.zramClient(this) - zramIdle = SessionPrefs.zramIdle(this) - vramCapMb = SessionPrefs.vramCapMb(this) gpuClockPin = SessionPrefs.gpuClockPin(this) prootNoSeccomp = SessionPrefs.prootNoSeccomp(this) prootFastPath = SessionPrefs.prootFastPath(this) diff --git a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt index 3c047d2e1..fe835b10c 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt @@ -281,9 +281,6 @@ object DeviceReport { k("Linux x86 (FEX)", if (com.droiddeck.launcher.runtime.LinuxFex.ready(context)) "ready" else "not set up") k("gamescope realtime", SessionPrefs.gamescopeRealtime(context)) k("pace cores", SessionPrefs.paceCores(context)) - k("zRAM: compress Steam during games", SessionPrefs.zramClient(context)) - k("RAM cap", SessionPrefs.ramCapMb(context).let { if (it > 0) "$it MB" else "off" }) - k("VRAM cap", SessionPrefs.vramCapMb(context).let { if (it > 0) "$it MB" else "driver default" }) k("proot without seccomp", SessionPrefs.prootNoSeccomp(context)) k("native userland (no proot)", SessionPrefs.nativeUserland(context)) k("proot fast path", SessionPrefs.prootFastPath(context)) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt index 9501915fe..53b54e9ca 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -234,8 +234,6 @@ object SessionFiles { val gpuLoad = listOf( "usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_gpuload.so" to "usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_gpuload.so", "usr/local/lib/droiddeck-gpuload/VK_LAYER_DROIDDECK_gpu_load.json" to "usr/share/vulkan/implicit_layer.d/droiddeck_gpu_load.json", - "usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_vramcap.so" to "usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_vramcap.so", - "usr/local/lib/droiddeck-gpuload/VK_LAYER_DROIDDECK_vram_cap.json" to "usr/share/vulkan/implicit_layer.d/droiddeck_vram_cap.json", ) val fexPreloads = listOf("x86_64", "i386").flatMap { arch -> listOf("libddsession.so", "libfakeinput.so", "libfaultreport.so").map { "$arch/$it" to "usr/local/lib/droiddeck-fex/$arch/$it" } @@ -282,6 +280,8 @@ object SessionFiles { if (installed) ledger.staged(relative, target) else Log.e(TAG, "$relative NOT staged") } File(root, "usr/local/bin/bannerlator-steam-compat").delete() + File(root, "usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_vramcap.so").delete() + File(root, "usr/share/vulkan/implicit_layer.d/droiddeck_vram_cap.json").delete() LegacyNames.migrateRootfs(root) ComponentsManager.migrateLaunchDir(context) EsyncPacks.stageBundled(context, root) 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 ed23e31bc..39d92312b 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -932,29 +932,6 @@ object SessionPrefs { prefs(context).edit().putBoolean("gamescopeRealtime", on).apply() } - fun ramCapMb(context: Context): Int = prefs(context).getInt("ramCapMb", 0).coerceAtLeast(0) - - fun setRamCapMb(context: Context, mb: Int) { - prefs(context).edit().putInt("ramCapMb", mb.coerceAtLeast(0)).apply() - } - - fun zramClient(context: Context): Boolean = prefs(context).getBoolean("zramClient", true) - - fun setZramClient(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("zramClient", on).apply() - } - - fun zramIdle(context: Context): Boolean = prefs(context).getBoolean("zramIdle", true) - - fun setZramIdle(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("zramIdle", on).apply() - } - - fun vramCapMb(context: Context): Int = prefs(context).getInt("vramCapMb", 0).coerceAtLeast(0) - - fun setVramCapMb(context: Context, mb: Int) { - prefs(context).edit().putInt("vramCapMb", mb.coerceAtLeast(0)).apply() - } fun gpuClockPin(context: Context): Boolean = prefs(context).getBoolean("gpuClockPin", false) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 9c8e6fe2c..aaf77c3f5 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -911,10 +911,9 @@ class SessionService : Service() { )) } }, - readBackAllowed = { SessionPrefs.ramCapMb(this) == 0 }, pagedIn = { processes, swapKb, swapBeforeKb, availableKb, millis -> if (processes == 0) { - Log.i(TAG, "left ${swapBeforeKb / 1024} MB in zram after resume (RAM cap, or ${availableKb / 1024} MB available is too little)") + Log.i(TAG, "left ${swapBeforeKb / 1024} MB in zram after resume (${availableKb / 1024} MB available is too little)") } else { Log.i(TAG, "read back $processes processes in $millis ms: zram ${swapBeforeKb / 1024} -> ${swapKb / 1024} MB") } @@ -1085,11 +1084,7 @@ class SessionService : Service() { relativeMouseForSession().takeIf { it != 0 }?.let { guest.add("gamescope_relative_mouse=$it") } if (com.droiddeck.launcher.core.ZramSupport.supported()) { guest.add("DD_ZRAM=1") - if (steamHere) SessionPrefs.ramCapMb(this).takeIf { it > 0 }?.let { guest.add("DD_RAM_CAP_MB=$it") } - if (!SessionPrefs.zramClient(this)) guest.add("DD_ZRAM_CLIENT=0") - if (!SessionPrefs.zramIdle(this)) guest.add("DD_ZRAM_IDLE=0") } - SessionPrefs.vramCapMb(this).takeIf { it > 0 }?.let { guest.add("DD_VRAM_MB=$it") } guest.add("AUDIO_DIRECT_DECAY=0") val extra = extraEnv() + agentEnvironment guest.addAll(TurnipEnvironment.gameEnvironment(tuOverride, tuDriver, SessionPrefs.tuSysmem(this), extra)) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt index 221a1e78c..74f7d5ace 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt @@ -27,7 +27,6 @@ internal class SessionSuspendController( private val nowNanos: () -> Long = System::nanoTime, private val pagedOut: (processes: Int, unacknowledged: Int, residentKb: Long, swapKb: Long, swapBeforeKb: Long, millis: Long) -> Unit = { _, _, _, _, _, _ -> }, - private val readBackAllowed: () -> Boolean = { true }, private val pagedIn: (processes: Int, swapKb: Long, swapBeforeKb: Long, availableKb: Long, millis: Long) -> Unit = { _, _, _, _, _ -> }, ) { @@ -278,12 +277,21 @@ internal class SessionSuspendController( private fun pageOut(records: MutableMap, ProcessRecord>, root: Int, helpers: List) { val control = zramControl?.takeIf { it.isFile } ?: return + val hold = holdFile(control) try { - addSnapshot(records, root, helpers) - control.writeText("1") + hold.writeText(PAGE_OUT_REQUEST) + sleep(PAGE_OUT_POLL_MS) + pageOut(control, records, root, helpers) } catch (_: IOException) { - return + } finally { + hold.delete() } + } + + private fun holdFile(control: File) = File(control.parentFile, "${control.name}.hold") + + private fun pageOut(control: File, records: MutableMap, ProcessRecord>, root: Int, helpers: List) { + addSnapshot(records, root, helpers) val targets = records.values.filter { record -> try { File(procRoot, "${record.pid}/maps").useLines { lines -> lines.any { it.endsWith("/libddsession.so") } } @@ -301,16 +309,22 @@ internal class SessionSuspendController( val waiting = targets.toMutableList() while (!closing && !cancelled && nowMillis() - start < PAGE_OUT_TIMEOUT_MS) { val started = nowMillis() - start >= PAGE_OUT_START_MS - waiting.removeAll { val ack = acks.getValue(it); ack.length() > 0 || (started && !ack.exists()) || isGone(it) } + waiting.removeAll { val ack = acks.getValue(it); pagedOut(ack) || (started && !ack.exists()) || isGone(it) } if (waiting.isEmpty()) break sleep(PAGE_OUT_POLL_MS) } - val unacknowledged = targets.count { acks.getValue(it).length() == 0L && !isGone(it) } + val unacknowledged = targets.count { !pagedOut(acks.getValue(it)) && !isGone(it) } acks.values.forEach { it.delete() } val after = memoryKb(targets) pagedOut(targets.size, unacknowledged, after.first, after.second, before.second, nowMillis() - start) } + private fun pagedOut(ack: File): Boolean = try { + ack.readText().trim() == PAGE_OUT_ACK + } catch (_: IOException) { + false + } + private fun readBack() { val targets = pagedOutTargets.filterNot { isGone(it) } pagedOutTargets = emptyList() @@ -318,13 +332,15 @@ internal class SessionSuspendController( if (targets.isEmpty() || closing) return val before = memoryKb(targets).second val (total, available) = meminfoKb() - if (!readBackAllowed() || !canTake(before, total, available)) { + if (!canTake(before, total, available)) { pagedIn(0, before, before, available, 0) return } + val hold = holdFile(control) try { - control.writeText("0") + hold.writeText(READ_BACK_REQUEST) } catch (_: IOException) { + hold.delete() return } val start = nowMillis() @@ -341,6 +357,8 @@ internal class SessionSuspendController( } } catch (_: InterruptedException) { Thread.currentThread().interrupt() + } finally { + hold.delete() } pagedIn(targets.size, swap, before, available, nowMillis() - start) } @@ -456,6 +474,9 @@ internal class SessionSuspendController( const val SIGSTOP = 19 const val SIGCONT = 18 const val SIGURG = 23 + const val PAGE_OUT_ACK = "1" + const val PAGE_OUT_REQUEST = "1" + const val READ_BACK_REQUEST = "0" const val PAGE_OUT_POLL_MS = 100L const val PAGE_OUT_START_MS = 2_000L const val PAGE_OUT_TIMEOUT_MS = 12_000L diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index 0a0806799..f85318b59 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -20,7 +20,7 @@ object SettingsReset { "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", "stretch16x9", "picturePosition", "integerScaling", "railLabels", "developerTools", "navTabOrder", "navTabShelved", "navTabHidden", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", - "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "paceCores", "ramCapMb", "vramCapMb", "zramClient", "zramIdle", + "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "paceCores", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", "noXalia", "fastSync", "fsyncFirst", "syncFallback", "prootNoSeccomp", "prootFastPath", "nativeUserland", "cursorComposite", "guestHostname", "fexPreset", "forceSsbs", "logs", "gameDebugLogsEnabled", "enhancedDiagnosticsNext", "storageDiagnostics", "buildWatermark", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt index df22a743f..3c4db68c3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt @@ -28,8 +28,6 @@ import com.droiddeck.launcher.session.SessionPrefs class CoreRow(val core: Int, val label: String) -private const val MEMORY_CAP_STEP_MB = 256 - @Composable fun PerformancePage( cores: List, @@ -47,12 +45,6 @@ fun PerformancePage( fsyncFirst: Boolean, gamescopeRealtime: Boolean, gpuClockPin: Boolean, - ramCapMb: Int, - zramClient: Boolean, - zramIdle: Boolean, - vramCapMb: Int, - deviceRamMb: Int, - ramCapAvailable: Boolean, prootNoSeccomp: Boolean, prootFastPath: Boolean, nativeUserland: Boolean, @@ -71,10 +63,6 @@ fun PerformancePage( onFsyncFirst: (Boolean) -> Unit, onGamescopeRealtime: (Boolean) -> Unit, onGpuClockPin: (Boolean) -> Unit, - onRamCapMb: (Int) -> Unit, - onZramClient: (Boolean) -> Unit, - onZramIdle: (Boolean) -> Unit, - onVramCapMb: (Int) -> Unit, onProotNoSeccomp: (Boolean) -> Unit, onProotFastPath: (Boolean) -> Unit, onNativeUserland: (Boolean) -> Unit, @@ -141,32 +129,6 @@ fun PerformancePage( gpuClockPin, onChange = onGpuClockPin, ) } - SettingsGroup(stringResource(R.string.perf_memory)) { - val top = (deviceRamMb / MEMORY_CAP_STEP_MB * MEMORY_CAP_STEP_MB).coerceAtLeast(MEMORY_CAP_STEP_MB) - val off = stringResource(R.string.perf_cap_off) - val auto = stringResource(R.string.perf_cap_auto) - ToggleRow( - host, "zramidle", stringResource(R.string.perf_zram_idle), - if (ramCapAvailable) stringResource(R.string.perf_zram_idle_hint) else stringResource(R.string.perf_ram_cap_unavailable), - zramIdle && ramCapAvailable, enabled = ramCapAvailable, onChange = onZramIdle, - ) - ToggleRow( - host, "zramclient", stringResource(R.string.perf_zram_client), - if (ramCapAvailable) stringResource(R.string.perf_zram_client_hint) else stringResource(R.string.perf_ram_cap_unavailable), - zramClient && ramCapAvailable, enabled = ramCapAvailable, onChange = onZramClient, - ) - SliderRow( - stringResource(R.string.perf_ram_cap), - if (ramCapAvailable) stringResource(R.string.perf_ram_cap_hint) else stringResource(R.string.perf_ram_cap_unavailable), - ramCapMb.coerceAtMost(top), 0..top, step = MEMORY_CAP_STEP_MB, enabled = ramCapAvailable, - format = { if (it == 0) off else "$it MB" }, onChange = onRamCapMb, - ) - SliderRow( - stringResource(R.string.perf_vram_cap), stringResource(R.string.perf_vram_cap_hint), - vramCapMb.coerceAtMost(top), 0..top, step = MEMORY_CAP_STEP_MB, - format = { if (it == 0) auto else "$it MB" }, onChange = onVramCapMb, - ) - } SettingsGroup(stringResource(R.string.perf_fixes)) { ToggleRow( host, "sysmem", stringResource(R.string.perf_sysmem), diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt index 37de5eba3..8e3912e43 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt @@ -76,10 +76,6 @@ internal object SettingsIndex { s(SettingsSection.PERFORMANCE, R.string.perf_noglerror), s(SettingsSection.PERFORMANCE, R.string.perf_gsrealtime, "gamescope"), s(SettingsSection.PERFORMANCE, R.string.perf_gpuclock, "gpu", "clock", "max"), - s(SettingsSection.PERFORMANCE, R.string.perf_ram_cap, "ram", "memory"), - s(SettingsSection.PERFORMANCE, R.string.perf_vram_cap, "vram", "memory"), - s(SettingsSection.PERFORMANCE, R.string.perf_zram_idle, "zram", "swap", "memory"), - s(SettingsSection.PERFORMANCE, R.string.perf_zram_client, "zram", "swap", "memory"), s(SettingsSection.PERFORMANCE, R.string.setup_clear_cached, "memory", "ram", "crash", "sleep", "killed"), s(SettingsSection.PERFORMANCE, R.string.setup_bg_limit, "memory", "ram", "background apps"), s(SettingsSection.PERFORMANCE, R.string.setup_memory_hud, "memory", "ram", "overlay"), diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index e92f6f47e..943fa4158 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -22,7 +22,6 @@ أضف مكتبات Steam من بطاقة SD أو محرك USB أو SSD، وسيجمع DroidDeck الألعاب معًا في «المكتبة». تتيح لك «المتاجر» تسجيل الدخول إلى Epic Games وGOG وXbox وEA وBattle.net وUbisoft Connect وAmazon Games وitch.io وGame Jolt، ثم تثبيت ألعابها وتحديثها من DroidDeck. تحدّث المكوّنات مثل FEX وDXVK وVKD3D-Proton نفسها تلقائيًا، ويكون Proton Experimental ARM64 هو الافتراضي، أو Proton 11.0 ARM64 بعد تثبيت هذا الإصدار. - يحرر «ضغط Steam أثناء تشغيل لعبة» مساحة من الذاكرة في الأجهزة قليلة الذاكرة. اسحب من الحافة اليمنى للداخل لفتح قائمة الجلسة: وضع «لوحة اللمس» و«لوحة مفاتيح الكمبيوتر» و«وضع زمن الاستجابة المنخفض» وملف اللعبة والمزيد. اللعبة بطيئة؟ حدّد معدل الإطارات في الوصول السريع، ثم جرّب إصدار Proton آخر أو إعدادًا مسبقًا آخر لـ FEX في مكوّنات اللعبة. هل الصوت متقطع أو مفقود في اللعبة؟ جرّب مفتاح «DirectAudio للألعاب» في إعدادات Steam ضمن «الصوت». @@ -634,18 +633,7 @@ gamescope: طابور GPU بأولوية الوقت الفعلي يعطي الأولوية لعمل GPU الخاص بالمُركِّب. قد يحسّن انتظام الإطارات على حساب أداء الألعاب قليلًا. GPU - الذاكرة إيقاف - افتراضي برنامج التشغيل - ضغط Steam أثناء تشغيل لعبة - ضغط ذاكرة اللعبة الخاملة - يرحّل ذاكرة اللعبة الخاملة عند انخفاض RAM. أوقفه إذا كانت الألعاب تتجمد لبضع ثوانٍ كل نصف دقيقة تقريبًا. يُطبَّق عند بدء الجلسة التالية. - بعد 20 ثانية من بدء اللعبة، يُضغط عميل Steam في zRAM لترك ذاكرة أكبر للعبة، ثم يُقرأ مجددًا عند إغلاقها. أوقف هذا الخيار إذا كانت الجلسة تُغلَق بعد بدء الألعاب بقليل. يظل حد RAM أعلاه يضغط Steam عندما تتجاوزه الجلسة. - حد RAM - يُطبَّق أثناء تشغيل عميل Steam، في جلسة Steam أو من سطح المكتب. عندما تستخدم الجلسة أكثر من هذا الحد، يُضغط Steam ثم عمليات الجلسة المدعومة الأخرى في zRAM. حد مرن: لا يُغلَق شيء، لكن قد تتقطّع الألعاب أثناء استعادة الصفحات. - يتطلب مساحة تبديل zRAM، وهي غير متوفرة على هذا الجهاز. - حد VRAM - يُبلّغ ألعاب Direct3D من 9 إلى 12 بميزانية ذاكرة الفيديو هذه لتشجيع تقليل استخدامها. قد تتجاوزها الألعاب؛ لا يضيف هذا ترحيل ذاكرة GPU ولا يضمن منع الانهيار بسبب نفاد الذاكرة. يسري في الجلسة التالية. تثبيت GPU على أعلى تردد له لـ Adreno فقط. تقطّع أقل، مع استهلاك أكبر للبطارية والحرارة. إصلاحات الجلسة 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 c75468997..135198262 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -22,7 +22,6 @@ Añade bibliotecas de Steam desde una tarjeta SD, una unidad USB o un SSD, y DroidDeck mantiene los juegos juntos en tu Biblioteca. Tiendas te permite iniciar sesión en Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io y Game Jolt, y luego instalar y actualizar sus juegos desde DroidDeck. Componentes como FEX, DXVK y VKD3D-Proton se actualizan solos, y Proton Experimental ARM64 es el predeterminado, o Proton 11.0 ARM64 una vez instalada esa versión. - Comprimir Steam mientras se ejecuta un juego libera RAM en dispositivos con poca memoria. Desliza desde el borde derecho para abrir el menú de sesión: modo touchpad, Teclado de PC, Modo de baja latencia, perfil del juego y más. ¿El juego va lento? Limita la tasa de fotogramas en Quick Access y prueba otra versión de Proton o un ajuste preestablecido de FEX en los componentes del juego. ¿Audio del juego entrecortado o ausente? Prueba el interruptor DirectAudio para juegos en los ajustes de Steam, en Audio. @@ -628,18 +627,7 @@ gamescope: cola de GPU en tiempo real Da prioridad al trabajo de GPU del compositor. Puede suavizar el ritmo de fotogramas a costa de algo de rendimiento en los juegos. GPU - Memoria Desactivado - Predeterminado del controlador - Comprimir Steam mientras se ejecuta un juego - Comprimir memoria inactiva del juego - Comprime la memoria inactiva del juego cuando queda poca RAM. Desactívalo si los juegos se congelan unos segundos cada medio minuto aproximadamente. Se aplica la próxima vez que se inicie la sesión. - 20 s después de que empiece un juego, el cliente de Steam se comprime en zRAM para dejarle más memoria al juego, y se vuelve a leer cuando el juego se cierra. Desactívalo si la sesión se cierra poco después de iniciar los juegos. Un límite de RAM definido arriba sigue comprimiendo Steam cuando la sesión lo supera. - Límite de RAM - Se aplica mientras se ejecuta el cliente de Steam, en modo Steam o desde el escritorio. Cuando la sesión usa más de esto, Steam y luego los demás procesos compatibles de la sesión se comprimen en zRAM. Es un límite flexible: no se cierra nada, pero los juegos pueden tener microcortes mientras se recuperan las páginas. - Requiere swap de zRAM, y este dispositivo no lo tiene. - Límite de VRAM - Informa a los juegos Direct3D 9 a 12 de este presupuesto de memoria de video para reducir su uso. Los juegos pueden superarlo; no agrega paginación de GPU ni garantiza evitar fallos por falta de memoria. Se aplica en la próxima sesión. Mantener la GPU a su reloj máximo Solo Adreno. Menos microcortes, más consumo de batería y calor. Correcciones de sesión diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index e5c8de89c..f44b98d75 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -22,7 +22,6 @@ Добавяйте библиотеки на Steam от SD карта, USB устройство или SSD, а DroidDeck държи игрите заедно в Библиотека. Магазини ви позволява да влезете в Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io и Game Jolt, а после да инсталирате и обновявате техните игри от DroidDeck. Компоненти като FEX, DXVK и VKD3D-Proton се обновяват сами, а Proton Experimental ARM64 е по подразбиране, или Proton 11.0 ARM64, щом тази версия е инсталирана. - Компресиране на Steam, докато върви игра освобождава RAM на устройства с малко памет. Плъзнете навътре от десния ръб, за да отворите менюто на сесията: режим на тъчпад, Клавиатура за компютър, Режим на ниска латентност, профил на играта и други. Играта е бавна? Ограничете кадрите в Quick Access, после опитайте друга версия на Proton или друга предварителна настройка на FEX в компонентите на играта. Пращене или липсващ звук в играта? Опитайте превключвателя DirectAudio за игри в настройките на Steam, под Звук. @@ -626,18 +625,7 @@ gamescope: GPU опашка в реално време Дава приоритет на GPU работата на компоситора. Може да изглади темпото на кадрите с известна цена за игрите. GPU - Памет Изкл. - По подразбиране за драйвера - Компресиране на Steam, докато върви игра - Компресиране на неактивната памет на играта - Компресира неактивната памет на играта при малко RAM. Изключете го, ако игрите замръзват за няколко секунди приблизително на всеки половин минута. Прилага се при следващото стартиране на сесията. - 20 s след стартиране на игра клиентът на Steam се компресира в zRAM, за да остави повече памет на играта, и се прочита обратно, когато играта се затвори. Изключете, ако сесията се затваря малко след стартиране на игри. Ограничение на RAM по-горе пак компресира Steam, когато сесията го надхвърли. - Ограничение на RAM - Прилага се, докато клиентът на Steam работи, в режим Steam или от работния плот. Когато сесията използва повече от това, Steam и след това другите поддържани процеси на сесията се компресират в zRAM. Меко ограничение: нищо не се затваря, но игрите може да засичат, докато страниците се връщат. - Изисква zRAM swap, който това устройство няма. - Ограничение на VRAM - Съобщава този бюджет за видео памет на игри с Direct3D 9 до 12, за да намали използването на памет. Игрите може да го надвишат; това не добавя странициране на GPU и не гарантира защита от сривове при недостиг на памет. Прилага се от следващата сесия. Задръжте GPU на максималната му честота Само за Adreno. По-малко засечки, по-голямо използване на батерията и повече топлина. Корекции на сесията diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 370a0eea6..c27da890b 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -22,7 +22,6 @@ Přidejte knihovny Steamu z SD karty, USB disku nebo SSD a DroidDeck udrží hry pohromadě v Knihovně. Obchody vám umožní přihlásit se do Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io a Game Jolt a pak instalovat a aktualizovat jejich hry přímo z DroidDeck. Komponenty jako FEX, DXVK a VKD3D-Proton se aktualizují samy a výchozí je Proton Experimental ARM64, případně Proton 11.0 ARM64, jakmile je tato verze nainstalovaná. - Komprimovat Steam během hry uvolní RAM na zařízeních s nedostatkem paměti. Přejetím od pravého okraje otevřete nabídku relace: režim touchpadu, Klávesnice PC, Režim nízkého zpoždění, profil hry a další. Hra běží pomalu? Omezte snímkovou frekvenci v Quick Access a zkuste jinou verzi Proton nebo jinou předvolbu FEX v komponentách hry. Praskání nebo chybějící zvuk ve hře? Zkuste přepínač DirectAudio pro hry v nastavení Steamu v části Zvuk. @@ -630,18 +629,7 @@ gamescope: fronta GPU v reálném čase Dává prioritu práci GPU kompozitoru. Může vyhladit tempo snímků na úkor her. GPU - Paměť Vypnuto - Výchozí ovladače - Komprimovat Steam během hry - Komprimovat neaktivní paměť hry - Při nedostatku RAM stránkuje neaktivní paměť hry. Vypněte to, pokud hry zhruba každou půlminutu na několik sekund zamrznou. Projeví se při příštím spuštění relace. - 20 s po spuštění hry se klient Steam zkomprimuje do zRAM, aby hře zbylo více paměti, a po zavření hry se načte zpět. Vypněte, pokud se relace krátce po spuštění her zavírá. Limit RAM výše stále komprimuje Steam, když ho relace překročí. - Limit RAM - Platí, když běží klient Steam, v režimu Steam nebo z Plochy. Když relace použije víc, zkomprimuje se do zRAM Steam a poté další podporované procesy relace. Měkký limit: nic se nezavře, ale hry mohou trhat, než se stránky načtou zpět. - Vyžaduje swap zRAM, který toto zařízení nemá. - Limit VRAM - Hlásí hrám s Direct3D 9 až 12 tento rozpočet videopaměti, aby snížily její využití. Hry jej mohou překročit; nepřidává stránkování GPU ani nezaručuje ochranu před pády kvůli nedostatku paměti. Platí od příští relace. Udržet GPU na nejvyšších taktech Jen Adreno. Méně zadrhávání, více spotřeby baterie a tepla. Opravy relace diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index ea39e14de..4eb0484c1 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -22,7 +22,6 @@ Tilføj Steam-biblioteker fra et SD-kort, et USB-drev eller en SSD, så samler DroidDeck spillene i dit Bibliotek. Butikker lader dig logge ind på Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io og Game Jolt og derefter installere og opdatere deres spil fra DroidDeck. Komponenter som FEX, DXVK og VKD3D-Proton opdaterer sig selv, og Proton Experimental ARM64 er standard, eller Proton 11.0 ARM64, når den version er installeret. - Komprimer Steam, mens et spil kører frigør RAM på enheder med lidt hukommelse. Stryg ind fra højre kant for at åbne sessionsmenuen: touchpad-tilstand, PC-tastatur, Lav forsinkelse, spilprofil og mere. Kører spillet langsomt? Begræns billedfrekvensen i Hurtig adgang, og prøv så en anden Proton-version eller FEX-forudindstilling i spillets komponenter. Knitrende eller manglende lyd i spillet? Prøv kontakten DirectAudio til spil i Steam-indstillingerne under Lyd. @@ -626,18 +625,7 @@ gamescope: realtids-GPU-kø Prioriterer compositorens GPU-arbejde. Kan give jævnere billedtiming på bekostning af spillene. GPU - Hukommelse Fra - Driverstandard - Komprimer Steam, mens et spil kører - Komprimer spillets inaktive hukommelse - Pager spillets inaktive hukommelse ud, når RAM er lav. Slå det fra, hvis spil fryser i et par sekunder cirka hvert halve minut. Træder i kraft, næste gang sessionen starter. - 20 s efter et spil starter, komprimeres Steam-klienten i zRAM for at give spillet mere hukommelse, og læses tilbage, når spillet lukkes. Slå fra, hvis sessionen lukker kort efter, at spil starter. En RAM-grænse ovenfor komprimerer stadig Steam, når sessionen overskrider den. - RAM-grænse - Gælder, mens Steam-klienten kører, i Steam-tilstand eller fra skrivebordet. Når sessionen bruger mere end dette, komprimeres Steam og derefter sessionens andre understøttede processer i zRAM. En blød grænse: intet lukkes, men spil kan hakke, mens sider hentes tilbage. - Kræver zRAM-swap, som denne enhed ikke har. - VRAM-grænse - Rapporterer dette videohukommelsesbudget til Direct3D 9 til 12-spil for at mindske hukommelsesforbruget. Spil kan overskride det; dette tilføjer ikke GPU-paging og garanterer ikke beskyttelse mod nedbrud ved hukommelsesmangel. Gælder fra næste session. Hold GPU’en på dens højeste clock Kun Adreno. Færre hak, mere batteribrug og varme. Sessionsrettelser diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e8b4ccd02..b60fceb58 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -22,7 +22,6 @@ Füge Steam-Bibliotheken von einer SD-Karte, einem USB-Laufwerk oder einer SSD hinzu, und DroidDeck hält die Spiele in deiner Bibliothek zusammen. Mit Stores meldest du dich bei Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io und Game Jolt an und installierst und aktualisierst deren Spiele direkt in DroidDeck. Komponenten wie FEX, DXVK und VKD3D-Proton aktualisieren sich selbst, und Proton Experimental ARM64 ist der Standard, oder Proton 11.0 ARM64, sobald diese Version installiert ist. - Steam komprimieren, während ein Spiel läuft gibt auf Geräten mit knappem Arbeitsspeicher RAM frei. Wische vom rechten Rand nach innen, um das Sitzungsmenü zu öffnen: Touchpad-Modus, PC-Tastatur, Modus mit geringer Latenz, Spielprofil und mehr. Das Spiel läuft langsam? Begrenze die Bildrate im Schnellzugriff und probiere dann eine andere Proton-Version oder ein anderes FEX-Preset in den Komponenten des Spiels. Knacken oder fehlender Spielton? Probiere den Schalter DirectAudio für Spiele in den Steam-Einstellungen unter Audio. @@ -626,18 +625,7 @@ gamescope: Echtzeit-GPU-Warteschlange Priorisiert die GPU-Arbeit des Compositors. Kann das Frame-Pacing glätten, kostet Spiele aber etwas Leistung. GPU - Arbeitsspeicher Aus - Treiberstandard - Steam komprimieren, während ein Spiel läuft - Inaktiven Spielspeicher komprimieren - Lagert inaktiven Spielspeicher bei knappem RAM aus. Schalte dies aus, wenn Spiele etwa jede halbe Minute für einige Sekunden einfrieren. Gilt ab dem nächsten Start der Sitzung. - 20 s nach dem Spielstart wird der Steam-Client in zRAM komprimiert, um dem Spiel mehr Speicher zu lassen, und beim Beenden des Spiels zurückgelesen. Schalte dies aus, wenn sich die Sitzung kurz nach dem Spielstart schließt. Ein RAM-Limit oben komprimiert Steam weiterhin, wenn die Sitzung es überschreitet. - RAM-Limit - Gilt, solange der Steam-Client läuft, im Steam-Modus oder vom Desktop aus. Verbraucht die Sitzung mehr als diesen Wert, werden Steam und danach die übrigen unterstützten Prozesse der Sitzung in zRAM komprimiert. Ein weiches Limit: Nichts wird geschlossen, aber Spiele können ruckeln, während Seiten zurückgeladen werden. - Benötigt zRAM-Swap, den dieses Gerät nicht hat. - VRAM-Limit - Meldet Direct3D-9-bis-12-Spielen dieses Videospeicherbudget, um den Speicherverbrauch zu senken. Spiele können es überschreiten; dies fügt kein GPU-Paging hinzu und garantiert keinen Schutz vor Abstürzen durch Speichermangel. Gilt ab der nächsten Sitzung. GPU auf höchstem Takt halten Nur Adreno. Weniger Ruckler, mehr Akkuverbrauch und Wärme. Sitzungskorrekturen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 42baf8965..faa6c9727 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -22,7 +22,6 @@ Προσθέστε βιβλιοθήκες Steam από κάρτα SD, μονάδα USB ή SSD, και το DroidDeck κρατά τα παιχνίδια μαζί στη Βιβλιοθήκη σας. Τα Καταστήματα σάς επιτρέπουν να συνδεθείτε σε Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io και Game Jolt και μετά να εγκαθιστάτε και να ενημερώνετε τα παιχνίδια τους από το DroidDeck. Στοιχεία όπως τα FEX, DXVK και VKD3D-Proton ενημερώνονται μόνα τους, και το Proton Experimental ARM64 είναι το προεπιλεγμένο, ή το Proton 11.0 ARM64 μόλις εγκατασταθεί αυτή η έκδοση. - Η επιλογή Συμπίεση του Steam όσο τρέχει παιχνίδι ελευθερώνει RAM σε συσκευές με λίγη μνήμη. Σύρετε προς τα μέσα από τη δεξιά άκρη για να ανοίξετε το μενού συνεδρίας: λειτουργία πινακίδας αφής, Πληκτρολόγιο PC, Λειτουργία χαμηλής καθυστέρησης, προφίλ παιχνιδιού και άλλα. Το παιχνίδι τρέχει αργά; Περιορίστε τον ρυθμό καρέ στο Quick Access και δοκιμάστε άλλη έκδοση Proton ή άλλη προεπιλογή FEX στα στοιχεία του παιχνιδιού. Κροταλίσματα ή απουσία ήχου στο παιχνίδι; Δοκιμάστε τον διακόπτη DirectAudio για παιχνίδια στις ρυθμίσεις του Steam, στην ενότητα Ήχος. @@ -626,18 +625,7 @@ gamescope: ουρά GPU πραγματικού χρόνου Δίνει προτεραιότητα στην εργασία GPU του compositor. Μπορεί να εξομαλύνει τον ρυθμό καρέ με κάποιο κόστος για τα παιχνίδια. GPU - Μνήμη Ανενεργό - Προεπιλογή προγράμματος οδήγησης - Συμπίεση του Steam όσο τρέχει παιχνίδι - Συμπίεση ανενεργής μνήμης παιχνιδιού - Σελιδοποιεί την ανενεργή μνήμη του παιχνιδιού όταν η RAM είναι χαμηλή. Απενεργοποιήστε το αν τα παιχνίδια παγώνουν για λίγα δευτερόλεπτα περίπου κάθε μισό λεπτό. Ισχύει από την επόμενη έναρξη της συνεδρίας. - 20 s μετά την εκκίνηση ενός παιχνιδιού, ο πελάτης Steam συμπιέζεται στη zRAM για να μείνει περισσότερη μνήμη στο παιχνίδι, και διαβάζεται πίσω όταν το παιχνίδι κλείσει. Απενεργοποιήστε το αν η συνεδρία κλείνει λίγο μετά την εκκίνηση παιχνιδιών. Ένα όριο RAM παραπάνω εξακολουθεί να συμπιέζει το Steam όταν η συνεδρία το ξεπεράσει. - Όριο RAM - Ισχύει όσο τρέχει ο πελάτης Steam, σε λειτουργία Steam ή από την επιφάνεια εργασίας. Όταν η συνεδρία χρησιμοποιεί περισσότερη, το Steam και έπειτα οι άλλες υποστηριζόμενες διεργασίες της συνεδρίας συμπιέζονται στη zRAM. Ήπιο όριο: τίποτα δεν κλείνει, αλλά τα παιχνίδια μπορεί να κολλάνε όσο επιστρέφουν οι σελίδες. - Απαιτεί zRAM swap, που δεν υπάρχει σε αυτή τη συσκευή. - Όριο VRAM - Αναφέρει αυτόν τον προϋπολογισμό μνήμης βίντεο σε παιχνίδια Direct3D 9 έως 12 για να μειωθεί η χρήση μνήμης. Τα παιχνίδια μπορεί να τον υπερβούν· δεν προσθέτει σελιδοποίηση GPU ούτε εγγυάται προστασία από σφάλματα έλλειψης μνήμης. Ισχύει από την επόμενη συνεδρία. Διατήρηση της GPU στη μέγιστη συχνότητά της Μόνο Adreno. Λιγότερα κολλήματα, μεγαλύτερη χρήση μπαταρίας και θερμότητα. Διορθώσεις συνεδρίας diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 38ada10bd..15a280bac 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -22,7 +22,6 @@ Añade bibliotecas de Steam desde una tarjeta SD, una unidad USB o un SSD, y DroidDeck mantiene los juegos juntos en tu Biblioteca. Tiendas te permite iniciar sesión en Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io y Game Jolt, y luego instalar y actualizar sus juegos desde DroidDeck. Componentes como FEX, DXVK y VKD3D-Proton se actualizan solos, y Proton Experimental ARM64 es el predeterminado, o Proton 11.0 ARM64 una vez instalada esa versión. - Comprimir Steam mientras se ejecuta un juego libera RAM en dispositivos con poca memoria. Desliza desde el borde derecho para abrir el menú de sesión: modo touchpad, Teclado de PC, Modo de baja latencia, perfil del juego y más. ¿El juego va lento? Limita la tasa de fotogramas en Quick Access y prueba otra versión de Proton o un ajuste preestablecido de FEX en los componentes del juego. ¿Audio del juego entrecortado o ausente? Prueba el interruptor DirectAudio para juegos en los ajustes de Steam, en Audio. @@ -628,18 +627,7 @@ gamescope: cola de GPU en tiempo real Da prioridad al trabajo de GPU del compositor. Puede suavizar el ritmo de fotogramas a costa de algo de rendimiento en los juegos. GPU - Memoria Desactivado - Predeterminado del controlador - Comprimir Steam mientras se ejecuta un juego - Comprimir memoria inactiva del juego - Comprime la memoria inactiva del juego cuando queda poca RAM. Desactívalo si los juegos se congelan unos segundos cada medio minuto aproximadamente. Se aplica la próxima vez que se inicie la sesión. - 20 s después de que empiece un juego, el cliente de Steam se comprime en zRAM para dejarle más memoria al juego, y se vuelve a leer cuando el juego se cierra. Desactívalo si la sesión se cierra poco después de iniciar los juegos. Un límite de RAM definido arriba sigue comprimiendo Steam cuando la sesión lo supera. - Límite de RAM - Se aplica mientras se ejecuta el cliente de Steam, en modo Steam o desde el escritorio. Cuando la sesión usa más de esto, Steam y luego los demás procesos compatibles de la sesión se comprimen en zRAM. Es un límite flexible: no se cierra nada, pero los juegos pueden tener tirones mientras se recuperan las páginas. - Requiere swap de zRAM, y este dispositivo no lo tiene. - Límite de VRAM - Informa a los juegos Direct3D 9 a 12 de este presupuesto de memoria de vídeo para reducir su uso. Los juegos pueden superarlo; no añade paginación de GPU ni garantiza evitar fallos por falta de memoria. Se aplica en la próxima sesión. Mantener la GPU a su reloj máximo Solo Adreno. Menos tirones, más consumo de batería y calor. Correcciones de sesión diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index b912a7cf0..2abc70d95 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -22,7 +22,6 @@ Lisää Steam-kirjastoja SD-kortilta, USB-asemalta tai SSD-levyltä, ja DroidDeck pitää pelit yhdessä Kirjastossasi. Kaupat-osiossa voit kirjautua sisään palveluihin Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io ja Game Jolt sekä asentaa ja päivittää niiden pelejä DroidDeckistä. Komponentit, kuten FEX, DXVK ja VKD3D-Proton, päivittyvät itsestään, ja oletuksena on Proton Experimental ARM64 tai Proton 11.0 ARM64, kun kyseinen versio on asennettu. - Pakkaa Steam pelin ollessa käynnissä vapauttaa RAM-muistia laitteilla, joilla muisti on vähissä. Pyyhkäise oikeasta reunasta sisäänpäin avataksesi istuntovalikon: kosketuslevytila, PC-näppäimistö, matalan viiveen tila, pelin profiili ja muuta. Peli pyörii hitaasti? Rajoita kuvanopeutta Pikavalikossa ja kokeile sitten toista Proton-versiota tai FEX-esiasetusta pelin komponenteissa. Rätisevä tai puuttuva pelin ääni? Kokeile Steamin asetuksissa kohdassa Ääni asetusta DirectAudio peleille. @@ -626,18 +625,7 @@ gamescope: reaaliaikainen GPU-jono Priorisoi kompositorin GPU-työtä. Voi tasoittaa kuvanopeuden tahditusta pelien kustannuksella. GPU - Muisti Pois - Ajurin oletus - Pakkaa Steam pelin ollessa käynnissä - Pakkaa pelin käyttämätöntä muistia - Siirtää pelin käyttämätöntä muistia zRAMiin, kun RAM-muisti vähenee. Poista tämä käytöstä, jos pelit jäätyvät muutamaksi sekunniksi noin puolen minuutin välein. Tulee voimaan, kun istunto käynnistyy seuraavan kerran. - 20 s pelin käynnistymisen jälkeen Steam-asiakasohjelma pakataan zRAMiin, jotta pelille jää enemmän muistia, ja luetaan takaisin, kun peli sulkeutuu. Poista tämä käytöstä, jos istunto sulkeutuu pian pelien käynnistymisen jälkeen. Yllä oleva RAM-raja pakkaa silti Steamin, kun istunto ylittää sen. - RAM-raja - Koskee aikaa, jolloin Steam-asiakasohjelma on käynnissä, Steam-tilassa tai työpöydältä. Kun istunto käyttää tätä enemmän, Steam ja sen jälkeen istunnon muut tuetut prosessit pakataan zRAMiin. Pehmeä raja: mitään ei suljeta, mutta pelit voivat nykiä, kun sivuja luetaan takaisin. - Vaatii zRAM-swapin, jota tässä laitteessa ei ole. - VRAM-raja - Ilmoittaa tämän videomuistibudjetin Direct3D 9–12 -peleille muistin käytön vähentämiseksi. Pelit voivat ylittää sen; tämä ei lisää GPU-sivutusta eikä takaa suojaa muistin loppumisesta johtuvilta kaatumisilta. Tulee voimaan seuraavassa istunnossa. Pidä GPU huippukellotaajuudessaan Vain Adreno. Vähemmän nykäyksiä, enemmän akun kulutusta ja lämpöä. Istunnon korjaukset diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c88981831..ef705ec2e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -22,7 +22,6 @@ Ajoutez des bibliothèques Steam depuis une carte SD, une clé USB ou un SSD, et DroidDeck réunit les jeux dans votre Bibliothèque. Boutiques vous permet de vous connecter à Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io et Game Jolt, puis d\'installer et de mettre à jour leurs jeux depuis DroidDeck. Les composants comme FEX, DXVK et VKD3D-Proton se mettent à jour seuls, et Proton Experimental ARM64 est la valeur par défaut, ou Proton 11.0 ARM64 une fois cette version installée. - Compresser Steam pendant un jeu libère de la RAM sur les appareils qui en manquent. Balayez depuis le bord droit pour ouvrir le menu de session : mode pavé tactile, Clavier PC, Mode faible latence, Profil du jeu et plus encore. Jeu lent ? Limitez la fréquence d\'images dans Accès rapide, puis essayez une autre version de Proton ou un autre préréglage FEX dans les composants du jeu. Audio du jeu qui grésille ou absent ? Essayez l\'option Utiliser DirectAudio pour le jeu dans les paramètres Steam, sous Audio. @@ -628,18 +627,7 @@ gamescope : file d\'attente GPU temps réel Augmente la priorité du travail GPU du compositeur. Peut améliorer la stabilité du temps de frame, mais consomme une partie des performances du jeu. GPU - Mémoire Désactivé - Valeur par défaut du pilote - Compresser Steam pendant un jeu - Compresser la mémoire inactive du jeu - Compresse la mémoire inactive du jeu quand la RAM manque. Désactivez-le si les jeux se figent quelques secondes environ toutes les trente secondes. S\'applique au prochain démarrage de la session. - 20 s après le démarrage d\'un jeu, le client Steam est compressé dans zRAM pour laisser plus de mémoire au jeu, puis relu à la fermeture du jeu. Désactivez cette option si la session se ferme peu après le démarrage des jeux. Une limite de RAM ci-dessus compresse toujours Steam lorsque la session la dépasse. - Limite de RAM - S\'applique tant que le client Steam fonctionne, en mode Steam ou depuis le bureau. Lorsque la session dépasse cette valeur, Steam puis les autres processus pris en charge de la session sont compressés dans zRAM. Limite souple : rien n\'est fermé, mais les jeux peuvent saccader pendant le rechargement des pages. - Nécessite un swap zRAM, dont cet appareil ne dispose pas. - Limite de VRAM - Signale ce budget de mémoire vidéo aux jeux Direct3D 9 à 12 pour réduire leur consommation. Les jeux peuvent le dépasser ; cela ne fournit pas de pagination GPU et ne garantit pas une protection contre les plantages par manque de mémoire. Prend effet à la prochaine session. Maintenir le GPU à sa fréquence maximale Uniquement pour Adreno. Moins de saccades, mais plus de consommation d\'énergie et de chaleur. Correctifs de session diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index d26bbc324..f758c5548 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -22,7 +22,6 @@ SD कार्ड, USB ड्राइव या SSD से Steam लाइब्रेरी जोड़ें, और DroidDeck गेम को आपकी लाइब्रेरी में एक साथ रखता है। स्टोर से आप Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io और Game Jolt में साइन इन कर सकते हैं, फिर DroidDeck से उनके गेम इंस्टॉल और अपडेट कर सकते हैं। FEX, DXVK और VKD3D-Proton जैसे कॉम्पोनेंट खुद अपडेट होते हैं, और डिफ़ॉल्ट Proton Experimental ARM64 है, या वह बिल्ड इंस्टॉल होने पर Proton 11.0 ARM64। - गेम चलते समय Steam को कंप्रेस करें कम RAM वाले डिवाइस पर RAM खाली करता है। सत्र मेनू खोलने के लिए दाएँ किनारे से अंदर की ओर स्वाइप करें: टचपैड मोड, पीसी कीबोर्ड, लो लेटेंसी मोड, गेम प्रोफ़ाइल और बहुत कुछ। गेम धीमा चल रहा है? Quick Access में फ़्रेम रेट सीमित करें, फिर गेम के कॉम्पोनेंट में कोई दूसरा Proton वर्शन या FEX प्रीसेट आज़माएँ। गेम की आवाज़ में खरखराहट है या आवाज़ नहीं आ रही? Steam सेटिंग में ऑडियो के अंतर्गत गेम के लिए DirectAudio टॉगल आज़माएँ। @@ -626,18 +625,7 @@ gamescope: रीयलटाइम GPU क्यू कम्पोज़िटर के GPU काम को प्राथमिकता देता है। गेम की कुछ कीमत पर फ़्रेम पेसिंग को स्मूथ कर सकता है। GPU - मेमोरी बंद - ड्राइवर डिफ़ॉल्ट - गेम चलते समय Steam को कंप्रेस करें - गेम की निष्क्रिय मेमोरी को संपीड़ित करें - RAM कम होने पर गेम की निष्क्रिय मेमोरी को पेज करता है। अगर गेम लगभग हर आधे मिनट में कुछ सेकंड के लिए रुकते हैं, तो इसे बंद करें। अगली बार सत्र शुरू होने पर लागू होता है। - गेम शुरू होने के 20 s बाद, Steam क्लाइंट को zRAM में कंप्रेस किया जाता है ताकि गेम को ज़्यादा मेमोरी मिले, और गेम बंद होने पर वापस पढ़ा जाता है। अगर गेम शुरू होने के कुछ देर बाद सेशन बंद हो जाता है तो इसे बंद करें। ऊपर दी गई RAM सीमा पार होने पर भी Steam कंप्रेस होता है। - RAM सीमा - Steam क्लाइंट चलते समय लागू होती है, Steam मोड में या डेस्कटॉप से। जब सेशन इससे ज़्यादा इस्तेमाल करता है, तो Steam और फिर सेशन की दूसरी समर्थित प्रोसेस zRAM में कंप्रेस होती हैं। यह सॉफ़्ट सीमा है: कुछ बंद नहीं होता, लेकिन पेज वापस आते समय गेम अटक सकते हैं। - zRAM स्वैप चाहिए, जो इस डिवाइस में नहीं है। - VRAM सीमा - मेमोरी का उपयोग कम करने के लिए Direct3D 9 से 12 गेम को यह वीडियो मेमोरी बजट बताता है। गेम इसे पार कर सकते हैं; यह GPU पेजिंग नहीं जोड़ता और मेमोरी खत्म होने से क्रैश रोकने की गारंटी नहीं देता। अगले सत्र से लागू होगा। GPU को उसकी टॉप क्लॉक पर बनाए रखें सिर्फ़ Adreno के लिए। कम हिचकोले, लेकिन ज़्यादा बैटरी खर्च और गर्मी। सेशन फ़िक्स diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 6563b39d2..e00b2643c 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -22,7 +22,6 @@ Adj hozzá Steam-könyvtárakat SD-kártyáról, USB-meghajtóról vagy SSD-ről, és a DroidDeck egy helyen tartja a játékokat a Könyvtárban. Az Áruházak lehetővé teszi, hogy bejelentkezz a Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io és Game Jolt szolgáltatásokba, majd telepítsd és frissítsd a játékaikat a DroidDeckből. Az olyan összetevők, mint a FEX, a DXVK és a VKD3D-Proton, maguktól frissülnek, az alapértelmezett pedig a Proton Experimental ARM64, vagy a Proton 11.0 ARM64, ha az a build telepítve van. - A Steam tömörítése játék közben RAM-ot szabadít fel a kevés memóriával rendelkező eszközökön. Húzd be az ujjad a jobb szélről a munkamenet menü megnyitásához: érintőpad mód, PC-billentyűzet, alacsony késleltetésű mód, játékprofil és más. Lassan fut a játék? Korlátozd a képkockasebességet a Gyors hozzáférésben, majd próbálj ki másik Proton-verziót vagy FEX-előbeállítást a játék összetevőiben. Ropog vagy hiányzik a játék hangja? Próbáld ki a DirectAudio a játékokhoz kapcsolót a Steam beállításaiban a Hang alatt. @@ -626,18 +625,7 @@ gamescope: valós idejű GPU-sor Előnyben részesíti a kompozitor GPU-munkáját. Egyenletesebbé teheti a képkocka-ütemezést, kisebb költséggel a játékoknak. GPU - Memória Ki - Illesztőprogram alapértéke - A Steam tömörítése játék közben - Játék inaktív memóriájának tömörítése - Kevés RAM esetén tömöríti a játék inaktív memóriáját. Kapcsold ki, ha a játékok nagyjából félpercenként néhány másodpercre lefagynak. A munkamenet következő indításakor lép érvénybe. - 20 mp-cel a játék indulása után a Steam-kliens a zRAM-ba tömörül, hogy több memória maradjon a játéknak, és a játék bezárásakor visszaolvasódik. Kapcsolja ki, ha a munkamenet röviddel a játékok indulása után bezárul. A fenti RAM-korlát akkor is tömöríti a Steamet, ha a munkamenet túllépi. - RAM-korlát - Akkor érvényes, amikor a Steam-kliens fut, Steam módban vagy az asztalról. Ha a munkamenet ennél többet használ, a Steam, majd a munkamenet többi támogatott folyamata a zRAM-ba tömörül. Puha korlát: semmi sem zárul be, de a játékok akadhatnak, amíg a lapok visszatöltődnek. - zRAM swap szükséges, amely ezen az eszközön nincs. - VRAM-korlát - Ezt a videomemória-keretet jelzi a Direct3D 9–12 játékoknak a memóriahasználat csökkentésére. A játékok túlléphetik; nem biztosít GPU-lapozást, és nem garantál védelmet a memóriahiány miatti összeomlás ellen. A következő munkamenettől érvényes. A GPU legmagasabb órajelen tartása Csak Adreno. Kevesebb akadás, nagyobb akkumulátorhasználat és hőtermelés. Munkamenet-javítások diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 1cc8c8a9c..b52adf60a 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -22,7 +22,6 @@ Tambahkan pustaka Steam dari kartu SD, drive USB, atau SSD, dan DroidDeck menyatukan semua gim di Pustaka kamu. Toko memungkinkanmu masuk ke Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io, dan Game Jolt, lalu memasang dan memperbarui gim mereka dari DroidDeck. Komponen seperti FEX, DXVK, dan VKD3D-Proton memperbarui diri sendiri, dan Proton Experimental ARM64 menjadi default, atau Proton 11.0 ARM64 setelah build tersebut terpasang. - Kompres Steam saat gim berjalan membebaskan RAM pada perangkat yang kekurangan memori. Geser masuk dari tepi kanan untuk membuka menu sesi: mode touchpad, Keyboard PC, Mode latensi rendah, Profil gim, dan lainnya. Gim berjalan lambat? Batasi frame rate di Akses cepat, lalu coba versi Proton lain atau preset FEX lain di komponen gim. Audio gim pecah atau tidak ada? Coba opsi DirectAudio untuk gim di pengaturan Steam pada bagian Audio. @@ -624,18 +623,7 @@ gamescope: antrean GPU realtime Memprioritaskan kerja GPU compositor. Dapat menghaluskan pacing frame dengan sedikit mengorbankan gim. GPU - Memori Nonaktif - Default driver - Kompres Steam saat gim berjalan - Kompres memori game yang tidak aktif - Mengompres memori game yang tidak aktif saat RAM rendah. Matikan jika game membeku beberapa detik kira-kira setiap setengah menit. Berlaku saat sesi dimulai berikutnya. - 20 detik setelah gim dimulai, klien Steam dikompres ke zRAM agar gim mendapat lebih banyak memori, lalu dibaca kembali saat gim ditutup. Nonaktifkan jika sesi tertutup sesaat setelah gim dimulai. Batas RAM di atas tetap mengompres Steam saat sesi melampauinya. - Batas RAM - Berlaku saat klien Steam berjalan, di mode Steam atau dari desktop. Saat sesi menggunakan lebih dari ini, Steam lalu proses lain yang didukung dalam sesi dikompres ke zRAM. Batas lunak: tidak ada yang ditutup, tetapi gim dapat tersendat saat halaman dimuat kembali. - Memerlukan swap zRAM, yang tidak dimiliki perangkat ini. - Batas VRAM - Melaporkan anggaran memori video ini ke game Direct3D 9 hingga 12 untuk mengurangi penggunaan memori. Game dapat melampauinya; ini tidak menambahkan paging GPU atau menjamin perlindungan dari crash akibat kehabisan memori. Berlaku pada sesi berikutnya. Pertahankan GPU pada clock tertingginya Hanya Adreno. Lebih sedikit tersendat, lebih banyak penggunaan baterai dan panas. Perbaikan sesi diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 296ea93f8..b8495afa0 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -22,7 +22,6 @@ Aggiungi librerie Steam da una scheda SD, un\'unità USB o un SSD, e DroidDeck tiene i giochi insieme nella tua Libreria. Negozi ti permette di accedere a Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io e Game Jolt, poi di installare e aggiornare i loro giochi da DroidDeck. I componenti come FEX, DXVK e VKD3D-Proton si aggiornano da soli, e Proton Experimental ARM64 è il predefinito, oppure Proton 11.0 ARM64 una volta installata quella build. - Comprimi Steam durante il gioco libera RAM sui dispositivi che ne hanno poca. Scorri verso l\'interno dal bordo destro per aprire il menu della sessione: modalità touchpad, Tastiera PC, Modalità bassa latenza, Profilo del gioco e altro. Il gioco è lento? Limita il frame rate in Accesso rapido, poi prova un\'altra versione di Proton o un altro preset FEX nei componenti del gioco. Audio del gioco che gracchia o manca? Prova l\'opzione DirectAudio per i giochi nelle impostazioni di Steam, sotto Audio. @@ -628,18 +627,7 @@ gamescope: coda GPU in tempo reale Dà priorità al lavoro GPU del compositor. Può rendere più regolare il frame pacing, a scapito dei giochi. GPU - Memoria Disattivo - Predefinito del driver - Comprimi Steam durante il gioco - Comprimi la memoria inattiva del gioco - Comprime la memoria inattiva del gioco quando la RAM scarseggia. Disattivalo se i giochi si bloccano per qualche secondo circa ogni mezzo minuto. Si applica al prossimo avvio della sessione. - 20 s dopo l\'avvio di un gioco, il client Steam viene compresso in zRAM per lasciare più memoria al gioco e viene riletto quando il gioco si chiude. Disattivalo se la sessione si chiude poco dopo l\'avvio dei giochi. Un limite di RAM impostato sopra comprime comunque Steam quando la sessione lo supera. - Limite RAM - Si applica mentre il client Steam è in esecuzione, in modalità Steam o dal desktop. Quando la sessione usa più di questo valore, Steam e poi gli altri processi supportati della sessione vengono compressi in zRAM. È un limite morbido: non viene chiuso nulla, ma i giochi possono scattare mentre le pagine vengono recuperate. - Richiede lo swap zRAM, che questo dispositivo non ha. - Limite VRAM - La memoria video che DXVK comunica ai giochi Direct3D, così usano meno texture. Le impostazioni DXVK del gioco hanno comunque la priorità. Si applica dalla prossima sessione. Mantieni la GPU alla frequenza massima Solo Adreno. Meno scatti, più consumo di batteria e più calore. Correzioni della sessione diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 3a616a857..fc7485bac 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -22,7 +22,6 @@ SDカード、USBドライブ、SSDからSteamライブラリを追加でき、DroidDeckはゲームをライブラリにまとめて表示します。 ストアでは、Epic Games、GOG、Xbox、EA、Battle.net、Ubisoft Connect、Amazon Games、itch.io、Game Joltにサインインして、DroidDeckからそれらのゲームをインストール・更新できます。 FEX、DXVK、VKD3D-Protonなどのコンポーネントは自動で更新されます。既定はProton Experimental ARM64で、Proton 11.0 ARM64がインストールされている場合はそちらになります。 - ゲーム実行中はSteamを圧縮すると、メモリが少ない端末でRAMを確保できます。 画面の右端から内側にスワイプするとセッションメニューが開きます。タッチパッドモード、PCキーボード、低遅延モード、ゲームプロファイルなどがあります。 ゲームが重い場合は、クイックアクセスでフレームレートを制限し、ゲームのコンポーネントで別のProtonバージョンやFEXプリセットを試してください。 ゲームの音が割れる、または出ない場合は、Steam設定のオーディオにある「ゲームでDirectAudioを使用」を試してください。 @@ -624,18 +623,7 @@ gamescope:リアルタイムGPUキュー コンポジタのGPU作業の優先度を上げます。フレームタイムの安定性が向上する場合がありますが、ゲームのパフォーマンスの一部を消費します。 GPU - メモリ オフ - ドライバーのデフォルト - ゲーム実行中はSteamを圧縮 - ゲームのアイドルメモリを圧縮 - RAMが少ないときにゲームのアイドルメモリを圧縮します。ゲームが30秒ごとに数秒止まる場合はオフにしてください。次回のセッション開始時に適用されます。 - ゲーム開始の20秒後、SteamクライアントをzRAMに圧縮してゲームに使えるメモリを増やし、ゲーム終了時に読み戻します。ゲーム開始直後にセッションが終了する場合はオフにしてください。上のRAM上限を設定している場合は、セッションが上限を超えるとSteamは引き続き圧縮されます。 - RAM上限 - Steamモードでもデスクトップからでも、Steamクライアントの実行中に適用されます。セッションの使用量がこの値を超えると、Steam、次にセッション内の対応する他のプロセスがzRAMに圧縮されます。ソフトな上限のため何も終了されませんが、ページの読み戻し中にゲームがカクつくことがあります。 - zRAMスワップが必要ですが、このデバイスにはありません。 - VRAM上限 - Direct3D 9~12のゲームにこのビデオメモリ予算を通知し、メモリ使用量の削減を促します。ゲームは予算を超える場合があります。GPUのページングを追加するものではなく、メモリ不足によるクラッシュの防止は保証されません。次のセッションから有効になります。 GPUを最高クロックに保つ Adrenoのみ。スタッターは減りますが、消費電力と発熱が増えます。 セッション修正 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 78182d217..9c7bf0671 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -22,7 +22,6 @@ SD 카드, USB 드라이브, SSD에서 Steam 라이브러리를 추가할 수 있으며, DroidDeck이 게임을 라이브러리에 함께 모아 줍니다. 스토어에서는 Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io, Game Jolt에 로그인하고 DroidDeck에서 해당 게임을 설치하고 업데이트할 수 있습니다. FEX, DXVK, VKD3D-Proton 같은 구성 요소는 스스로 업데이트되며, 기본값은 Proton Experimental ARM64이고 Proton 11.0 ARM64 빌드가 설치되면 그쪽이 기본값이 됩니다. - 게임 실행 중 Steam 압축은 메모리가 부족한 기기에서 RAM을 확보해 줍니다. 오른쪽 가장자리에서 안쪽으로 스와이프하면 세션 메뉴가 열립니다. 터치패드 모드, PC 키보드, 저지연 모드, 게임 프로필 등이 있습니다. 게임이 느린가요? 빠른 액세스에서 프레임 레이트를 제한한 다음, 게임의 구성 요소에서 다른 Proton 버전이나 FEX 프리셋을 시도해 보세요. 게임 소리가 지직거리거나 나오지 않나요? Steam 설정의 오디오에서 게임에서 DirectAudio 사용 토글을 시도해 보세요. @@ -624,18 +623,7 @@ gamescope: 실시간 GPU 큐 컴포지터 GPU 작업의 우선순위를 높입니다. 프레임 타임 안정성을 개선할 수 있지만 게임 성능의 일부를 소모합니다. GPU - 메모리 끄기 - 드라이버 기본값 - 게임 실행 중 Steam 압축 - 유휴 게임 메모리 압축 - RAM이 부족할 때 유휴 게임 메모리를 압축합니다. 게임이 약 30초마다 몇 초씩 멈추면 끄세요. 다음 세션을 시작할 때 적용됩니다. - 게임이 시작되고 20초 후 Steam 클라이언트를 zRAM으로 압축해 게임에 더 많은 메모리를 남기고, 게임이 종료되면 다시 읽어 들입니다. 게임 시작 직후 세션이 종료되면 이 옵션을 끄세요. 위의 RAM 제한을 설정하면 세션이 이를 초과할 때 여전히 Steam을 압축합니다. - RAM 제한 - Steam 모드나 데스크톱에서 Steam 클라이언트가 실행되는 동안 적용됩니다. 세션이 이 값보다 많이 사용하면 Steam과 세션의 다른 지원 프로세스를 차례로 zRAM으로 압축합니다. 소프트 제한이므로 종료되는 것은 없지만, 페이지를 다시 읽어 들이는 동안 게임이 끊길 수 있습니다. - zRAM 스왑이 필요하지만 이 기기에는 없습니다. - VRAM 제한 - 메모리 사용량을 줄이도록 Direct3D 9~12 게임에 이 비디오 메모리 예산을 알립니다. 게임은 예산을 초과할 수 있으며, GPU 페이징을 추가하거나 메모리 부족으로 인한 충돌 방지를 보장하지 않습니다. 다음 세션부터 적용됩니다. GPU를 최고 클럭으로 유지 Adreno에만 해당됩니다. 끊김이 줄어들지만 전력 소모와 발열이 증가합니다. 세션 수정 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 8ac9fe26e..95bde0cbb 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -22,7 +22,6 @@ Tambah pustaka Steam daripada kad SD, pemacu USB atau SSD, dan DroidDeck menyatukan permainan dalam Pustaka anda. Kedai membolehkan anda log masuk ke Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io dan Game Jolt, kemudian memasang dan mengemas kini permainan mereka daripada DroidDeck. Komponen seperti FEX, DXVK dan VKD3D-Proton mengemas kini sendiri, dan Proton Experimental ARM64 ialah lalai, atau Proton 11.0 ARM64 sebaik sahaja binaan itu dipasang. - Mampatkan Steam semasa permainan berjalan membebaskan RAM pada peranti yang kekurangan memori. Leret masuk dari tepi kanan untuk membuka menu sesi: mod pad sentuh, Papan kekunci PC, Mod kependaman rendah, profil permainan dan banyak lagi. Permainan berjalan perlahan? Hadkan kadar bingkai dalam Akses pantas, kemudian cuba versi Proton atau pratetap FEX lain dalam komponen permainan. Bunyi permainan berderak atau tiada? Cuba togol DirectAudio untuk permainan dalam tetapan Steam di bawah Audio. @@ -624,18 +623,7 @@ gamescope: baris gilir GPU masa nyata Mengutamakan kerja GPU compositor. Boleh melicinkan rentak bingkai dengan sedikit kos kepada permainan. GPU - Memori Mati - Lalai pemacu - Mampatkan Steam semasa permainan berjalan - Mampatkan memori permainan terbiar - Mampatkan memori permainan terbiar apabila RAM rendah. Matikan jika permainan membeku beberapa saat lebih kurang setiap setengah minit. Berkuat kuasa apabila sesi dimulakan seterusnya. - 20 s selepas permainan bermula, klien Steam dimampatkan ke dalam zRAM untuk memberi permainan lebih banyak memori, dan dibaca semula apabila permainan ditutup. Matikan ini jika sesi tertutup sejurus selepas permainan bermula. Had RAM di atas masih memampatkan Steam apabila sesi melebihinya. - Had RAM - Berkuat kuasa semasa klien Steam berjalan, dalam mod Steam atau dari desktop. Apabila sesi menggunakan lebih daripada ini, Steam dan kemudian proses lain sesi yang disokong dimampatkan ke dalam zRAM. Had lembut: tiada apa yang ditutup, tetapi permainan mungkin tersekat-sekat semasa halaman dibaca semula. - Memerlukan swap zRAM, yang tiada pada peranti ini. - Had VRAM - Melaporkan bajet memori video ini kepada permainan Direct3D 9 hingga 12 untuk mengurangkan penggunaan memori. Permainan boleh melebihinya; ini tidak menambah paging GPU atau menjamin perlindungan daripada ranap akibat kehabisan memori. Berkuat kuasa pada sesi seterusnya. Kekalkan GPU pada kelajuan tertinggi Adreno sahaja. Kurang tersekat-sekat, lebih penggunaan bateri dan haba. Pembetulan sesi diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index dc2dc6ec1..6c6416788 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -22,7 +22,6 @@ Legg til Steam-biblioteker fra et SD-kort, en USB-stasjon eller en SSD, så holder DroidDeck spillene samlet i Biblioteket ditt. Butikker lar deg logge inn på Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io og Game Jolt, og deretter installere og oppdatere spillene deres fra DroidDeck. Komponenter som FEX, DXVK og VKD3D-Proton oppdaterer seg selv, og Proton Experimental ARM64 er standard, eller Proton 11.0 ARM64 når den versjonen er installert. - Komprimer Steam mens et spill kjører frigjør minne på enheter som har lite. Sveip inn fra høyre kant for å åpne øktmenyen: styreflatemodus, PC-tastatur, modus for lav forsinkelse, spillprofil og mer. Kjører spillet tregt? Begrens bildefrekvensen i Hurtigmeny, og prøv deretter en annen Proton-versjon eller FEX-forhåndsinnstilling i spillets komponenter. Knitrende eller manglende spillyd? Prøv bryteren DirectAudio for spill i Steam-innstillingene under Lyd. @@ -626,18 +625,7 @@ gamescope: realtime GPU-kø Prioriterer kompositørens GPU-arbeid. Kan jevne ut bildetakten, på bekostning av spillene. GPU - Minne Av - Driverstandard - Komprimer Steam mens et spill kjører - Komprimer inaktivt spillminne - Komprimerer inaktivt spillminne når RAM er lav. Slå av hvis spill fryser i noen sekunder omtrent hvert halve minutt. Trer i kraft neste gang økten starter. - 20 s etter at et spill starter, komprimeres Steam-klienten til zRAM for å gi spillet mer minne, og leses inn igjen når spillet lukkes. Slå av hvis sesjonen lukkes kort tid etter at spill starter. En RAM-grense ovenfor komprimerer fortsatt Steam når sesjonen går over den. - RAM-grense - Gjelder mens Steam-klienten kjører, i Steam-modus eller fra skrivebordet. Når sesjonen bruker mer enn dette, komprimeres Steam og deretter sesjonens andre støttede prosesser til zRAM. En myk grense: ingenting lukkes, men spill kan hakke mens sider hentes tilbake. - Krever zRAM-swap, som denne enheten ikke har. - VRAM-grense - Rapporterer dette videominnebudsjettet til Direct3D 9 til 12-spill for å redusere minnebruken. Spill kan overskride det; dette legger ikke til GPU-sideveksling og garanterer ikke beskyttelse mot krasj ved minnemangel. Gjelder fra neste økt. Hold GPU-en på toppfrekvens Bare Adreno. Færre hikk, mer batteribruk og varme. Sesjonsfikser diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 1ae36c1ca..1176b0173 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -22,7 +22,6 @@ Voeg Steam-bibliotheken toe vanaf een SD-kaart, USB-stick of SSD, en DroidDeck houdt de games bij elkaar in je Bibliotheek. Met Winkels log je in bij Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io en Game Jolt, en installeer en update je hun games vanuit DroidDeck. Componenten zoals FEX, DXVK en VKD3D-Proton updaten zichzelf, en Proton Experimental ARM64 is de standaard, of Proton 11.0 ARM64 zodra die build is geïnstalleerd. - Steam comprimeren terwijl een game draait maakt RAM vrij op apparaten die weinig geheugen hebben. Veeg vanaf de rechterrand naar binnen om het sessiemenu te openen: touchpadmodus, Pc-toetsenbord, modus voor lage latentie, gameprofiel en meer. Draait een game traag? Begrens de framerate in het Snelmenu en probeer dan een andere Proton-versie of FEX-preset in de componenten van de game. Kraakt de audio of ontbreekt het geluid? Probeer de schakelaar DirectAudio voor games in de Steam-instellingen onder Audio. @@ -626,18 +625,7 @@ gamescope: realtime GPU-wachtrij Geeft het GPU-werk van de compositor voorrang. Kan de framepacing gladder maken, ten koste van wat gameprestaties. GPU - Geheugen Uit - Driverstandaard - Steam comprimeren terwijl een game draait - Inactief gamegeheugen comprimeren - Comprimeert inactief gamegeheugen bij weinig RAM. Zet dit uit als games ongeveer elke halve minuut een paar seconden vastlopen. Geldt vanaf de volgende keer dat de sessie start. - 20 s nadat een game start, wordt de Steam-client in zRAM gecomprimeerd om de game meer geheugen te geven, en teruggelezen als de game sluit. Zet dit uit als de sessie kort na het starten van games sluit. Een RAM-limiet hierboven comprimeert Steam nog steeds als de sessie die overschrijdt. - RAM-limiet - Geldt terwijl de Steam-client draait, in de Steam-modus of vanaf de desktop. Als de sessie meer gebruikt dan dit, worden Steam en daarna de andere ondersteunde processen van de sessie in zRAM gecomprimeerd. Een zachte limiet: er wordt niets gesloten, maar games kunnen haperen terwijl pagina’s terugkomen. - Vereist zRAM-swap, die dit apparaat niet heeft. - VRAM-limiet - Meldt dit videogeheugenbudget aan Direct3D 9- tot 12-games om het geheugengebruik te verlagen. Games kunnen het overschrijden; dit voegt geen GPU-paging toe en garandeert geen bescherming tegen crashes door geheugentekort. Geldt vanaf de volgende sessie. GPU op hoogste kloksnelheid houden Alleen Adreno. Minder haperingen, meer batterijverbruik en warmte. Sessiefixes diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index dd47a73b5..da0c0e4c1 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -22,7 +22,6 @@ Dodaj biblioteki Steam z karty SD, dysku USB lub SSD, a DroidDeck zbierze gry razem w Twojej Bibliotece. Sklepy pozwalają zalogować się do Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io i Game Jolt, a następnie instalować i aktualizować ich gry z poziomu DroidDeck. Komponenty takie jak FEX, DXVK i VKD3D-Proton aktualizują się same, a domyślny jest Proton Experimental ARM64 albo Proton 11.0 ARM64, gdy ta wersja jest zainstalowana. - Kompresuj Steam podczas gry zwalnia pamięć RAM na urządzeniach, którym jej brakuje. Przesuń palcem od prawej krawędzi, aby otworzyć menu sesji: tryb touchpada, Klawiatura PC, Tryb niskiego opóźnienia, profil gry i więcej. Gra działa wolno? Ogranicz liczbę klatek w menu Szybki dostęp, a potem wypróbuj inną wersję Proton lub inny preset FEX w komponentach gry. Trzaski lub brak dźwięku w grze? Wypróbuj przełącznik DirectAudio dla gier w ustawieniach Steam w sekcji Dźwięk. @@ -630,18 +629,7 @@ gamescope: kolejka GPU czasu rzeczywistego Nadaje priorytet pracy GPU kompozytora. Może wygładzić tempo klatek kosztem części wydajności gier. GPU - Pamięć Wyłączony - Domyślny sterownika - Kompresuj Steam podczas gry - Kompresuj nieużywaną pamięć gry - Kompresuje nieużywaną pamięć gry przy małej ilości RAM. Wyłącz, jeśli gry zawieszają się na kilka sekund mniej więcej co pół minuty. Działa od następnego uruchomienia sesji. - 20 s po starcie gry klient Steam jest kompresowany do zRAM, aby zostawić grze więcej pamięci, i wczytywany z powrotem po zamknięciu gry. Wyłącz, jeśli sesja zamyka się wkrótce po starcie gier. Powyższy limit RAM nadal kompresuje Steam, gdy sesja go przekroczy. - Limit RAM - Działa, gdy działa klient Steam, w trybie Steam lub z pulpitu. Gdy sesja używa więcej, Steam, a następnie inne obsługiwane procesy sesji są kompresowane do zRAM. Miękki limit: nic nie jest zamykane, ale gry mogą się zacinać podczas wczytywania stron z powrotem. - Wymaga swapu zRAM, którego to urządzenie nie ma. - Limit VRAM - Zgłasza ten budżet pamięci wideo grom Direct3D od 9 do 12, aby ograniczyć zużycie pamięci. Gry mogą go przekroczyć; nie dodaje to stronicowania GPU ani nie gwarantuje ochrony przed awariami z powodu braku pamięci. Działa od następnej sesji. Utrzymuj GPU na najwyższym taktowaniu Tylko Adreno. Mniej przycięć, większe zużycie baterii i więcej ciepła. Poprawki sesji diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index fdb7974b5..f36d346b3 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -22,7 +22,6 @@ Adicione bibliotecas Steam de um cartão SD, unidade USB ou SSD, e o DroidDeck mantém os jogos juntos na sua Biblioteca. Lojas permite iniciar sessão no Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io e Game Jolt, e depois instalar e atualizar os jogos deles a partir do DroidDeck. Componentes como FEX, DXVK e VKD3D-Proton atualizam-se sozinhos, e o Proton Experimental ARM64 é o predefinido, ou o Proton 11.0 ARM64 quando essa versão estiver instalada. - Comprimir o Steam durante um jogo liberta RAM em dispositivos com pouca memória. Deslize a partir do limite direito para abrir o menu da sessão: modo de painel tátil, Teclado de PC, Modo de baixa latência, perfil do jogo e mais. O jogo está lento? Limite a taxa de fotogramas no Acesso rápido e experimente outra versão do Proton ou outra predefinição do FEX nos componentes do jogo. Áudio do jogo com estalidos ou ausente? Experimente a opção DirectAudio para jogos nas definições do Steam, em Áudio. @@ -628,18 +627,7 @@ gamescope: fila de GPU em tempo real Dá prioridade ao trabalho de GPU do compositor. Pode suavizar o ritmo de fotogramas, com algum custo para os jogos. GPU - Memória Desativado - Predefinição do controlador - Comprimir o Steam durante um jogo - Comprimir memória inativa do jogo - Comprime a memória inativa do jogo quando há pouca RAM. Desative se os jogos bloquearem durante alguns segundos aproximadamente a cada meio minuto. Aplica-se no próximo início da sessão. - 20 s após o início de um jogo, o cliente Steam é comprimido na zRAM para deixar mais memória ao jogo, e é lido de volta quando o jogo fecha. Desative se a sessão fechar pouco depois de os jogos iniciarem. Um limite de RAM acima continua a comprimir o Steam quando a sessão o ultrapassa. - Limite de RAM - Aplica-se enquanto o cliente Steam está em execução, no modo Steam ou a partir do ambiente de trabalho. Quando a sessão utiliza mais do que isto, o Steam e depois os outros processos suportados da sessão são comprimidos na zRAM. Um limite flexível: nada é fechado, mas os jogos podem ter soluços enquanto as páginas são repostas. - Requer swap em zRAM, que este dispositivo não tem. - Limite de VRAM - Comunica este orçamento de memória de vídeo aos jogos Direct3D 9 a 12 para reduzir a utilização de memória. Os jogos podem excedê-lo; isto não adiciona paginação da GPU nem garante proteção contra falhas por falta de memória. Aplica-se na próxima sessão. Manter a GPU na frequência máxima Apenas Adreno. Menos soluços, mais consumo de bateria e mais calor. Correções da sessão diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index d29261a8a..bc8927ea3 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -22,7 +22,6 @@ Adicione bibliotecas da Steam de um cartão SD, pen drive USB ou SSD, e o DroidDeck mantém os jogos juntos na sua Biblioteca. Lojas permite entrar no Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io e Game Jolt, e depois instalar e atualizar os jogos deles pelo DroidDeck. Componentes como FEX, DXVK e VKD3D-Proton se atualizam sozinhos, e o Proton Experimental ARM64 é o padrão, ou o Proton 11.0 ARM64 quando essa versão estiver instalada. - Comprimir a Steam durante o jogo libera RAM em dispositivos com pouca memória. Deslize da borda direita para abrir o menu da sessão: modo touchpad, Teclado de PC, Modo de baixa latência, perfil do jogo e mais. Jogo rodando devagar? Limite a taxa de quadros no Acesso rápido e depois teste outra versão do Proton ou outra predefinição do FEX nos componentes do jogo. Áudio do jogo com chiado ou sem som? Experimente a opção DirectAudio para jogos nas configurações da Steam, em Áudio. @@ -628,18 +627,7 @@ gamescope: fila de GPU em tempo real Prioriza o trabalho de GPU do compositor. Pode suavizar o ritmo dos quadros, com algum custo para os jogos. GPU - Memória Desativado - Padrão do driver - Comprimir a Steam durante o jogo - Comprimir memória inativa do jogo - Comprime a memória inativa do jogo quando há pouca RAM. Desative se os jogos travarem por alguns segundos a cada meio minuto, aproximadamente. Vale a partir do próximo início da sessão. - 20 s após o início de um jogo, o cliente Steam é comprimido na zRAM para deixar mais memória ao jogo, e é lido de volta quando o jogo fecha. Desative se a sessão fechar logo após os jogos iniciarem. Um limite de RAM acima ainda comprime a Steam quando a sessão o ultrapassa. - Limite de RAM - Vale enquanto o cliente Steam está em execução, no modo Steam ou pela área de trabalho. Quando a sessão usa mais que isso, a Steam e depois os outros processos compatíveis da sessão são comprimidos na zRAM. Um limite flexível: nada é fechado, mas os jogos podem travar enquanto as páginas voltam. - Requer swap em zRAM, que este dispositivo não tem. - Limite de VRAM - Informa este orçamento de memória de vídeo aos jogos Direct3D 9 a 12 para reduzir o uso de memória. Os jogos podem excedê-lo; isso não adiciona paginação de GPU nem garante proteção contra falhas por falta de memória. Entra em vigor na próxima sessão. Manter a GPU no clock máximo Só em Adreno. Menos engasgos, mais gasto de bateria e mais calor. Correções da sessão diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index fff6f6269..4ef9d1d8c 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -22,7 +22,6 @@ Adaugă biblioteci Steam de pe un card SD, o unitate USB sau un SSD, iar DroidDeck păstrează jocurile împreună în Biblioteca ta. Magazine îți permite să te conectezi la Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io și Game Jolt, apoi să instalezi și să actualizezi jocurile lor din DroidDeck. Componente precum FEX, DXVK și VKD3D-Proton se actualizează singure, iar Proton Experimental ARM64 este implicit, sau Proton 11.0 ARM64 odată ce acea versiune este instalată. - Comprimă Steam cât rulează un joc eliberează RAM pe dispozitivele cu memorie puțină. Glisează dinspre marginea dreaptă ca să deschizi meniul sesiunii: mod touchpad, Tastatură de PC, Mod latență redusă, profilul jocului și altele. Jocul rulează greu? Limitează rata de cadre în Acces rapid, apoi încearcă altă versiune de Proton sau alt preset FEX în componentele jocului. Sunet de joc cu pârâituri sau lipsă? Încearcă opțiunea DirectAudio pentru jocuri din setările Steam, la Sunet. @@ -628,18 +627,7 @@ gamescope: coadă GPU în timp real Prioritizează lucrul GPU al compositorului. Poate netezi ritmul cadrelor, cu un cost pentru jocuri. GPU - Memorie Dezactivat - Implicit driver - Comprimă Steam cât rulează un joc - Comprimă memoria inactivă a jocului - Comprimă memoria inactivă a jocului când memoria RAM este redusă. Dezactivează dacă jocurile îngheață câteva secunde aproximativ la fiecare jumătate de minut. Se aplică la următoarea pornire a sesiunii. - La 20 s după pornirea unui joc, clientul Steam este comprimat în zRAM pentru a lăsa jocului mai multă memorie și este citit înapoi când jocul se închide. Dezactivează dacă sesiunea se închide la scurt timp după pornirea jocurilor. O limită RAM de mai sus tot comprimă Steam când sesiunea o depășește. - Limită RAM - Se aplică cât rulează clientul Steam, în modul Steam sau de pe desktop. Când sesiunea folosește mai mult de atât, Steam și apoi celelalte procese acceptate ale sesiunii sunt comprimate în zRAM. O limită flexibilă: nimic nu se închide, dar jocurile pot sacada cât paginile revin. - Necesită swap zRAM, pe care acest dispozitiv nu îl are. - Limită VRAM - Raportează acest buget de memorie video jocurilor Direct3D 9 până la 12 pentru a reduce utilizarea memoriei. Jocurile îl pot depăși; nu adaugă paginare GPU și nu garantează protecție împotriva blocărilor cauzate de lipsa memoriei. Se aplică din sesiunea următoare. Fixează GPU-ul la frecvența maximă Doar Adreno. Mai puține întreruperi, consum mai mare de baterie și căldură. Remedieri de sesiune diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c1e27d2a5..f2005f1af 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -22,7 +22,6 @@ Добавляйте библиотеки Steam с SD-карты, USB-накопителя или SSD, и DroidDeck соберёт игры вместе в вашей «Библиотеке». «Магазины» позволяют войти в Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io и Game Jolt, а затем устанавливать и обновлять их игры из DroidDeck. Компоненты вроде FEX, DXVK и VKD3D-Proton обновляются сами, а по умолчанию используется Proton Experimental ARM64 или Proton 11.0 ARM64, когда эта сборка установлена. - «Сжимать Steam во время игры» освобождает ОЗУ на устройствах с нехваткой памяти. Проведите от правого края, чтобы открыть меню сеанса: режим тачпада, «Клавиатура ПК», «Режим низкой задержки», профиль игры и другое. Игра тормозит? Ограничьте частоту кадров в меню «Быстрый доступ», затем попробуйте другую версию Proton или другой пресет FEX в компонентах игры. Треск или нет звука в игре? Попробуйте переключатель «DirectAudio для игр» в настройках Steam в разделе «Аудио». @@ -630,18 +629,7 @@ gamescope: очередь GPU в реальном времени Повышает приоритет работы GPU композитора. Может улучшить стабильность времени кадра, но потребляет часть производительности игры. GPU - Память Выкл. - По умолчанию драйвера - Сжимать Steam во время игры - Сжимать неактивную память игры - Сжимает неактивную память игры при нехватке RAM. Отключите, если игры зависают на несколько секунд примерно каждые полминуты. Применяется при следующем запуске сеанса. - Через 20 с после запуска игры клиент Steam сжимается в zRAM, чтобы оставить игре больше памяти, и считывается обратно после закрытия игры. Отключите, если сессия закрывается вскоре после запуска игр. Лимит RAM выше всё равно сжимает Steam, когда сессия его превышает. - Лимит RAM - Действует, пока работает клиент Steam, в режиме Steam или с рабочего стола. Когда сессия использует больше этого значения, Steam, а затем другие поддерживаемые процессы сессии сжимаются в zRAM. Мягкий лимит: ничего не закрывается, но игры могут подтормаживать, пока страницы возвращаются. - Нужен своп zRAM, которого на этом устройстве нет. - Лимит VRAM - Сообщает играм Direct3D 9–12 этот бюджет видеопамяти для снижения её использования. Игры могут его превысить; это не добавляет подкачку памяти GPU и не гарантирует защиту от сбоев из-за нехватки памяти. Действует со следующего сеанса. Поддерживать максимальную частоту GPU Только для Adreno. Меньше подтормаживаний, но больше энергопотребления и нагрева. Исправления сессии diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index f2732a0c9..670a8019c 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -22,7 +22,6 @@ Lägg till Steam-bibliotek från ett SD-kort, USB-minne eller SSD, så håller DroidDeck ihop spelen i ditt Bibliotek. Butiker låter dig logga in på Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io och Game Jolt och sedan installera och uppdatera deras spel från DroidDeck. Komponenter som FEX, DXVK och VKD3D-Proton uppdaterar sig själva, och Proton Experimental ARM64 är standard, eller Proton 11.0 ARM64 när den versionen är installerad. - Komprimera Steam medan ett spel körs frigör RAM på enheter med lite minne. Svep in från högerkanten för att öppna sessionsmenyn: pekplattsläge, PC-tangentbord, låg latens, spelprofil med mera. Går spelet långsamt? Begränsa bildfrekvensen i Snabbåtkomst och prova sedan en annan Proton-version eller FEX-förinställning i spelets komponenter. Knaster eller saknat ljud i spelet? Prova växlaren DirectAudio för spel i Steam-inställningarna under Ljud. @@ -626,18 +625,7 @@ gamescope: GPU-kö i realtid Prioriterar kompositorns GPU-arbete. Kan jämna ut bildtakten till viss kostnad för spelen. GPU - Minne Av - Drivrutinens standard - Komprimera Steam medan ett spel körs - Komprimera spelets inaktiva minne - Komprimerar spelets inaktiva minne när RAM-minnet är lågt. Stäng av om spel fryser några sekunder ungefär var halvminut. Gäller nästa gång sessionen startar. - 20 s efter att ett spel startat komprimeras Steam-klienten till zRAM för att ge spelet mer minne, och läses tillbaka när spelet stängs. Stäng av om sessionen stängs strax efter att spel startar. En RAM-gräns ovan komprimerar fortfarande Steam när sessionen överskrider den. - RAM-gräns - Gäller medan Steam-klienten körs, i Steam-läge eller från skrivbordet. När sessionen använder mer än detta komprimeras Steam och sedan sessionens övriga processer som stöds till zRAM. En mjuk gräns: inget stängs, men spel kan hacka medan sidor läses tillbaka. - Kräver zRAM-swap, vilket den här enheten saknar. - VRAM-gräns - Rapporterar denna videominnesbudget till Direct3D 9 till 12-spel för att minska minnesanvändningen. Spel kan överskrida den; detta lägger inte till sidväxling av GPU-minne och garanterar inte skydd mot krascher vid minnesbrist. Gäller från nästa session. Håll GPU:n på dess högsta klockfrekvens Bara Adreno. Färre hack, högre batteriförbrukning och mer värme. Sessionsfixar diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 89147a62c..576b285e7 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -22,7 +22,6 @@ เพิ่มคลังเกม Steam จากการ์ด SD ไดรฟ์ USB หรือ SSD แล้ว DroidDeck จะรวมเกมไว้ด้วยกันใน ไลบรารี ของคุณ สโตร์ ให้คุณลงชื่อเข้าใช้ Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io และ Game Jolt แล้วติดตั้งและอัปเดตเกมของสโตร์เหล่านั้นจาก DroidDeck ได้ คอมโพเนนต์อย่าง FEX, DXVK และ VKD3D-Proton อัปเดตตัวเอง และค่าเริ่มต้นคือ Proton Experimental ARM64 หรือ Proton 11.0 ARM64 เมื่อติดตั้งบิลด์นั้นแล้ว - บีบอัด Steam ขณะเล่นเกม ช่วยเพิ่ม RAM ว่างบนอุปกรณ์ที่หน่วยความจำเหลือน้อย ปัดเข้าจากขอบขวาเพื่อเปิดเมนูเซสชัน: โหมดทัชแพด แป้นพิมพ์พีซี โหมดหน่วงเวลาต่ำ โปรไฟล์เกม และอื่น ๆ เกมช้าใช่ไหม ลองจำกัดเฟรมเรตใน Quick Access แล้วลองใช้ Proton เวอร์ชันอื่นหรือพรีเซ็ต FEX อื่นในคอมโพเนนต์ของเกม เสียงเกมแตกพร่าหรือไม่มีเสียง ลองเปิดสวิตช์ DirectAudio สำหรับเกม ในการตั้งค่า Steam ภายใต้ เสียง @@ -624,18 +623,7 @@ gamescope: คิว GPU แบบเรียลไทม์ ให้ความสำคัญกับงาน GPU ของตัวประกอบภาพก่อน อาจทำให้การเรียงเฟรมราบรื่นขึ้นโดยแลกกับประสิทธิภาพของเกมบางส่วน GPU - หน่วยความจำ ปิด - ค่าเริ่มต้นของไดรเวอร์ - บีบอัด Steam ขณะเล่นเกม - บีบอัดหน่วยความจำเกมที่ไม่ได้ใช้งาน - บีบอัดหน่วยความจำเกมที่ไม่ได้ใช้งานเมื่อ RAM เหลือน้อย ปิดไว้หากเกมค้างไม่กี่วินาทีทุกประมาณครึ่งนาที มีผลเมื่อเริ่มเซสชันครั้งถัดไป - 20 วินาทีหลังเกมเริ่ม ไคลเอนต์ Steam จะถูกบีบอัดลงใน zRAM เพื่อเหลือหน่วยความจำให้เกมมากขึ้น และอ่านกลับเมื่อปิดเกม ปิดตัวเลือกนี้หากเซสชันปิดไปไม่นานหลังเริ่มเกม ขีดจำกัด RAM ด้านบนยังคงบีบอัด Steam เมื่อเซสชันใช้เกินขีดจำกัด - ขีดจำกัด RAM - มีผลขณะไคลเอนต์ Steam ทำงาน ทั้งในโหมด Steam หรือจากเดสก์ท็อป เมื่อเซสชันใช้เกินค่านี้ Steam และโปรเซสอื่นที่รองรับของเซสชันจะถูกบีบอัดลงใน zRAM ตามลำดับ เป็นขีดจำกัดแบบอ่อน: ไม่มีอะไรถูกปิด แต่เกมอาจกระตุกขณะดึงหน้าหน่วยความจำกลับมา - ต้องใช้ zRAM swap ซึ่งอุปกรณ์นี้ไม่มี - ขีดจำกัด VRAM - แจ้งงบประมาณหน่วยความจำวิดีโอนี้ให้เกม Direct3D 9 ถึง 12 เพื่อลดการใช้หน่วยความจำ เกมอาจใช้เกินงบได้ ฟีเจอร์นี้ไม่ได้เพิ่มการสลับหน้าหน่วยความจำ GPU และไม่รับประกันว่าจะป้องกันการแครชเมื่อหน่วยความจำหมด มีผลในเซสชันถัดไป ตรึง GPU ไว้ที่ความเร็วสัญญาณนาฬิกาสูงสุด สำหรับ Adreno เท่านั้น สะดุดน้อยลง แต่ใช้แบตเตอรี่และเกิดความร้อนมากขึ้น การแก้ไขเซสชัน diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 84ccc32c3..3fe7a74c5 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -22,7 +22,6 @@ SD karttan, USB sürücüden veya SSD\'den Steam kütüphaneleri ekle; DroidDeck oyunları Kütüphane\'nde bir arada tutar. Mağazalar, Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io ve Game Jolt\'ta oturum açmanı, ardından oyunlarını DroidDeck\'ten yüklemeni ve güncellemeni sağlar. FEX, DXVK ve VKD3D-Proton gibi bileşenler kendini günceller; varsayılan Proton Experimental ARM64\'tür, Proton 11.0 ARM64 kurulduktan sonra ise o olur. - Oyun çalışırken Steam\'i sıkıştır, belleği az olan cihazlarda RAM boşaltır. Oturum menüsünü açmak için sağ kenardan içeri kaydır: dokunmatik yüzey modu, PC klavyesi, düşük gecikme, oyun profili ve daha fazlası. Oyun yavaş mı çalışıyor? Hızlı erişim\'de kare hızını sınırla, sonra oyunun bileşenlerinde başka bir Proton sürümü veya FEX ön ayarı dene. Oyun sesinde cızırtı var ya da ses yok mu? Steam ayarlarında Ses altındaki Oyunlar için DirectAudio düğmesini dene. @@ -626,18 +625,7 @@ gamescope: gerçek zamanlı GPU kuyruğu Bileştiricinin GPU işine öncelik verir. Oyunlardan biraz feda ederek kare zamanlamasını yumuşatabilir. GPU - Bellek Kapalı - Sürücü varsayılanı - Oyun çalışırken Steam\'i sıkıştır - Oyunun boşta belleğini sıkıştır - RAM azaldığında oyunun boşta belleğini sıkıştırır. Oyunlar yaklaşık her yarım dakikada birkaç saniye donuyorsa kapatın. Oturum bir sonraki başlatıldığında geçerli olur. - Oyun başladıktan 20 sn sonra oyuna daha fazla bellek kalması için Steam istemcisi zRAM\'e sıkıştırılır ve oyun kapanınca geri okunur. Oyunlar başladıktan kısa süre sonra oturum kapanıyorsa bunu kapatın. Yukarıdaki RAM sınırı, oturum onu aştığında Steam\'i yine sıkıştırır. - RAM sınırı - Steam istemcisi Steam oturumunda veya masaüstünden çalışırken uygulanır. Oturum bundan fazlasını kullandığında önce Steam, ardından oturumun desteklenen diğer işlemleri zRAM\'e sıkıştırılır. Yumuşak bir sınırdır: hiçbir şey kapatılmaz, ancak sayfalar geri yüklenirken oyunlar takılabilir. - Bu cihazda olmayan zRAM takası gerekir. - VRAM sınırı - Bellek kullanımını azaltmak için Direct3D 9–12 oyunlarına bu video belleği bütçesini bildirir. Oyunlar bütçeyi aşabilir; GPU sayfalaması eklemez veya bellek yetersizliğinden kaynaklanan çökmeleri önlemeyi garanti etmez. Sonraki oturumda geçerli olur. GPU\'yu en yüksek saat hızında tut Yalnızca Adreno. Daha az takılma, daha fazla pil tüketimi ve ısınma. Oturum düzeltmeleri diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 17d3a8383..f7354e66e 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -22,7 +22,6 @@ Додавайте бібліотеки Steam із SD-картки, USB-накопичувача чи SSD, і DroidDeck збере ігри разом у вашій «Бібліотеці». «Магазини» дають змогу увійти в Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io і Game Jolt, а потім установлювати й оновлювати їхні ігри з DroidDeck. Компоненти, як-от FEX, DXVK і VKD3D-Proton, оновлюються самі, а типовою є Proton Experimental ARM64 або Proton 11.0 ARM64, щойно цю збірку встановлено. - «Стискати Steam під час гри» звільняє оперативну пам\'ять на пристроях, яким її бракує. Проведіть від правого краю, щоб відкрити меню сеансу: режим сенсорної панелі, «Клавіатура ПК», низька затримка, профіль гри та інше. Гра гальмує? Обмежте частоту кадрів у меню «Швидкий доступ», потім спробуйте іншу версію Proton або набір налаштувань FEX у компонентах гри. Тріск або зникає звук у грі? Спробуйте перемикач «DirectAudio для ігор» у налаштуваннях Steam у розділі «Звук». @@ -630,18 +629,7 @@ gamescope: черга GPU реального часу Надає пріоритет роботі композитора на GPU. Може вирівняти темп кадрів ціною частини продуктивності ігор. GPU - Памʼять Вимк. - Типово для драйвера - Стискати Steam під час гри - Стискати неактивну пам’ять гри - Стискає неактивну пам’ять гри, коли мало RAM. Вимкніть, якщо ігри зависають на кілька секунд приблизно кожні пів хвилини. Застосовується під час наступного запуску сеансу. - Через 20 с після запуску гри клієнт Steam стискається в zRAM, щоб залишити грі більше памʼяті, і зчитується назад, коли гра закривається. Вимкніть, якщо сеанс закривається невдовзі після запуску ігор. Ліміт RAM вище все одно стискає Steam, коли сеанс його перевищує. - Ліміт RAM - Діє, поки працює клієнт Steam, у режимі Steam або з робочого столу. Коли сеанс використовує більше цього значення, Steam, а потім інші підтримувані процеси сеансу стискаються в zRAM. Мʼякий ліміт: нічого не закривається, але ігри можуть підвисати, поки сторінки повертаються. - Потрібен своп zRAM, якого на цьому пристрої немає. - Ліміт VRAM - Повідомляє іграм Direct3D 9–12 цей бюджет відеопам’яті для зменшення її використання. Ігри можуть його перевищити; це не додає підкачку пам’яті GPU й не гарантує захисту від збоїв через нестачу пам’яті. Діє з наступного сеансу. Тримати GPU на максимальній частоті Лише Adreno. Менше запинок, вища витрата заряду та нагрів. Виправлення сеансу diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 34ec1d90b..896a78769 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -22,7 +22,6 @@ Thêm thư viện Steam từ thẻ SD, ổ USB hoặc SSD, và DroidDeck sẽ gom các game lại trong Thư viện của bạn. Cửa hàng cho phép bạn đăng nhập Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io và Game Jolt, rồi cài đặt và cập nhật game của họ ngay từ DroidDeck. Các thành phần như FEX, DXVK và VKD3D-Proton tự cập nhật, và mặc định là Proton Experimental ARM64, hoặc Proton 11.0 ARM64 khi bản dựng đó đã được cài. - Nén Steam khi game đang chạy giúp giải phóng RAM trên các thiết bị thiếu bộ nhớ. Vuốt vào từ mép phải để mở menu phiên: chế độ bàn di chuột, Bàn phím PC, độ trễ thấp, hồ sơ game và nhiều hơn nữa. Game chạy chậm? Hãy giới hạn tốc độ khung hình trong Truy cập nhanh, rồi thử phiên bản Proton khác hoặc bộ cài đặt sẵn FEX khác trong các thành phần của game. Âm thanh game bị rè hoặc mất tiếng? Hãy thử bật DirectAudio cho game trong cài đặt Steam, mục Âm thanh. @@ -624,18 +623,7 @@ gamescope: hàng đợi GPU thời gian thực Ưu tiên công việc GPU của compositor. Có thể làm nhịp khung hình mượt hơn với một phần chi phí cho game. GPU - Bộ nhớ Tắt - Mặc định của driver - Nén Steam khi game đang chạy - Nén bộ nhớ game không hoạt động - Nén bộ nhớ game không hoạt động khi RAM thấp. Tắt nếu game bị đứng vài giây khoảng mỗi nửa phút. Áp dụng từ lần khởi động phiên tiếp theo. - 20 giây sau khi game bắt đầu, client Steam được nén vào zRAM để game có thêm bộ nhớ, và được đọc lại khi game đóng. Tắt nếu phiên bị đóng ngay sau khi game bắt đầu. Giới hạn RAM ở trên vẫn nén Steam khi phiên vượt quá mức đó. - Giới hạn RAM - Áp dụng khi client Steam đang chạy, ở chế độ Steam hoặc từ desktop. Khi phiên dùng nhiều hơn mức này, Steam rồi đến các tiến trình được hỗ trợ khác của phiên sẽ bị nén vào zRAM. Giới hạn mềm: không có gì bị đóng, nhưng game có thể giật khi các trang được nạp lại. - Cần swap zRAM, thiết bị này không có. - Giới hạn VRAM - Báo ngân sách bộ nhớ video này cho các trò chơi Direct3D 9 đến 12 để giảm mức dùng bộ nhớ. Trò chơi có thể vượt ngân sách; tính năng này không bổ sung phân trang GPU hay bảo đảm tránh lỗi do hết bộ nhớ. Có hiệu lực ở phiên tiếp theo. Giữ GPU ở xung nhịp cao nhất Chỉ dành cho Adreno. Ít giật hơn, dùng nhiều pin và nhiệt hơn. Các bản sửa phiên diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index aa10c5ccf..e91a58b48 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -22,7 +22,6 @@ 可添加 SD 卡、USB 驱动器或 SSD 上的 Steam 游戏库,DroidDeck 会把这些游戏集中在你的库中。 游戏商店让你登录 Epic Games、GOG、Xbox、EA、Battle.net、Ubisoft Connect、Amazon Games、itch.io 和 Game Jolt,然后在 DroidDeck 中安装和更新它们的游戏。 FEX、DXVK 和 VKD3D-Proton 等组件会自动更新,默认使用 Proton Experimental ARM64,安装 Proton 11.0 ARM64 后则默认使用它。 - “游戏运行时压缩 Steam”可在内存不足的设备上释放 RAM。 从右边缘向内滑动可打开会话菜单:触控板模式、PC 键盘、低延迟、游戏配置档案等。 游戏运行缓慢?先在快捷访问中限制帧率,再到游戏的组件中尝试其他 Proton 版本或 FEX 预设。 游戏音频爆音或没有声音?请在 Steam 设置的“音频”下尝试“游戏使用 DirectAudio”开关。 @@ -624,18 +623,7 @@ gamescope:实时 GPU 队列 优先处理合成器的 GPU 工作。可平滑帧节奏,但会牺牲部分游戏性能。 GPU - 内存 关闭 - 驱动默认 - 游戏运行时压缩 Steam - 压缩游戏闲置内存 - RAM 较低时压缩游戏闲置内存。如果游戏大约每半分钟卡顿几秒,请关闭此项。下次启动会话时生效。 - 游戏启动 20 秒后,Steam 客户端会被压缩到 zRAM 中,为游戏腾出更多内存,并在游戏关闭时读回。如果会话在游戏启动后不久就关闭,请关闭此选项。设置了上方的 RAM 上限时,会话超出上限后仍会压缩 Steam。 - RAM 上限 - 在 Steam 客户端运行时生效,无论是 Steam 模式还是从桌面启动。会话使用量超过此值时,会先将 Steam、再将会话中其他受支持的进程压缩到 zRAM。这是软上限:不会关闭任何进程,但在页面读回时游戏可能卡顿。 - 需要 zRAM 交换空间,但此设备不支持。 - VRAM 上限 - 向 Direct3D 9 至 12 游戏报告此显存预算,以促使游戏减少内存使用。游戏可能超出预算;此功能不提供 GPU 分页,也不保证避免内存不足导致的崩溃。下次会话生效。 把 GPU 锁定在最高频率 仅限 Adreno。卡顿更少,但更耗电、更发热。 会话修复 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index d86325fe0..25a9d22ae 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -22,7 +22,6 @@ 可加入 SD 卡、USB 隨身碟或 SSD 上的 Steam 遊戲庫,DroidDeck 會把這些遊戲集中在你的收藏庫中。 「商店」讓你登入 Epic Games、GOG、Xbox、EA、Battle.net、Ubisoft Connect、Amazon Games、itch.io 和 Game Jolt,然後在 DroidDeck 中安裝和更新它們的遊戲。 FEX、DXVK 和 VKD3D-Proton 等元件會自動更新,預設使用 Proton Experimental ARM64,安裝 Proton 11.0 ARM64 後則預設使用它。 - 「遊戲執行時壓縮 Steam」可在記憶體不足的裝置上釋放 RAM。 從右邊緣向內滑動可開啟工作階段選單:觸控板模式、電腦鍵盤、低延遲、遊戲設定檔等。 遊戲執行緩慢?先在快速存取中限制影格率,再到遊戲的元件中嘗試其他 Proton 版本或 FEX 預設。 遊戲音訊爆音或沒有聲音?請在 Steam 設定的「音訊」下嘗試「遊戲使用 DirectAudio」開關。 @@ -624,18 +623,7 @@ gamescope:即時 GPU 佇列 優先處理合成器的 GPU 工作。可令幀間隔更平穩,但會犧牲少許遊戲效能。 GPU - 記憶體 關閉 - 驅動程式預設 - 遊戲執行時壓縮 Steam - 壓縮遊戲閒置記憶體 - RAM 偏低時壓縮遊戲閒置記憶體。如果遊戲大約每半分鐘凍結幾秒,請關閉此項。下次啟動工作階段時生效。 - 遊戲啟動 20 秒後,Steam 用戶端會被壓縮到 zRAM,為遊戲騰出更多記憶體,並在遊戲關閉時讀回。如果會話在遊戲啟動後不久就關閉,請關閉此選項。若超過上方的 RAM 上限,會話仍會壓縮 Steam。 - RAM 上限 - 在 Steam 用戶端執行時生效,無論是 Steam 模式或從桌面啟動。當會話的用量超過此值時,會先將 Steam、再將會話中其他受支援的程序壓縮到 zRAM。這是軟性上限:不會關閉任何程式,但在分頁讀回時遊戲可能會卡頓。 - 需要 zRAM 交換空間,但此裝置沒有。 - VRAM 上限 - 向 Direct3D 9 至 12 遊戲報告此顯存預算,以促使遊戲減少記憶體用量。遊戲可能超出預算;此功能不提供 GPU 分頁,也不保證避免因記憶體不足而崩潰。下次工作階段生效。 讓 GPU 保持最高頻率 只限 Adreno。減少卡頓,但更耗電、更發熱。 會話修正 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index cb8df3aec..66a0480c5 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -22,7 +22,6 @@ 可加入 SD 卡、USB 隨身碟或 SSD 上的 Steam 遊戲庫,DroidDeck 會把這些遊戲集中在你的收藏庫中。 「遊戲商店」讓你登入 Epic Games、GOG、Xbox、EA、Battle.net、Ubisoft Connect、Amazon Games、itch.io 和 Game Jolt,然後在 DroidDeck 中安裝和更新它們的遊戲。 FEX、DXVK 和 VKD3D-Proton 等元件會自動更新,預設使用 Proton Experimental ARM64,安裝 Proton 11.0 ARM64 後則預設使用它。 - 「遊戲執行時壓縮 Steam」可在記憶體不足的裝置上釋放 RAM。 從右邊緣向內滑動可開啟工作階段選單:觸控板模式、電腦鍵盤、低延遲、遊戲設定檔等。 遊戲執行緩慢?先在快速存取中限制影格率,再到遊戲的元件中嘗試其他 Proton 版本或 FEX 預設。 遊戲音訊爆音或沒有聲音?請在 Steam 設定的「音訊」下嘗試「遊戲使用 DirectAudio」開關。 @@ -624,18 +623,7 @@ gamescope:即時 GPU 佇列 提高合成器 GPU 工作的優先順序。可能改善影格時間穩定性,但會佔用一部分遊戲效能。 GPU - 記憶體 關閉 - 驅動程式預設值 - 遊戲執行時壓縮 Steam - 壓縮遊戲閒置記憶體 - RAM 偏低時壓縮遊戲閒置記憶體。如果遊戲大約每半分鐘凍結幾秒,請關閉此項。下次啟動工作階段時生效。 - 遊戲啟動 20 秒後,Steam 用戶端會被壓縮到 zRAM,為遊戲騰出更多記憶體,並在遊戲關閉時讀回。如果工作階段在遊戲啟動後不久就關閉,請關閉此選項。若超過上方的 RAM 上限,工作階段仍會壓縮 Steam。 - RAM 上限 - 在 Steam 用戶端執行時生效,無論是 Steam 模式或從桌面啟動。當工作階段的用量超過此值時,會先將 Steam、再將工作階段中其他受支援的程序壓縮到 zRAM。這是軟性上限:不會關閉任何程式,但在分頁讀回時遊戲可能會卡頓。 - 需要 zRAM 交換空間,但這部裝置沒有。 - VRAM 上限 - 向 Direct3D 9 至 12 遊戲回報此顯示記憶體預算,以促使遊戲減少記憶體使用量。遊戲可能超出預算;此功能不提供 GPU 分頁,也不保證避免記憶體不足造成的當機。下次工作階段生效。 讓 GPU 保持最高頻率 僅適用於 Adreno。卡頓更少,但耗電和發熱更多。 工作階段修復 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e697c0bb0..c72a92b84 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -49,7 +49,6 @@ Add Steam libraries from an SD card, USB drive or SSD, and DroidDeck keeps the games together in your Library. Stores lets you sign in to Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io and Game Jolt, then install and update their games from DroidDeck. Components like FEX, DXVK and VKD3D-Proton update themselves, and Proton Experimental ARM64 is the default, or Proton 11.0 ARM64 once that build is installed. - Compress Steam while a game runs frees RAM on devices that run low. Swipe in from the right edge to open the session menu: touchpad mode, PC keyboard, low latency, game profile and more. Game running slow? Cap the frame rate in Quick Access, then try another Proton version or FEX preset in the game\'s components. Crackling or missing game audio? Try the DirectAudio for games toggle in Steam settings under Audio. @@ -654,18 +653,7 @@ gamescope: realtime GPU queue Prioritizes the compositor\'s GPU work. Can smooth frame pacing at some cost to games. GPU - Memory Off - Driver default - Compress Steam while a game runs - Compress idle game memory - Pages out idle game memory when RAM is low. Turn this off if games freeze for a few seconds about every half minute. Applies the next time the session starts. - Compresses Steam while a game runs, starting sooner when memory is tight. Steam is read back after the game closes once enough RAM is available. Turn this off if the session closes shortly after games start. A RAM cap above still compresses Steam when the session goes over it. - RAM cap - Applies while the Steam client runs, in Steam mode or from the desktop. When the session uses more than this, Steam and then the session\'s other supported processes are compressed into zRAM. A soft cap: nothing is closed, but games may stutter while pages come back. - Needs zRAM swap, which this device does not have. - VRAM cap - Reports this video memory budget to Direct3D 9 to 12 games to encourage lower memory use. Games may exceed it; this does not add GPU paging or guarantee protection from out-of-memory crashes. Takes effect at the next session. Hold the GPU at its top clock Adreno only. Fewer hitches, more battery use and heat. Session fixes diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt index 7d2087f6f..66b68631f 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt @@ -35,7 +35,8 @@ class SessionSuspendControllerTest { val urgent = fixture.signals.filter { it.signal == URG } assertEquals(listOf(GAME), urgent.map { it.pid }) assertTrue(fixture.signals.indexOfFirst { it.signal == URG } < fixture.signals.indexOfFirst { it.signal == STOP }) - assertEquals("1", fixture.control.readText()) + assertEquals(listOf("1"), fixture.held) + assertEquals("0", fixture.control.readText()) assertEquals(listOf(Triple(1, 1_000_000L, 3_000_000L)), fixture.pagedOut) assertEquals(0, fixture.unacknowledged) assertTrue(fixture.game.threads.all { it.state == 't' }) @@ -56,6 +57,22 @@ class SessionSuspendControllerTest { assertEquals(0, fixture.unacknowledged) } + @Test fun aTrimAcknowledgementIsNotTakenForAFinishedPageOut() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.handlerStalls = true + val ack = File(fixture.control.parentFile, ".dd-zram.ack.$GAME") + var stoppedEarly = false + fixture.afterSleep = { + if (fixture.now == 3000L) fixture.handlerStalls = false + if (fixture.handlerStalls && fixture.signals.any { it.signal == URG }) ack.writeText("4096") + if (fixture.handlerStalls && fixture.signals.any { it.signal == STOP }) stoppedEarly = true + } + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + assertFalse(stoppedEarly) + assertEquals(0, fixture.unacknowledged) + } + @Test fun replacedHandlerIsNotWaitedForPastTheStartWindow() { val fixture = fixture(17) fixture.control.writeText("0") @@ -107,6 +124,17 @@ class SessionSuspendControllerTest { assertEquals(1, fixture.pagedIn.size) } + @Test fun theMonitorIsHeldOffWhilePagingOutAndReadingBack() { + val fixture = fixture(17) + fixture.control.writeText("0") + val hold = File(fixture.control.parentFile, ".dd-zram.hold") + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + assertFalse(hold.exists()) + fixture.controller.resume { assertTrue(it) } + assertFalse(hold.exists()) + assertEquals(listOf("1", "0"), fixture.held) + } + @Test fun noReadBackAfterAFreezeWithoutPageOut() { val fixture = fixture(17) fixture.control.writeText("0") @@ -116,6 +144,18 @@ class SessionSuspendControllerTest { assertTrue(fixture.pagedIn.isEmpty()) } + @Test fun aTrimRequestInTheControlFileDoesNotReplaceThePageOut() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.afterSleep = { fixture.control.writeText("2 4096\n") } + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + fixture.controller.resume { assertTrue(it) } + assertEquals(listOf("1", "0"), fixture.held) + assertEquals("2 4096\n", fixture.control.readText()) + assertEquals(listOf(Triple(1, 1_000_000L, 3_000_000L)), fixture.pagedOut) + assertEquals(listOf(Triple(1, 0L, 3_000_000L)), fixture.pagedIn) + } + @Test fun readBackIsSkippedWhenAvailableMemoryCannotTakeIt() { val fixture = fixture(17) fixture.control.writeText("0") @@ -124,7 +164,7 @@ class SessionSuspendControllerTest { val before = fixture.signals.size fixture.controller.resume { assertTrue(it) } assertFalse(fixture.signals.drop(before).any { it.signal == URG }) - assertEquals("1", fixture.control.readText()) + assertEquals(listOf("1"), fixture.held) assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) } @@ -151,18 +191,6 @@ class SessionSuspendControllerTest { assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) } - @Test fun noReadBackWithARamCap() { - val fixture = fixture(17) - fixture.control.writeText("0") - fixture.readBackAllowed = false - fixture.controller.freeze(pageOut = true) { assertTrue(it) } - val before = fixture.signals.size - fixture.controller.resume { assertTrue(it) } - assertFalse(fixture.signals.drop(before).any { it.signal == URG }) - assertEquals("1", fixture.control.readText()) - assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) - } - @Test fun cancelledFreezeReadsBackWhatThePageOutAlreadyMoved() { val fixture = fixture(17) fixture.control.writeText("0") @@ -170,7 +198,7 @@ class SessionSuspendControllerTest { fixture.controller.freeze(pageOut = true) { assertFalse(it) } assertFalse(fixture.signals.any { it.signal == STOP }) assertEquals(2, fixture.signals.count { it.signal == URG }) - assertEquals("0", fixture.control.readText()) + assertEquals(listOf("1", "0"), fixture.held) assertEquals(1, fixture.pagedIn.single().first) assertEquals(0L, fixture.pagedIn.single().second) assertTrue(fixture.pagedIn.single().third > 0L) @@ -183,7 +211,7 @@ class SessionSuspendControllerTest { fixture.afterSleep = { if (fixture.now >= 500) fixture.controller.cancelFreeze() } fixture.controller.freeze(pageOut = true) { assertFalse(it) } assertEquals(2, fixture.signals.count { it.signal == URG }) - assertEquals("0", fixture.control.readText()) + assertEquals(listOf("1", "0"), fixture.held) assertEquals(Triple(1, 0L, 0L), fixture.pagedIn.single()) } @@ -467,6 +495,7 @@ class SessionSuspendControllerTest { val groups = mutableListOf(root, game) val helpers = mutableListOf() val signals = mutableListOf() + val held = mutableListOf() var rootPid = ROOT var now = 0L var audioSuspends = 0 @@ -486,7 +515,6 @@ class SessionSuspendControllerTest { val pagedIn = mutableListOf>() var availableKb = 8_000_000L var totalKb = 16_000_000L - var readBackAllowed = true private var gameResidentKb = 4_000_000L private var gameSwapKb = 0L private var pagingOut = false @@ -506,7 +534,6 @@ class SessionSuspendControllerTest { pagedOut += Triple(processes, resident, swap) this.unacknowledged = unacknowledged }, - readBackAllowed = { readBackAllowed }, pagedIn = { processes, swap, swapBefore, _, _ -> pagedIn += Triple(processes, swap, swapBefore) }, ) @@ -514,6 +541,8 @@ class SessionSuspendControllerTest { private fun signal(pid: Int, signal: Int) { signals += SentSignal(pid, signal) + val request = if (signal == URG) File(control.parentFile, "${control.name}.hold").takeIf { it.isFile }?.readText() else null + if (signal == URG) held += request val group = groups.first { it.pid == pid } if (signal == STOP) { continuing = false @@ -522,7 +551,7 @@ class SessionSuspendControllerTest { it.state !in listOf('T', 't', 'Z', 'X') && !(neverStop && it == game.threads.last()) }?.state = 't' } else if (signal == URG) { - if (control.readText() == "0") { pagingOut = false; pagingIn = true } else pagingOut = true + if (request == "0") { pagingOut = false; pagingIn = true } else pagingOut = true } else if (signal == CONT) { if (clockAtContinue == null && clock.isFile) { clockAtContinue = ByteBuffer.wrap(clock.readBytes()).order(ByteOrder.LITTLE_ENDIAN).long diff --git a/docs/development/low-memory.md b/docs/development/low-memory.md index 434aa2267..218d1fd8e 100644 --- a/docs/development/low-memory.md +++ b/docs/development/low-memory.md @@ -1,42 +1,121 @@ -# Low-memory reclaim and userspace compression +# Automatic memory management -The Steam session monitor uses the existing `libddsession.so` page-out request to reclaim -private anonymous launcher memory. The default remains a request 20 seconds after game focus, -with five minutes between requests. With client compression enabled, low system headroom can -also trigger a request while a game is loading, before its first focused window. +The Steam session keeps enough memory free on its own. There are no memory settings: the +session monitor in `droiddeck-session` measures how much memory is available and how fast it is +being taken, and compresses just enough idle memory into zRAM to stay ahead of it. -Every five seconds the monitor reads `MemAvailable`, swap headroom and memory PSI. Low -headroom means less than one fifth of total RAM (bounded to 512–1536 MiB), or at least 1% -`some avg10` memory stall with less than one third of RAM available. Pressure requests target -only the launcher processes already recognized by the monitor, never the game. They require -at least 128 MiB launcher RSS and enough free swap to cover its anonymous RSS while leaving -one fifth of swap (at least 256 MiB) free. File-backed resident pages do not consume this -budget: the page-out helper targets private anonymous mappings. If `RssAnon` is absent from a -process's status, its full RSS is used instead. The regular automatic client request uses the -same swap guard. An explicit session RAM cap retains its existing behavior. +## What the monitor measures -Pressure requests are at least 30 seconds apart. Reclaiming less than 16 MiB doubles the -retry delay, up to five minutes. After game exit, speculative launcher readback is deferred -until the session is under any explicit RAM cap, pressure has subsided, and available RAM -can cover twice the launcher's swap while leaving the headroom reserve. Normal demand paging -continues while readback is deferred; Steam does not have to wait for the monitor to recover. -The same readback runs while the game is still running once the client has been in front of it -for five seconds (a game stuck on a black screen and left through Steam, or a long stay in the -Steam menu), under the same memory checks and only without an explicit RAM cap. Missing or -unreadable focus data never counts as the client in front. Demand paging -alone left the Steam library and menus blank for about half a minute in that case. The -client is compressed again 20 seconds after the game is back in front. -Missing memory counters disable automatic pressure reclaim and speculative readback. Missing -PSI alone still permits the `MemAvailable` fallback. No root settings, swap sizes, compression -algorithms, Android process priorities or game-specific settings are changed. +Each pass reads four things: + +- `MemAvailable` from `/proc/meminfo`. +- The fall rate: how much `MemAvailable` dropped since the last pass, plus what the monitor + itself freed in between, per second. A peak decays by a quarter per pass, so one burst keeps + the monitor alert for a few seconds without holding it there. +- Memory stall: the change in the `some` total of `/proc/pressure/memory`, as a percentage of + the time between passes. A missing PSI file reads as no stall. +- zRAM room and saving: free space on the zRAM swap devices in `/proc/swaps` after a reserve + of one eighth of zRAM (at least 128 MiB), and the measured saving per compressed byte from + `/sys/block/zram0/mm_stat` (bounded to 1.2:1–6:1, 2.5:1 before 64 MiB has been stored). + Disk swap is not counted as room: paging to storage is what causes long stalls. + +The monitor sleeps five seconds between passes while more than two fifths of RAM is available +and memory is steady, and one second otherwise. + +## Levels + +| Level | Value | Meaning | +| --- | --- | --- | +| Floor | one eighth of RAM, bounded to 640–1280 MiB | Below this the system is close to killing the session. `lmkd` ended a session on a 7.5 GiB device with 490 MiB available. | +| Target | floor + ten seconds of the fall rate | Where the monitor wants available memory to stay. | +| Burst | two seconds of the fall rate, when that is at least 64 MiB and less than two fifths of RAM is available | Memory that will be taken before the next passes can react. | + +The amount to free is the distance to the target or the burst, whichever is larger. The hard +part of it is what available memory is short of the floor, and nothing when it is above. With +a memory stall of at least 1% the hard part is two seconds of the fall rate when that is +larger, whatever the size of the fall and however much memory is available. + +## What gets compressed, in order + +1. The Steam client and hidden launchers, while a game is running and the client is not known + to be in front (unreadable focus data counts as not in front), or at any time when there is + a hard need. Without a hard need the client is left alone for 30 seconds after + it was read back. +2. Processes of the session that loaded `libddsession.so` (the game, Wine and its services), + largest first, only for the hard part that the client did not cover. One pass moves at + most 256 MiB. + +Both use the preload's cold-only request (`2 `): each process pages out only memory it has +not touched recently and stops at the budget, so memory in use stays in RAM and is not read +straight back. The budget is the amount to free divided by the measured saving, limited to the +zRAM room. With less than half the floor available the request ignores heat (`3 `), moves +up to 1 GiB, and runs at most once every ten seconds. + +Two things keep memory from going in and out of zRAM. The preload remembers each 1 MiB chunk +it paged out: when a quarter or more of those pages are resident again at the next visit, the +chunk is hot and is passed over for the next 64 visits, then 128, then 255. And the monitor +reads `pswpin` from `/proc/vmstat`: what was read back from swap, fading over half a minute, +is taken off what one pass may move (1 GiB in all, at most 256 MiB of it from the session). A device +whose working set does not fit therefore stops being trimmed and is left to the kernel, until +the forced level is reached. + +A pass that gives back less than a quarter of what the floor is short by is followed by a wait: +five seconds, doubling after each such pass up to a minute. The wait ends early when available +memory drops another eighth of the floor or reaches the forced level, and is forgotten after a +pass that gives back enough or once nothing is needed. + +Requests go to one process at a time. The monitor waits for that process's acknowledgement +(the kB it paged out) before the next, reads `MemAvailable` again, and stops once the budget is +met or available memory is back at the level the pass was started for. A process that has not +started within half a second, or has not finished when the pass (client and session together) +has waited five seconds in total or six seconds have gone by since it began, is skipped for a +minute, and a late answer from it is discarded. A process is known by its number and start time, so a new process that got the +number of a skipped one is asked. Processes with less +than 8 MiB of anonymous memory are skipped. While the app pages the session out for suspend, or +reads it back on resume, it holds the monitor off with `/tmp/.dd-zram.hold` and writes its own +request (`1` to page out, `0` to read back) into that file. A signalled process reads the hold +file first and the control file only when the hold file is missing or empty, so a trim request +the monitor wrote at the same moment cannot replace the app's. The suspend page-out answers `1` +in `/tmp/.dd-zram.ack.` and a trim answers its kB in `/tmp/.dd-zram.trim.`, so the +monitor never removes or reads an answer the app is waiting for, and the app never takes a +trim's answer for its own. A trim budget smaller than a chunk covers the stretch of the chunk +that holds that many resident pages, and the next request continues from where it ended. With less than 64 MiB of zRAM room nothing is requested and the +session log says so once a minute. + +With no shortage nothing is compressed. A game that fits in memory is never touched, and Steam +is no longer compressed on a timer. + +## Reading the client back + +Once the client has been compressed, it is read back in one request when the game has exited, +or the client has been in front of the game for five seconds, and at least 30 seconds have +passed since the last request, and available memory covers the client's swap plus the target +and the floor. Missing or unreadable focus data never counts as the client in front. Demand +paging alone left the Steam library and menus blank for about half a minute in that case. +Suspending the session while it is asleep, hidden or the screen is off still pages everything +out, and resuming reads it back when available memory is at least twice what those processes +have in swap at that moment and, after it, 1 GiB or a tenth of RAM, whichever is larger, stays +available. + +## Threads + +Page-out never runs on a thread of the game. The preload's signal handler only wakes its +`zr-worker` thread, which does the `madvise` calls. A forked process +without a worker trims inline in steps of at most 32 MiB per request and looks at no more +than 512 MiB of its address space each time. The page-out for a suspend and the read-back +after it are not limited there: they run once, while the process is being stopped or +started, and cover all of it. The monitor is a +shell loop in the session, outside every game process. + +The session log gets a line once at least 16 MiB has moved since the last one, at most every +five seconds: +`memory: available N MB, falling N MB/s, compressed N MB of the client and N MB of the session`. + +No root settings, swap sizes, compression algorithms, Android process priorities or +game-specific settings are changed. + +## Measurements behind the levels -A bounded live test of the pressure helper on the FIT during Caravan SandWitch loading -requested page-out at 20:52:37 UTC, 18 seconds before the installed timed reclaimer. Aggregate -launcher RSS fell from 608 to 283 MiB across that request; this is summed process RSS, not a -measurement of net physical RAM saved. The game reached its main menu at 60 FPS. The test ran -the candidate monitor functions alongside the old APK's monitor, not a newly built APK; -the old monitor's later request is visible separately at 20:52:55 in the session log. This -does not establish gameplay performance or resolve Stellar Blade's larger memory failure. Continuing an existing Caravan save reproduced a whole-session low-memory kill with the pressure helper running. Android recorded `ApplicationExitInfo` reason `LOW_MEMORY`, and @@ -49,39 +128,6 @@ reduced aggregate launcher RSS only from 263 to 255 MiB and backed off. Thus lau does not resolve this load failure, and this run did not exhaust swap. The unevictable/shmem growth needs allocation attribution before treating it as a driver or GPU-memory diagnosis. -## Pressure reclaim: compressing idle game memory - -The monitor also compresses the game session itself when observed pressure approaches the -system kill boundary. There is no RAM-size gate. The trigger is absolute real headroom, not a -percentage: Android's `lmkd` killed a session on a 7.5 GiB device with -490 MiB still available, so a 95% used threshold (about 400 MiB left on 8 GB) is already past the -kill. A world load added 1 GiB of GPU memory in about ten seconds, and compressing 1.4 GiB took -2.6 seconds, so the request has to leave room for both. - -Performance > Compress idle game memory turns this off (`DD_ZRAM_IDLE=0`); launcher compression -and the RAM cap are unaffected. - -The session request runs when real headroom falls below a quarter of RAM (bounded to -768–2560 MiB), or below one and a half times that with at least 1% `some` or `full avg10` -memory stall. Real headroom subtracts positive growth in KGSL allocation, `Unevictable`, and -`Shmem` from `MemAvailable`; a rapid fall also qualifies below twice the headroom or two fifths of RAM, whichever is larger (a 15 GB Thor Max was killed with 5.3 GB still available while memory fell about 400 MB per tick). The monitor -may first request page-out of idle Steam and hidden launchers, subject to the Performance -setting and client reclaim limits. When both qualify, both requests are sent before waiting -for either to complete, so a slow launcher acknowledgement does not delay the game request. Until the client -request finishes, its anonymous RSS remains reserved from the session's swap budget. Completion -and backoff are measured against the processes that received each request, even if a later scan -finds different processes. The session request targets processes that loaded -`libddsession.so`: the game, Wine and its services, and excludes Steam and hidden launchers. -Requests are at least 30 seconds apart and need the same -swap reserve as launcher requests. When the session has read back more than half of what the -previous request compressed, that memory is in use: the request is skipped and the wait doubles, -up to five minutes. A completed request must also raise `MemAvailable` by at least one -sixteenth of the tier headroom, with a 16 MiB minimum; otherwise the same wait doubles because -the pass did not provide meaningful system headroom. A request whose memory stayed compressed or -whose available memory recovers resets the wait to 30 seconds. Below half the headroom the wait -is ignored and only the 30-second spacing applies, so critical pressure can still trigger a -request. The state resets when the game exits. - Measured on a Retroid Pocket Duo (7.5 GiB, kernel 6.6, 6 GiB lzo-rle zram plus a 4 GiB swap file) entering the world in World of Warcraft: Forever, one run each: @@ -99,20 +145,6 @@ allocation, not swap capacity. Little Nightmares at the same settings compressed the following minute at its menu and 440 MiB while loading the next area; frame rate stayed at 44–46 FPS with one or two short frame-time spikes. These are single runs, not averages. -On the PR build without any manual step, the monitor compressed WoW before character select and -again during the load; the game entered the world and stayed there at 33 FPS. Once in the world, -available memory settled near 1 GiB, under the headroom, and the first version of the policy -compressed 200–400 MiB every 30 seconds while the game read back about 15 MiB/s. The -read-back check therefore compares against the last request instead of all compressed memory. - -A second run on that build showed the trigger arriving too late: character select sat at -1.5–1.6 GiB available, just above the original one-fifth headroom, so nothing was compressed -there. During the load, available memory crossed the headroom 9 seconds after Enter World, but the -launcher check ran first and waited 12 seconds for acknowledgements; the game request started at -21 seconds, moved about 200 MiB, and `lmkd` ended the session at 30 seconds. The quarter-of-RAM -level starts reclaim earlier. Sending both requests before waiting removes the launcher -acknowledgement delay; it does not guarantee that reclaim can keep up with every loading peak. - Without root an app cannot write its memory cgroup's `memory.reclaim` (owned by `system`), `process_madvise` on another process returns `EPERM`, `PAGEMAP_SCAN` is absent before Linux 6.7, and KGSL's per-process GPU reclaim `state` is root-only. Page-out therefore runs inside each diff --git a/docs/development/vram-budget.md b/docs/development/vram-budget.md deleted file mode 100644 index 8877bd7bf..000000000 --- a/docs/development/vram-budget.md +++ /dev/null @@ -1,28 +0,0 @@ -# Reported video memory budget - -The Performance VRAM setting enables `VK_LAYER_DROIDDECK_vram_cap` for games and reports smaller device-local `VK_EXT_memory_budget` budgets. DXVK exposes these through DXGI's `QueryVideoMemoryInfo`, including to D3D12 games using DXVK's DXGI alongside vkd3d-proton. Games that consult this budget can choose smaller working sets. The driver still supplies real heap sizes, usage figures, memory types, and actual allocation results. DXVK also receives `dxgi.maxDeviceMemory` and `dxgi.maxSharedMemory`, which separately reduce the adapter's advertised dedicated and shared video memory (on a single-heap GPU DXVK reports the heap as both, so a game adding the two would otherwise still see the whole heap as shared), and, for caps below DXVK's 4096 MiB D3D9 default, `d3d9.maxAvailableMemory`, which caps the texture memory DXVK's D3D9 frontend reports, since D3D9 games do not read the DXGI setting. Higher caps leave the D3D9 setting alone so DXVK's lower per-game limits still apply. OpenGL games are not covered. A lower driver budget remains lower; the layer never increases it. - -This does not make vkd3d-proton automatically enforce the selected budget. In the [upstream allocator inspected during this investigation](https://github.com/HansKristian-Work/vkd3d-proton/blob/865b12ba0cc20796b3709397ce5d6d3b8a205b04/libs/vkd3d/memory.c), `heapBudget` is used for diagnostic reporting, while the [DXVK adapter](https://github.com/doitsujin/dxvk/blob/cf0a0d90f8965147741ad17dcd0b263817572ab3/src/dxgi/dxgi_adapter.cpp) returns the Vulkan budget to applications. Seeing a smaller budget in a VKD3D log verifies reporting, not reduced allocation or eviction. - -This is a budget hint, not a physical reservation or a GPU paging implementation. Games may exceed it. On UMA hardware, host-visible Vulkan allocations can share the same device-local heap as textures. Rejecting every allocation above a fixed total can therefore break required upload buffers and other allocations, rather than make a game reduce its texture pool. The layer does not intercept `vkAllocateMemory` or `vkFreeMemory`, and preserves the real heap size so individual allocations larger than the budget remain Vulkan-valid. - -The layer activates only with `DROIDDECK_VRAM_CAP=1` and a positive `DROIDDECK_VRAM_CAP_MB`. With the Performance setting on Auto, the game environment does not enable it. Explicit DXVK configuration remains available, while the Vulkan layer also covers D3D12 and games that replace their DXVK configuration. - -## Physical investigation - -On an 8 GB Pocket FIT Elite with DD Turnip 0.4.0, Proton 11-12.1, and Caravan SandWitch build 25301828: - -- A native Vulkan probe reported a device-local heap of 5,650,776,064 bytes. All exposed memory types used the same device-local UMA heap. The initial implementation clamped both heap and budget to 2048 MiB; the revised layer preserves heap capacity and clamps only the budget. -- The initial hard allocation cap caused the existing save to fail a required 603,979,776-byte D3D12 allocation. Android survived, but the game crashed. Discord testers also reported crashes after reaching the cap in Fallout 76. -- In the initial test with allocation rejection disabled, vkd3d-proton logged the smaller 2048 MiB heap and budget. Caravan still exhausted system memory while loading the save. A reported budget alone does not solve this workload. -- DX11 loaded the same save and supported movement around the station at approximately 60 FPS for more than five minutes, both with and without the reported budget layer. Graphics settings were unchanged. This establishes a renderer workaround, not proof that the layer solved Caravan's OOM. -- The final release-signed APK, preserving real heap size and clamping only the budget to 2048 MiB, also passed more than five minutes of loaded-save DX11 movement. D3D12 with the same budget still exhausted system memory. -- Launching D3D12 through `droiddeck-proton-run --app` without the Linux Steam client reached the loaded save and allowed movement, then Android killed the session for low memory. Removing the client footprint alone was insufficient. - -A separate Windows DXGI query probe on a **12 GB AYN Thor** with the same APK and Proton queried the adapter without allocating game resources. With the layer disabled, dedicated video memory was 8,858,370,048 bytes and the local budget was 5,656,018,944 bytes. Enabling only the layer at 2048 MiB preserved that dedicated-memory value and changed the local and UMA non-local budgets to 2,147,483,648 bytes. Adding the existing `DXVK_CONFIG="dxgi.maxDeviceMemory = 2048"` setting also lowered advertised dedicated memory to 2,147,483,648 bytes while retaining the 2048 MiB budgets. These probes verify the application-facing budget path; they are not 8 GB gameplay results. - -On that Thor, subsequent D3D12 runs both with and without the 2048 MiB budget reached the existing save and supported more than five minutes of movement. Both used the Stability preset and `VKD3D_CONFIG=log_memory_budget`. The budgeted run ended with an Android low-memory kill during the shutdown window; the unbudgeted retry stopped cleanly. Earlier runs also encountered low-memory kills or a separate exception-stack startup failure. These observations do not establish a reduction in Caravan's memory use from the budget hint or a stable D3D12 fix. - -Native regression coverage exercises core and KHR memory-property queries, chained budget structures, unchanged real usage above the budget, separate heap types, disabled behavior, device lifecycle dispatch, and successful driver allocations whose individual and combined sizes exceed the reported budget. - -The Vulkan specification describes [`heapBudget` as a guideline](https://docs.vulkan.org/refpages/latest/refpages/source/VkPhysicalDeviceMemoryBudgetPropertiesEXT.html). Transparent movement between device-local and host-local memory requires driver and operating-system support for [pageable device-local memory](https://docs.vulkan.org/refpages/latest/refpages/source/vkAllocateMemory.html). diff --git a/docs/settings-map.md b/docs/settings-map.md index b9b42d563..694717ff8 100644 --- a/docs/settings-map.md +++ b/docs/settings-map.md @@ -19,10 +19,6 @@ Links of the form `droiddeck://settings/
` open a Settings section direc | Skip GL error checks | Settings › Performance (`droiddeck://settings/performance`) | | | gamescope: realtime GPU queue | Settings › Performance (`droiddeck://settings/performance`) | gamescope | | Hold the GPU at its top clock | Settings › Performance (`droiddeck://settings/performance`) | gpu, clock, max | -| RAM cap | Settings › Performance (`droiddeck://settings/performance`) | ram, memory | -| VRAM cap | Settings › Performance (`droiddeck://settings/performance`) | vram, memory | -| Compress idle game memory | Settings › Performance (`droiddeck://settings/performance`) | zram, swap, memory | -| Compress Steam while a game runs | Settings › Performance (`droiddeck://settings/performance`) | zram, swap, memory | | Clear cached apps before a session | Settings › Performance (`droiddeck://settings/performance`) | memory, ram, crash, sleep, killed | | Background apps during a session | Settings › Performance (`droiddeck://settings/performance`) | memory, ram, background apps | | Memory readout | Settings › Performance (`droiddeck://settings/performance`) | memory, ram, overlay | diff --git a/tools/components/recipes.json b/tools/components/recipes.json index 79562333d..5fd8ca4bc 100644 --- a/tools/components/recipes.json +++ b/tools/components/recipes.json @@ -23,8 +23,7 @@ "outputs": [ "app/src/main/assets/linuxfs/usr/local/bin/gamescope", "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-vr/droiddeck/bin/linuxarm64/driver_droiddeck.so", - "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_gpuload.so", - "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_vramcap.so" + "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_gpuload.so" ], "ndk": true, "packages": [ diff --git a/tools/gpuload/build.sh b/tools/gpuload/build.sh index 683057c38..cf43a948b 100755 --- a/tools/gpuload/build.sh +++ b/tools/gpuload/build.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash # Builds VK_LAYER_DROIDDECK_gpu_load for the arm64 guest: tools/gpuload/build.sh [--native] OUT -# OUT gets libVkLayer_droiddeck_gpuload.so, libVkLayer_droiddeck_vramcap.so and their implicit-layer manifests. set -euo pipefail here=$(cd "$(dirname "$0")" && pwd) repo=$(cd "$here/../.." && pwd) @@ -36,15 +35,10 @@ cmd=(sh -c ' build/gpuload/test_gpuload_busy cc -std=c11 -O2 -Wall -Wextra -Werror -Ibuild/gpuload/include -Itools/gpuload/src -o build/gpuload/test_gpuload_ring tools/gpuload/tests/test_gpuload_ring.c build/gpuload/test_gpuload_ring - cc -std=c11 -O2 -Wall -Wextra -Werror -Ibuild/gpuload/include -Itools/gpuload/src -pthread -Wno-unused-parameter -Wno-missing-field-initializers -o build/gpuload/test_vramcap_budget tools/gpuload/tests/test_vramcap_budget.c - build/gpuload/test_vramcap_budget aarch64-linux-gnu-gcc -std=c11 -shared -fPIC -O2 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-missing-field-initializers \ -fvisibility=hidden -pthread -Wl,-z,defs -Ibuild/gpuload/include -Itools/gpuload/src \ -o build/gpuload/out/libVkLayer_droiddeck_gpuload.so tools/gpuload/src/vk_layer_droiddeck_gpuload.c - aarch64-linux-gnu-gcc -std=c11 -shared -fPIC -O2 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-missing-field-initializers \ - -fvisibility=hidden -pthread -Wl,-z,defs -Ibuild/gpuload/include -Itools/gpuload/src \ - -o build/gpuload/out/libVkLayer_droiddeck_vramcap.so tools/gpuload/src/vk_layer_droiddeck_vramcap.c - aarch64-linux-gnu-strip --strip-unneeded build/gpuload/out/libVkLayer_droiddeck_gpuload.so build/gpuload/out/libVkLayer_droiddeck_vramcap.so') + aarch64-linux-gnu-strip --strip-unneeded build/gpuload/out/libVkLayer_droiddeck_gpuload.so') if [ "$native" = 1 ]; then (cd "$repo" && "${cmd[@]}") else @@ -52,8 +46,7 @@ else "${DROIDDECK_BUILD_IMAGE:-droiddeck-local-cross:24.04-v3}" "${cmd[@]}" fi -cp "$here/layer/VK_LAYER_DROIDDECK_gpu_load.json" "$here/layer/VK_LAYER_DROIDDECK_vram_cap.json" "$work/out/" +cp "$here/layer/VK_LAYER_DROIDDECK_gpu_load.json" "$work/out/" mkdir -p "$out" -cp "$work/out/libVkLayer_droiddeck_gpuload.so" "$work/out/libVkLayer_droiddeck_vramcap.so" \ - "$work/out/VK_LAYER_DROIDDECK_gpu_load.json" "$work/out/VK_LAYER_DROIDDECK_vram_cap.json" "$out/" +cp "$work/out/libVkLayer_droiddeck_gpuload.so" "$work/out/VK_LAYER_DROIDDECK_gpu_load.json" "$out/" echo "built $out" diff --git a/tools/gpuload/layer/VK_LAYER_DROIDDECK_vram_cap.json b/tools/gpuload/layer/VK_LAYER_DROIDDECK_vram_cap.json deleted file mode 100644 index 9bff13fe7..000000000 --- a/tools/gpuload/layer/VK_LAYER_DROIDDECK_vram_cap.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "file_format_version": "1.2.0", - "layer": { - "name": "VK_LAYER_DROIDDECK_vram_cap", - "type": "GLOBAL", - "library_path": "/usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_vramcap.so", - "api_version": "1.3.0", - "implementation_version": "1", - "description": "Reports a smaller video memory budget to DXVK and vkd3d-proton", - "functions": { - "vkNegotiateLoaderLayerInterfaceVersion": "DroidDeckVramCap_NegotiateLoaderLayerInterfaceVersion" - }, - "enable_environment": { - "DROIDDECK_VRAM_CAP": "1" - }, - "disable_environment": { - "DROIDDECK_VRAM_CAP_DISABLE": "1" - } - } -} diff --git a/tools/gpuload/src/vk_layer_droiddeck_vramcap.c b/tools/gpuload/src/vk_layer_droiddeck_vramcap.c deleted file mode 100644 index eefa5608d..000000000 --- a/tools/gpuload/src/vk_layer_droiddeck_vramcap.c +++ /dev/null @@ -1,206 +0,0 @@ -#define _GNU_SOURCE -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "vramcap_budget.h" - -#define EXPORT __attribute__((visibility("default"))) - -static uint64_t g_cap; - -__attribute__((constructor)) static void init(void) { - g_cap = vramcap_parse_mb(getenv("DROIDDECK_VRAM_CAP_MB")); -} - -struct inst { - struct inst *next_in_list; - VkInstance handle; - PFN_vkGetInstanceProcAddr gipa; - PFN_vkDestroyInstance destroy; - PFN_vkGetPhysicalDeviceMemoryProperties2 mem2; - PFN_vkGetPhysicalDeviceMemoryProperties2 mem2_khr; -}; - -struct dev { - struct dev *next_in_list; - VkDevice handle; - PFN_vkGetDeviceProcAddr gdpa; - PFN_vkDestroyDevice destroy; -}; - -static pthread_mutex_t g_lock = PTHREAD_MUTEX_INITIALIZER; -static struct inst *g_insts; -static struct dev *g_devs; -static int g_announced; - -static void *key(const void *obj) { return *(void *const *)obj; } - -static struct inst *inst_for(const void *obj) { - struct inst *r; - pthread_mutex_lock(&g_lock); - for (r = g_insts; r && key(r->handle) != key(obj); r = r->next_in_list) {} - pthread_mutex_unlock(&g_lock); - return r; -} - -static struct dev *dev_for(const void *obj) { - struct dev *r; - pthread_mutex_lock(&g_lock); - for (r = g_devs; r && key(r->handle) != key(obj); r = r->next_in_list) {} - pthread_mutex_unlock(&g_lock); - return r; -} - -static void say(const char *what) { - fprintf(stderr, "[droiddeck-vram-cap] pid %d: %s\n", (int)getpid(), what); -} - -static void announce(void) { - if (__atomic_exchange_n(&g_announced, 1, __ATOMIC_RELAXED)) return; - char line[96]; - snprintf(line, sizeof(line), "reported device memory budget %llu MB", (unsigned long long)(g_cap >> 20)); - say(line); -} - -static void clamp_properties2(PFN_vkGetPhysicalDeviceMemoryProperties2 next, VkPhysicalDevice pd, - VkPhysicalDeviceMemoryProperties2 *out) { - next(pd, out); - for (VkBaseOutStructure *s = out->pNext; s; s = s->pNext) - if (s->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT) { - vramcap_budget(&out->memoryProperties, (VkPhysicalDeviceMemoryBudgetPropertiesEXT *)s, g_cap); - if (g_cap) announce(); - } -} - -static void VKAPI_CALL GetMemoryProperties2(VkPhysicalDevice pd, VkPhysicalDeviceMemoryProperties2 *out) { - struct inst *in = inst_for(pd); - if (in) clamp_properties2(in->mem2, pd, out); -} - -static void VKAPI_CALL GetMemoryProperties2KHR(VkPhysicalDevice pd, VkPhysicalDeviceMemoryProperties2 *out) { - struct inst *in = inst_for(pd); - if (in) clamp_properties2(in->mem2_khr, pd, out); -} - -static VkResult VKAPI_CALL CreateInstance(const VkInstanceCreateInfo *ci, const VkAllocationCallbacks *alloc, VkInstance *out) { - VkLayerInstanceCreateInfo *link = (VkLayerInstanceCreateInfo *)ci->pNext; - while (link && !(link->sType == VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO && link->function == VK_LAYER_LINK_INFO)) - link = (VkLayerInstanceCreateInfo *)link->pNext; - if (!link) return VK_ERROR_INITIALIZATION_FAILED; - PFN_vkGetInstanceProcAddr next_gipa = link->u.pLayerInfo->pfnNextGetInstanceProcAddr; - link->u.pLayerInfo = link->u.pLayerInfo->pNext; - PFN_vkCreateInstance create = (PFN_vkCreateInstance)next_gipa(VK_NULL_HANDLE, "vkCreateInstance"); - if (!create) return VK_ERROR_INITIALIZATION_FAILED; - struct inst *in = calloc(1, sizeof(*in)); - if (!in) return VK_ERROR_OUT_OF_HOST_MEMORY; - VkResult r = create(ci, alloc, out); - if (r != VK_SUCCESS) { free(in); return r; } - in->handle = *out; - in->gipa = next_gipa; - in->destroy = (PFN_vkDestroyInstance)next_gipa(*out, "vkDestroyInstance"); - in->mem2 = (PFN_vkGetPhysicalDeviceMemoryProperties2)next_gipa(*out, "vkGetPhysicalDeviceMemoryProperties2"); - in->mem2_khr = (PFN_vkGetPhysicalDeviceMemoryProperties2)next_gipa(*out, "vkGetPhysicalDeviceMemoryProperties2KHR"); - pthread_mutex_lock(&g_lock); - in->next_in_list = g_insts; - g_insts = in; - pthread_mutex_unlock(&g_lock); - return VK_SUCCESS; -} - -static void VKAPI_CALL DestroyInstance(VkInstance instance, const VkAllocationCallbacks *alloc) { - struct inst *in = inst_for(instance); - if (!in) return; - PFN_vkDestroyInstance destroy = in->destroy; - pthread_mutex_lock(&g_lock); - for (struct inst **p = &g_insts; *p; p = &(*p)->next_in_list) - if (*p == in) { *p = in->next_in_list; break; } - pthread_mutex_unlock(&g_lock); - free(in); - if (destroy) destroy(instance, alloc); -} - -static VkLayerDeviceCreateInfo *device_chain(const VkDeviceCreateInfo *ci, VkLayerFunction function) { - VkLayerDeviceCreateInfo *c = (VkLayerDeviceCreateInfo *)ci->pNext; - while (c && !(c->sType == VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO && c->function == function)) - c = (VkLayerDeviceCreateInfo *)c->pNext; - return c; -} - -static VkResult VKAPI_CALL CreateDevice(VkPhysicalDevice pd, const VkDeviceCreateInfo *ci, const VkAllocationCallbacks *alloc, - VkDevice *out) { - VkLayerDeviceCreateInfo *link = device_chain(ci, VK_LAYER_LINK_INFO); - if (!link) return VK_ERROR_INITIALIZATION_FAILED; - PFN_vkGetInstanceProcAddr next_gipa = link->u.pLayerInfo->pfnNextGetInstanceProcAddr; - PFN_vkGetDeviceProcAddr next_gdpa = link->u.pLayerInfo->pfnNextGetDeviceProcAddr; - link->u.pLayerInfo = link->u.pLayerInfo->pNext; - struct inst *in = inst_for(pd); - PFN_vkCreateDevice create = (PFN_vkCreateDevice)next_gipa(in ? in->handle : VK_NULL_HANDLE, "vkCreateDevice"); - if (!create) return VK_ERROR_INITIALIZATION_FAILED; - struct dev *d = calloc(1, sizeof(*d)); - if (!d) return VK_ERROR_OUT_OF_HOST_MEMORY; - VkResult r = create(pd, ci, alloc, out); - if (r != VK_SUCCESS) { free(d); return r; } - d->handle = *out; - d->gdpa = next_gdpa; - d->destroy = (PFN_vkDestroyDevice)next_gdpa(*out, "vkDestroyDevice"); - pthread_mutex_lock(&g_lock); - d->next_in_list = g_devs; - g_devs = d; - pthread_mutex_unlock(&g_lock); - return VK_SUCCESS; -} - -static void VKAPI_CALL DestroyDevice(VkDevice device, const VkAllocationCallbacks *alloc) { - struct dev *d = dev_for(device); - if (!d) return; - pthread_mutex_lock(&g_lock); - for (struct dev **p = &g_devs; *p; p = &(*p)->next_in_list) - if (*p == d) { *p = d->next_in_list; break; } - pthread_mutex_unlock(&g_lock); - PFN_vkDestroyDevice destroy = d->destroy; - free(d); - if (destroy) destroy(device, alloc); -} - -EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL DroidDeckVramCap_GetDeviceProcAddr(VkDevice device, const char *name); - -EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL DroidDeckVramCap_GetInstanceProcAddr(VkInstance instance, const char *name) { - if (!strcmp(name, "vkCreateInstance")) return (PFN_vkVoidFunction)CreateInstance; - if (!strcmp(name, "vkDestroyInstance")) return (PFN_vkVoidFunction)DestroyInstance; - if (!strcmp(name, "vkCreateDevice")) return (PFN_vkVoidFunction)CreateDevice; - if (!strcmp(name, "vkDestroyDevice")) return (PFN_vkVoidFunction)DestroyDevice; - if (!strcmp(name, "vkGetInstanceProcAddr")) return (PFN_vkVoidFunction)DroidDeckVramCap_GetInstanceProcAddr; - if (!strcmp(name, "vkGetDeviceProcAddr")) return (PFN_vkVoidFunction)DroidDeckVramCap_GetDeviceProcAddr; - if (!instance) return NULL; - struct inst *in = inst_for(instance); - if (!in) return NULL; - if (g_cap) { - if (!strcmp(name, "vkGetPhysicalDeviceMemoryProperties2") && in->mem2) return (PFN_vkVoidFunction)GetMemoryProperties2; - if (!strcmp(name, "vkGetPhysicalDeviceMemoryProperties2KHR") && in->mem2_khr) - return (PFN_vkVoidFunction)GetMemoryProperties2KHR; - } - return in->gipa(instance, name); -} - -EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL DroidDeckVramCap_GetDeviceProcAddr(VkDevice device, const char *name) { - if (!strcmp(name, "vkGetDeviceProcAddr")) return (PFN_vkVoidFunction)DroidDeckVramCap_GetDeviceProcAddr; - if (!strcmp(name, "vkDestroyDevice")) return (PFN_vkVoidFunction)DestroyDevice; - struct dev *d = dev_for(device); - if (!d) return NULL; - return d->gdpa(device, name); -} - -EXPORT VKAPI_ATTR VkResult VKAPI_CALL DroidDeckVramCap_NegotiateLoaderLayerInterfaceVersion(VkNegotiateLayerInterface *v) { - if (v->loaderLayerInterfaceVersion > 2) v->loaderLayerInterfaceVersion = 2; - v->pfnGetInstanceProcAddr = DroidDeckVramCap_GetInstanceProcAddr; - v->pfnGetDeviceProcAddr = DroidDeckVramCap_GetDeviceProcAddr; - v->pfnGetPhysicalDeviceProcAddr = NULL; - return VK_SUCCESS; -} diff --git a/tools/gpuload/src/vramcap_budget.h b/tools/gpuload/src/vramcap_budget.h deleted file mode 100644 index 3d77b1c95..000000000 --- a/tools/gpuload/src/vramcap_budget.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef VRAMCAP_BUDGET_H -#define VRAMCAP_BUDGET_H - -#include -#include - -static inline uint64_t vramcap_parse_mb(const char *text) { - if (!text || !*text) return 0; - uint64_t value = 0, limit = UINT64_MAX >> 20; - for (; *text; text++) { - if (*text < '0' || *text > '9') return 0; - unsigned digit = (unsigned)(*text - '0'); - if (value > (limit - digit) / 10) return 0; - value = value * 10 + digit; - } - return value << 20; -} - -static inline VkDeviceSize vramcap_clamp(VkDeviceSize value, uint64_t cap) { - return cap && value > cap ? cap : value; -} - -static inline void vramcap_budget(const VkPhysicalDeviceMemoryProperties *p, - VkPhysicalDeviceMemoryBudgetPropertiesEXT *budget, uint64_t cap) { - for (uint32_t i = 0; i < p->memoryHeapCount && i < VK_MAX_MEMORY_HEAPS; i++) - if (p->memoryHeaps[i].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) { - budget->heapBudget[i] = vramcap_clamp(budget->heapBudget[i], cap); - budget->heapBudget[i] = vramcap_clamp(budget->heapBudget[i], p->memoryHeaps[i].size); - } -} - -#endif diff --git a/tools/gpuload/tests/test_vramcap_budget.c b/tools/gpuload/tests/test_vramcap_budget.c deleted file mode 100644 index 40c6f9d8c..000000000 --- a/tools/gpuload/tests/test_vramcap_budget.c +++ /dev/null @@ -1,154 +0,0 @@ -#include -#include -#include "../src/vk_layer_droiddeck_vramcap.c" - -static int instance_dispatch, device_dispatch; -static void *instance_object = &instance_dispatch, *physical_object = &instance_dispatch; -static void *device_object = &device_dispatch; -static VkInstance instance; -static VkPhysicalDevice physical; -static VkDevice device; -static unsigned allocations, frees, destroyed_devices, destroyed_instances; - -static void VKAPI_CALL memory_properties(VkPhysicalDevice pd, VkPhysicalDeviceMemoryProperties *out) { - assert(pd == physical); - *out = (VkPhysicalDeviceMemoryProperties){ - .memoryHeapCount = 3, - .memoryHeaps = {{8ULL << 30, VK_MEMORY_HEAP_DEVICE_LOCAL_BIT}, {4ULL << 30, 0}, - {512ULL << 20, VK_MEMORY_HEAP_DEVICE_LOCAL_BIT}}, - .memoryTypeCount = 1, - .memoryTypes = {{VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, 0}}, - }; -} - -static void VKAPI_CALL memory_properties2(VkPhysicalDevice pd, VkPhysicalDeviceMemoryProperties2 *out) { - memory_properties(pd, &out->memoryProperties); - for (VkBaseOutStructure *p = out->pNext; p; p = p->pNext) - if (p->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT) { - VkPhysicalDeviceMemoryBudgetPropertiesEXT *b = (void *)p; - b->heapBudget[0] = 6ULL << 30; - b->heapBudget[1] = 3ULL << 30; - b->heapBudget[2] = 256ULL << 20; - b->heapUsage[0] = 3ULL << 30; - } -} - -static VkResult VKAPI_CALL allocate(VkDevice d, const VkMemoryAllocateInfo *info, - const VkAllocationCallbacks *a, VkDeviceMemory *out) { - assert(d == device && info->allocationSize == (3ULL << 30)); - *out = (VkDeviceMemory)(uintptr_t)++allocations; - return VK_SUCCESS; -} - -static void VKAPI_CALL release(VkDevice d, VkDeviceMemory m, const VkAllocationCallbacks *a) { - assert(d == device && m); - frees++; -} - -static void VKAPI_CALL destroy_device(VkDevice d, const VkAllocationCallbacks *a) { - assert(d == device); - destroyed_devices++; -} - -static void VKAPI_CALL destroy_instance(VkInstance in, const VkAllocationCallbacks *a) { - assert(in == instance); - destroyed_instances++; -} - -static PFN_vkVoidFunction VKAPI_CALL gdpa(VkDevice d, const char *name) { - assert(d == device); - if (!strcmp(name, "vkAllocateMemory")) return (PFN_vkVoidFunction)allocate; - if (!strcmp(name, "vkFreeMemory")) return (PFN_vkVoidFunction)release; - if (!strcmp(name, "vkDestroyDevice")) return (PFN_vkVoidFunction)destroy_device; - return NULL; -} - -static VkResult VKAPI_CALL create_device(VkPhysicalDevice pd, const VkDeviceCreateInfo *ci, - const VkAllocationCallbacks *a, VkDevice *out) { - assert(pd == physical); - *out = device; - return VK_SUCCESS; -} - -static VkResult VKAPI_CALL create_instance(const VkInstanceCreateInfo *ci, const VkAllocationCallbacks *a, VkInstance *out) { - *out = instance; - return VK_SUCCESS; -} - -static PFN_vkVoidFunction VKAPI_CALL gipa(VkInstance in, const char *name) { - assert(in == instance || in == VK_NULL_HANDLE); - if (!strcmp(name, "vkCreateInstance")) return (PFN_vkVoidFunction)create_instance; - if (!strcmp(name, "vkDestroyInstance")) return (PFN_vkVoidFunction)destroy_instance; - if (!strcmp(name, "vkCreateDevice")) return (PFN_vkVoidFunction)create_device; - if (!strcmp(name, "vkGetPhysicalDeviceMemoryProperties")) return (PFN_vkVoidFunction)memory_properties; - if (!strcmp(name, "vkGetPhysicalDeviceMemoryProperties2") || !strcmp(name, "vkGetPhysicalDeviceMemoryProperties2KHR")) - return (PFN_vkVoidFunction)memory_properties2; - return NULL; -} - -int main(void) { - assert(vramcap_parse_mb("2048") == (2ULL << 30)); - assert(vramcap_parse_mb(NULL) == 0 && vramcap_parse_mb("") == 0 && vramcap_parse_mb("0") == 0); - const char *bad[] = {"-1", "+1", " 1024", "1024 ", "1GB", "18446744073709551616", "17592186044416"}; - for (size_t i = 0; i < sizeof(bad) / sizeof(bad[0]); i++) assert(vramcap_parse_mb(bad[i]) == 0); - assert(vramcap_parse_mb("17592186044415") == ((UINT64_MAX >> 20) << 20)); - - instance = (VkInstance)&instance_object; - physical = (VkPhysicalDevice)&physical_object; - device = (VkDevice)&device_object; - g_cap = 2ULL << 30; - VkLayerInstanceLink il = {.pfnNextGetInstanceProcAddr = gipa}; - VkLayerInstanceCreateInfo ic = {.sType = VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO, - .function = VK_LAYER_LINK_INFO, .u.pLayerInfo = &il}; - VkInstanceCreateInfo ici = {.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, .pNext = &ic}; - VkInstance got_instance; - assert(CreateInstance(&ici, NULL, &got_instance) == VK_SUCCESS && got_instance == instance); - VkPhysicalDeviceMemoryProperties p; - PFN_vkGetPhysicalDeviceMemoryProperties get = (void *)DroidDeckVramCap_GetInstanceProcAddr(instance, "vkGetPhysicalDeviceMemoryProperties"); - assert(get == memory_properties); - get(physical, &p); - assert(p.memoryHeaps[0].size == (8ULL << 30) && p.memoryHeaps[1].size == (4ULL << 30)); - assert(p.memoryHeaps[2].size == (512ULL << 20)); - assert(p.memoryTypes[0].propertyFlags == (VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)); - - const char *names[] = {"vkGetPhysicalDeviceMemoryProperties2", "vkGetPhysicalDeviceMemoryProperties2KHR"}; - for (size_t i = 0; i < 2; i++) { - VkPhysicalDeviceMemoryBudgetPropertiesEXT b = {.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT}; - VkPhysicalDeviceIDProperties id = {.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES, .pNext = &b}; - VkPhysicalDeviceMemoryProperties2 p2 = {.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2, .pNext = &id}; - PFN_vkGetPhysicalDeviceMemoryProperties2 get2 = (void *)DroidDeckVramCap_GetInstanceProcAddr(instance, names[i]); - get2(physical, &p2); - assert(p2.memoryProperties.memoryHeaps[0].size == (8ULL << 30)); - assert(b.heapBudget[0] == g_cap && b.heapBudget[1] == (3ULL << 30)); - assert(b.heapBudget[2] == (256ULL << 20)); - assert(b.heapUsage[0] == (3ULL << 30)); - assert(p2.pNext == &id && id.pNext == &b); - } - - VkLayerDeviceLink dl = {.pfnNextGetInstanceProcAddr = gipa, .pfnNextGetDeviceProcAddr = gdpa}; - VkLayerDeviceCreateInfo dc = {.sType = VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO, - .function = VK_LAYER_LINK_INFO, .u.pLayerInfo = &dl}; - VkDeviceCreateInfo dci = {.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, .pNext = &dc}; - VkDevice got_device; - assert(CreateDevice(physical, &dci, NULL, &got_device) == VK_SUCCESS && got_device == device); - PFN_vkAllocateMemory next_allocate = (void *)DroidDeckVramCap_GetDeviceProcAddr(device, "vkAllocateMemory"); - PFN_vkFreeMemory next_free = (void *)DroidDeckVramCap_GetDeviceProcAddr(device, "vkFreeMemory"); - assert(next_allocate == allocate && next_free == release); - VkMemoryAllocateInfo ai = {.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, .allocationSize = 3ULL << 30}; - VkDeviceMemory blocks[2]; - for (unsigned i = 0; i < 2; i++) assert(next_allocate(device, &ai, NULL, &blocks[i]) == VK_SUCCESS); - assert(allocations == 2); - for (unsigned i = 0; i < 2; i++) next_free(device, blocks[i], NULL); - assert(frees == 2); - - g_cap = 0; - assert(DroidDeckVramCap_GetInstanceProcAddr(instance, names[0]) == (PFN_vkVoidFunction)memory_properties2); - assert(DroidDeckVramCap_GetInstanceProcAddr(instance, "vkGetPhysicalDeviceMemoryProperties") == (PFN_vkVoidFunction)memory_properties); - PFN_vkDestroyDevice destroy = (void *)DroidDeckVramCap_GetInstanceProcAddr(instance, "vkDestroyDevice"); - assert(destroy == DestroyDevice); - destroy(device, NULL); - DestroyInstance(instance, NULL); - assert(destroyed_devices == 1 && destroyed_instances == 1 && !g_devs && !g_insts); - puts("test_vramcap_budget: ok"); - return 0; -} diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 0e816b9da..5dd574abd 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -14,7 +14,6 @@ from pathlib import Path GAME_PREFIX = "DROIDDECK_GAME_" GAME_SPLIT_KEYS = ("TU_DEBUG", "MESA_NO_ERROR") CHROMIUM_FILES = {"chrome-sandbox", "chrome_100_percent.pak", "v8_context_snapshot.bin"} -D3D9_DEFAULT_MEMORY_MB = 4096 SYNC_KEYS = ("DD_SYNC", "DD_SYNC_FALLBACK", "DD_FSYNC_FIRST", "DD_SYNC_MIN_NOFILE", "PROTON_NO_ESYNC", "PROTON_NO_FSYNC", "PROTON_NO_NTSYNC", "WINEESYNC") SEED_REDISTS = "/usr/local/bin/droiddeck-seed-redists" PACK_KEYS = ("WINESERVER", "DD_SYNC_PACK", "WINEESYNC", "PROTON_NO_ESYNC", "PROTON_NO_FSYNC") @@ -470,21 +469,6 @@ def split_game_gpu(entries): return result -def vram_cap(env): - value = env.get("DD_VRAM_MB", "") - if not re.fullmatch(r"[1-9][0-9]{0,6}", value): - return env - result = env.copy() - cap = "dxgi.maxDeviceMemory = {0}; dxgi.maxSharedMemory = {0}".format(int(value)) - if int(value) < D3D9_DEFAULT_MEMORY_MB: - cap += "; d3d9.maxAvailableMemory = {0}".format(int(value)) - own = result.get("DXVK_CONFIG", "").strip().strip(";").strip() - result["DXVK_CONFIG"] = cap + "; " + own if own else cap - result["DROIDDECK_VRAM_CAP"] = "1" - result["DROIDDECK_VRAM_CAP_MB"] = value - return result - - def parse_cores(text): cores = set() for part in text.replace(" ", "").split(","): @@ -1456,7 +1440,6 @@ def main(): if mic_enabled == "0": env["AUDIO_DIRECT_MIC"] = "0" env = directaudio_settings(env) - env = vram_cap(env) note = render_path_defaults(command, env) if app_id else None if note: print("droiddeck-game-env: " + note, file=sys.stderr) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 4a10cd42b..ee13167e3 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -132,6 +132,7 @@ clear_stale_tmp() { [ -z "${DD_INSIDE:-}" ] && clear_stale_tmp if [ -z "${DD_INSIDE:-}" ]; then if [ "${DD_ZRAM:-0}" = 1 ]; then printf 0 > /tmp/.dd-zram; else rm -f /tmp/.dd-zram; fi + rm -f /tmp/.dd-zram.hold dd if=/dev/zero of=/tmp/.dd-clock bs=8 count=1 conv=notrunc status=none fi @@ -756,13 +757,6 @@ case $mode in fi if [ "${DD_ZRAM:-0}" = 1 ]; then step "zRAM compression: on" - [ "${DD_ZRAM_CLIENT:-1}" = 1 ] || step "zRAM: Steam, the hidden Epic Games Launcher and Battle.net are not compressed while games run (turned off in Performance)" - _dd_ram_cap=0 - case ${DD_RAM_CAP_MB:-} in - ''|0) ;; - *[!0-9]*|0*|???????*) step "RAM cap: ignored invalid value '$DD_RAM_CAP_MB'" ;; - *) _dd_ram_cap=$((DD_RAM_CAP_MB * 1024)); step "RAM cap: ${DD_RAM_CAP_MB} MB" ;; - esac ( dd_zram_scan() { _dd_game=0 _dd_pids=() _dd_others=() _dd_apps= @@ -839,284 +833,235 @@ case $mode in echo "$# processes, resident $((_rss / 1024)) MB, in zram $((_swap / 1024)) MB" } dd_memory_read() { - local _k _v _u _kind _fields _avg _whole _frac _gpu_bytes _growth _saved_growth _saved_fall - _saved_growth=${_dd_preserved_growth:-0} _saved_fall=${_dd_preserved_fall:-0} - _dd_preserved_growth=0 _dd_preserved_fall=0 - _dd_mem_total=0 _dd_available=-1 _dd_swap_total=0 _dd_swap_free=-1 - _dd_psi_some=0 _dd_psi_full=0 _dd_gpu=0 _dd_unevictable=0 _dd_shmem=0 + local _k _v _u _kind _fields _name _type _size _used _orig _comp _mem _dt _fall + local _stall=-1 _swap_total=0 _swap_free=0 _total=0 _room=0 _listed=0 _in=-1 + _dd_mem_total=0 _dd_available=-1 while read -r _k _v _u; do case $_v in ''|*[!0-9]*) continue ;; esac case $_k in MemTotal:) _dd_mem_total=$_v ;; MemAvailable:) _dd_available=$_v ;; - SwapTotal:) _dd_swap_total=$_v ;; - SwapFree:) _dd_swap_free=$_v ;; - Unevictable:) _dd_unevictable=$_v ;; - Shmem:) _dd_shmem=$_v ;; + SwapTotal:) _swap_total=$_v ;; + SwapFree:) _swap_free=$_v ;; esac done 2>/dev/null < /proc/meminfo + while read -r _name _type _size _used _u; do + _listed=1 + case $_name in */zram[0-9]*) ;; *) continue ;; esac + case $_size$_used in ''|*[!0-9]*) continue ;; esac + _total=$((_total + _size)) _room=$((_room + _size - _used)) + done 2>/dev/null < /proc/swaps + [ "$_listed" = 1 ] || _total=$_swap_total _room=$_swap_free + _dd_swap_room=$((_total / 8)) + [ "$_dd_swap_room" -ge $((128 * 1024)) ] || _dd_swap_room=$((128 * 1024)) + _dd_swap_room=$((_room - _dd_swap_room)) + _dd_saving=600 + if [ -r /sys/block/zram0/mm_stat ] && read -r _orig _comp _mem _u 2>/dev/null < /sys/block/zram0/mm_stat; then + case $_orig$_mem in + ''|*[!0-9]*) ;; + *) [ "$_orig" -lt $((64 << 20)) ] || _dd_saving=$(((_orig - _mem) / (_orig / 1000))) ;; + esac + [ "$_dd_saving" -ge 167 ] || _dd_saving=167 + [ "$_dd_saving" -le 833 ] || _dd_saving=833 + fi if [ -r /proc/pressure/memory ]; then while read -r _kind _fields; do - [ "$_kind" = some ] || [ "$_kind" = full ] || continue - _avg=${_fields#avg10=} _avg=${_avg%% *} - _whole=${_avg%%.*} _frac=${_avg#*.} - [ "$_frac" = "$_avg" ] && _frac=00 - _frac=${_frac}00 - _frac=${_frac:0:2} - case $_whole$_frac in ''|*[!0-9]*) continue ;; esac - if [ "$_kind" = some ]; then - _dd_psi_some=$((10#$_whole * 100 + 10#$_frac)) - else - _dd_psi_full=$((10#$_whole * 100 + 10#$_frac)) - fi + [ "$_kind" = some ] || continue + _fields=${_fields##*total=} + case $_fields in ''|*[!0-9]*) ;; *) _stall=$_fields ;; esac done 2>/dev/null < /proc/pressure/memory fi - if [ -r /sys/class/kgsl/kgsl/page_alloc ]; then - read -r _gpu_bytes _u < /sys/class/kgsl/kgsl/page_alloc - case $_gpu_bytes in ''|*[!0-9]*) _gpu_bytes=0 ;; esac - _dd_gpu=$((_gpu_bytes / 1024)) + while read -r _k _v; do + [ "$_k" = pswpin ] || continue + case $_v in ''|*[!0-9]*) ;; *) _in=$((_v * _dd_page_kb)) ;; esac + break + done 2>/dev/null < /proc/vmstat + _dt=$((SECONDS - ${_dd_sample_at:-$SECONDS})) + if [ -z "${_dd_sample_at:-}" ]; then + _dd_rate=0 _dd_psi=0 _dd_returned=0 + elif [ "$_dt" -gt 0 ] && [ "$_dd_available" -ge 0 ]; then + _fall=$(((_dd_sample_available - _dd_available + _dd_freed) / _dt)) + _dd_rate=$((_dd_rate * 3 / 4)) + [ "$_fall" -le "$_dd_rate" ] || _dd_rate=$_fall + _dd_psi=0 + [ "$_stall" -lt 0 ] || [ "$_dd_sample_stall" -lt 0 ] || _dd_psi=$(((_stall - _dd_sample_stall) / (_dt * 100))) + _dd_returned=$((_dt < 30 ? _dd_returned * (30 - _dt) / 30 : 0)) + [ "$_in" -lt "$_dd_sample_in" ] || [ "$_dd_sample_in" -lt 0 ] || _dd_returned=$((_dd_returned + _in - _dd_sample_in)) fi - _dd_psi=$_dd_psi_some - [ "$_dd_psi_full" -gt "$_dd_psi" ] && _dd_psi=$_dd_psi_full - if [ "${_dd_sample_at:-}" = "" ]; then - _dd_growth=0 _dd_fall=0 - _dd_sample_at=$SECONDS _dd_sample_available=$_dd_available _dd_sample_gpu=$_dd_gpu - _dd_sample_unevictable=$_dd_unevictable _dd_sample_shmem=$_dd_shmem - elif [ "$SECONDS" -gt "$_dd_sample_at" ]; then - _dd_growth=0 _dd_fall=0 - _growth=$((_dd_gpu - _dd_sample_gpu)); [ "$_growth" -gt 0 ] && _dd_growth=$((_dd_growth + _growth)) - _growth=$((_dd_unevictable - _dd_sample_unevictable)); [ "$_growth" -gt 0 ] && _dd_growth=$((_dd_growth + _growth)) - _growth=$((_dd_shmem - _dd_sample_shmem)); [ "$_growth" -gt 0 ] && _dd_growth=$((_dd_growth + _growth)) - _dd_fall=$((_dd_sample_available - _dd_available)) - [ "$_saved_growth" -gt "$_dd_growth" ] && _dd_growth=$_saved_growth - [ "$_saved_fall" -gt "$_dd_fall" ] && _dd_fall=$_saved_fall - if [ $((SECONDS - _dd_sample_at)) -ge 5 ]; then - _dd_sample_at=$SECONDS _dd_sample_available=$_dd_available _dd_sample_gpu=$_dd_gpu - _dd_sample_unevictable=$_dd_unevictable _dd_sample_shmem=$_dd_shmem - fi + if [ "$_dd_available" -ge 0 ] && { [ -z "${_dd_sample_at:-}" ] || [ "$_dt" -gt 0 ]; }; then + _dd_sample_at=$SECONDS _dd_sample_available=$_dd_available _dd_sample_stall=$_stall _dd_sample_in=$_in _dd_freed=0 fi - _dd_real_available=$_dd_available - [ "$_dd_real_available" -ge 0 ] && _dd_real_available=$((_dd_real_available - _dd_growth)) - _dd_headroom=$((_dd_mem_total / 5)) - [ "$_dd_headroom" -ge $((512 * 1024)) ] || _dd_headroom=$((512 * 1024)) - [ "$_dd_headroom" -le $((1536 * 1024)) ] || _dd_headroom=$((1536 * 1024)) - _dd_tier_headroom=$((_dd_mem_total / 4)) - [ "$_dd_tier_headroom" -ge $((768 * 1024)) ] || _dd_tier_headroom=$((768 * 1024)) - [ "$_dd_tier_headroom" -le $((2560 * 1024)) ] || _dd_tier_headroom=$((2560 * 1024)) - _dd_fall_headroom=$((_dd_tier_headroom * 2)) - [ "$_dd_fall_headroom" -ge $((_dd_mem_total * 2 / 5)) ] || _dd_fall_headroom=$((_dd_mem_total * 2 / 5)) - _dd_swap_reserve=$((_dd_swap_total / 5)) - [ "$_dd_swap_reserve" -ge $((256 * 1024)) ] || _dd_swap_reserve=$((256 * 1024)) + _dd_floor=$((_dd_mem_total / 8)) + [ "$_dd_floor" -ge $((640 * 1024)) ] || _dd_floor=$((640 * 1024)) + [ "$_dd_floor" -le $((1280 * 1024)) ] || _dd_floor=$((1280 * 1024)) + _dd_target=$((_dd_floor + _dd_rate * 10)) } - dd_memory_tight() { - [ "$_dd_mem_total" -gt 0 ] && [ "$_dd_available" -ge 0 ] && - { [ "$_dd_real_available" -lt "$_dd_headroom" ] || - { [ "$_dd_psi" -ge 100 ] && [ "$_dd_real_available" -lt $((_dd_mem_total / 3)) ]; } || - { [ "$_dd_fall" -ge $((256 * 1024)) ] && [ "$_dd_real_available" -lt $((_dd_headroom * 2)) ]; }; } - } - dd_client_can_pageout() { - dd_memory_read - dd_zram_usage "${_dd_pids[@]}" > /dev/null - [ "$_dd_mem_total" -gt 0 ] && dd_zram_has_room - } - dd_zram_has_room() { - [ "$_dd_swap_total" -gt 0 ] && - [ $((_dd_swap_free - _dd_anon - ${_dd_client_reserve:-0})) -ge "$_dd_swap_reserve" ] - } - dd_client_can_readback() { - dd_memory_read - dd_zram_usage "${_dd_pids[@]}" > /dev/null - [ "$_dd_mem_total" -gt 0 ] && ! dd_memory_tight && ! dd_memory_critical && - [ "$_dd_real_available" -ge $((_dd_swap * 2)) ] && - [ $((_dd_real_available - _dd_swap)) -ge "$_dd_headroom" ] - } - dd_client_pressure() { - [ "${DD_ZRAM_CLIENT:-1}" = 1 ] && [ "$_dd_game" = 1 ] && - [ "${#_dd_pids[@]}" -gt 0 ] && { dd_memory_tight || dd_memory_critical; } || return 0 - [ "$_dd_pressure_at" -lt 0 ] || - [ $((SECONDS - _dd_pressure_at)) -ge "$_dd_pressure_backoff" ] || return 0 - [ "$_dd_packed" -lt 0 ] || [ $((SECONDS - _dd_packed)) -ge 30 ] || return 0 - _dd_pressure_at=$SECONDS - if ! dd_client_can_pageout; then - step "zRAM: pressure reclaim skipped, swap headroom too small ($((_dd_swap_free / 1024)) MB free)" - return 0 + dd_memory_need() { + local _burst=$((_dd_rate * 2)) + _dd_need=0 _dd_hard=0 _dd_force=0 + [ "$_dd_mem_total" -gt 0 ] && [ "$_dd_available" -ge 0 ] || return 0 + _dd_need=$((_dd_target - _dd_available)) _dd_hard=$((_dd_floor - _dd_available)) + if [ "$_burst" -ge $((64 * 1024)) ] && [ "$_dd_available" -lt $((_dd_mem_total * 2 / 5)) ] && [ "$_burst" -gt "$_dd_need" ]; then + _dd_need=$_burst fi - [ "$_dd_rss" -ge $((128 * 1024)) ] || return 0 - _dd_pressure_before=$_dd_rss - if [ "${1:-}" = defer ]; then - _dd_client_reserve=$_dd_anon - _dd_client_pending=1 - fi - dd_zram_send 1 "memory pressure, compressing the client (available $((_dd_available / 1024)) MB, swap free $((_dd_swap_free / 1024)) MB)" client "${1:-}" - _dd_packed=$SECONDS - if [ "${1:-}" = defer ]; then - _dd_client_targets=("${_dd_zram_targets[@]}") - else - dd_client_pressure_result + if [ "$_dd_psi" -ge 100 ] && [ "$_burst" -gt "$_dd_hard" ]; then + _dd_hard=$_burst fi + [ "$_dd_hard" -gt 0 ] || _dd_hard=0 + [ "$_dd_need" -ge "$_dd_hard" ] || _dd_need=$_dd_hard + [ "$_dd_available" -ge $((_dd_floor / 2)) ] || _dd_force=1 } - dd_client_pressure_finish() { - [ "${_dd_client_pending:-0}" = 1 ] || return 0 - dd_zram_finish 1 "${_dd_client_targets[@]}" - dd_client_pressure_result "${_dd_client_targets[@]}" - _dd_client_pending=0 _dd_client_reserve=0 _dd_client_targets=() - } - dd_client_pressure_result() { - [ "${_dd_pageout_complete:-0}" = 1 ] || return 0 - if [ "$#" -gt 0 ]; then dd_zram_usage "$@" > /dev/null; else dd_zram_usage "${_dd_pids[@]}" > /dev/null; fi - if [ $((_dd_pressure_before - _dd_rss)) -lt $((16 * 1024)) ]; then - _dd_pressure_backoff=$((_dd_pressure_backoff * 2 > 300 ? 300 : _dd_pressure_backoff * 2)) - else - _dd_pressure_backoff=30 - fi - } - dd_memory_critical() { - [ "$_dd_mem_total" -gt 0 ] && [ "$_dd_available" -ge 0 ] && - { [ "$_dd_real_available" -lt "$_dd_tier_headroom" ] || - { [ "$_dd_psi" -ge 100 ] && [ "$_dd_real_available" -lt $((_dd_tier_headroom * 3 / 2)) ]; } || - { [ "$_dd_fall" -ge $((256 * 1024)) ] && [ "$_dd_real_available" -lt "$_dd_fall_headroom" ]; }; } - } - dd_session_pressure() { - dd_memory_read - dd_memory_critical || _dd_tier_backoff=30 _dd_tier_nogain=0 - [ "$_dd_game" = 1 ] && dd_memory_critical || return 0 - [ "${DD_ZRAM_IDLE:-1}" = 1 ] && dd_game_focused 0 || return 0 - local _wait=$_dd_tier_backoff _before _available_before _pids _targets _gain _min_gain - [ "$_dd_available" -ge $((_dd_headroom / 2)) ] || [ "$_dd_tier_pushed" -lt 0 ] || _wait=30 - [ "$_dd_tier_at" -lt 0 ] || [ $((SECONDS - _dd_tier_at)) -ge "$_wait" ] || return 0 - if [ "$_dd_tier_at" -ge 0 ] && [ "$_dd_tier_pushed" -gt 0 ]; then - dd_tier_readback - if [ "$_dd_tier_back" -le $((_dd_tier_pushed / 2)) ]; then - [ "${_dd_tier_nogain:-0}" = 1 ] || _dd_tier_backoff=30 - else - _dd_tier_backoff=$((_dd_tier_backoff * 2 > 300 ? 300 : _dd_tier_backoff * 2)) - _dd_tier_at=$SECONDS _dd_tier_pushed=-1 - step "zRAM: the game read back most of its last page-out, next try in ${_dd_tier_backoff} s" - return 0 - fi - fi - _dd_tier_at=$SECONDS _dd_tier_pushed=0 - dd_zram_pick session - dd_zram_usage "${_pids[@]}" > /dev/null - [ "$_dd_rss" -ge $((256 * 1024)) ] || return 0 - if ! dd_zram_has_room; then - step "zRAM: low-memory page-out skipped, swap headroom too small ($((_dd_swap_free / 1024)) MB free)" - return 0 - fi - _targets=("${_pids[@]}") _before=$_dd_swap _available_before=$_dd_available - dd_zram_send 1 "low memory (available $((_dd_real_available / 1024)) MB), compressing idle game memory" session - dd_zram_usage "${_targets[@]}" > /dev/null - _dd_tier_pushed=$((_dd_swap - _before)) - dd_tier_note "${_targets[@]}" - if [ "${_dd_pageout_complete:-0}" = 1 ]; then - dd_memory_read - _gain=$((_dd_available - _available_before)) - _min_gain=$((_dd_tier_headroom / 16)) - [ "$_min_gain" -ge $((16 * 1024)) ] || _min_gain=$((16 * 1024)) - if [ "$_gain" -lt "$_min_gain" ]; then - _dd_tier_backoff=$((_dd_tier_backoff * 2 > 300 ? 300 : _dd_tier_backoff * 2)) - _dd_tier_at=$SECONDS _dd_tier_nogain=1 - step "zRAM: low-memory page-out gained only $((_gain / 1024)) MB available, next try in ${_dd_tier_backoff} s" - else - _dd_tier_nogain=0 - fi - fi - } - dd_proc_start() { - local _s= - _dd_start= - read -r _s 2>/dev/null < "/proc/$1/stat" || return 1 - _s=${_s##*) } - set -- $_s - [ "$1" != Z ] && [ "$#" -ge 20 ] || return 1 - _dd_start=${20} - } - dd_tier_note() { - local _p - _dd_tier_targets=() _dd_tier_swaps=() _dd_tier_starts=() - for _p in "$@"; do - dd_proc_start "$_p" || continue - dd_zram_usage "$_p" > /dev/null - _dd_tier_targets+=("$_p") _dd_tier_swaps+=("$_dd_swap") _dd_tier_starts+=("$_dd_start") - done - } - dd_tier_readback() { - local _i _back=0 - for _i in "${!_dd_tier_targets[@]}"; do - dd_proc_start "${_dd_tier_targets[$_i]}" && [ "$_dd_start" = "${_dd_tier_starts[$_i]}" ] || continue - dd_zram_usage "${_dd_tier_targets[$_i]}" > /dev/null - [ "${_dd_tier_swaps[$_i]}" -le "$_dd_swap" ] || _back=$((_back + _dd_tier_swaps[_i] - _dd_swap)) - done - _dd_tier_back=$_back - } - dd_watch_nap() { - local _i - if [ "$_dd_game" = 1 ] && [ "$_dd_available" -ge 0 ] && [ "$_dd_real_available" -lt "$_dd_fall_headroom" ]; then - for _i in 1 2 3 4 5; do - nap 1 - dd_memory_read - dd_memory_critical && return 0 - done - else - nap 5 - fi - return 0 + dd_pid_key() { + local _s + _dd_key=$1 + read -r _s 2>/dev/null < "/proc/$1/stat" || return 0 + set -- ${_s##*) } + _dd_key=$_dd_key.${20:-} } dd_session_others() { local _p + local -A _known=() _dd_session=() for _p in "${_dd_others[@]}"; do - grep -q -m1 '/libddsession\.so$' "/proc/$_p/maps" 2>/dev/null && _dd_session+=("$_p") + dd_pid_key "$_p" + [ -n "${_dd_preloaded[$_dd_key]:-}" ] || + grep -q -m1 '/libddsession\.so$' "/proc/$_p/maps" 2>/dev/null || continue + _known[$_dd_key]=1 + dd_zram_usage "$_p" > /dev/null + _dd_session+=("$_dd_anon $_p") done + _dd_preloaded=() + for _p in "${!_known[@]}"; do + _dd_preloaded[$_p]=1 + done + [ "${#_dd_session[@]}" -gt 0 ] || return 0 + mapfile -t _dd_session < <(printf '%s\n' "${_dd_session[@]}" | sort -rn) + _dd_session=("${_dd_session[@]#* }") } - dd_zram_pick() { - if [ "$1" = game ]; then - dd_session_others - _pids=("${_dd_session[@]}") - [ "${DD_ZRAM_CLIENT:-1}" != 1 ] || _pids+=("${_dd_pids[@]}") - elif [ "$1" = session ]; then - dd_session_others - _pids=("${_dd_session[@]}") + dd_memory_relieved() { + local _k _v _u + while read -r _k _v _u; do + [ "$_k" = MemAvailable: ] || continue + case $_v in ''|*[!0-9]*) return 1 ;; esac + [ "$_v" -ge "$_dd_goal" ] + return + done 2>/dev/null < /proc/meminfo + return 1 + } + dd_zram_trim() { + local _mode=$1 _left=$2 _p _k _n _i _acks=() + shift 2 + _dd_trimmed=0 + for _k in "${!_dd_deaf[@]}"; do + [ "${_dd_deaf[$_k]}" -gt "$SECONDS" ] || unset "_dd_deaf[$_k]" + done + for _p in "$@"; do + [ "$_left" -ge 4096 ] && [ "$_dd_polls" -lt 250 ] && [ $((SECONDS - _dd_pass_at)) -lt 6 ] && + [ ! -e /tmp/.dd-zram.hold ] || break + ! dd_memory_relieved || break + dd_pid_key "$_p" + _k=$_dd_key + [ "${_dd_deaf[$_k]:-0}" -le "$SECONDS" ] || continue + dd_zram_usage "$_p" > /dev/null + [ "$_dd_anon" -ge 8192 ] || continue + printf %s - > "/tmp/.dd-zram.trim.$_p" + _acks+=("/tmp/.dd-zram.trim.$_p") + printf '%s %s\n' "$_mode" "$_left" > /tmp/.dd-zram + kill -URG "$_p" 2>/dev/null || continue + _dd_deaf[$_k]=$((SECONDS + 60)) + for ((_i = 0; _dd_polls < 250 && SECONDS - _dd_pass_at < 6; _i++, _dd_polls++)); do + [ ! -e /tmp/.dd-zram.hold ] || { _dd_deaf[$_k]=0; break; } + _n= + read -r _n 2>/dev/null < "/tmp/.dd-zram.trim.$_p" || : + case $_n in + -) [ "$_i" -lt 25 ] || break ;; + ''|*[!0-9]*) ;; + *) _dd_trimmed=$((_dd_trimmed + _n)) _left=$((_left - _n)) _dd_deaf[$_k]=0; break ;; + esac + nap 0.02 + done + done + [ ! -e /tmp/.dd-zram.hold ] || return 0 + printf '2 0\n' > /tmp/.dd-zram + [ "${#_acks[@]}" = 0 ] || rm -f "${_acks[@]}" + } + dd_memory_relieve() { + local _mode=2 _budget _gain=0 _rest _cap=$((256 * 1024)) _all=$((1024 * 1024)) + dd_memory_need + _dd_polls=0 _dd_pass_at=$SECONDS + if [ "$_dd_need" -le 0 ]; then + _dd_rest=0 + return 0 + fi + [ "$_dd_rest" = 0 ] || [ "$_dd_force" = 1 ] || [ "$SECONDS" -ge "$_dd_rest_until" ] || + [ "$_dd_available" -lt $((_dd_rest_available - _dd_floor / 8)) ] || return 0 + if [ "$_dd_swap_room" -lt $((64 * 1024)) ]; then + if [ $((SECONDS - _dd_full_at)) -ge 60 ]; then + _dd_full_at=$SECONDS + step "memory: available $((_dd_available / 1024)) MB and zRAM has no room left" + fi + return 0 + fi + if [ "$_dd_force" = 1 ] && [ $((SECONDS - _dd_forced_at)) -ge 10 ]; then + _mode=3 _dd_forced_at=$SECONDS _cap=$_all else - _pids=("${_dd_pids[@]}") + _cap=$((_cap - _dd_returned)) _all=$((_all - _dd_returned)) + fi + if [ "${#_dd_pids[@]}" -gt 0 ] && [ "$_all" -ge 4096 ] && + { [ "$_dd_hard" -gt 0 ] || + { [ "$_dd_game" = 1 ] && [ "$_dd_focus" != 1 ] && [ $((SECONDS - _dd_back_at)) -ge 30 ]; }; }; then + _budget=$((_dd_need * 1000 / _dd_saving)) + [ "$_budget" -le "$_all" ] || _budget=$_all + [ "$_budget" -le "$_dd_swap_room" ] || _budget=$_dd_swap_room + _dd_goal=$((_dd_available + _dd_need)) + dd_zram_trim "$_mode" "$_budget" "${_dd_pids[@]}" + _gain=$((_dd_trimmed * _dd_saving / 1000)) + _dd_swap_room=$((_dd_swap_room - _dd_trimmed)) _all=$((_all - _dd_trimmed)) + [ "$_cap" -le "$_all" ] || _cap=$_all + _dd_client_out=$((_dd_client_out + _dd_trimmed)) _dd_note_client=$((_dd_note_client + _dd_trimmed)) + [ "$_dd_trimmed" = 0 ] || _dd_trim_at=$SECONDS + fi + _rest=$((_dd_hard - _gain)) + if [ "$_rest" -gt 0 ] && [ "$_cap" -ge 4096 ] && [ "$_dd_swap_room" -ge $((64 * 1024)) ]; then + [ "$_dd_session_at" = "$_dd_scan_at" ] || dd_session_others + _dd_session_at=$_dd_scan_at + _budget=$((_rest * 1000 / _dd_saving)) + [ "$_budget" -le "$_cap" ] || _budget=$_cap + [ "$_budget" -le "$_dd_swap_room" ] || _budget=$_dd_swap_room + _dd_goal=$((_dd_available + _dd_hard)) + dd_zram_trim "$_mode" "$_budget" "${_dd_session[@]}" + _gain=$((_gain + _dd_trimmed * _dd_saving / 1000)) + _dd_note_session=$((_dd_note_session + _dd_trimmed)) + fi + _dd_freed=$((_dd_freed + _gain)) + if [ "$_dd_hard" -gt 0 ] && [ "$_gain" -lt $((_dd_hard / 4)) ]; then + _dd_rest=$((_dd_rest > 0 ? _dd_rest * 2 : 5)) + [ "$_dd_rest" -le 60 ] || _dd_rest=60 + _dd_rest_until=$((SECONDS + _dd_rest)) _dd_rest_available=$_dd_available + else + _dd_rest=0 fi } - dd_zram_wait() { - local _p _left _start=$SECONDS - while [ $((SECONDS - _start)) -lt 12 ]; do - _left=0 - for _p in "$@"; do - [ -s "/tmp/.dd-zram.ack.$_p" ] && continue - [ -d "/proc/$_p" ] || continue - [ $((SECONDS - _start)) -ge 2 ] && [ ! -e "/tmp/.dd-zram.ack.$_p" ] && continue - _left=1 - done - [ "$_left" = 1 ] || break - nap 0.2 - done - _dd_pageout_complete=1 - for _p in "$@"; do - if [ -d "/proc/$_p" ] && [ ! -s "/tmp/.dd-zram.ack.$_p" ]; then _dd_pageout_complete=0; fi - rm -f "/tmp/.dd-zram.ack.$_p" - done + dd_memory_note() { + [ $((_dd_note_client + _dd_note_session)) -ge $((16 * 1024)) ] && [ $((SECONDS - _dd_noted_at)) -ge 5 ] || return 0 + step "memory: available $((_dd_available / 1024)) MB, falling $((_dd_rate / 1024)) MB/s, compressed $((_dd_note_client / 1024)) MB of the client and $((_dd_note_session / 1024)) MB of the session" + _dd_note_client=0 _dd_note_session=0 _dd_noted_at=$SECONDS } - dd_zram_send() { - local _mode=$1 _what=$2 _which=$3 _pids _p - dd_zram_pick "$_which" - step "zRAM: $_what ($(dd_zram_usage "${_pids[@]}"))" - for _p in "${_pids[@]}"; do rm -f "/tmp/.dd-zram.ack.$_p"; done - printf '%s' "$_mode" > /tmp/.dd-zram - [ "${#_pids[@]}" = 0 ] || kill -URG "${_pids[@]}" 2>/dev/null - _dd_zram_targets=("${_pids[@]}") - [ "${4:-}" != defer ] || return 0 - dd_zram_finish "$_mode" "${_pids[@]}" - } - dd_zram_finish() { - local _mode=$1 - shift - if [ "$_mode" = 1 ]; then dd_zram_wait "$@"; else nap 5; fi - dd_zram_scan - step "zRAM: done ($(dd_zram_usage "$@"))" + dd_client_readback() { + [ "$_dd_client_out" -gt 0 ] && [ "${#_dd_pids[@]}" -gt 0 ] || return 0 + [ "$_dd_game" = 0 ] || { [ -n "$_dd_away" ] && [ $((SECONDS - _dd_away)) -ge 5 ]; } || return 0 + [ $((SECONDS - _dd_trim_at)) -ge 30 ] || return 0 + dd_zram_usage "${_dd_pids[@]}" > /dev/null + if [ "$_dd_swap" -lt $((16 * 1024)) ]; then + _dd_client_out=0 + return 0 + fi + [ $((_dd_available - _dd_swap)) -ge $((_dd_target + _dd_floor)) ] || return 0 + step "memory: available $((_dd_available / 1024)) MB, reading $((_dd_swap / 1024)) MB of the client back" + printf 0 > /tmp/.dd-zram || return 0 + kill -URG "${_dd_pids[@]}" 2>/dev/null || return 0 + _dd_freed=$((_dd_freed - _dd_swap * _dd_saving / 1000)) + _dd_client_out=0 _dd_back_at=$SECONDS } dd_game_focused() { if [ "${DD_DESKTOP:-}" = 1 ] || [ -z "${DD_LAUNCH_DIR:-}" ]; then @@ -1131,92 +1076,40 @@ case $mode in esac return 1 } - dd_over_cap() { - [ "$_dd_ram_cap" -gt 0 ] || return 1 - _dd_measured=$SECONDS - dd_session_others - dd_zram_usage "${_dd_pids[@]}" "${_dd_session[@]}" > /dev/null - [ "$_dd_rss" -gt "$_dd_ram_cap" ] - } - dd_cap_due() { - [ "$_dd_ram_cap" -gt 0 ] && { [ "$_dd_measured" -lt 0 ] || [ $((SECONDS - _dd_measured)) -ge 30 ]; } - } - _dd_since=-1 _dd_since_apps= _dd_packed=-1 _dd_measured=-1 _dd_unpack=0 _dd_capped=-1 _dd_backoff=30 - _dd_pressure_at=-1 _dd_pressure_backoff=30 _dd_tier_at=-1 _dd_tier_backoff=30 _dd_tier_nogain=0 _dd_tier_pushed=0 _dd_tier_back=0 _dd_tier_targets=() _dd_tier_swaps=() _dd_tier_starts=() - _dd_client_pending=0 _dd_client_reserve=0 _dd_client_targets=() _dd_away= - _dd_sample_at= _dd_sample_available=0 _dd_sample_gpu=0 _dd_sample_unevictable=0 _dd_sample_shmem=0 - while kill -0 $$ 2>/dev/null; do - dd_zram_scan - dd_memory_read - if dd_cap_due; then - if dd_over_cap; then - if [ "$_dd_capped" -lt 0 ] || [ $((SECONDS - _dd_capped)) -ge "$_dd_backoff" ]; then - dd_zram_usage "${_dd_pids[@]}" > /dev/null - if [ "$_dd_rss" -ge $((512 * 1024)) ]; then - dd_zram_send 1 "over the ${DD_RAM_CAP_MB} MB RAM cap, compressing the client" client - [ "$_dd_game" = 1 ] && _dd_packed=$SECONDS - else - step "RAM cap: over, client already small ($((_dd_rss / 1024)) MB resident), skipping it" - fi - dd_over_cap && dd_zram_send 1 "still over the RAM cap, compressing the rest of the session" session - if dd_over_cap; then - _dd_backoff=$((_dd_backoff * 2 > 600 ? 600 : _dd_backoff * 2)) - step "RAM cap: still over after paging out, next try in ${_dd_backoff} s" - else - _dd_backoff=30 - fi - _dd_capped=$SECONDS - fi - else - _dd_backoff=30 + dd_memory_tick() { + if [ $((SECONDS - _dd_scan_at)) -ge 5 ]; then + _dd_scan_at=$SECONDS + dd_zram_scan + _dd_focus=1 + if [ "$_dd_game" = 1 ]; then + dd_game_focused && _dd_focus=0 || _dd_focus=$? fi - fi - _dd_preserved_growth=$_dd_growth _dd_preserved_fall=$_dd_fall - dd_client_pressure defer - _dd_preserved_growth=$_dd_growth _dd_preserved_fall=$_dd_fall - dd_session_pressure - dd_client_pressure_finish - _dd_focus=1 - [ "$_dd_game" = 1 ] && { dd_game_focused && _dd_focus=0 || _dd_focus=$?; } - if [ "$_dd_game" = 1 ] && [ "$_dd_focus" = 0 ]; then - _dd_away= - if [ "$_dd_since" -lt 0 ] || [ "$_dd_since_apps" != "$_dd_apps" ]; then - _dd_since=$SECONDS _dd_since_apps=$_dd_apps - fi - if [ "${DD_ZRAM_CLIENT:-1}" = 1 ] && [ $((SECONDS - _dd_since)) -ge 20 ] && [ "${#_dd_pids[@]}" -gt 0 ] && - { [ "$_dd_packed" -lt 0 ] || [ $((SECONDS - _dd_packed)) -ge 300 ]; } && dd_client_can_pageout; then - dd_zram_send 1 "compressing the client" client - _dd_packed=$SECONDS - fi - elif [ "$_dd_game" != 1 ]; then - _dd_away= - if [ "$_dd_packed" -ge 0 ]; then - _dd_unpack=1 - fi - _dd_since=-1 _dd_packed=-1 _dd_tier_at=-1 _dd_tier_backoff=30 _dd_tier_nogain=0 _dd_tier_pushed=0 _dd_tier_targets=() _dd_tier_swaps=() _dd_tier_starts=() - else - _dd_since=-1 - if [ "$_dd_focus" = 1 ]; then - [ -n "${_dd_away-}" ] || _dd_away=$SECONDS + if [ "$_dd_game" = 1 ] && [ "$_dd_focus" = 1 ]; then + [ -n "$_dd_away" ] || _dd_away=$SECONDS else _dd_away= fi - if [ "$_dd_packed" -ge 0 ]; then - _dd_unpack=1 - fi fi - if [ "$_dd_unpack" = 1 ] && - { [ "$_dd_game" = 0 ] || { [ "${_dd_ram_cap:-0}" = 0 ] && [ -n "${_dd_away-}" ] && [ $((SECONDS - _dd_away)) -ge 5 ]; }; } && - ! dd_over_cap && dd_client_can_readback; then - if [ "$_dd_game" = 0 ]; then - dd_zram_send 0 "memory recovered, reading the client back" client - else - dd_zram_send 0 "the client is in front of the game, reading it back" client - _dd_packed=-1 - fi - _dd_unpack=0 + dd_memory_read + [ ! -e /tmp/.dd-zram.hold ] || return 0 + dd_memory_relieve + dd_memory_note + [ "$_dd_need" -gt 0 ] || dd_client_readback + } + declare -A _dd_deaf=() _dd_preloaded=() + _dd_scan_at=-5 _dd_session_at=-1 _dd_session=() _dd_focus=1 _dd_away= + _dd_page_kb=$(($(getconf PAGESIZE 2>/dev/null || echo 4096) / 1024)) _dd_returned=0 _dd_polls=0 _dd_pass_at=0 _dd_goal=0 + _dd_sample_at= _dd_freed=0 _dd_client_out=0 _dd_note_client=0 _dd_note_session=0 + _dd_trim_at=-30 _dd_back_at=-30 _dd_forced_at=-10 _dd_full_at=-60 _dd_noted_at=-5 + _dd_rest=0 _dd_rest_until=0 _dd_rest_available=0 + while kill -0 $$ 2>/dev/null; do + dd_memory_tick + if [ "$_dd_available" -ge 0 ] && + { [ "$_dd_available" -lt $((_dd_mem_total * 2 / 5)) ] || [ "$_dd_rate" -ge $((16 * 1024)) ]; }; then + nap 1 + else + nap 5 fi - dd_watch_nap done ) & fi diff --git a/tools/linuxfs/preload/zram.c b/tools/linuxfs/preload/zram.c index 177fe8efe..551a6e148 100644 --- a/tools/linuxfs/preload/zram.c +++ b/tools/linuxfs/preload/zram.c @@ -20,7 +20,16 @@ #define ZR_CTL "/tmp/.dd-zram" #endif #define ZR_SWAPPED (1ULL << 62) +#define ZR_PRESENT (1ULL << 63) #define ZR_BATCH 512 +#define ZR_CHUNK (1UL << 20) +#define ZR_SLOTS 32768UL +#define ZR_PROBES 16 +#define ZR_HEAT_MAX 3 +#define ZR_SKIP 32U +#define ZR_INLINE_KB (32UL << 10) +#define ZR_INLINE_CHUNKS 512UL +#define ZR_FAILED (~0UL) #define ZR_FUTEX_WAIT 0 #define ZR_FUTEX_WAKE 1 @@ -33,18 +42,43 @@ static char zr_maps[8192]; static uint64_t zr_entries[ZR_BATCH]; static struct iovec zr_iov[ZR_BATCH]; static char zr_sink[ZR_BATCH]; +static struct zr_slot { + unsigned long key; + uint16_t gen; + uint16_t pushed; + uint16_t kept; + uint8_t heat; + uint8_t skip; +} zr_slots[ZR_SLOTS]; +static uint16_t zr_gen = 1; +static unsigned long zr_cursor; +static unsigned long zr_visits; static int zr_open(const char *path) { return (int)zr_sys(SYS_openat, AT_FDCWD, path, O_RDONLY | O_CLOEXEC, 0); } -static int zr_mode(void) { - char c = 0; - int fd = zr_open(ZR_CTL); - if (fd < 0) return -1; - long n = zr_sys(SYS_read, fd, &c, 1); - zr_sys(SYS_close, fd); - return n == 1 && (c == '0' || c == '1') ? c - '0' : -1; +static int zr_mode(unsigned long *want) { + char text[24]; + long n = 0; + int fd = zr_open(ZR_CTL ".hold"); + if (fd >= 0) { + n = zr_sys(SYS_read, fd, text, sizeof(text)); + zr_sys(SYS_close, fd); + } + if (n < 1) { + fd = zr_open(ZR_CTL); + if (fd < 0) return -1; + n = zr_sys(SYS_read, fd, text, sizeof(text)); + zr_sys(SYS_close, fd); + } + if (n < 1 || text[0] < '0' || text[0] > '3') return -1; + unsigned long kb = 0; + for (long i = 2; i < n && text[i] >= '0' && text[i] <= '9'; i++) + kb = kb * 10 + (unsigned long)(text[i] - '0'); + *want = kb / (zr_page / 1024); + if (text[0] >= '2' && *want == 0) return -1; + return text[0] - '0'; } static unsigned long zr_hex(const char **p) { @@ -96,16 +130,103 @@ static void zr_read_back(int pagemap, unsigned long start, unsigned long end) { } } -static void zr_walk(int compress) { - int maps = zr_open("/proc/self/maps"); - if (maps < 0) return; - int pagemap = compress ? -1 : zr_open("/proc/self/pagemap"); - if (!compress && pagemap < 0) { - zr_sys(SYS_close, maps); - return; +static unsigned long zr_count(int pagemap, unsigned long start, unsigned long end, uint64_t bit) { + unsigned long count = 0; + long size = (long)((end - start) / zr_page * sizeof(uint64_t)); + long got; + do { + if (zr_sys(SYS_lseek, pagemap, (long)(start / zr_page * sizeof(uint64_t)), SEEK_SET) < 0) return ZR_FAILED; + got = zr_sys(SYS_read, pagemap, zr_entries, size); + } while (got < 0 && errno == EINTR); + if (got != size) return ZR_FAILED; + for (long i = 0; i < got / (long)sizeof(uint64_t); i++) + if (zr_entries[i] & bit) count++; + return count; +} + +static struct zr_slot *zr_slot(unsigned long addr, int create) { + unsigned long key = addr / zr_page + 1; + unsigned long home = key * 2654435761UL % ZR_SLOTS; + for (unsigned long i = 0; i < ZR_PROBES; i++) { + struct zr_slot *slot = &zr_slots[(home + i) % ZR_SLOTS]; + if (slot->key == key) return slot; + if (slot->key == 0 && !create) return NULL; + if (slot->key == 0) { + slot->key = key; + return slot; + } } + if (!create) return NULL; + memset(&zr_slots[home], 0, sizeof(zr_slots[home])); + zr_slots[home].key = key; + return &zr_slots[home]; +} + +static unsigned long zr_trim(int pagemap, unsigned long start, unsigned long end, + unsigned long want, int force, unsigned long lo, unsigned long hi) { + unsigned long done = 0; + for (unsigned long addr = start, next; addr < end && done < want; addr = next) { + next = (addr | (ZR_CHUNK - 1)) + 1; + if (next > end || next < addr) next = end; + if (next <= lo || addr >= hi) continue; + if (zr_visits == 0) break; + zr_visits--; + zr_cursor = next; + if (addr < (unsigned long)(zr_slots + ZR_SLOTS) && next > (unsigned long)zr_slots) continue; + unsigned long present = zr_count(pagemap, addr, next, ZR_PRESENT); + if (present == ZR_FAILED) continue; + struct zr_slot *slot = zr_slot(addr, 0); + if (slot != NULL && slot->gen == zr_gen && slot->pushed > 0) { + if (present > slot->kept && (present - slot->kept) * 4 > slot->pushed) { + if (slot->heat < ZR_HEAT_MAX) slot->heat++; + slot->skip = (uint8_t)(ZR_SKIP << slot->heat > 255 ? 255 : ZR_SKIP << slot->heat); + slot->pushed = 0; + } else if (slot->heat > 0) { + slot->heat--; + } + } + if (slot != NULL && slot->skip > 0 && !force) { + slot->skip--; + continue; + } + if (present == 0) continue; + unsigned long from = addr < lo ? lo : addr; + unsigned long left = present; + while (from < next && done + present - left < want) { + unsigned long budget = want - done - (present - left); + unsigned long i = (from - addr) / zr_page; + for (; i < (next - addr) / zr_page && budget > 0; i++) + if (zr_entries[i] & ZR_PRESENT) budget--; + unsigned long to = addr + i * zr_page; + zr_sys(SYS_madvise, from, to - from, MADV_PAGEOUT); + from = to; + unsigned long now = zr_count(pagemap, addr, next, ZR_PRESENT); + if (now == ZR_FAILED) break; + left = now < present ? now : present; + } + if (from < next) zr_cursor = from; + if (left >= present) continue; + if (slot == NULL) slot = zr_slot(addr, 1); + if (slot->gen != zr_gen) slot->pushed = 0; + slot->gen = zr_gen; + slot->pushed = (uint16_t)(slot->pushed + present - left); + slot->kept = (uint16_t)left; + done += present - left; + } + return done; +} + +static unsigned long zr_walk(int mode, unsigned long want, unsigned long lo, unsigned long hi) { + int maps = zr_open("/proc/self/maps"); + if (maps < 0) return 0; + int pagemap = mode == 1 ? -1 : zr_open("/proc/self/pagemap"); + if (mode != 1 && pagemap < 0) { + zr_sys(SYS_close, maps); + return 0; + } + unsigned long done = 0; size_t have = 0; - for (;;) { + while (done < want && zr_visits > 0) { long n = zr_sys(SYS_read, maps, zr_maps + have, sizeof(zr_maps) - 1 - have); if (n < 0 && errno == EINTR) continue; if (n <= 0) break; @@ -113,12 +234,13 @@ static void zr_walk(int compress) { zr_maps[have] = 0; char *line = zr_maps; char *nl; - while ((nl = memchr(line, '\n', have - (size_t)(line - zr_maps))) != NULL) { + while (done < want && zr_visits > 0 && (nl = memchr(line, '\n', have - (size_t)(line - zr_maps))) != NULL) { *nl = 0; unsigned long s, e; - if (zr_eligible(line, compress, &s, &e) && e > s) { - if (compress) zr_sys(SYS_madvise, s, e - s, MADV_PAGEOUT); - else zr_read_back(pagemap, s, e); + if (zr_eligible(line, mode != 0, &s, &e) && e > s) { + if (mode == 0) zr_read_back(pagemap, s, e); + else if (mode == 1) zr_sys(SYS_madvise, s, e - s, MADV_PAGEOUT); + else done += zr_trim(pagemap, s, e, want - done, mode == 3, lo, hi); } line = nl + 1; } @@ -128,11 +250,12 @@ static void zr_walk(int compress) { } if (pagemap >= 0) zr_sys(SYS_close, pagemap); zr_sys(SYS_close, maps); + return done; } -static void zr_ack(int done) { - static const char suffix[] = ".ack."; - char path[sizeof(ZR_CTL) + sizeof(suffix) + 20]; +static void zr_ack(long value, int trim) { + const char *suffix = trim ? ".trim." : ".ack."; + char path[sizeof(ZR_CTL) + sizeof(".trim.") + 20]; char digits[20]; size_t n = 0, d = 0; for (const char *p = ZR_CTL; *p; p++) path[n++] = *p; @@ -143,15 +266,29 @@ static void zr_ack(int done) { path[n] = 0; int fd = (int)zr_sys(SYS_openat, AT_FDCWD, path, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0600); if (fd < 0) return; - if (done) zr_sys(SYS_write, fd, "1", 1UL); + for (d = 0; value >= 0 && (d == 0 || value > 0); value /= 10) digits[d++] = (char)('0' + value % 10); + for (n = 0; d > 0;) path[n++] = digits[--d]; + if (n > 0) zr_sys(SYS_write, fd, path, n); zr_sys(SYS_close, fd); } -static void zr_request(void) { - int mode = zr_mode(); - if (mode == 1) zr_ack(0); - if (mode >= 0) zr_walk(mode); - if (mode == 1) zr_ack(1); +static void zr_request(int worker) { + unsigned long want = 0; + int mode = zr_mode(&want); + if (mode < 0) return; + if (!worker && want > ZR_INLINE_KB / (zr_page / 1024)) want = ZR_INLINE_KB / (zr_page / 1024); + zr_visits = worker ? ZR_FAILED : ZR_INLINE_CHUNKS; + if (mode > 0) zr_ack(-1, mode > 1); + if (mode < 2) { + zr_walk(mode, 1, 0, 0); + zr_gen++; + if (mode == 1) zr_ack(1, 0); + return; + } + unsigned long from = zr_cursor; + unsigned long done = zr_walk(mode, want, from, ~0UL); + if (done < want && from > 0) done += zr_walk(mode, want - done, 0, from); + zr_ack((long)(done * (zr_page / 1024)), 1); } static void *zr_worker_main(void *unused) { @@ -160,7 +297,7 @@ static void *zr_worker_main(void *unused) { for (;;) { while (!__atomic_exchange_n(&zr_pending, 0, __ATOMIC_SEQ_CST)) zr_sys(SYS_futex, &zr_pending, ZR_FUTEX_WAIT, 0, NULL, NULL, 0); - zr_request(); + zr_request(1); } return NULL; } @@ -176,7 +313,7 @@ static void zr_handler(int sig, siginfo_t *info, void *context) { } else while (__atomic_load_n(&zr_pending, __ATOMIC_SEQ_CST) && !__atomic_exchange_n(&zr_busy, 1, __ATOMIC_SEQ_CST)) { __atomic_store_n(&zr_pending, 0, __ATOMIC_SEQ_CST); - zr_request(); + zr_request(0); __atomic_store_n(&zr_busy, 0, __ATOMIC_SEQ_CST); } errno = saved; diff --git a/tools/release/runtime_inputs.py b/tools/release/runtime_inputs.py index 16d4c9342..4b02d29c2 100644 --- a/tools/release/runtime_inputs.py +++ b/tools/release/runtime_inputs.py @@ -100,8 +100,7 @@ def required(): 'layer/VK_LAYER_DROIDDECK_vr.json', 'layer/VK_LAYER_DROIDDECK_vr_implicit.json', 'layer/libdroiddeck_vr_scheduling.so']] paths += ['assets/linuxfs/usr/local/lib/droiddeck-gpuload/' + name for name in - ['libVkLayer_droiddeck_gpuload.so', 'VK_LAYER_DROIDDECK_gpu_load.json', - 'libVkLayer_droiddeck_vramcap.so', 'VK_LAYER_DROIDDECK_vram_cap.json']] + ['libVkLayer_droiddeck_gpuload.so', 'VK_LAYER_DROIDDECK_gpu_load.json']] for side in ['left', 'right']: paths += [f'assets/linuxfs/usr/local/lib/droiddeck-vr/droiddeck/resources/rendermodels/droiddeck_hand_{side}/{name}' for name in [f'droiddeck_hand_{side}.json', 'hand.mtl', 'hand.png', 'hand_open.obj', 'hand_fist.obj', diff --git a/tools/tests/test_client_zram_focus.py b/tools/tests/test_client_zram_focus.py index 4a69f47ed..be8e1dc31 100644 --- a/tools/tests/test_client_zram_focus.py +++ b/tools/tests/test_client_zram_focus.py @@ -18,6 +18,15 @@ def run_bash(script, env=None): return subprocess.run(['bash', '-c', script], capture_output=True, text=True, timeout=10, env=env) +def state_source(): + source = SCRIPT.read_text() + start = source.index(' declare -A _dd_deaf=()') + return source[start:source.index(' while kill -0', start)] + + +STATE = state_source() + + class ClientZramFocusTest(unittest.TestCase): def test_the_hidden_epic_launcher_is_compressed_with_the_client(self): with tempfile.TemporaryDirectory() as tmp: @@ -78,217 +87,59 @@ class ClientZramFocusTest(unittest.TestCase): self.assertEqual(0, result.returncode, result.stderr) self.assertEqual('|6000021 6000022 6000020|0', result.stdout.strip()) - def test_refocus_restarts_the_delay_and_game_exit_restores_a_packed_client(self): - source = SCRIPT.read_text() - start = source.index(' _dd_focus=1\n') - stop = source.index(' dd_watch_nap\n', start) - body = source[start:stop] - harness = ''' -_dd_since=-1 _dd_since_apps= _dd_packed=-1 _dd_unpack=0 _dd_apps=" 413150" -_dd_pids=(123) -dd_game_focused() { [ "$focused" = 1 ]; } -dd_over_cap() { return 1; } -dd_client_can_pageout() { return 0; } -dd_client_can_readback() { return 0; } -dd_zram_send() { echo "send:$1"; } -tick() { - SECONDS=$1 _dd_game=$2 focused=$3 -''' + body + ''' -} -tick 0 1 1 -tick 5 1 0 -tick 30 1 1 -echo "refocus:$_dd_packed" -tick 49 1 1 -tick 50 1 1 -tick 55 1 0 -tick 60 0 0 -''' - result = run_bash(harness) - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['refocus:-1', 'send:1', 'send:0'], result.stdout.splitlines()) - - def monitor_harness(self): - source = SCRIPT.read_text() - start = source.index(' dd_zram_scan\n dd_memory_read\n') - stop = source.index(' dd_watch_nap\n', start) - return ''' -_dd_since=-1 _dd_since_apps= _dd_packed=-1 _dd_measured=-1 _dd_unpack=0 _dd_capped=-1 _dd_backoff=30 -_dd_apps=" 413150" -_dd_pids=(123) + TICK = ''' +dd_zram_scan() { _dd_game=$game _dd_pids=(10) _dd_others=() _dd_apps=" 413150"; } +dd_game_focused() { return $focus; } +dd_memory_read() { _dd_available=$((available * 1024)) _dd_mem_total=$((7168 * 1024)) _dd_floor=$((896 * 1024)); _dd_target=$((target * 1024)) _dd_swap_room=$((4096 * 1024)) _dd_saving=500 _dd_rate=0 _dd_psi=0; } +dd_zram_trim() { echo "trim:$NOW"; _dd_trimmed=$((64 * 1024)); } +dd_zram_usage() { _dd_swap=$((64 * 1024)); } +dd_session_others() { :; } step() { :; } -dd_zram_scan() { :; } -dd_memory_read() { :; } -dd_client_pressure() { :; } -dd_client_pressure_finish() { :; } -dd_session_pressure() { :; } -dd_client_can_pageout() { return 0; } -dd_client_can_readback() { [ "${readback:-1}" = 1 ]; } -dd_game_focused() { [ "$focused" = 1 ] && return 0; [ "$focused" = 2 ] && return 2; return 1; } -dd_cap_due() { [ "$cap_due" = 1 ]; } -dd_over_cap() { [ "$over_cap" = 1 ]; } -dd_zram_send() { echo "send:$1:$3"; } -tick() { - SECONDS=$1 _dd_game=$2 focused=$3 over_cap=$4 cap_due=$5 -''' + source[start:stop] + '\n}\n' +kill() { echo "back:$NOW"; } +game=1 focus=0 available=1500 target=1600 +run() { for NOW in $(seq "$1" "$2"); do dd_memory_tick; done; } +''' - def test_client_toggle_still_disables_automatic_compression(self): - result = run_bash(self.monitor_harness() + ''' -DD_ZRAM_CLIENT=0 -tick 0 1 1 0 0 -tick 25 1 1 0 0 -tick 30 0 0 0 0 -''') + def tick(self, body): + functions = '\n'.join(function_source(name) for name in ( + 'dd_memory_need', 'dd_memory_relieve', 'dd_memory_note', 'dd_client_readback', 'dd_memory_tick')) + with tempfile.TemporaryDirectory() as tmp: + script = (functions + self.TICK + body).replace('/tmp/.dd-zram', tmp + '/ctl') + result = run_bash(('NOW=0\nset -u\n' + STATE + script).replace('SECONDS', 'NOW')) self.assertEqual(0, result.returncode, result.stderr) self.assertEqual('', result.stderr) - self.assertEqual('', result.stdout) + return result.stdout.splitlines() - def test_a_new_game_restarts_the_compression_delay(self): - result = run_bash(self.monitor_harness() + ''' -tick 0 1 1 0 0 -_dd_apps=" 413150 1245620" -tick 15 1 1 0 0 -tick 20 1 1 0 0 -echo "starting:$_dd_packed" -tick 34 1 1 0 0 -tick 35 1 1 0 0 -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['starting:-1', 'send:1:client'], result.stdout.splitlines()) + def test_the_client_behind_a_game_is_trimmed_while_memory_is_short_of_the_target(self): + self.assertEqual(['trim:0', 'trim:1', 'trim:2'], self.tick('run 0 2\navailable=1700; run 3 9\n')) - def test_ram_cap_can_still_compress_an_unfocused_client(self): - result = run_bash(self.monitor_harness() + ''' -DD_ZRAM_CLIENT=0 DD_RAM_CAP_MB=1024 -dd_zram_usage() { _dd_rss=$((768 * 1024)); } -tick 0 1 0 1 1 -echo "cap:$_dd_packed:$_dd_since:$_dd_backoff" -tick 5 0 0 0 0 -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'send:1:session', 'cap:0:-1:60', 'send:0:client'], result.stdout.splitlines()) + def test_nothing_is_requested_while_the_app_holds_the_control_file(self): + self.assertEqual(['trim:3'], self.tick( + ': > /tmp/.dd-zram.hold; run 0 2\nrm /tmp/.dd-zram.hold; run 3 3\n')) - def test_game_exit_defers_restore_until_the_session_is_under_the_ram_cap(self): - result = run_bash(self.monitor_harness() + ''' -tick 0 1 1 0 0 -tick 20 1 1 0 0 -tick 25 1 0 0 0 -tick 30 0 0 1 0 -echo "deferred:$_dd_unpack:$_dd_packed" -tick 35 0 0 0 0 -echo "restored:$_dd_unpack" -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'deferred:1:-1', 'send:0:client', 'restored:0'], result.stdout.splitlines()) + def test_nothing_is_read_back_while_memory_is_still_needed(self): + self.assertEqual(['trim:0'], self.tick( + 'run 0 0\ngame=0 available=4000; dd_memory_need() { _dd_need=1 _dd_hard=0 _dd_force=0; }\n' + 'dd_memory_relieve() { dd_memory_need; }; run 1 40\n')) - def test_game_exit_defers_readback_under_pressure_even_without_a_ram_cap(self): - result = run_bash(self.monitor_harness() + """ -tick 0 1 1 0 0 -tick 20 1 1 0 0 -readback=0 -tick 25 0 0 0 0 -echo "deferred:$_dd_unpack" -readback=1 -tick 30 0 0 0 0 -echo "restored:$_dd_unpack" -""") - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'deferred:1', 'send:0:client', 'restored:0'], result.stdout.splitlines()) + def test_game_exit_reads_the_client_back_after_a_quiet_half_minute(self): + self.assertEqual(['trim:0', 'back:30'], self.tick('run 0 0\ngame=0 available=4000; run 1 40\n')) - def test_client_in_front_of_a_running_game_is_read_back_and_compressed_again_later(self): - result = run_bash(self.monitor_harness() + ''' -tick 0 1 1 0 0 -tick 20 1 1 0 0 -tick 25 1 0 0 0 -echo "away:$_dd_packed" -tick 30 1 0 0 0 -echo "read:$_dd_packed:$_dd_unpack" -tick 35 1 0 0 0 -tick 40 1 1 0 0 -tick 55 1 1 0 0 -tick 60 1 1 0 0 -echo "again:$_dd_packed" -tick 65 0 0 0 0 -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'away:20', 'send:0:client', 'read:-1:0', 'send:1:client', 'again:60', 'send:0:client'], - result.stdout.splitlines()) - - def test_unknown_focus_keeps_the_client_compressed(self): - result = run_bash(self.monitor_harness() + ''' -tick 0 1 1 0 0 -tick 20 1 1 0 0 -tick 25 1 2 0 0 -tick 40 1 2 0 0 -echo "unknown:$_dd_packed:$_dd_unpack" -tick 45 1 0 0 0 -tick 48 1 2 0 0 -tick 52 1 0 0 0 -tick 56 1 0 0 0 -echo "flicker:$_dd_packed" -tick 57 1 0 0 0 -echo "read:$_dd_packed" -tick 60 0 2 0 0 -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'unknown:20:1', 'flicker:20', 'send:0:client', 'read:-1'], - result.stdout.splitlines()) + def test_client_in_front_of_a_running_game_is_read_back_and_trimmed_again_later(self): + self.assertEqual(['trim:0', 'back:30', 'trim:60'], + self.tick('run 0 0\nfocus=1 available=4000; run 1 44\nfocus=0 available=1500; run 45 60\n')) def test_a_short_look_at_the_client_keeps_it_compressed(self): - result = run_bash(self.monitor_harness() + ''' -tick 0 1 1 0 0 -tick 20 1 1 0 0 -tick 25 1 0 0 0 -tick 28 1 1 0 0 -tick 30 1 0 0 0 -tick 34 1 0 0 0 -echo "packed:$_dd_packed" -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'packed:20'], result.stdout.splitlines()) + self.assertEqual(['trim:0'], self.tick('run 0 0\navailable=4000; run 1 34\nfocus=1; run 35 38\nfocus=0; run 39 60\n')) - def test_client_in_front_waits_for_memory_and_a_ram_cap_keeps_it_compressed(self): - result = run_bash(self.monitor_harness() + ''' -tick 0 1 1 0 0 -tick 20 1 1 0 0 -readback=0 -tick 25 1 0 0 0 -tick 35 1 0 0 0 -echo "tight:$_dd_packed" -readback=1 -tick 40 1 0 0 0 -echo "eased:$_dd_packed" -_dd_ram_cap=1048576 -tick 60 1 1 0 0 -tick 80 1 1 0 0 -tick 85 1 0 0 0 -tick 100 1 0 0 0 -echo "capped:$_dd_packed" -tick 105 0 0 0 0 -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'tight:20', 'send:0:client', 'eased:-1', 'send:1:client', 'capped:80', 'send:0:client'], - result.stdout.splitlines()) + def test_unknown_focus_keeps_the_client_compressed(self): + self.assertEqual(['trim:0'], self.tick('run 0 0\nfocus=2 available=4000; run 1 60\n')) - def test_client_in_front_without_compression_reads_nothing_back(self): - result = run_bash(self.monitor_harness() + ''' -DD_ZRAM_CLIENT=0 -tick 0 1 1 0 0 -tick 25 1 0 0 0 -tick 40 1 0 0 0 -tick 45 0 0 0 0 -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual('', result.stdout) + def test_client_in_front_waits_for_memory(self): + self.assertEqual(['trim:0', 'back:50'], self.tick('run 0 0\nfocus=1 available=1800 target=896; run 1 49\navailable=2500; run 50 60\n')) + + def test_a_client_that_was_never_trimmed_reads_nothing_back(self): + self.assertEqual([], self.tick('focus=1 available=4000; run 0 60\n')) def test_scan_keeps_the_running_game_and_ignores_steams_own_reaper(self): temp = tempfile.TemporaryDirectory() diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 18435ffb9..fbc7bdc02 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -824,7 +824,6 @@ class GameEnvironmentTest(unittest.TestCase): "offline_without_anticheat": lambda command, env: command, "game_logs": lambda command, env, app_id: env, "directaudio_settings": lambda env: env, - "vram_cap": lambda env: env, "render_path_defaults": lambda *args: None, "bridge_feature_level": lambda env: None, "force_ssbs": lambda command, env: env, @@ -1304,22 +1303,6 @@ class GameEnvironmentTest(unittest.TestCase): link.symlink_to(other, target_is_directory=True) self.assertTrue(chromium(str(link))) - def test_the_vram_cap_comes_before_the_games_own_dxvk_settings(self): - cap = MODULE["vram_cap"] - self.assertEqual(cap({"DD_VRAM_MB": "4096"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 4096; dxgi.maxSharedMemory = 4096") - self.assertEqual(cap({"DD_VRAM_MB": "8192"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 8192; dxgi.maxSharedMemory = 8192") - self.assertEqual(cap({"DD_VRAM_MB": "4095"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 4095; dxgi.maxSharedMemory = 4095; d3d9.maxAvailableMemory = 4095") - self.assertEqual(cap({"DD_VRAM_MB": "2048", "DXVK_CONFIG": "dxvk.maxFrameRate = 60;"})["DXVK_CONFIG"], - "dxgi.maxDeviceMemory = 2048; dxgi.maxSharedMemory = 2048; d3d9.maxAvailableMemory = 2048; dxvk.maxFrameRate = 60") - for off in ({}, {"DD_VRAM_MB": "0"}, {"DD_VRAM_MB": "lots"}, {"DD_VRAM_MB": "²"}, {"DD_VRAM_MB": "-1"}): - self.assertNotIn("DXVK_CONFIG", cap(off)) - self.assertNotIn("DROIDDECK_VRAM_CAP", cap(off)) - self.assertNotIn("DROIDDECK_VRAM_CAP_MB", cap(off)) - - def test_the_vram_cap_also_turns_on_the_vulkan_layer_that_holds_the_game_to_it(self): - env = MODULE["vram_cap"]({"DD_VRAM_MB": "3072", "DXVK_CONFIG": "dxgi.maxDeviceMemory = 16384"}) - self.assertEqual((env["DROIDDECK_VRAM_CAP"], env["DROIDDECK_VRAM_CAP_MB"]), ("1", "3072")) - def test_a_games_wine_sync_choice_also_reaches_its_setup_runs(self): env = {"DD_SYNC": "1", "DD_SYNC_FALLBACK": "1", "DD_FSYNC_FIRST": "0", "OTHER": "kept"} config = {"version": 1, "games": {"42": {"DD_SYNC": "0", "DD_FSYNC_FIRST": "1", "PROTON_NO_ESYNC": "1", "FEX_TSOENABLED": "1"}}} diff --git a/tools/tests/test_memory_pressure.py b/tools/tests/test_memory_pressure.py index d32fa1f80..aeac289ac 100644 --- a/tools/tests/test_memory_pressure.py +++ b/tools/tests/test_memory_pressure.py @@ -2,7 +2,9 @@ from pathlib import Path import tempfile import unittest -from tools.tests.test_client_zram_focus import SCRIPT, function_source, run_bash +from tools.tests.test_client_zram_focus import STATE, function_source, run_bash + +MB = 1024 class MemoryPressureTest(unittest.TestCase): @@ -10,629 +12,336 @@ class MemoryPressureTest(unittest.TestCase): self.directory = tempfile.TemporaryDirectory() self.addCleanup(self.directory.cleanup) self.root = Path(self.directory.name) - self.memory() - def memory(self, available=1024, swap_free=4096, total=7168, swap_total=6144, psi='0.00'): - (self.root / 'meminfo').write_text( - f'MemTotal: {total * 1024} kB\nMemAvailable: {available * 1024} kB\n' - f'SwapTotal: {swap_total * 1024} kB\nSwapFree: {swap_free * 1024} kB\n') - (self.root / 'pressure').write_text(f'some avg10={psi} avg60=0.00 avg300=0.00 total=1234\n') + def sample(self, available=3000, total=7168, stall=0, zram=(6144, 0), other=(4096, 0), stored=None, swapped_in=None): + lines = [f'MemTotal: {total * MB} kB', f'MemAvailable: {available * MB} kB', + f'SwapTotal: {(zram[0] + other[0]) * MB} kB', + f'SwapFree: {(zram[0] - zram[1] + other[0] - other[1]) * MB} kB'] + swaps = ['Filename Type Size Used Priority'] + if zram[0]: + swaps.append(f'/dev/block/zram0 partition {zram[0] * MB} {zram[1] * MB} 100') + if other[0]: + swaps.append(f'/data/swap/swapfile file {other[0] * MB} {other[1] * MB} 50') + text = "printf '%s\\n' " + ' '.join(f"'{line}'" for line in lines) + f" > {self.root}/meminfo\n" + text += "printf '%s\\n' " + ' '.join(f"'{line}'" for line in swaps) + f" > {self.root}/swaps\n" + text += f"echo 'some avg10=0.00 avg60=0.00 avg300=0.00 total={stall}' > {self.root}/pressure\n" + if swapped_in is None: + text += f'rm -f {self.root}/vmstat\n' + else: + text += f"printf '%s\\n' 'pgfault 9' 'pswpin {swapped_in * MB // 4}' 'pswpout 7' > {self.root}/vmstat\n" + if stored is None: + text += f'rm -f {self.root}/mm_stat\n' + else: + text += f'echo "{stored[0] << 20} {stored[1] << 20} {stored[1] << 20} 0 0 0 0 0 0" > {self.root}/mm_stat\n' + return text - def run_policy(self, body): - functions = '\n'.join(function_source(name) for name in ( - 'dd_memory_read', 'dd_memory_tight', 'dd_memory_critical', 'dd_client_can_pageout', - 'dd_client_can_readback', 'dd_client_pressure', 'dd_client_pressure_result', 'dd_zram_has_room')) - functions = functions.replace('/proc/meminfo', str(self.root / 'meminfo')) - functions = functions.replace('/proc/pressure/memory', str(self.root / 'pressure')) - harness = ''' -set -u -_dd_pids=(123) _dd_game=1 _dd_packed=-1 _dd_pressure_at=-1 _dd_pressure_backoff=30 -rss=$((384 * 1024)) client_swap=$((512 * 1024)) reclaimed=$((128 * 1024)) -step() { :; } -dd_zram_usage() { _dd_rss=$rss _dd_anon=${anon:-$rss} _dd_swap=$client_swap; } -dd_zram_send() { echo "send:$1:$3"; rss=$((rss - reclaimed)); _dd_pageout_complete=${pageout_complete:-1}; } -''' + functions + '\ndd_memory_read\n' + body - result = run_bash('NOW=0\n' + harness.replace('SECONDS', 'NOW')) + def run_policy(self, body, *names): + functions = '\n'.join(function_source(name) for name in ('dd_memory_read', 'dd_memory_need') + names) + for name in ('meminfo', 'swaps', 'pressure/memory', 'vmstat'): + functions = functions.replace('/proc/' + name, str(self.root / name.split('/')[0])) + functions = functions.replace('/sys/block/zram0/mm_stat', str(self.root / 'mm_stat')) + functions = functions.replace('/tmp/.dd-zram', str(self.root / 'ctl')) + result = run_bash(('NOW=0\nset -u\n' + STATE + functions + '\n' + body).replace('SECONDS', 'NOW')) self.assertEqual(0, result.returncode, result.stderr) self.assertEqual('', result.stderr) return result.stdout.splitlines() - def test_pressure_reclaims_before_the_focus_delay_and_respects_cooldown(self): - self.assertEqual(['send:1:client', 'send:1:client'], self.run_policy(''' -SECONDS=0; dd_client_pressure -SECONDS=5; dd_client_pressure -SECONDS=29; dd_client_pressure -SECONDS=30; dd_client_pressure -''')) - - def test_no_game_or_disabled_client_compression_does_not_reclaim(self): - self.assertEqual([], self.run_policy(''' -_dd_game=0; dd_client_pressure -_dd_game=1 DD_ZRAM_CLIENT=0; dd_client_pressure -''')) - - def test_high_available_memory_does_not_reclaim_even_with_stalls(self): - self.memory(available=4096, psi='12.34') - self.assertEqual([], self.run_policy('dd_client_pressure')) - - def test_psi_reclaims_with_moderate_headroom(self): - self.memory(available=2048, psi='01.23') - self.assertEqual(['send:1:client'], self.run_policy('dd_client_pressure')) - - def test_missing_psi_still_uses_memory_headroom(self): - (self.root / 'pressure').unlink() - self.assertEqual(['send:1:client'], self.run_policy('dd_client_pressure')) - - def test_missing_meminfo_never_reclaims_or_prefetches(self): - (self.root / 'meminfo').write_text('SwapTotal: 6291456 kB\nSwapFree: 4194304 kB\n') - self.assertEqual(['no'], self.run_policy(''' -dd_client_pressure -if dd_client_can_readback; then echo yes; else echo no; fi -''')) - - def test_missing_available_memory_does_not_trigger_pressure(self): - p = self.root / 'meminfo' - p.write_text('\n'.join(line for line in p.read_text().splitlines() if not line.startswith('MemAvailable:'))) - self.assertEqual([], self.run_policy('dd_client_pressure')) - - def test_swap_reserve_includes_the_clients_resident_memory(self): - self.memory(swap_free=1536) - self.assertEqual(['no'], self.run_policy(''' -dd_client_pressure -if dd_client_can_pageout; then echo yes; else echo no; fi -''')) - - def test_client_swap_budget_excludes_file_backed_memory(self): - self.memory(swap_free=1536) - self.assertEqual(['send:1:client'], self.run_policy(''' -rss=$((2048 * 1024)) anon=$((256 * 1024)) -dd_client_pressure -''')) - - def test_without_swap_automatic_pageout_is_disabled(self): - self.memory(swap_total=0, swap_free=0) - self.assertEqual([], self.run_policy('dd_client_pressure')) - - def test_recent_periodic_pageout_prevents_an_immediate_pressure_repeat(self): - self.assertEqual([], self.run_policy('_dd_packed=$SECONDS; dd_client_pressure')) - - def test_ineffective_reclaim_backs_off_and_success_resets_it(self): - self.assertEqual(['send:1:client', 'backoff:60', 'send:1:client', 'backoff:30'], self.run_policy(''' -reclaimed=0 -SECONDS=0; dd_client_pressure -echo "backoff:$_dd_pressure_backoff" -SECONDS=30; dd_client_pressure -reclaimed=$((128 * 1024)) -SECONDS=60; dd_client_pressure -echo "backoff:$_dd_pressure_backoff" -''')) - - def test_readback_requires_room_for_the_swapped_client_plus_headroom(self): - self.memory(available=2048) - self.assertEqual(['yes', 'no'], self.run_policy(''' -if dd_client_can_readback; then echo yes; else echo no; fi -client_swap=$((1024 * 1024)) -if dd_client_can_readback; then echo yes; else echo no; fi -''')) - - def test_unfinished_pageout_does_not_increase_the_ineffective_reclaim_backoff(self): - self.assertEqual(['send:1:client', 'backoff:30'], self.run_policy(''' -reclaimed=0 pageout_complete=0 -SECONDS=0; dd_client_pressure -echo "backoff:$_dd_pressure_backoff" -''')) - - def test_pageout_completion_requires_a_finished_ack_from_every_live_target(self): - proc = self.root / 'proc' - proc.mkdir() - for pid in (123, 456): - (proc / str(pid)).mkdir() - source = function_source('dd_zram_wait').replace('/proc/', str(proc) + '/') - source = source.replace('/tmp/.dd-zram.ack.', str(self.root / 'ack.')) - for pending in ('done', 'running', 'not_started'): - with self.subTest(pending=pending): - (self.root / 'ack.123').write_text('1') - if pending != 'not_started': - (self.root / 'ack.456').write_text('1' if pending == 'done' else '') - result = run_bash('nap() { SECONDS=$((SECONDS + 1)); }\n' + source + - '\nSECONDS=0; dd_zram_wait 123 456; echo "$_dd_pageout_complete"') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('1' if pending == 'done' else '0', result.stdout.strip()) - - def test_pressure_prevents_prefetch_even_if_the_client_would_fit(self): - self.memory(available=2048, psi='2.00') - self.assertEqual(['no'], self.run_policy('if dd_client_can_readback; then echo yes; else echo no; fi')) - - -class SessionPressureTest(unittest.TestCase): - def setUp(self): - self.directory = tempfile.TemporaryDirectory() - self.addCleanup(self.directory.cleanup) - self.root = Path(self.directory.name) - self.memory() - - def memory(self, available=1024, swap_free=6144, total=7168, swap_total=8192, psi='0.00'): - (self.root / 'meminfo').write_text( - f'MemTotal: {total * 1024} kB\nMemAvailable: {available * 1024} kB\n' - f'SwapTotal: {swap_total * 1024} kB\nSwapFree: {swap_free * 1024} kB\n') - (self.root / 'pressure').write_text(f'some avg10={psi} avg60=0.00 avg300=0.00 total=1234\n') - - def run_policy(self, body): - functions = '\n'.join(function_source(name) for name in ( - 'dd_memory_read', 'dd_memory_tight', 'dd_memory_critical', - 'dd_client_can_pageout', 'dd_client_pressure', 'dd_client_pressure_result', - 'dd_session_pressure', 'dd_zram_has_room', 'dd_watch_nap', 'dd_zram_pick', 'dd_tier_note', 'dd_tier_readback')) - functions = functions.replace('/proc/meminfo', str(self.root / 'meminfo')) - functions = functions.replace('/proc/pressure/memory', str(self.root / 'pressure')) - harness = ''' -set -u -_dd_game=1 _dd_tier_at=-1 _dd_tier_backoff=30 _dd_tier_pushed=0 _dd_tier_back=0 _dd_tier_targets=() _dd_tier_swaps=() _dd_tier_starts=() _dd_pids=(999) -_dd_pressure_at=-1 _dd_pressure_backoff=30 _dd_packed=-1 -rss=$((1536 * 1024)) swap=0 pushed=$((1024 * 1024)) alive="999 321 654" started=100 complete=1 -step() { :; } -meminfo=''' + repr(str(self.root / 'meminfo')) + ''' -dd_game_focused() { [ "${focused:-1}" = 1 ]; } -dd_proc_start() { _dd_start=; case " $alive " in *" $1 "*) _dd_start=$started; return 0 ;; esac; return 1; } -nap() { echo "nap:$1"; } -dd_session_others() { _dd_session=(321 654); } -dd_zram_usage() { _dd_rss=$rss _dd_anon=${anon:-$rss} _dd_swap=$swap; } -dd_zram_send() { echo "send:$1:$3"; rss=$((rss - pushed)); swap=$((swap + pushed)); next_available=${available_after:-$(( $(awk '/^MemAvailable:/ { print $2 }' "$meminfo") / 1024 + 128 ))}; sed -i "s/^MemAvailable:.*/MemAvailable: $((next_available * 1024)) kB/" "$meminfo"; _dd_pageout_complete=$complete; } -''' + functions + '\ndd_memory_read\n' + body - result = run_bash('NOW=0\n' + harness.replace('SECONDS', 'NOW')) - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - return result.stdout.splitlines() - - def test_low_headroom_compresses_the_game_session_at_most_every_30_seconds(self): - self.assertEqual(['send:1:session', 'send:1:session'], self.run_policy(''' -SECONDS=0; dd_session_pressure -SECONDS=10; dd_session_pressure -SECONDS=29; dd_session_pressure -SECONDS=30; dd_session_pressure -''')) - - def test_pressure_policy_is_independent_of_ram_size(self): - for total, expected in ((11264, ['send:1:session']), (12288, ['send:1:session']), (16384, ['send:1:session'])): - with self.subTest(total=total): - self.memory(total=total) - self.assertEqual(expected, self.run_policy('dd_session_pressure')) - - def test_large_device_with_real_headroom_does_not_reclaim(self): - self.memory(total=16384, available=5120, psi='12.34') - self.assertEqual([], self.run_policy('dd_session_pressure')) - - def test_large_device_with_psi_and_moderate_headroom_reclaims(self): - self.memory(total=16384, available=3072, psi='1.23') - self.assertEqual(['send:1:session'], self.run_policy('dd_session_pressure')) - - def test_a_fast_fall_on_a_large_device_reclaims_above_the_fixed_headroom(self): - self.memory(total=15255, available=6176) - falling = self.root / 'falling' - falling.write_text( - f'MemTotal: {15255 * 1024} kB\nMemAvailable: {5367 * 1024} kB\n' - f'SwapTotal: {8192 * 1024} kB\nSwapFree: {6144 * 1024} kB\n') - meminfo = self.root / 'meminfo' - self.assertEqual(['send:1:session'], self.run_policy( - f'cp {falling} {meminfo}\nSECONDS=5; dd_session_pressure')) - - def test_a_fall_split_across_one_second_polls_still_reclaims(self): - self.memory(total=15255, available=6300) - steps = [] - for second, available in ((5, 6100), (6, 6020), (7, 5940), (8, 5860), (9, 5780)): - sample = self.root / f'meminfo-{second}' - sample.write_text( - f'MemTotal: {15255 * 1024} kB\nMemAvailable: {available * 1024} kB\n' - f'SwapTotal: {8192 * 1024} kB\nSwapFree: {6144 * 1024} kB\n') - steps.append(f'cp {sample} {self.root / "meminfo"}; SECONDS={second}; dd_session_pressure') - self.assertEqual(['send:1:session'], self.run_policy('\n'.join(steps))) - - def test_no_game_does_not_compress_the_session(self): - self.assertEqual([], self.run_policy('_dd_game=0; dd_session_pressure')) - - def test_disabled_idle_compression_does_not_compress_the_session(self): - self.assertEqual(['send:1:client'], self.run_policy('DD_ZRAM_IDLE=0; dd_client_pressure; dd_session_pressure')) - - def test_disabled_idle_compression_signals_only_launcher_processes(self): - sender = (function_source('dd_zram_send') + '\n' + function_source('dd_zram_finish')).replace('/tmp/.dd-zram', str(self.root / 'control')) - self.assertEqual(['kill:-URG 999 998', 'mode:1'], self.run_policy(''' -_dd_pids=(999 998) -kill() { echo "kill:$*"; } -dd_zram_wait() { _dd_pageout_complete=1; } -dd_zram_scan() { :; } -''' + sender + ''' -DD_ZRAM_IDLE=0; dd_client_pressure; dd_session_pressure -echo "mode:$(cat ''' + str(self.root / 'control') + ''')" -''')) - - def test_disabled_idle_compression_reclaims_only_the_launcher_before_focus(self): - self.memory(available=1700) - self.assertEqual(['send:1:client'], self.run_policy(''' -DD_ZRAM_IDLE=0 focused=0 -dd_client_pressure -dd_session_pressure -''')) - - def test_disabled_idle_compression_respects_launcher_setting_and_threshold(self): - self.memory(available=1700) - self.assertEqual([], self.run_policy('DD_ZRAM_IDLE=0 DD_ZRAM_CLIENT=0; dd_client_pressure; dd_session_pressure')) - self.memory(available=1900) - self.assertEqual([], self.run_policy('DD_ZRAM_IDLE=0; dd_client_pressure; dd_session_pressure')) - - def test_game_reclaim_requires_focus(self): - self.assertEqual([], self.run_policy('focused=0; dd_session_pressure')) - - def test_game_reclaim_runs_when_focus_is_unknown(self): - launch = self.root / 'launch' - (launch / 'agent').mkdir(parents=True) - body = function_source('dd_game_focused') + f'\nDD_LAUNCH_DIR={launch} _dd_apps=7\n' - self.assertEqual(['send:1:session'], self.run_policy(body + 'dd_session_pressure')) - (launch / 'agent' / 'focus.json').write_text('{"focusedApp": 9}') - self.assertEqual([], self.run_policy(body + 'dd_session_pressure')) - self.assertEqual(['unfocused'], self.run_policy(body + 'dd_game_focused || echo unfocused')) - (launch / 'agent' / 'focus.json').unlink() - self.assertEqual(['unfocused'], self.run_policy(body + 'dd_game_focused || echo unfocused')) - - def test_launcher_pressure_remains_available_on_larger_devices(self): - self.memory(total=15360, available=1400) - self.assertEqual(['send:1:client'], self.run_policy('DD_ZRAM_IDLE=0; dd_client_pressure; dd_session_pressure')) - - def test_enough_available_memory_does_not_compress_even_with_stalls(self): - self.memory(available=3072, psi='5.00') - self.assertEqual([], self.run_policy('dd_session_pressure')) - - def test_stalls_with_moderate_headroom_compress_before_the_hard_limit(self): - self.memory(available=2048, psi='1.50') - self.assertEqual(['send:1:session'], self.run_policy('dd_session_pressure')) - - def test_moderate_headroom_without_stalls_waits(self): - self.memory(available=2048) - self.assertEqual([], self.run_policy('dd_session_pressure')) - - def test_same_second_memory_read_preserves_the_pressure_baseline(self): - self.memory(available=2048) - meminfo = self.root / 'meminfo' - self.assertEqual(['1048576:524288:2097152'], self.run_policy(f''' -SECONDS=100 -_dd_sample_at=100 _dd_sample_available=2097152 _dd_growth=0 _dd_fall=524288 -sed -i 's/MemAvailable: 2097152 kB/MemAvailable: 1048576 kB/' {meminfo} -dd_memory_read -echo "$_dd_available:$_dd_fall:$_dd_sample_available" -''')) - - def test_game_reading_back_most_of_a_pageout_skips_and_doubles_the_wait(self): - self.assertEqual(['send:1:session', 'backoff:60', 'send:1:session', 'backoff:60', - 'send:1:session', 'backoff:30'], self.run_policy(''' -pushed=$((512 * 1024)) -SECONDS=0; dd_session_pressure -swap=$((swap / 4)) -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -SECONDS=60; dd_session_pressure -SECONDS=90; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -SECONDS=150; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_repeated_read_back_keeps_doubling_up_to_five_minutes(self): - self.assertEqual(['backoff:300'], self.run_policy(''' -_dd_tier_backoff=240 _dd_tier_at=0 _dd_tier_targets=(999) _dd_tier_swaps=($((1024 * 1024))) _dd_tier_starts=(100) _dd_tier_pushed=$((1024 * 1024)) swap=0 -SECONDS=240; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_no_gain_pageout_doubles_the_tier_wait(self): - self.assertEqual(['send:1:session', 'backoff:60', 'send:1:session', 'backoff:120'], self.run_policy(''' -available_after=1024 -SECONDS=0; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -SECONDS=30; dd_session_pressure -SECONDS=60; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_meaningful_available_gain_keeps_the_tier_wait(self): - self.assertEqual(['send:1:session', 'backoff:30', 'send:1:session', 'backoff:30'], self.run_policy(''' -available_after=1300 -SECONDS=0; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -available_after=1600 -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_recovered_available_memory_resets_the_tier_wait(self): - self.assertEqual(['send:1:session', 'backoff:60', 'backoff:30', 'send:1:session'], self.run_policy(''' -available_after=1024 -SECONDS=0; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -available_after=2000 -sed -i "s/^MemAvailable:.*/MemAvailable: 2048000 kB/" "$meminfo" -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -available_after=1024 -sed -i "s/^MemAvailable:.*/MemAvailable: 1048576 kB/" "$meminfo" -SECONDS=60; dd_session_pressure -''')) - - def test_critical_memory_still_compresses_after_a_no_gain_pass(self): - self.memory(available=512) - self.assertEqual(['send:1:session', 'send:1:session'], self.run_policy(''' -available_after=512 -SECONDS=0; dd_session_pressure -SECONDS=30; dd_session_pressure -''')) - - def test_a_no_gain_pass_still_skips_memory_the_game_read_back(self): - self.memory(available=512) - self.assertEqual(['send:1:session'], self.run_policy(''' -available_after=512 -SECONDS=0; dd_session_pressure -swap=0 -SECONDS=30; dd_session_pressure -''')) - - def test_nearly_out_of_memory_ignores_the_backoff_but_keeps_30_seconds(self): - self.memory(available=512) - self.assertEqual(['send:1:session', 'send:1:session'], self.run_policy(''' -_dd_tier_backoff=300 -SECONDS=0; dd_session_pressure -SECONDS=20; dd_session_pressure -SECONDS=30; dd_session_pressure -''')) - - def test_nearly_out_of_memory_still_backs_off_when_the_game_reads_its_pageout_back(self): - self.memory(available=512) - self.assertEqual(['send:1:session', 'backoff:60', 'send:1:session'], self.run_policy(''' -SECONDS=0; dd_session_pressure -swap=0 -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -SECONDS=59; dd_session_pressure -SECONDS=60; dd_session_pressure -SECONDS=90; dd_session_pressure -''')) - - def test_nearly_out_of_memory_retries_a_skipped_pageout_after_30_seconds(self): - self.memory(available=512) - self.assertEqual(['send:1:session', 'send:1:session'], self.run_policy(''' -SECONDS=0; dd_session_pressure -swap=0 -SECONDS=30; dd_session_pressure -_dd_tier_backoff=300 -saved=$rss; rss=$((128 * 1024)) -SECONDS=330; dd_session_pressure -rss=$saved -SECONDS=359; dd_session_pressure -SECONDS=360; dd_session_pressure -''')) - - def test_small_swap_headroom_skips_the_pageout(self): - self.memory(swap_free=1536, swap_total=2048) - self.assertEqual([], self.run_policy('dd_session_pressure')) - - def test_file_backed_resident_memory_does_not_consume_the_swap_budget(self): - self.memory(swap_free=3088, swap_total=6144) - self.assertEqual(['send:1:session'], self.run_policy(''' -rss=$((4096 * 1024)) anon=$((1024 * 1024)) -dd_session_pressure -''')) - - def test_anonymous_memory_and_pending_client_still_need_the_full_swap_reserve(self): - self.memory(swap_free=3088, swap_total=6144) - self.assertEqual([], self.run_policy(''' -rss=$((4096 * 1024)) anon=$((2048 * 1024)) -dd_session_pressure -''')) - self.assertEqual([], self.run_policy(''' -rss=$((4096 * 1024)) anon=$((1536 * 1024)) _dd_client_reserve=$((512 * 1024)) -dd_session_pressure -''')) - - def test_small_session_is_left_alone(self): - self.assertEqual([], self.run_policy('rss=$((128 * 1024)); dd_session_pressure')) - - def test_watch_polls_every_second_near_the_limit_and_stops_when_critical(self): - self.memory(available=2560) - self.assertEqual(['nap:1', 'nap:1', 'nap:1', 'nap:1', 'nap:1'], self.run_policy('dd_watch_nap')) - self.memory(available=1024) - self.assertEqual(['nap:1'], self.run_policy('_dd_available=$((2560 * 1024)); dd_watch_nap')) - self.memory(available=4096) - self.assertEqual(['nap:5'], self.run_policy('dd_watch_nap')) - self.assertEqual(['nap:5'], self.run_policy('_dd_game=0; dd_watch_nap')) - - def test_session_push_preserves_client_timestamps(self): - self.assertEqual(['send:1:session', 'pids:321 654', 'client:-1:-1'], self.run_policy(''' -SECONDS=0; dd_session_pressure -dd_zram_pick session; echo "pids:${_pids[*]}" -echo "client:$_dd_pressure_at:$_dd_packed" -''')) - - def test_launcher_compression_turned_off_keeps_the_launcher_out(self): - self.assertEqual(['pids:321 654', 'client:-1:-1'], self.run_policy(''' -DD_ZRAM_CLIENT=0 -SECONDS=0; dd_session_pressure -dd_zram_pick session; echo "pids:${_pids[*]}" -echo "client:$_dd_pressure_at:$_dd_packed" -''')[1:]) - - def test_low_ram_devices_compress_with_a_quarter_of_memory_left(self): - self.memory(available=1700) - self.assertEqual(['send:1:session'], self.run_policy('dd_session_pressure')) - self.memory(available=1900) - self.assertEqual([], self.run_policy('dd_session_pressure')) - - - def test_a_compressed_process_that_exits_is_not_counted_as_read_back(self): - self.assertEqual(['send:1:session', 'send:1:session', 'backoff:30'], self.run_policy(''' -SECONDS=0; dd_session_pressure -alive=""; swap=0 -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_a_process_that_starts_after_a_pageout_is_not_in_its_read_back(self): - self.assertEqual(['send:1:session', 'targets:321 654', 'send:1:session', 'backoff:30'], self.run_policy(''' -SECONDS=0; dd_session_pressure -echo "targets:${_dd_tier_targets[*]}" -alive="999 1234" -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_read_back_wait_holds_above_the_critical_level(self): - self.assertEqual(['send:1:session', 't:60', 'send:1:session'], self.run_policy(''' -SECONDS=0; dd_session_pressure -swap=0 -SECONDS=30; dd_session_pressure -SECONDS=60; dd_session_pressure; echo t:60 -SECONDS=90; dd_session_pressure -''')) - - def test_a_no_gain_pageout_preserves_client_timestamps(self): - self.assertEqual(['send:1:session', 'backoff:60', 'client:-1:-1'], self.run_policy(''' -available_after=1024 -SECONDS=0; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -echo "client:$_dd_pressure_at:$_dd_packed" -''')) - - def test_an_incomplete_pageout_does_not_restart_the_launcher_wait(self): - self.assertEqual(['send:1:session', 'client:-1:-1'], self.run_policy(''' -complete=0 -SECONDS=0; dd_session_pressure -echo "client:$_dd_pressure_at:$_dd_packed" -''')) - - - def test_a_reused_process_id_is_not_counted_as_read_back(self): - self.assertEqual(['send:1:session', 'send:1:session', 'backoff:30'], self.run_policy(''' -SECONDS=0; dd_session_pressure -started=200; swap=0 -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_process_start_comes_from_stat_and_zombies_have_none(self): - stat = self.root / 'stat' - source = function_source('dd_proc_start').replace('/proc/$1/stat', str(stat)) - fields = ' '.join(['0'] * 17) - for state, expected in (('S', ['ok:4242']), ('Z', ['gone:'])): - with self.subTest(state=state): - stat.write_text(f'77 (Wow (arm64).exe) {state} 1 {fields} 4242 99 0\n') - result = run_bash(source + '\nif dd_proc_start 77; then echo "ok:$_dd_start"; else echo "gone:$_dd_start"; fi') - self.assertEqual(expected, result.stdout.split()) - stat.unlink() - result = run_bash(source + '\ndd_proc_start 77 || echo gone') - self.assertEqual(['gone'], result.stdout.split()) - - -class ReclaimDispatchTest(unittest.TestCase): - def run_cycle(self, client=1, game=1, anonymous=384, complete=1, reclaimed=128, body=None, available=1024, fall=0, tick=0): - with tempfile.TemporaryDirectory() as directory: - root = Path(directory) - (root / 'meminfo').write_text( - f'MemTotal: 7340032 kB\nMemAvailable: {available * 1024} kB\n' - 'SwapTotal: 6291456 kB\nSwapFree: 4194304 kB\n') - (root / 'pressure').write_text('some avg10=0.00 avg60=0.00 avg300=0.00 total=0\n') - names = ('dd_memory_read', 'dd_memory_tight', 'dd_memory_critical', - 'dd_zram_has_room', 'dd_client_can_pageout', 'dd_client_pressure', - 'dd_client_pressure_result', 'dd_client_pressure_finish', - 'dd_session_pressure', 'dd_zram_send', 'dd_zram_finish', 'dd_zram_pick') - source = '\n'.join(function_source(name) for name in names) - source = source.replace('/proc/meminfo', str(root / 'meminfo')) - source = source.replace('/proc/pressure/memory', str(root / 'pressure')) - source = source.replace('/tmp/.dd-zram', str(root / 'ctl')) - monitor = SCRIPT.read_text() - start = monitor.index(' _dd_preserved_growth=$_dd_growth', monitor.index('while kill -0 $$')) - stop = monitor.index(' _dd_focus=1\n', start) - cycle = monitor[start:stop] if body is None else body - script = f''' -set -u -DD_ZRAM_CLIENT={client} _dd_game={game} _dd_pids=(123) _dd_others=(321) -_dd_pressure_at=-1 _dd_pressure_backoff=30 _dd_packed=-1 -_dd_tier_at=-1 _dd_tier_backoff=30 _dd_tier_pushed=0 -_dd_client_reserve=0 client_rss=393216 client_anon={anonymous * 1024} -step() {{ :; }} -dd_session_others() {{ _dd_session=(321); }} -dd_zram_scan() {{ _dd_pids=(456); }} -nap() {{ echo "nap:$*:at:$NOW"; }} -dd_zram_usage() {{ - if [ "$1" = 123 ]; then - _dd_rss=$client_rss _dd_anon=$client_anon _dd_swap=0 - else - _dd_rss=3145728 _dd_anon=1572864 _dd_swap=0 - fi -}} -kill() {{ echo "signal:$*:at:$NOW"; NOW=$((NOW + {tick})); }} -dd_zram_wait() {{ - echo "wait:$*:at:$NOW" - NOW=$((NOW + 12)) - _dd_pageout_complete={complete} - [ "$1" != 123 ] || client_rss=$((client_rss - {reclaimed * 1024})) -}} -dd_tier_note() {{ :; }} -dd_game_focused() {{ :; }} -''' + source + f''' -dd_memory_read -_dd_fall={fall * 1024} -''' + cycle + ''' -echo "client:$_dd_pressure_backoff:${_dd_client_reserve:-0}:${_dd_client_pending:-0}" + def test_the_floor_follows_device_memory_within_limits(self): + body = ''.join(self.sample(total=total) + 'dd_memory_read; echo $((_dd_floor / 1024))\n' + for total in (3584, 7168, 15360)) + self.assertEqual(['640', '896', '1280'], self.run_policy(body)) + + def test_the_target_grows_with_how_fast_memory_is_falling(self): + body = (self.sample(available=3000) + 'dd_memory_read; echo $_dd_rate $((_dd_target / 1024))\n' + + self.sample(available=2800) + 'NOW=1; dd_memory_read; echo $((_dd_rate / 1024)) $((_dd_target / 1024))\n' + + 'NOW=2; dd_memory_read; echo $((_dd_rate / 1024)) $((_dd_target / 1024))\n' + + self.sample(available=3400) + 'NOW=3; dd_memory_read; echo $((_dd_rate / 1024))\n') + self.assertEqual(['0 896', '200 2896', '150 2396', '112'], self.run_policy(body)) + + def test_memory_the_monitor_freed_itself_does_not_hide_a_fall(self): + body = (self.sample(available=2000) + 'dd_memory_read\n_dd_freed=$((300 * 1024))\n' + + 'NOW=2; dd_memory_read; echo $((_dd_rate / 1024)) $_dd_freed\n') + self.assertEqual(['150 0'], self.run_policy(body)) + + def test_two_reads_in_the_same_second_keep_the_sample(self): + body = (self.sample(available=2000) + 'dd_memory_read\n_dd_freed=4096\n' + + self.sample(available=1000) + 'dd_memory_read; echo $_dd_rate $_dd_freed $_dd_sample_available\n') + self.assertEqual([f'0 4096 {2000 * MB}'], self.run_policy(body)) + + def test_stall_time_becomes_a_share_of_the_interval(self): + body = (self.sample(stall=1000) + 'dd_memory_read; echo $_dd_psi\n' + + self.sample(stall=41000) + 'NOW=2; dd_memory_read; echo $_dd_psi\n' + + 'NOW=3; dd_memory_read; echo $_dd_psi\n') + self.assertEqual(['0', '200', '0'], self.run_policy(body)) + + def test_room_counts_zram_only_and_keeps_a_reserve(self): + body = (self.sample(zram=(6144, 1024)) + 'dd_memory_read; echo $((_dd_swap_room / 1024))\n' + + self.sample(zram=(6144, 5632)) + 'dd_memory_read; echo $((_dd_swap_room / 1024))\n' + + self.sample(zram=(0, 0), other=(4096, 1024)) + 'dd_memory_read; echo $((_dd_swap_room / 1024))\n' + + self.sample(zram=(512, 0), other=(0, 0)) + 'dd_memory_read; echo $((_dd_swap_room / 1024))\n' + + self.sample(zram=(0, 0), other=(4096, 1024)) + f'rm {self.root}/swaps\n' + + 'dd_memory_read; echo $((_dd_swap_room / 1024))\n') + self.assertEqual(['4352', '-256', '-128', '384', '2560'], self.run_policy(body)) + + def test_memory_read_back_from_swap_is_remembered_for_half_a_minute(self): + body = '_dd_page_kb=4\n' + ''.join( + f'NOW={now}\n' + self.sample(swapped_in=total) + 'dd_memory_read; echo $((_dd_returned / 1024))\n' + for now, total in ((0, 500), (1, 800), (2, 800), (16, 800), (17, None), (18, 900), (19, 1000), (60, 1000))) + self.assertEqual(['0', '300', '290', '154', '149', '144', '239', '0'], self.run_policy(body)) + + def test_saving_comes_from_what_zram_really_stores(self): + body = ''.join(self.sample(stored=stored) + 'dd_memory_read; echo $_dd_saving\n' + for stored in (None, (32, 30), (1000, 250), (1000, 950), (1000, 20))) + self.assertEqual(['600', '600', '750', '167', '833'], self.run_policy(body)) + + def need(self, available, rate=0, psi=0): + return (self.sample(available=available) + + f'dd_memory_read; _dd_rate=$(({rate} * 1024)) _dd_psi={psi}\n' + '_dd_target=$((_dd_floor + _dd_rate * 10))\n' + 'dd_memory_need; echo $((_dd_need / 1024)) $((_dd_hard / 1024)) $_dd_force\n') + + def test_steady_memory_above_the_floor_needs_nothing(self): + self.assertEqual(['0 0 0'], self.run_policy(self.need(2000))) + + def test_memory_under_the_floor_must_be_freed(self): + self.assertEqual(['96 96 0'], self.run_policy(self.need(800))) + + def test_a_slow_fall_is_met_ten_seconds_ahead(self): + self.assertEqual(['196 0 0'], self.run_policy(self.need(1000, rate=30))) + + def test_a_fast_fall_is_matched_once_memory_is_under_two_fifths(self): + self.assertEqual(['0 0 0', '200 0 0', '0 0 0'], + self.run_policy(self.need(2500, rate=20) + self.need(2500, rate=100) + self.need(4000, rate=100))) + + def test_stalls_make_a_fall_urgent(self): + self.assertEqual(['200 0 0', '200 200 0', '0 0 0'], + self.run_policy(self.need(2500, rate=100) + self.need(2500, rate=100, psi=100) + + self.need(2000, psi=900))) + + def test_half_the_floor_forces(self): + self.assertEqual(['446 446 0', '456 456 1'], self.run_policy(self.need(450) + self.need(440))) + + RELIEVE = ''' +step() { echo "step:$*"; } +dd_session_others() { echo others; _dd_session=(70 80); } +dd_zram_trim() { echo "trim:$1:$(($2 / 1024)):${*:3}"; _dd_trimmed=${paged:-$2}; } +relieve() { dd_memory_read; _dd_returned=${returned:-0}; _dd_rate=$((${2:-0} * 1024)) _dd_target=$((_dd_floor + ${2:-0} * 10240)); dd_memory_relieve; } +_dd_pids=(10 20) _dd_game=1 _dd_focus=0 _dd_saving=500 ''' - result = run_bash('NOW=0\n' + script.replace('SECONDS', 'NOW')) - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - return result.stdout.splitlines() - def test_both_requests_are_sent_before_either_wait(self): - self.assertEqual(['signal:-URG 123:at:0', 'signal:-URG 321:at:0', - 'wait:321:at:0', 'wait:123:at:12', 'client:30:0:0'], self.run_cycle()) + def relieve(self, body): + return self.run_policy(self.RELIEVE + body, 'dd_memory_relieve', 'dd_memory_note') - def test_disabled_client_is_never_signalled_or_waited_for(self): - self.assertEqual(['signal:-URG 321:at:0', 'wait:321:at:0', 'client:30:0:0'], - self.run_cycle(client=0)) + def test_a_fall_trims_the_client_behind_a_game_by_what_zram_gives_back(self): + self.assertEqual(['trim:2:326:10 20', f'{196 * MB} {334506 * 600 // 1000} 334506'], self.relieve( + self.sample(available=1000) + 'relieve 1000 30; echo $_dd_need $_dd_freed $_dd_client_out\n')) - def test_no_game_requests_nothing(self): - self.assertEqual(['client:30:0:0'], self.run_cycle(game=0)) + def test_the_client_in_front_is_left_alone_until_memory_is_under_the_floor(self): + self.assertEqual(['trim:2:160:10 20'], self.relieve( + self.sample(available=1000) + '_dd_focus=1; relieve 1000 30\n' + + self.sample(available=800) + 'relieve 800\n')) - def test_a_client_with_no_anonymous_pages_still_finishes_its_request(self): - self.assertEqual(['signal:-URG 123:at:0', 'signal:-URG 321:at:0', - 'wait:321:at:0', 'wait:123:at:12', 'client:30:0:0'], - self.run_cycle(anonymous=0)) + def test_unknown_focus_still_trims_the_client(self): + self.assertEqual(['trim:2:326:10 20'], self.relieve(self.sample(available=1000) + '_dd_focus=2; relieve 1000 30\n')) - def test_falling_headroom_survives_a_tick_between_requests(self): - self.assertEqual(['signal:-URG 123:at:0', 'signal:-URG 321:at:1', - 'wait:321:at:2', 'wait:123:at:14', 'client:30:0:0'], - self.run_cycle(available=2304, fall=512, tick=1)) + def test_the_client_is_not_trimmed_right_after_it_was_read_back(self): + self.assertEqual(['trim:2:326:10 20'], self.relieve( + self.sample(available=1000) + 'NOW=100 _dd_back_at=80; relieve 1000 30\nNOW=110; relieve 1000 30\n')) - def test_deferred_ineffective_reclaim_still_doubles_the_backoff(self): - self.assertEqual('client:60:0:0', self.run_cycle(reclaimed=0)[-1]) + def test_without_a_game_only_the_floor_trims(self): + self.assertEqual(['trim:2:160:10 20'], self.relieve( + self.sample(available=1000) + '_dd_game=0 _dd_focus=1; relieve 1000 30\n' + + self.sample(available=800) + 'relieve 800\n')) - def test_deferred_incomplete_reclaim_does_not_double_the_backoff(self): - self.assertEqual('client:30:0:0', self.run_cycle(reclaimed=0, complete=0)[-1]) + def test_the_session_gives_what_the_client_could_not(self): + self.assertEqual(['trim:2:660:10 20', 'others', 'trim:2:256:70 80', 'trim:2:660:10 20', 'trim:2:256:70 80'], + self.relieve(self.sample(available=500) + f'paged={128 * MB}; relieve 500\nNOW=1; relieve 500\n')) - def test_explicit_combined_send_keeps_its_synchronous_wait(self): - self.assertEqual(['signal:-URG 321 123:at:0', 'wait:321 123:at:0', 'client:30:0:0'], - self.run_cycle(body='dd_zram_send 1 cap game\n')) - self.assertEqual(['signal:-URG 321:at:0', 'wait:321:at:0', 'client:30:0:0'], - self.run_cycle(client=0, body='dd_zram_send 1 cap game\n')) + def test_the_session_gets_what_the_client_left_of_the_pass(self): + self.assertEqual(['trim:3:1024:10 20', 'others', 'trim:3:24:70 80'], self.relieve( + self.sample(available=100) + f'paged={1000 * MB}; relieve 100\n')) - def test_readback_keeps_its_synchronous_delay(self): - self.assertEqual(['signal:-URG 123:at:0', 'nap:5:at:0', 'client:30:0:0'], - self.run_cycle(body='dd_zram_send 0 readback client\n')) + def test_memory_that_keeps_coming_back_is_taken_off_what_a_pass_may_move(self): + self.assertEqual(['trim:2:660:10 20', 'others', 'trim:2:156:70 80', 'trim:2:660:10 20', 'trim:2:24:10 20'], self.relieve( + self.sample(available=500) + f'paged={256 * MB}\nreturned={100 * MB}; relieve 500\n' + + f'NOW=1 returned={300 * MB}; relieve 500\nNOW=2 returned={1000 * MB}; relieve 500\n')) - def test_usage_sums_anonymous_rss_and_falls_back_per_process(self): - with tempfile.TemporaryDirectory() as directory: - root = Path(directory) - for pid, contents in ((123, 'VmRSS: 2000 kB\nRssAnon: 300 kB\nVmSwap: 100 kB\n'), - (321, 'VmRSS: 4000 kB\nVmSwap: 200 kB\n'), - (654, 'VmRSS: 1000 kB\nRssAnon: 0 kB\n')): - (root / str(pid)).mkdir() - (root / str(pid) / 'status').write_text(contents) - source = function_source('dd_zram_usage').replace('/proc/', str(root) + '/') - result = run_bash(source + '\ndd_zram_usage 123 321 654 > /dev/null; echo "$_dd_rss:$_dd_anon:$_dd_swap"') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('7000:4300:300', result.stdout.strip()) + def test_forcing_moves_memory_whatever_came_back(self): + self.assertEqual(['trim:3:993:10 20', 'others', 'trim:3:993:70 80'], self.relieve( + self.sample(available=300) + f'paged=0 returned={2048 * MB}; relieve 300\n')) + + def test_the_session_is_scanned_again_after_a_new_process_scan(self): + self.assertEqual(['others', 'others'], [line for line in self.relieve( + self.sample(available=500) + f'paged={256 * MB}; relieve 500\n_dd_scan_at=5; relieve 500\n') if line == 'others']) + + def test_forcing_ignores_heat_once_in_ten_seconds(self): + lines = self.relieve(self.sample(available=300) + 'paged=0\nrelieve 300\nNOW=5; relieve 300\nNOW=10; relieve 300\n') + self.assertEqual(['3', '3', '2', '2', '3', '3'], [line.split(':')[1] for line in lines if line.startswith('trim')]) + self.assertIn('trim:3:993:70 80', lines) + + def trims(self, body): + return [line.split(':')[2] for line in self.relieve(body) if line.startswith('trim') and line.endswith('10 20')] + + def test_passes_that_free_little_come_further_and_further_apart(self): + passes = ''.join(f'NOW={now}; relieve 500; echo at:{now}\n' for now in (0, 4, 5, 14, 15, 34, 35)) + lines = self.relieve(self.sample(available=500) + f'paged={8 * MB}\n' + passes) + self.assertEqual(['0', '5', '15', '35'], + [after.split(':')[1] for line, after in zip(lines, lines[1:] + ['']) if line == 'trim:2:256:70 80']) + + def test_the_wait_between_passes_stops_at_a_minute(self): + self.assertEqual(['60 195'], self.relieve( + self.sample(available=500) + f'paged={8 * MB}\nfor NOW in 0 5 15 35 75 135; do relieve 500; done > /dev/null\n' + 'echo $_dd_rest $_dd_rest_until\n')) + + def test_a_pass_that_frees_enough_is_followed_at_once(self): + self.assertEqual(['660', '660'], self.trims( + self.sample(available=500) + f'paged={128 * MB}; relieve 500\nNOW=1; relieve 500\n')) + + def test_memory_that_keeps_falling_ends_the_wait(self): + self.assertEqual(['326', '526'], self.trims( + self.sample(available=700) + f'paged={8 * MB}; relieve 700\nNOW=1; relieve 700\n' + + self.sample(available=600) + 'NOW=2; relieve 600\n' + self.sample(available=580) + 'NOW=3; relieve 580\n')) + + def test_forcing_does_not_wait(self): + self.assertEqual(['993', '993'], self.trims( + self.sample(available=300) + 'paged=0\nrelieve 300\nNOW=1; relieve 300\n')) + + def test_the_wait_is_forgotten_once_memory_is_back(self): + self.assertEqual(['660', '660'], self.trims( + self.sample(available=500) + f'paged={8 * MB}; relieve 500\n' + + self.sample(available=3000) + 'NOW=1; relieve 3000\n' + self.sample(available=500) + 'NOW=2; relieve 500\n')) + + def test_trims_stop_at_the_room_zram_has(self): + self.assertEqual(['trim:2:100:10 20', 'step:memory: available 800 MB and zRAM has no room left'], self.relieve( + self.sample(available=800, zram=(6144, 5276)) + 'relieve 800\n' + + self.sample(available=800, zram=(6144, 5400)) + 'relieve 800\nNOW=30; relieve 800\n')) + + def test_small_trims_are_not_logged(self): + self.assertEqual(['step:memory: available 1000 MB, falling 30 MB/s, compressed 20 MB of the client and 0 MB of the session'], + [line for line in self.relieve( + self.sample(available=1000) + f'paged={10 * MB}\nrelieve 1000 30; dd_memory_note\n' + 'NOW=1; relieve 1000 30; dd_memory_note\nNOW=2; dd_memory_note\n') + if line.startswith('step')]) + + TRIM = ''' +declare -A anon=() reply=() born=() +nap() { :; } +dd_pid_key() { _dd_key=$1.${born[$1]:-0}; } +dd_zram_usage() { _dd_anon=${anon[$1]}; } +kill() { + echo "signal:$2:$(< "$ROOT/ctl")" + case ${reply[$2]} in + deaf) ;; + gone) return 1 ;; + *) printf %s "${reply[$2]}" > "$ROOT/ctl.trim.$2" ;; + esac +} +''' + + def trim(self, body): + return self.run_policy(f'ROOT={self.root}\n' + self.TRIM + body + '\nls "$ROOT"; cat "$ROOT/ctl"', 'dd_memory_relieved', 'dd_zram_trim') + + def test_a_trim_spends_its_budget_across_processes_in_order(self): + self.assertEqual(['signal:10:2 100000', 'signal:20:2 60000', '100000', 'ctl', '2 0'], self.trim(''' +anon=([10]=500000 [20]=500000 [30]=500000) reply=([10]=40000 [20]=60000 [30]=1) +dd_zram_trim 2 100000 10 20 30 +echo $_dd_trimmed''')) + + def test_a_trim_skips_small_and_gone_processes_and_stops_when_little_is_left(self): + self.assertEqual(['signal:20:3 50000', 'signal:30:3 50000', 'signal:40:3 50000', '47000', 'ctl', '2 0'], self.trim(''' +anon=([10]=4096 [20]=500000 [30]=500000 [40]=500000 [50]=500000) reply=([20]=gone [30]=0 [40]=47000 [50]=1) +dd_zram_trim 3 50000 10 20 30 40 50 +echo $_dd_trimmed''')) + + def test_a_process_that_never_answers_is_left_alone_for_a_minute(self): + self.assertEqual(['signal:10:2 9000', 'signal:20:2 9000', '500', 'signal:20:2 9000', 'signal:10:2 9000', + 'signal:20:2 9000', 'ctl', '2 0'], self.trim(''' +anon=([10]=500000 [20]=500000) reply=([10]=deaf [20]=500) +dd_zram_trim 2 9000 10 20 +echo $_dd_trimmed +NOW=59 _dd_pass_at=59; dd_zram_trim 2 9000 10 20 +NOW=60 _dd_pass_at=60; dd_zram_trim 2 9000 10 20''')) + + def test_a_new_process_with_a_silent_ones_number_is_asked(self): + self.assertEqual(['signal:10:2 9000', 'signal:10:2 9000', '1', 'ctl', '2 0'], self.trim(''' +anon=([10]=500000) reply=([10]=deaf) +dd_zram_trim 2 9000 10 +NOW=5 _dd_pass_at=5; dd_zram_trim 2 9000 10 +born[10]=7 +dd_zram_trim 2 9000 10 +NOW=62 _dd_pass_at=62 anon=(); dd_zram_trim 2 9000 +echo ${#_dd_deaf[@]}''')) + + def test_one_pass_waits_five_seconds_in_all(self): + self.assertEqual(['signal:10:2 9000', 'signal:20:2 9000', 'ctl', '2 0'], self.trim(''' +anon=([10]=500000 [20]=500000 [30]=500000) reply=([10]=- [20]=deaf [30]=deaf) +_dd_polls=215 +dd_zram_trim 2 9000 10 +dd_zram_trim 2 9000 20 30''')) + + def test_one_pass_ends_six_seconds_after_it_began_however_slow_the_polls(self): + self.assertEqual(['signal:10:2 9000', '6', 'ctl', '2 0'], self.trim(''' +anon=([10]=500000 [20]=500000) reply=([10]=deaf [20]=500) +nap() { NOW=$((NOW + 1)); } +dd_zram_trim 2 9000 10 20 +echo $_dd_polls''')) + + def test_a_trim_stops_once_memory_is_back_where_it_should_be(self): + self.assertEqual(['signal:10:2 9000', '500', 'signal:10:2 9000', 'signal:20:2 8500', '1000', 'ctl', 'meminfo', '2 0'], + self.trim(''' +anon=([10]=500000 [20]=500000) reply=([10]=500 [20]=500) +available() { echo "MemAvailable: $1 kB" > "$ROOT/meminfo"; } +signal=$(declare -f kill) +eval "raw_${signal}" +kill() { raw_kill "$@"; available $((after)); } +available 800000 +_dd_goal=900000 after=900000 +dd_zram_trim 2 9000 10 20 +echo $_dd_trimmed +available 800000 +after=899999 +dd_zram_trim 2 9000 10 20 +echo $_dd_trimmed''')) + + def test_a_held_control_file_keeps_its_acknowledgements(self): + self.assertEqual(['signal:10:2 9000', 'ctl', 'ctl.hold', 'ctl.trim.10', '2 9000'], self.trim(''' +anon=([10]=500000) +kill() { echo "signal:$2:$(< "$ROOT/ctl")"; : > "$ROOT/ctl.hold"; printf 1 > "$ROOT/ctl.trim.$2"; } +dd_zram_trim 2 9000 10''')) + + def test_a_trim_leaves_the_acknowledgement_of_a_suspend_page_out_alone(self): + self.assertEqual(['signal:10:2 9000', 'ctl', 'ctl.ack.10', '2 0'], self.trim(''' +anon=([10]=500000) reply=([10]=9000) +: > "$ROOT/ctl.ack.10" +dd_zram_trim 2 9000 10''')) + + READBACK = ''' +step() { echo "step:$*"; } +kill() { echo "signal:$*:$(< "$ROOT/ctl")"; } +dd_zram_usage() { _dd_swap=$((swap * 1024)); } +back() { dd_memory_read; _dd_rate=0 _dd_target=$_dd_floor; dd_client_readback; } +_dd_pids=(10 20) _dd_game=0 _dd_client_out=4096 _dd_trim_at=0 swap=400 NOW=30 +''' + + def readback(self, body): + return self.run_policy(f'ROOT={self.root}\n' + self.READBACK + body, 'dd_client_readback') + + def test_the_client_is_read_back_once_memory_can_hold_it_with_a_floor_to_spare(self): + self.assertEqual(['step:memory: available 2192 MB, reading 400 MB of the client back', 'signal:-URG 10 20:0', + f'0 {-400 * MB * 600 // 1000} 30'], self.readback( + self.sample(available=2191) + 'back\n' + self.sample(available=2192) + 'back\n' + + 'echo $_dd_client_out $_dd_freed $_dd_back_at\nback\n')) + + def test_nothing_is_read_back_right_after_a_trim(self): + self.assertEqual([], self.readback(self.sample(available=4000) + 'NOW=29; back\n')) + + def test_a_running_game_keeps_the_client_compressed_until_the_client_is_in_front(self): + self.assertEqual(['signal:-URG 10 20:0'], [line for line in self.readback( + self.sample(available=4000) + '_dd_game=1\nback\n_dd_away=27; back\n_dd_away=25; back\n') + if line.startswith('signal')]) + + def test_a_client_the_kernel_already_brought_back_needs_no_request(self): + self.assertEqual(['0'], self.readback(self.sample(available=4000) + 'swap=8; back; echo $_dd_client_out\n')) if __name__ == '__main__': diff --git a/tools/tests/test_zram_preload.py b/tools/tests/test_zram_preload.py index 8e4af1aa2..bf1e8391c 100644 --- a/tools/tests/test_zram_preload.py +++ b/tools/tests/test_zram_preload.py @@ -60,6 +60,19 @@ static long status(const char *key) { return v; } +static long resident(char *start, size_t size) { + long page = sysconf(_SC_PAGESIZE), kb = 0; + int fd = open("/proc/self/pagemap", O_RDONLY); + if (fd < 0) exit(8); + for (size_t i = 0; i < size; i += page) { + uint64_t entry; + if (pread(fd, &entry, sizeof(entry), ((uintptr_t)start + i) / page * sizeof(entry)) != sizeof(entry)) exit(8); + if (entry >> 63) kb += page / 1024; + } + close(fd); + return kb; +} + static void send_request(char mode) { int fd = open(ctl, O_WRONLY | O_TRUNC); if (fd < 0 || write(fd, &mode, 1) != 1) exit(3); @@ -91,6 +104,25 @@ static void request(char mode) { usleep(1000000); } +static long trim(char mode, long kb) { + char ack[256], text[32]; + snprintf(ack, sizeof(ack), "%s.trim.%d", ctl, getpid()); + unlink(ack); + FILE *f = fopen(ctl, "w"); + if (!f) exit(3); + fprintf(f, "%c %ld\n", mode, kb); + fclose(f); + kill(getpid(), SIGURG); + for (int i = 0; i < 1200; i++) { + f = fopen(ack, "r"); + char *line = f ? fgets(text, sizeof(text), f) : NULL; + if (f) fclose(f); + if (line) return atol(text); + usleep(10000); + } + exit(5); +} + static uint64_t sum(const unsigned char *p, size_t n) { uint64_t s = 0; for (size_t i = 0; i < n; i += 64) s = s * 31 + p[i]; @@ -167,6 +199,80 @@ int main(int argc, char **argv) { int status_code; waitpid(child, &status_code, 0); printf("childack %d\n", WIFEXITED(status_code) && WEXITSTATUS(status_code) == 0); + } else if (!strcmp(argv[4], "trim")) { + stop = 1; + for (int i = 0; i < 2; i++) pthread_join(t[i], NULL); + printf("first %ld\n", trim('2', 8192)); + printf("second %ld\n", trim('2', 8192)); + printf("swapped %ld\n", status("VmSwap:")); + printf("rest %ld\n", trim('2', 1L << 30)); + printf("touched %d\n", sum(shared, size) != 0); + printf("hot %ld\n", trim('2', 1L << 30)); + printf("forced %ld\n", trim('3', 1L << 30)); + request('0'); + printf("again %ld\n", trim('2', 1L << 30)); + printf("intact %d\n", sum(data, size) == before); + return 0; + } else if (!strcmp(argv[4], "trim-small")) { + stop = 1; + for (int i = 0; i < 2; i++) pthread_join(t[i], NULL); + long total = 0, largest = 0; + for (int i = 0; i < 112; i++) { + long step = trim('2', 512); + total += step; + if (step > largest) largest = step; + } + printf("small %ld\n", total); + printf("largest %ld\n", largest); + return 0; + } else if (!strcmp(argv[4], "trim-sparse")) { + stop = 1; + for (int i = 0; i < 2; i++) pthread_join(t[i], NULL); + size_t wide = 32UL << 20; + char *thin = mmap(NULL, wide, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + if (thin == MAP_FAILED) exit(7); + for (size_t i = 0; i < wide; i += 2 * page) thin[i] = 1; + printf("sparse %ld\n", resident(thin, wide)); + for (int i = 0; i < 240; i++) trim('2', 512); + printf("kept %ld\n", resident(thin, wide)); + return 0; + } else if (!strcmp(argv[4], "hold")) { + stop = 1; + for (int i = 0; i < 2; i++) pthread_join(t[i], NULL); + char hold[256]; + snprintf(hold, sizeof(hold), "%s.hold", ctl); + FILE *f = fopen(hold, "w"); + if (!f) exit(3); + fclose(f); + printf("empty %ld\n", trim('2', 512)); + f = fopen(hold, "w"); + if (!f) exit(3); + fputs("1", f); + fclose(f); + f = fopen(ctl, "w"); + if (!f) exit(3); + fputs("2 512\n", f); + fclose(f); + kill(getpid(), SIGURG); + wait_ack(); + printf("held %ld\n", status("VmSwap:")); + unlink(hold); + return 0; + } else if (!strcmp(argv[4], "trim-fork")) { + stop = 1; + for (int i = 0; i < 2; i++) pthread_join(t[i], NULL); + fflush(stdout); + pid_t child = fork(); + if (child < 0) exit(6); + if (child == 0) { + for (size_t i = 0; i < size; i += page) data[i]++; + printf("inline_trim %ld\n", trim('2', 1L << 30)); + fflush(stdout); + _exit(0); + } + waitpid(child, NULL, 0); + printf("worker_trim %ld\n", trim('2', 1L << 30)); + return 0; } else if (!strcmp(argv[4], "burst")) { send_request('0'); usleep(10000); @@ -280,8 +386,9 @@ class ZramPreloadTest(unittest.TestCase): def setUp(self): self.ctl.write_text("0") - for ack in self.dir.glob("ctl.ack.*"): + for ack in [*self.dir.glob("ctl.ack.*"), *self.dir.glob("ctl.trim.*")]: ack.unlink() + (self.dir / "ctl.hold").unlink(missing_ok=True) def run_program(self, program=None, mb=48, cycles=1, *extra): environment = dict(os.environ, LD_PRELOAD=str(self.lib)) @@ -347,7 +454,9 @@ class ZramPreloadTest(unittest.TestCase): os.kill(process.pid, signal.SIGURG) os.kill(process.pid, signal.SIGUSR1) self.assertEqual(f"received {_ + 1}", process.stdout.readline().strip()) - output, _ = process.communicate(timeout=10) + process.stdin.close() + process.wait(timeout=10) + output = process.stdout.read() values = dict(line.split() for line in output.splitlines()) self.assertNotEqual(0, int(values["urg"])) self.assertNotEqual(0, int(values["usr"])) @@ -388,6 +497,50 @@ class ZramPreloadTest(unittest.TestCase): out = self.run_program(None, 48, 0, "fork") self.assertEqual([1], out["childack"]) + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_trim_stops_at_its_budget_and_continues_where_it_stopped(self): + out = self.run_program(None, 32, 0, "trim") + self.assertTrue(7168 < out["first"][0] <= 8192, out) + self.assertTrue(7168 < out["second"][0] <= 8192, out) + self.assertGreater(out["swapped"][0], 15 * 1024) + self.assertGreater(out["rest"][0], 40 * 1024) + self.assertEqual([1], out["intact"]) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_trim_leaves_memory_that_came_straight_back(self): + out = self.run_program(None, 32, 0, "trim") + self.assertLess(out["hot"][0], 4 * 1024, out) + self.assertGreater(out["forced"][0], 28 * 1024, out) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_requested_read_back_does_not_count_as_heat(self): + out = self.run_program(None, 32, 0, "trim") + self.assertTrue(28 * 1024 < out["again"][0] < 40 * 1024, out) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_budgets_smaller_than_a_chunk_still_reach_all_of_it(self): + out = self.run_program(None, 32, 0, "trim-small") + self.assertLessEqual(out["largest"][0], 512) + self.assertGreater(out["small"][0], 52 * 1024) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_small_budgets_reach_the_end_of_a_thinly_used_chunk(self): + out = self.run_program(None, 8, 0, "trim-sparse") + self.assertEqual([16 * 1024], out["sparse"]) + self.assertLess(out["kept"][0], 1024, out) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_a_request_in_the_hold_file_wins_over_the_control_file(self): + out = self.run_program(None, 32, 0, "hold") + self.assertTrue(0 < out["empty"][0] <= 512, out) + self.assertGreater(out["held"][0], 40 * 1024, out) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_process_without_a_worker_trims_in_small_steps(self): + out = self.run_program(None, 48, 0, "trim-fork") + self.assertTrue(16 * 1024 < out["inline_trim"][0] <= 32 * 1024, out) + self.assertGreater(out["worker_trim"][0], 64 * 1024, out) + def test_worker_acknowledges_back_to_back_requests(self): out = self.run_program(None, 48, 0, "burst") self.assertEqual([1], out["burstack"]) From f180d98da79e5772083aba889838918a5d53f57c Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 22:13:49 -0500 Subject: [PATCH 03/31] Ubisoft: show art for owned games the profile list leaves out (#2865) Games Connect owns but the GraphQL game list does not name were added with no image. Take their art from the product configuration's background_image and thumb_image, following localisation keys, from Ubisoft's launcher asset CDN. --- .../launcher/stores/ubisoft/UbisoftBackend.kt | 32 ++++++++++++++++--- .../launcher/stores/ubisoft/UbisoftTest.kt | 17 ++++++++++ 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt index ba3053ef7..35fd96ed9 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt @@ -168,14 +168,14 @@ object UbisoftLibrary { internal fun assemble(listed: List, owned: JSONObject?): List { val known = owned?.optJSONArray("games") != null && owned.optString("error").isEmpty() val bySpace = ownedBySpace(owned) - val matched = listed.map { g -> bySpace[g.id]?.let { g.copy(extra = g.extra + download(it)) } ?: g } + val matched = listed.map { g -> bySpace[g.id]?.let { withArt(g.copy(extra = g.extra + download(it)), it) } ?: g } .filter { !known || it.extra["productId"] != null } .let { games -> games.filter { g -> g.extra["productId"] == null || games.first { it.extra["productId"] == g.extra["productId"] } === g } } .let { games -> games.filter { g -> g.extra["productId"] != null || games.none { it !== g && it.title == g.title && it.extra["productId"] != null } } } val products = matched.mapNotNull { it.extra["productId"] }.toSet() val unlisted = bySpace.filterKeys { space -> listed.none { it.id == space } }.filterValues { it.optLong("productId").toString() !in products }.mapNotNull { (space, o) -> val title = title(o.optString("configuration")) ?: return@mapNotNull null - CatalogItem(Store.UBISOFT, space, title, null, owned = true, extra = mapOf("spaceId" to space) + download(o)) + withArt(CatalogItem(Store.UBISOFT, space, title, null, owned = true, extra = mapOf("spaceId" to space) + download(o)), o) } return (matched + unlisted).sortedBy { it.title.lowercase() } } @@ -184,12 +184,36 @@ object UbisoftLibrary { private val NAME = Regex("""^\s{1,4}name:\s*['"]?(.+?)['"]?\s*$""", RegexOption.MULTILINE) + /** The default text of a localisation key such as `l1` or `THUMBIMAGE`. */ + private fun localized(configuration: String, key: String): String? { + if (!Regex("""\w+""").matches(key)) return null + val local = configuration.indexOf("localizations:").takeIf { it >= 0 } ?: return null + return Regex("""^\s+${key}:\s*['"]?(.+?)['"]?\s*$""", RegexOption.MULTILINE).find(configuration, local)?.groupValues?.get(1)?.trim() + } + /** The product's name from its configuration, following a localisation key such as `l1` to its default text. */ internal fun title(configuration: String): String? { val raw = NAME.find(configuration)?.groupValues?.get(1)?.trim()?.takeIf { it.isNotEmpty() } ?: return null if (!Regex("""l\d+""").matches(raw)) return raw - val local = configuration.indexOf("localizations:").takeIf { it >= 0 } ?: return raw - return Regex("""^\s+${raw}:\s*['"]?(.+?)['"]?\s*$""", RegexOption.MULTILINE).find(configuration, local)?.groupValues?.get(1)?.trim() ?: raw + return localized(configuration, raw) ?: raw + } + + private const val ASSETS = "https://static3.cdn.ubi.com/orbit/uplay_launcher_3_0/assets/" + private val ASSET = Regex("""[\w.-]+\.(?:jpe?g|png)""", RegexOption.IGNORE_CASE) + + /** The URL of an image the configuration's `root` names, such as `thumb_image`, following a localisation key to its file. */ + internal fun image(configuration: String, key: String): String? { + val raw = Regex("""^ {1,2}${key}:[ \t]*['"]?([^'"\r\n]+?)['"]?[ \t]*$""", RegexOption.MULTILINE).find(configuration)?.groupValues?.get(1)?.trim() ?: return null + val file = raw.takeIf { ASSET.matches(it) } ?: localized(configuration, raw)?.takeIf { ASSET.matches(it) } ?: return null + return ASSETS + file + } + + /** Art the profile's game list lacks, from the product's configuration: games Connect owns but the list leaves out have none. */ + private fun withArt(g: CatalogItem, owned: JSONObject): CatalogItem { + if (g.imageUrl != null && g.tallImageUrl != null) return g + val configuration = owned.optString("configuration") + val thumb = image(configuration, "thumb_image") + return g.copy(imageUrl = g.imageUrl ?: image(configuration, "background_image") ?: thumb, tallImageUrl = g.tallImageUrl ?: thumb) } /** The first launch path under `start_game` in a product's configuration. */ diff --git a/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt index b0aea6866..75e2df58c 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt @@ -40,6 +40,23 @@ class UbisoftTest { assertEquals("Steam", UbisoftLibrary.thirdParty(steamConfig)) } + @Test fun gamesTheProfileLeavesOutTakeTheirArtFromTheConfiguration() { + val config = "version: 2.0\r\nroot:\r\n name: l1\r\n thumb_image: THUMBIMAGE\r\n background_image: 'b4c1.jpg'\r\n" + + " installer:\r\n thumb_image: nested.jpg\r\nlocalizations:\r\n default:\r\n l1: \"Assassin's Creed\u2122\"\r\n THUMBIMAGE: a3a6.jpg\r\n" + val owned = JSONObject().put("games", JSONArray() + .put(JSONObject().put("productId", 109).put("spaceId", "space-sc").put("productType", 0).put("owned", true).put("manifest", "AB").put("configuration", config)) + .put(JSONObject().put("productId", 82).put("spaceId", "space-ac").put("productType", 0).put("owned", true).put("manifest", "CD").put("configuration", config))) + val art = CatalogItem(Store.UBISOFT, "space-sc", "Splinter Cell", "https://x/wide.jpg", tallImageUrl = "https://x/tall.jpg", owned = true, extra = mapOf("spaceId" to "space-sc")) + val games = UbisoftLibrary.assemble(listOf(art), owned) + val assets = "https://static3.cdn.ubi.com/orbit/uplay_launcher_3_0/assets/" + val unlisted = games.first { it.id == "space-ac" } + assertEquals("Assassin's Creed\u2122", unlisted.title) + assertEquals(assets + "b4c1.jpg", unlisted.imageUrl) + assertEquals(assets + "a3a6.jpg", unlisted.tallImageUrl) + assertEquals("https://x/wide.jpg", games.first { it.id == "space-sc" }.imageUrl) + assertNull(UbisoftLibrary.image("root:\n thumb_image: THUMBIMAGE\n", "thumb_image")) + } + @Test fun withoutAnOwnershipAnswerTheProfileListStays() { val profile = listOf(listed("space-sc", "Splinter Cell"), listed("space-gone", "Free Weekend")) assertEquals(listOf("space-gone", "space-sc"), UbisoftLibrary.assemble(profile, JSONObject().put("error", "demux closed")).map { it.id }) From c35da09d1a4957d9c42d5b0f14352b93c3018dae Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 18 Nov 2026 23:26:45 -0500 Subject: [PATCH 04/31] feat(proton): offer DroidDeck-Proton test builds in Components (#2831) Components > Proton offers a DroidDeck-Proton pre-release that is ahead of Stable through the existing channel toggle. Automatic installs and updates stay on Stable. --- .../droiddeck/launcher/FrontEndActivity.kt | 1 + .../java/com/droiddeck/launcher/ProtonMenu.kt | 10 +- .../launcher/session/ProtonExtras.kt | 117 +++++++++++----- .../droiddeck/launcher/ui/ComponentsPage.kt | 55 +++++--- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-b+es+419/strings.xml | 1 + app/src/main/res/values-bg/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-hi/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values-ms/strings.xml | 1 + app/src/main/res/values-nb/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rPT/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ro/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-th/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-vi/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + .../droiddeck/launcher/CompatLaunchTest.kt | 2 +- .../droiddeck/launcher/ProtonMenuAutoTest.kt | 24 ++-- .../launcher/session/ProtonExtrasTest.kt | 131 ++++++++++++++++++ 40 files changed, 297 insertions(+), 76 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 56787a714..37e92c04b 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -2431,6 +2431,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet ), protonActions = com.droiddeck.launcher.ui.ProtonsActions( onInstall = { id -> protons.installProton(id) }, + onInstallTest = { id -> protons.installProton(id, test = true) }, onCancel = { id -> ProtonExtras.tools.firstOrNull { it.id == id }?.let { ProtonExtras.unqueue(this, it) }; protons.refreshProtons() }, onRemove = { id, dir -> protons.removeProton(id, dir) }, onRemoveOlder = { id -> protons.removeProton(id, older = true) }, diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt index c8fe30c9e..22d7b2ec0 100644 --- a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt @@ -34,10 +34,10 @@ internal class ProtonMenu( var protonPercent by Operation.percent var protonProblem by Operation.problem private val checking = java.util.concurrent.atomic.AtomicBoolean(false) - @VisibleForTesting internal var installer: (ProtonExtras.Tool, (String, Int) -> Unit) -> String? = - { tool, progress -> ProtonExtras.install(activity, tool, progress) } + @VisibleForTesting internal var installer: (ProtonExtras.Tool, Boolean, (String, Int) -> Unit) -> String? = + { tool, test, progress -> ProtonExtras.install(activity, tool, test, progress) } - fun installProton(id: String, automatic: Boolean = false) { + fun installProton(id: String, automatic: Boolean = false, test: Boolean = false) { val tool = ProtonExtras.tools.firstOrNull { it.id == id } ?: return if (protonBusyId != null || ProtonExtras.installInProgress || SessionState.running) return ProtonExtras.unqueue(activity, tool) @@ -47,7 +47,7 @@ internal class ProtonMenu( protonPercent = -1 Thread({ val problem = runCatching { - installer(tool) { label, value -> + installer(tool, test) { label, value -> ui.post { protonStage = label; protonPercent = value } } }.getOrElse { it.message ?: it.javaClass.simpleName } @@ -89,7 +89,7 @@ internal class ProtonMenu( fun refreshProtons() { protonRows = ProtonExtras.tools.map { val all = ProtonExtras.installedAll(activity, it) - ProtonRow(it.id, it.name, all.lastOrNull(), ProtonExtras.queued(activity, it), all, ProtonExtras.update(activity, it)) + ProtonRow(it.id, it.name, all.lastOrNull(), ProtonExtras.queued(activity, it), all, ProtonExtras.update(activity, it), ProtonExtras.testBuild(activity, it)) } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt index b27326969..63307c159 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt @@ -9,13 +9,15 @@ import com.droiddeck.launcher.core.Downloader import com.droiddeck.launcher.core.FileUtils import com.droiddeck.launcher.runtime.LinuxRuntime import java.io.File +import java.util.Locale import org.json.JSONArray import org.json.JSONObject object ProtonExtras { private const val TAG = "ProtonExtras" private const val NEED_BYTES = 4L * 1024 * 1024 * 1024 - private const val RELEASES = "https://api.github.com/repos/%s/releases?per_page=15" + private const val RELEASES = "https://api.github.com/repos/%s/releases?per_page=15&page=%d" + private const val RELEASE_PAGES = 5 const val CHECK_EVERY_MS = 60L * 60 * 1000 @Volatile var installInProgress = false @@ -104,6 +106,12 @@ object ProtonExtras { fun cachedLatest(context: Context, tool: Tool): String? = readJson(latestFile(context)).optJSONObject(tool.id)?.optString("tag")?.ifEmpty { null } + fun testBuild(context: Context, tool: Tool): String? = + testFor(installedTags(context, tool), readJson(latestFile(context)).optJSONObject(tool.id)?.optString("test")?.ifEmpty { null }) + + internal fun testFor(installed: List, test: String?): String? = + test?.takeIf { it !in installed && (installed.isEmpty() || updateFor(installed, it) != null) } + private val checkLock = Any() private const val RETRY_MS = 15L * 60 * 1000 private const val USER_SETTINGS = "user_settings.py" @@ -120,22 +128,27 @@ object ProtonExtras { if (due.isEmpty() || !force && (now - lastAttempt) in 0 until RETRY_MS) return false lastAttempt = now for (tool in due) { - val tag = findLatestAsset(tool)?.tag ?: continue - cache.put(tool.id, JSONObject().put("tag", tag).put("at", now)) + updateLatest(cache, tool, releases(tool), now) } runCatching { file.writeText(cache.toString()) } return true } } - private fun record(context: Context, tool: Tool, dir: String?, tag: String) { + internal fun recordLatest(latest: JSONObject, tool: Tool, tag: String, test: Boolean, now: Long): Boolean { + if (test) return false + val entry = latest.optJSONObject(tool.id) + val known = entry?.optString("tag") + if (!known.isNullOrEmpty() && compareVersions(tag, known) < 0) return false + val ahead = entry?.optString("test")?.takeIf { it.isNotEmpty() && compareVersions(it, tag) > 0 } + latest.put(tool.id, JSONObject().put("tag", tag).put("at", now).putOpt("test", ahead)) + return true + } + + private fun record(context: Context, tool: Tool, dir: String?, tag: String, test: Boolean) { runCatching { val latest = readJson(latestFile(context)) - val known = latest.optJSONObject(tool.id)?.optString("tag") - if (known.isNullOrEmpty() || compareVersions(tag, known) >= 0) { - latest.put(tool.id, JSONObject().put("tag", tag).put("at", System.currentTimeMillis())) - latestFile(context).writeText(latest.toString()) - } + if (recordLatest(latest, tool, tag, test, System.currentTimeMillis())) latestFile(context).writeText(latest.toString()) if (dir != null) { val releases = readJson(releasesFile(context)) val present = toolsDir(context).list()?.toSet() ?: emptySet() @@ -208,17 +221,17 @@ object ProtonExtras { } @Synchronized - fun install(context: Context, tool: Tool, onProgress: (String, Int) -> Unit): String? { + fun install(context: Context, tool: Tool, test: Boolean = false, onProgress: (String, Int) -> Unit): String? { if (installInProgress) return context.getString(R.string.pextra_busy) installInProgress = true - return try { installNow(context, tool, onProgress) } finally { installInProgress = false } + return try { installNow(context, tool, test, onProgress) } finally { installInProgress = false } } - private fun installNow(context: Context, tool: Tool, onProgress: (String, Int) -> Unit): String? { + private fun installNow(context: Context, tool: Tool, test: Boolean, onProgress: (String, Int) -> Unit): String? { if (SessionState.running) return context.getString(R.string.pextra_stop_session) if (!LinuxRuntime.isInstalled(context)) return context.getString(R.string.user_apps_runtime_required) - val asset = findLatestAsset(tool) ?: return context.getString(R.string.pextra_no_release, tool.name) + val asset = releases(tool)?.let { pickAsset(tool, it, test && tool.id == OWN) } ?: return context.getString(R.string.pextra_no_release, tool.name) val downloads = File(context.filesDir, "proton-downloads").apply { mkdirs() } val archive = File(downloads, "${tool.id}-${asset.name}") if (asset.size > 0 && archive.length() > asset.size) archive.delete() @@ -313,7 +326,7 @@ object ProtonExtras { else { archive.delete() unqueue(context, tool) - record(context, tool, placed, asset.tag) + record(context, tool, placed, asset.tag, test) if (tool.id == OWN) replaceOlder(context, tool) if (EsyncPacks.enabled(context)) { onProgress(context.getString(R.string.esync_fetching), -1) @@ -331,36 +344,68 @@ object ProtonExtras { } } - private fun findLatestAsset(tool: Tool): Asset? { - val releases = Downloader.downloadString(RELEASES.format(tool.repo)) ?: return null - return try { - pickAsset(tool, JSONArray(releases)) - } catch (e: Exception) { - Log.w(TAG, "release metadata for ${tool.id}", e) - null + private fun releases(tool: Tool): JSONArray? = releases(tool) { page -> + Downloader.downloadString(RELEASES.format(Locale.ROOT, tool.repo, page))?.let { body -> + try { + JSONArray(body) + } catch (e: Exception) { + Log.w(TAG, "release metadata for ${tool.id}", e) + null + } } } - internal fun pickAsset(tool: Tool, array: JSONArray): Asset? { - for (i in 0 until array.length()) { - val release = array.getJSONObject(i) - if (release.optBoolean("draft", false) || release.optBoolean("prerelease", false)) continue - val assets = release.optJSONArray("assets") ?: continue - val entries = (0 until assets.length()).map { assets.getJSONObject(it) } - val archive = entries.sortedBy { it.optString("name") }.firstOrNull { tool.assetPattern.containsMatchIn(it.optString("name")) } ?: continue + internal fun releases(tool: Tool, fetch: (Int) -> JSONArray?): JSONArray? { + val all = fetch(1) ?: return null + var page = 1 + var last = all.length() + while (last > 0 && page < RELEASE_PAGES && pickAsset(tool, all) == null) { + val next = fetch(++page) ?: return null + for (i in 0 until next.length()) all.put(next.opt(i)) + last = next.length() + } + return all + } + + internal fun pickAsset(tool: Tool, array: JSONArray, test: Boolean = false): Asset? { + val candidates = (0 until array.length()).asSequence() + .mapNotNull { array.optJSONObject(it) } + .filter { !it.optBoolean("draft", false) && it.optBoolean("prerelease", false) == test } + if (!test) return candidates.firstNotNullOfOrNull { assetOf(tool, it) } + val stable = pickAsset(tool, array)?.tag ?: return null + return candidates + .filter { it.optString("tag_name").startsWith(tool.prefix) && updateFor(listOf(stable), it.optString("tag_name")) != null } + .mapNotNull { assetOf(tool, it, requireChecksum = true) } + .maxWithOrNull { a, b -> compareVersions(a.tag, b.tag) } + } + + internal fun updateLatest(cache: JSONObject, tool: Tool, array: JSONArray?, now: Long) { + if (array == null) return + val test = if (tool.id == OWN) pickAsset(tool, array, test = true)?.tag else null + val tag = pickAsset(tool, array)?.tag + if (tag == null) { + cache.optJSONObject(tool.id)?.remove("test") + return + } + cache.put(tool.id, JSONObject().put("tag", tag).put("at", now).putOpt("test", test)) + } + + private fun assetOf(tool: Tool, release: JSONObject, requireChecksum: Boolean = false): Asset? = try { + val assets = release.optJSONArray("assets") + val entries = assets?.let { list -> (0 until list.length()).mapNotNull { list.optJSONObject(it) } }.orEmpty() + entries.sortedBy { it.optString("name") }.filter { tool.assetPattern.containsMatchIn(it.optString("name")) }.mapNotNull { archive -> val name = archive.optString("name") val stem = name.substringBefore(".tar") val checksum = entries.firstOrNull { it.optString("name").startsWith(stem) && it.optString("name").contains("sha512", ignoreCase = true) }?.optString("browser_download_url")?.takeIf { it.startsWith("http") } - return Asset( - release.optString("tag_name"), name, - archive.optString("browser_download_url").takeIf { it.startsWith("http") } ?: continue, checksum, - archive.optLong("size", 0L), - Hashes.githubSha256(archive.optString("digest")), - ) - } - return null + archive.optString("browser_download_url").takeIf { it.startsWith("http") }?.let { url -> + Asset(release.optString("tag_name"), name, url, checksum, archive.optLong("size", 0L), Hashes.githubSha256(archive.optString("digest"))) + } + }.let { found -> if (requireChecksum) found.firstOrNull { it.sha256 != null || it.sha512 != null } else found.firstOrNull() } + } catch (e: Exception) { + Log.w(TAG, "release metadata for ${tool.id}", e) + null } private fun requestLines(context: Context): List = diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt index b00edeb98..62ce4cf73 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt @@ -524,7 +524,7 @@ fun ComponentsPage( } val availableTitle: @Composable (String) -> String = { l -> when (l) { - PROTON_TAB -> stringResource(R.string.comp_available_count, protons.rows.count { it.installed == null || it.update != null }) + PROTON_TAB -> stringResource(R.string.comp_available_count, protons.rows.count(ProtonRow::available)) else -> stringResource(R.string.comp_nightlies_count, availableRows(l, catalog, snapshot).size) } } @@ -589,21 +589,29 @@ fun ComponentsPage( val availableRows: @Composable ColumnScope.(String) -> Unit = { l -> when (l) { PROTON_TAB -> { - val rows = protons.rows.filter { it.installed == null || it.update != null } + val rows = protons.rows.filter(ProtonRow::available) if (rows.isEmpty()) EmptyLine(stringResource(R.string.comp_nothing_new)) - for (row in rows) GetLine( - row.name, - when { - row.update != null -> stringResource(R.string.proton_update_available, row.update) - row.queued -> stringResource(R.string.proton_queued) - else -> stringResource(R.string.proton_not_installed) - }, - progress = if (protons.busyId == row.id) protons.percent else null, - stage = if (protons.busyId == row.id) protons.stage else null, - enabled = protons.busyId == null && protons.runtimeReady && !protons.sessionRunning, - onCancel = if (row.queued && protons.busyId == null && !protons.sessionRunning) ({ protonActions.onCancel(row.id) }) else null, - action = if (row.update != null) stringResource(R.string.common_update) else null, - ) { protonActions.onInstall(row.id) } + for (row in rows) { + val idle = protons.busyId == null && protons.runtimeReady && !protons.sessionRunning + val test = row.test != null && (nightlyPicked[row.id] == true || row.installed != null && row.update == null) + GetLine( + row.name, + when { + test -> row.test!! + row.update != null -> stringResource(R.string.proton_update_available, row.update) + row.queued -> stringResource(R.string.proton_queued) + else -> stringResource(R.string.proton_not_installed) + }, + progress = if (protons.busyId == row.id) protons.percent else null, + stage = if (protons.busyId == row.id) protons.stage else null, + enabled = idle, + onCancel = if (row.queued && protons.busyId == null && !protons.sessionRunning) ({ protonActions.onCancel(row.id) }) else null, + action = if (!test && row.update != null) stringResource(R.string.common_update) else null, + channel = if (row.test != null) ({ + ChannelToggle(test, enabled = idle && (row.installed == null || row.update != null), other = R.string.comp_channel_test) { nightlyPicked[row.id] = !test } + }) else null, + ) { if (test) protonActions.onInstallTest(row.id) else protonActions.onInstall(row.id) } + } } else -> { val available = availableRows(l, catalog, snapshot) @@ -1528,12 +1536,12 @@ private fun GetLine( } @Composable -private fun ChannelToggle(nightly: Boolean, enabled: Boolean, onFlip: () -> Unit) { +private fun ChannelToggle(nightly: Boolean, enabled: Boolean, other: Int = R.string.comp_channel_nightly, onFlip: () -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val src = remember { MutableInteractionSource() } val hot = rememberHot(src) && enabled - val state = stringResource(if (nightly) R.string.comp_channel_nightly else R.string.comp_channel_stable) + val state = stringResource(if (nightly) other else R.string.comp_channel_stable) Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(2.dp), modifier = Modifier.heightIn(min = 44.dp).clip(RoundedCornerShape(10.dp)) @@ -1544,12 +1552,12 @@ private fun ChannelToggle(nightly: Boolean, enabled: Boolean, onFlip: () -> Unit .semantics { stateDescription = state } .padding(4.dp), ) { - for ((label, on) in listOf(R.string.comp_channel_stable to !nightly, R.string.comp_channel_nightly to nightly)) { + for ((label, on) in listOf(R.string.comp_channel_stable to !nightly, other to nightly)) { Text( stringResource(label), fontSize = 13.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, - color = if (!enabled) colors.onSurfaceVariant else if (on) (if (hot) pal.onSignal else pal.signal) else colors.onSurfaceVariant, + color = if (on) (if (hot) pal.onSignal else pal.signal) else colors.onSurfaceVariant, modifier = Modifier.clip(RoundedCornerShape(7.dp)) - .background(if (on && enabled) (if (hot) pal.signal else pal.signal.copy(alpha = 0.16f)) else Color.Transparent) + .background(if (on) (if (hot) pal.signal else pal.signal.copy(alpha = 0.16f)) else Color.Transparent) .padding(horizontal = 10.dp, vertical = 6.dp), ) } @@ -1634,6 +1642,7 @@ class ProtonsState( class ProtonsActions( val onInstall: (String) -> Unit = {}, + val onInstallTest: (String) -> Unit = {}, val onCancel: (String) -> Unit = {}, val onRemove: (String, String) -> Unit = { _, _ -> }, val onRemoveOlder: (String) -> Unit = {}, @@ -1641,8 +1650,10 @@ class ProtonsActions( class ProtonRow( val id: String, val name: String, val installed: String?, val queued: Boolean, - val installedAll: List = listOfNotNull(installed), val update: String? = null, -) + val installedAll: List = listOfNotNull(installed), val update: String? = null, val test: String? = null, +) { + val available: Boolean get() = installed == null || update != null || test != null +} @Composable private fun gpuCardValue(gpu: GpuDriversState, auto: String): String { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 943fa4158..49440fa05 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -585,6 +585,7 @@ في الإصدارات الليلية · %1$d مستقر ليلي + تجريبي حدّث لعرض الحزم في إصدارات Nightlies وDroidDeck. لا جديد منذ آخر فحص. استيراد ملف ‎.wcp 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 135198262..745e50505 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -579,6 +579,7 @@ En las Nightlies · %1$d Estable Nocturna + Prueba Actualiza para listar los paquetes de Nightlies y DroidDeck. Nada nuevo desde la última comprobación. Importar .wcp diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index f44b98d75..15dd8ac28 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -577,6 +577,7 @@ В Nightlies · %1$d Стабилна Нощна + Тестова Обновете, за да видите пакетите в Nightlies и DroidDeck. Нищо ново от последната проверка. Импортиране на .wcp diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index c27da890b..d1c055687 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -581,6 +581,7 @@ Na Nightlies · %1$d Stabilní Noční + Testovací Obnovte pro zobrazení balíčků na Nightlies a DroidDeck. Od poslední kontroly nic nového. Importovat .wcp diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 4eb0484c1..ecb0723cc 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -577,6 +577,7 @@ På Nightlies · %1$d Stabil Nightly + Test Opdater for at se pakker på Nightlies og DroidDeck. Intet nyt siden sidste kontrol. Importer .wcp diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b60fceb58..0c202baf5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -577,6 +577,7 @@ In den Nightlies · %1$d Stabil Nightly + Test Aktualisiere, um die Pakete in den Nightlies und bei DroidDeck aufzulisten. Nichts Neues seit der letzten Prüfung. .wcp importieren diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index faa6c9727..749f77914 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -577,6 +577,7 @@ Στα Nightlies · %1$d Σταθερή Νυχτερινή + Δοκιμαστική Ανανεώστε για να εμφανιστούν τα πακέτα στα Nightlies και στο DroidDeck. Τίποτα νέο από τον τελευταίο έλεγχο. Εισαγωγή .wcp diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 15a280bac..e734ac3ab 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -579,6 +579,7 @@ En las Nightlies · %1$d Estable Nocturna + Prueba Actualiza para listar los paquetes de Nightlies y DroidDeck. Nada nuevo desde la última comprobación. Importar .wcp diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 2abc70d95..75505a4d0 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -577,6 +577,7 @@ Nightliesissä · %1$d Vakaa Yöversio + Testi Päivitä nähdäksesi Nightliesin ja DroidDeckin paketit. Ei mitään uutta viimeisimmän tarkistuksen jälkeen. Tuo .wcp diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ef705ec2e..cbe2334cf 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -579,6 +579,7 @@ Dans Nightlies · %1$d Stable Nightly + Test Actualiser pour lister les paquets dans Nightlies et DroidDeck. Aucun nouvel élément depuis la dernière vérification. Importer .wcp diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index f758c5548..199a26295 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -577,6 +577,7 @@ Nightlies पर · %1$d स्थिर नाइटली + परीक्षण Nightlies और DroidDeck के पैकेज सूचीबद्ध करने के लिए रीफ़्रेश करें। पिछली जांच के बाद कुछ नया नहीं है। .wcp इंपोर्ट करें diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index e00b2643c..aa74d6799 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -577,6 +577,7 @@ A Nightliesen · %1$d Stabil Nightly + Teszt Frissítsen a Nightlies és a DroidDeck csomagjainak listázásához. Nincs semmi új az utolsó ellenőrzés óta. .wcp importálása diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index b52adf60a..935869a35 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -575,6 +575,7 @@ Di Nightlies · %1$d Stabil Nightly + Uji Segarkan untuk melihat daftar paket di Nightlies dan DroidDeck. Tidak ada yang baru sejak pemeriksaan terakhir. Impor .wcp diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index b8495afa0..6aad28b97 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -579,6 +579,7 @@ Nelle Nightlies · %1$d Stabile Nightly + Test Aggiorna per elencare i pacchetti nelle Nightlies e in DroidDeck. Niente di nuovo dall\'ultimo controllo. Importa .wcp diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index fc7485bac..fa800884a 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -575,6 +575,7 @@ Nightlies内 · %1$d 安定版 ナイトリー + テスト 更新してNightliesとDroidDeckのパッケージを一覧表示します。 前回の確認以降、新しいものはありません。 .wcpをインポート diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 9c7bf0671..49c59c7fe 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -575,6 +575,7 @@ Nightlies 내 · %1$d 안정판 나이틀리 + 테스트 새로 고쳐 Nightlies 및 DroidDeck의 패키지를 나열합니다. 마지막 확인 이후 새로운 내용이 없습니다. .wcp 가져오기 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 95bde0cbb..20c5977e3 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -575,6 +575,7 @@ Pada Nightlies · %1$d Stabil Nightly + Ujian Segarkan semula untuk menyenaraikan pakej pada Nightlies dan DroidDeck. Tiada apa-apa yang baharu sejak semakan terakhir. Import .wcp diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 6c6416788..535038128 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -577,6 +577,7 @@ På Nightlies · %1$d Stabil Nightly + Test Oppdater for å liste pakker på Nightlies og DroidDeck. Ingenting nytt siden siste sjekk. Importer .wcp diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 1176b0173..ed67b367e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -577,6 +577,7 @@ In de Nightlies · %1$d Stabiel Nightly + Test Vernieuw om de pakketten in de Nightlies en bij DroidDeck te tonen. Niets nieuws sinds de laatste controle. .wcp importeren diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index da0c0e4c1..2ac1cbfbf 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -581,6 +581,7 @@ W wersjach nightly · %1$d Stabilna Nightly + Testowa Odśwież, aby wyświetlić pakiety w Nightlies i DroidDeck. Nic nowego od ostatniego sprawdzenia. Importuj .wcp diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index f36d346b3..54cca5da9 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -579,6 +579,7 @@ Nas Nightlies · %1$d Estável Nightly + Teste Atualize para listar os pacotes nas Nightlies e no DroidDeck. Nada de novo desde a última verificação. Importar .wcp diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index bc8927ea3..8116d2215 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -579,6 +579,7 @@ Nas Nightlies · %1$d Estável Nightly + Teste Atualize para listar os pacotes nas Nightlies e no DroidDeck. Nada novo desde a última verificação. Importar .wcp diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 4ef9d1d8c..9315e8d9f 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -579,6 +579,7 @@ Pe versiunile nightly · %1$d Stabilă Nightly + Test Reîmprospătează pentru a lista pachetele din Nightlies și DroidDeck. Nimic nou de la ultima verificare. Importă .wcp diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index f2005f1af..b4105decd 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -581,6 +581,7 @@ В Nightlies · %1$d Стабильная Ночная + Тестовая Обновите, чтобы увидеть пакеты в Nightlies и DroidDeck. С момента последней проверки нового нет. Импорт .wcp diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 670a8019c..ed197424f 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -577,6 +577,7 @@ I nattbyggena · %1$d Stabil Nattbygge + Test Uppdatera för att lista paket i Nightlies och DroidDeck. Inget nytt sedan senaste kontrollen. Importera .wcp diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 576b285e7..97e4ae05c 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -575,6 +575,7 @@ ใน Nightlies · %1$d เสถียร Nightly + ทดสอบ รีเฟรชเพื่อแสดงรายการแพ็กเกจใน Nightlies และ DroidDeck ไม่มีอะไรใหม่ตั้งแต่การตรวจสอบครั้งล่าสุด นำเข้า .wcp diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 3fe7a74c5..5ee9d6ae2 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -577,6 +577,7 @@ Nightlies içinde · %1$d Kararlı Nightly + Test Nightlies ve DroidDeck paketlerini listelemek için yenileyin. Son kontrolden beri yeni bir şey yok. .wcp içe aktar diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index f7354e66e..20b12469d 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -581,6 +581,7 @@ У нічних збірках · %1$d Стабільна Нічна + Тестова Оновіть, щоб побачити пакети з Nightlies і DroidDeck. Нічого нового з часу останньої перевірки. Імпортувати .wcp diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 896a78769..1e1dd1856 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -575,6 +575,7 @@ Trên Nightlies · %1$d Ổn định Nightly + Thử nghiệm Làm mới để liệt kê các gói trên Nightlies và DroidDeck. Không có gì mới từ lần kiểm tra trước. Nhập tệp .wcp diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e91a58b48..8b99d8285 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -575,6 +575,7 @@ 在 Nightlies 上 · %1$d 稳定版 每夜版 + 测试 刷新以列出 Nightlies 和 DroidDeck 上的软件包。 自上次检查以来没有新内容。 导入 .wcp diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 25a9d22ae..bfe3e076f 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -575,6 +575,7 @@ Nightlies · %1$d 穩定版 每夜版 + 測試 重新整理以列出 Nightlies 及 DroidDeck 中的軟件包。 自上次檢查以來沒有新內容。 匯入 .wcp diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 66a0480c5..1a1c502bd 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -575,6 +575,7 @@ Nightlies 中 · %1$d 穩定版 每夜版 + 測試 重新整理以列出 Nightlies 和 DroidDeck 中的套件。 自上次檢查以來沒有新內容。 匯入 .wcp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c72a92b84..14bfd4d60 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -605,6 +605,7 @@ On the Nightlies · %1$d Stable Nightly + Test Refresh to list packages on the Nightlies and DroidDeck releases. Nothing new since the last check. Import .wcp diff --git a/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt b/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt index e19b1d634..8e48d3c35 100644 --- a/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt @@ -202,7 +202,7 @@ class CompatLaunchTest { val entered = CountDownLatch(1) val finish = CountDownLatch(1) protons.protonBusyId = null - protons.installer = { _, progress -> + protons.installer = { _, _, progress -> progress("Verifying download", 64) entered.countDown() check(finish.await(5, TimeUnit.SECONDS)) diff --git a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt index 14dbdb833..270b9de48 100644 --- a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt @@ -60,7 +60,7 @@ class ProtonMenuAutoTest { menu.protonProblem = null menu.protonStage = null menu.protonPercent = -1 - menu.installer = { tool, progress -> + menu.installer = { tool, _, progress -> progress("Installing ${tool.name}", 50) install("${tool.prefix}-11-12") null @@ -116,7 +116,7 @@ class ProtonMenuAutoTest { @Test fun downloadsWaitForTheSessionNetworkPowerAndOtherInstallWork() { install("DroidDeck-Proton-11-11.1") - menu.installer = { tool, _ -> attempts.add(tool.id); "failed" } + menu.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } SessionState.running = true menu.ensureAutoUpdates() SessionState.running = false @@ -139,11 +139,11 @@ class ProtonMenuAutoTest { @Test fun aFinishedInstallStartsTheComponentCheckAndAFailedOneDoesNot() { var checks = 0 val watched = ProtonMenu(activity, Handler(Looper.getMainLooper()), onInstalled = { checks++ }) { idle } - watched.installer = { tool, _ -> install("${tool.prefix}-11-12"); null } + watched.installer = { tool, _, _ -> install("${tool.prefix}-11-12"); null } watched.installProton("droiddeck") waitUntil { watched.protonBusyId == null && checks == 1 } assertEquals(1, checks) - watched.installer = { _, _ -> "failed" } + watched.installer = { _, _, _ -> "failed" } watched.installProton("ge") waitUntil { watched.protonBusyId == null } assertEquals(1, checks) @@ -152,7 +152,7 @@ class ProtonMenuAutoTest { @Test fun aFailedUpdateDoesNotLoopOrBlockOtherInstalledFamilies() { val ge = install("GE-Proton11-11") install("DroidDeck-Proton-11-11.1") - menu.installer = { tool, _ -> + menu.installer = { tool, _, _ -> attempts.add(tool.id) if (tool.id == "ge") throw IllegalStateException("download failed") install("${tool.prefix}-11-12") @@ -171,7 +171,7 @@ class ProtonMenuAutoTest { @Test fun anUninstalledRuntimeOrCurrentProtonDoesNotStartADownload() { install("DroidDeck-Proton-11-12") - menu.installer = { tool, _ -> attempts.add(tool.id); null } + menu.installer = { tool, _, _ -> attempts.add(tool.id); null } menu.ensureAutoUpdates() assertTrue(attempts.isEmpty()) install("GE-Proton11-11") @@ -183,12 +183,12 @@ class ProtonMenuAutoTest { @Test fun aFailedReleaseIsNotRetriedAfterRecreatingTheLauncher() { install("DroidDeck-Proton-11-11.1") - menu.installer = { tool, _ -> attempts.add(tool.id); "failed" } + menu.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } menu.ensureAutoUpdates() waitUntil { menu.protonBusyId == null } val recreated = Robolectric.buildActivity(Activity::class.java).setup().get() val next = ProtonMenu(recreated, Handler(Looper.getMainLooper())) - next.installer = { tool, _ -> attempts.add(tool.id); "failed" } + next.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } next.ensureAutoUpdates() assertNull(next.protonBusyId) assertEquals(listOf("droiddeck"), attempts) @@ -208,7 +208,7 @@ class ProtonMenuAutoTest { } @Test fun droidDeckProtonIsInstalledWhenMissingUnlessTheUserRemovedIt() { - menu.installer = { tool, _ -> attempts.add(tool.id); install("${tool.prefix}-11-12"); null } + menu.installer = { tool, test, _ -> attempts.add(if (test) "test" else tool.id); install("${tool.prefix}-11-12"); null } ProtonExtras.setDeclined(activity, true) menu.ensureAutoUpdates() assertNull(menu.protonBusyId) @@ -222,11 +222,11 @@ class ProtonMenuAutoTest { menu.removeProton("droiddeck") waitUntil { menu.protonBusyId == null } assertTrue(ProtonExtras.declined(activity)) - menu.installer = { _, _ -> "failed" } + menu.installer = { _, _, _ -> "failed" } menu.installProton("droiddeck") waitUntil { menu.protonBusyId == null } assertTrue(ProtonExtras.declined(activity)) - menu.installer = { tool, _ -> install("${tool.prefix}-11-12"); null } + menu.installer = { tool, _, _ -> install("${tool.prefix}-11-12"); null } menu.installProton("droiddeck") waitUntil { menu.protonBusyId == null } assertFalse(ProtonExtras.declined(activity)) @@ -236,7 +236,7 @@ class ProtonMenuAutoTest { install("DroidDeck-Proton-11-11.1") val launcher = Robolectric.buildActivity(FrontEndActivity::class.java).get() val protons = ReflectionHelpers.getField(launcher, "protons") - protons.installer = { tool, _ -> attempts.add(tool.id); "failed" } + protons.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } Motion.refresh(launcher) LaunchOrigin.mark(Rect(0f, 0f, 100f, 100f), "game") launcher.startActivity(Intent(launcher, SessionActivity::class.java)) diff --git a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt index 43571a3ff..5f3f3891f 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt @@ -83,6 +83,20 @@ class ProtonExtrasTest { assertTrue(picked.sha512!!.endsWith("GE-Proton11-7-aarch64.sha512sum")) } + @Test + fun aTestBuildChoosesACompatibleArchiveWithVerification() { + val release = release( + "DroidDeck-Proton-11-12.9", + asset("DroidDeck-Proton-11-12.9-aarch64.tar.gz"), + asset("DroidDeck-Proton-11-12.9-aarch64.tar.xz", "sha256:" + "ab".repeat(32)), + prerelease = true, + ) + val releases = JSONArray().put(release).put(droiddeckRelease("11-12.8")) + val picked = ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!! + assertEquals("DroidDeck-Proton-11-12.9-aarch64.tar.xz", picked.name) + assertEquals("ab".repeat(32), picked.sha256) + } + @Test fun prereleasesDraftsAndReleasesWithoutAnArm64BuildAreSkipped() { val releases = JSONArray() @@ -242,4 +256,121 @@ class ProtonExtrasTest { assertNull(ProtonExtras.missing(context, tool("droiddeck"))) assertEquals("DroidDeck-Proton-11-11.4", ProtonExtras.update(context, tool("droiddeck"))) } + + @Test + fun theNewestPrereleaseAheadOfTheLatestReleaseIsTheTestBuild() { + val releases = JSONArray() + .put(release("DroidDeck-Bionic-12.8-r25", asset("DroidDeck-Bionic-12.8-r25-aarch64.tar.xz"), prerelease = true)) + .put(droiddeckRelease("11-12.9", prerelease = true)) + .put(droiddeckRelease("11-12.8")) + assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!!.tag) + assertEquals("DroidDeck-Proton-11-12.8", ProtonExtras.pickAsset(tool("droiddeck"), releases)!!.tag) + } + + @Test + fun aPrereleaseOlderThanTheLatestReleaseIsNotOffered() { + val releases = JSONArray() + .put(droiddeckRelease("11-12.9")) + .put(droiddeckRelease("11-12.8", prerelease = true)) + assertNull(ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)) + assertNull(ProtonExtras.pickAsset(tool("droiddeck"), JSONArray().put(droiddeckRelease("11-12.8")), test = true)) + } + + @Test + fun aTestBuildIsOfferedOnlyWhenNotInstalledAndNewer() { + assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.testFor(emptyList(), "DroidDeck-Proton-11-12.9")) + assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.testFor(listOf("DroidDeck-Proton-11-12.8"), "DroidDeck-Proton-11-12.9")) + assertNull(ProtonExtras.testFor(listOf("DroidDeck-Proton-11-12.9"), "DroidDeck-Proton-11-12.9")) + assertNull(ProtonExtras.testFor(listOf("DroidDeck-Proton-11-13.0"), "DroidDeck-Proton-11-12.9")) + assertNull(ProtonExtras.testFor(listOf("DroidDeck-Proton-11-12.8"), null)) + } + + @Test + fun theHighestEligibleTestBuildWinsWhateverTheListOrder() { + val releases = JSONArray() + .put(droiddeckRelease("11-12.7", prerelease = true)) + .put(droiddeckRelease("11-12.9", prerelease = true)) + .put(droiddeckRelease("11-12.8.5", prerelease = true)) + .put(droiddeckRelease("11-12.8")) + assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!!.tag) + } + + @Test + fun noTestBuildWithoutAStableBaseline() { + val releases = JSONArray().put(droiddeckRelease("11-12.9", prerelease = true)) + assertNull(ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)) + } + + @Test + fun aTestBuildWithNoChecksumIsNotOffered() { + val releases = JSONArray() + .put(release("DroidDeck-Proton-11-12.10", asset("DroidDeck-Proton-11-12.10-aarch64.tar.gz"), prerelease = true)) + .put(droiddeckRelease("11-12.9", prerelease = true)) + .put(droiddeckRelease("11-12.8")) + assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!!.tag) + } + + @Test + fun laterPagesAreReadOnlyUntilAStableBaselineIsFound() { + val tool = tool("droiddeck") + val pages = mapOf( + 1 to JSONArray().put(droiddeckRelease("11-12.10", prerelease = true)), + 2 to JSONArray().put(droiddeckRelease("11-12.8")), + 3 to JSONArray().put(droiddeckRelease("11-12.7")), + ) + val asked = mutableListOf() + val all = ProtonExtras.releases(tool) { asked += it; pages[it] ?: JSONArray() }!! + assertEquals(listOf(1, 2), asked) + assertEquals("DroidDeck-Proton-11-12.8", ProtonExtras.pickAsset(tool, all)!!.tag) + assertEquals("DroidDeck-Proton-11-12.10", ProtonExtras.pickAsset(tool, all, test = true)!!.tag) + + asked.clear() + ProtonExtras.releases(tool) { asked += it; pages.getValue(2) } + assertEquals(listOf(1), asked) + + asked.clear() + assertEquals(0, ProtonExtras.releases(tool) { asked += it; JSONArray() }!!.length()) + assertEquals(listOf(1), asked) + assertNull(ProtonExtras.releases(tool) { null }) + + asked.clear() + assertNull(ProtonExtras.releases(tool) { page -> + asked += page + if (page == 1) JSONArray().put(droiddeckRelease("11-12.10", prerelease = true)) else null + }) + assertEquals(listOf(1, 2), asked) + } + + @Test + fun anIncompleteLookupKeepsTheCachedTestBuildAndACompletedLookupClearsIt() { + val tool = tool("droiddeck") + val cache = JSONObject().put(tool.id, JSONObject().put("tag", "DroidDeck-Proton-11-12.8").put("test", "DroidDeck-Proton-11-12.9")) + ProtonExtras.updateLatest(cache, tool, null, 1L) + assertEquals("DroidDeck-Proton-11-12.9", cache.getJSONObject(tool.id).getString("test")) + ProtonExtras.updateLatest(cache, tool, JSONArray().put(droiddeckRelease("11-12.8")), 1L) + assertFalse(cache.getJSONObject(tool.id).has("test")) + } + + @Test + fun aTestInstallLeavesTheStableEntryAndAStableInstallKeepsTheTestOffer() { + val tool = tool("droiddeck") + val cache = JSONObject().put(tool.id, JSONObject().put("tag", "DroidDeck-Proton-11-12.8").put("test", "DroidDeck-Proton-11-12.9")) + assertFalse(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-12.9", true, 2L)) + assertEquals("DroidDeck-Proton-11-12.8", cache.getJSONObject(tool.id).getString("tag")) + assertEquals("DroidDeck-Proton-11-12.9", cache.getJSONObject(tool.id).getString("test")) + assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.testFor(emptyList(), cache.getJSONObject(tool.id).getString("test"))) + assertFalse(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-12.7", false, 2L)) + assertTrue(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-12.8", false, 2L)) + assertEquals("DroidDeck-Proton-11-12.9", cache.getJSONObject(tool.id).getString("test")) + assertEquals(2L, cache.getJSONObject(tool.id).getLong("at")) + assertTrue(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-13.0", false, 3L)) + assertFalse(cache.getJSONObject(tool.id).has("test")) + } + + @Test + fun malformedReleaseEntriesAreSkipped() { + val releases = JSONArray("[null, 5, {\"tag_name\": \"x\", \"assets\": [null]}]").put(droiddeckRelease("11-12.8")) + assertEquals("DroidDeck-Proton-11-12.8", ProtonExtras.pickAsset(tool("droiddeck"), releases)!!.tag) + assertNull(ProtonExtras.pickAsset(tool("droiddeck"), JSONArray("[null]"))) + } } From 44ade5eeeea28b4dd3854f05f4c38372cf4cfee5 Mon Sep 17 00:00:00 2001 From: FryMcNugget Date: Thu, 19 Nov 2026 07:32:30 +0000 Subject: [PATCH 05/31] feat(proton): install experimental Proton builds from a .zip (#2864) Components > Proton gains an Experimental builds card that installs a Proton build from a .zip, lists it as Experimental- and removes it with its stored and unpacked originals and selections. Replacing a build keeps its user settings and is safe to interrupt. Co-authored-by: maxjivi05 --- .../droiddeck/launcher/FrontEndActivity.kt | 12 +- .../java/com/droiddeck/launcher/ProtonMenu.kt | 46 ++++ .../launcher/session/ComponentsManager.kt | 33 ++- .../launcher/session/ExperimentalProtons.kt | 216 ++++++++++++++++++ .../launcher/session/ProtonExtras.kt | 35 +-- .../droiddeck/launcher/ui/ComponentsPage.kt | 27 ++- app/src/main/res/values-ar/strings.xml | 12 + app/src/main/res/values-b+es+419/strings.xml | 12 + app/src/main/res/values-bg/strings.xml | 12 + app/src/main/res/values-cs/strings.xml | 12 + app/src/main/res/values-da/strings.xml | 12 + app/src/main/res/values-de/strings.xml | 12 + app/src/main/res/values-el/strings.xml | 12 + app/src/main/res/values-es/strings.xml | 12 + app/src/main/res/values-fi/strings.xml | 12 + app/src/main/res/values-fr/strings.xml | 12 + app/src/main/res/values-hi/strings.xml | 12 + app/src/main/res/values-hu/strings.xml | 12 + app/src/main/res/values-in/strings.xml | 12 + app/src/main/res/values-it/strings.xml | 12 + app/src/main/res/values-ja/strings.xml | 12 + app/src/main/res/values-ko/strings.xml | 12 + app/src/main/res/values-ms/strings.xml | 12 + app/src/main/res/values-nb/strings.xml | 12 + app/src/main/res/values-nl/strings.xml | 12 + app/src/main/res/values-pl/strings.xml | 12 + app/src/main/res/values-pt-rPT/strings.xml | 12 + app/src/main/res/values-pt/strings.xml | 12 + app/src/main/res/values-ro/strings.xml | 12 + app/src/main/res/values-ru/strings.xml | 12 + app/src/main/res/values-sv/strings.xml | 12 + app/src/main/res/values-th/strings.xml | 12 + app/src/main/res/values-tr/strings.xml | 12 + app/src/main/res/values-uk/strings.xml | 12 + app/src/main/res/values-vi/strings.xml | 12 + app/src/main/res/values-zh-rCN/strings.xml | 12 + app/src/main/res/values-zh-rHK/strings.xml | 12 + app/src/main/res/values-zh-rTW/strings.xml | 12 + app/src/main/res/values/strings.xml | 12 + .../session/ExperimentalProtonsTest.kt | 155 +++++++++++++ .../launcher/session/ProtonExtrasTest.kt | 19 +- .../overlay/usr/local/bin/steam-compatibility | 40 +++- tools/tests/test_game_environment.py | 116 ++++++++++ 43 files changed, 1059 insertions(+), 36 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 37e92c04b..629986abf 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -275,6 +275,11 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet private val pickAnyDriver = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { r -> if (r.resultCode == RESULT_OK) InAppFilePicker.pickedUri(r.data)?.let { drivers.importDriver(it, linux = null) } } + private val pickExperimentalProton = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { r -> + if (r.resultCode == RESULT_OK) InAppFilePicker.pickedFile(r.data)?.let { zip -> + protons.installExperimental { progress -> com.droiddeck.launcher.session.ExperimentalProtons.installFromFile(this, zip, progress) } + } + } private val pickLossless = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { r -> if (r.resultCode == RESULT_OK) InAppFilePicker.pickedFile(r.data)?.let { importLossless(it) } } @@ -2427,7 +2432,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet ), protons = com.droiddeck.launcher.ui.ProtonsState( rows = protons.protonRows, busyId = protons.protonBusyId, stage = protons.protonStage, percent = protons.protonPercent, - runtimeReady = ready && !busy, sessionRunning = SessionState.running, + runtimeReady = ready && !busy, sessionRunning = SessionState.running, experimental = protons.experimentalDirs, ), protonActions = com.droiddeck.launcher.ui.ProtonsActions( onInstall = { id -> protons.installProton(id) }, @@ -2435,6 +2440,11 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet onCancel = { id -> ProtonExtras.tools.firstOrNull { it.id == id }?.let { ProtonExtras.unqueue(this, it) }; protons.refreshProtons() }, onRemove = { id, dir -> protons.removeProton(id, dir) }, onRemoveOlder = { id -> protons.removeProton(id, older = true) }, + onExperimentalFile = { + pickExperimentalProton.launch(InAppFilePicker.buildIntent(this, ZIP_EXT, getString(R.string.xproton_pick), + android.os.Environment.getExternalStoragePublicDirectory(android.os.Environment.DIRECTORY_DOWNLOADS).path)) + }, + onRemoveExperimental = { dir -> protons.removeExperimental(dir) }, ), protonOptions = { com.droiddeck.launcher.ui.ProtonOptions( diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt index 22d7b2ec0..c076df220 100644 --- a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt @@ -7,6 +7,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue +import com.droiddeck.launcher.session.ExperimentalProtons import com.droiddeck.launcher.session.ProtonExtras import com.droiddeck.launcher.ui.ProtonRow import com.droiddeck.launcher.session.SessionState @@ -27,12 +28,17 @@ internal class ProtonMenu( val stage = mutableStateOf(null) val percent = mutableIntStateOf(-1) val problem = mutableStateOf(null) + val experimental = mutableStateOf>(emptyList()) } var protonRows by Operation.rows var protonBusyId by Operation.busyId var protonStage by Operation.stage var protonPercent by Operation.percent var protonProblem by Operation.problem + var experimentalDirs by Operation.experimental + companion object { + const val EXPERIMENTAL = "experimental" + } private val checking = java.util.concurrent.atomic.AtomicBoolean(false) @VisibleForTesting internal var installer: (ProtonExtras.Tool, Boolean, (String, Int) -> Unit) -> String? = { tool, test, progress -> ProtonExtras.install(activity, tool, test, progress) } @@ -86,7 +92,47 @@ internal class ProtonMenu( }, "remove-proton-$id").start() } + fun installExperimental(work: ((String, Int) -> Unit) -> String?) { + if (protonBusyId != null || ProtonExtras.installInProgress || SessionState.running) return + protonBusyId = EXPERIMENTAL + protonProblem = null + protonStage = activity.getString(R.string.store_starting) + protonPercent = -1 + Thread({ + val problem = runCatching { + work { label, value -> ui.post { protonStage = label; protonPercent = value } } + }.getOrElse { it.message ?: it.javaClass.simpleName } + ui.post { + protonProblem = problem + protonBusyId = null + protonStage = null + protonPercent = -1 + refreshProtons() + android.widget.Toast.makeText(activity, problem ?: activity.getString(R.string.xproton_installed), android.widget.Toast.LENGTH_LONG).show() + if (problem == null) onInstalled() + } + }, "install-proton-experimental").start() + } + + fun removeExperimental(dir: String) { + if (protonBusyId != null || SessionState.running) return + protonBusyId = EXPERIMENTAL + protonProblem = null + protonStage = activity.getString(R.string.main_removing_named, dir) + protonPercent = -1 + Thread({ + val removed = runCatching { ExperimentalProtons.remove(activity, dir) }.getOrDefault(false) + ui.post { + protonBusyId = null + protonStage = null + refreshProtons() + if (!removed) android.widget.Toast.makeText(activity, activity.getString(R.string.xproton_remove_failed, dir), android.widget.Toast.LENGTH_LONG).show() + } + }, "remove-proton-experimental").start() + } + fun refreshProtons() { + experimentalDirs = ExperimentalProtons.installed(activity).map { it.dir } protonRows = ProtonExtras.tools.map { val all = ProtonExtras.installedAll(activity, it) ProtonRow(it.id, it.name, all.lastOrNull(), ProtonExtras.queued(activity, it), all, ProtonExtras.update(activity, it), ProtonExtras.testBuild(activity, it)) diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt index e9409b74c..749532cdd 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -282,6 +282,8 @@ object ComponentsManager { if (parts.size > 1) parts[1] else parts.firstOrNull()?.ifEmpty { null } ?: "unknown" }.getOrDefault("unknown") + internal fun isProtonTree(dir: File): Boolean = File(dir, WINE).isDirectory && File(dir, "proton").isFile + fun protons(context: Context): List { val found = LinkedHashMap() val bases = listOf(File(steam(context), "compatibilitytools.d") to false) + @@ -290,7 +292,7 @@ object ComponentsManager { for ((base, valve) in bases) { val entries = base.listFiles()?.sortedBy { it.name } ?: continue for (dir in entries) { - if (!File(dir, WINE).isDirectory || !File(dir, "proton").isFile) continue + if (!isProtonTree(dir)) continue val real = runCatching { dir.canonicalPath }.getOrDefault(dir.path) if (found.containsKey(real)) continue val guest = if (dir.absolutePath.startsWith(rootPath)) dir.absolutePath.removePrefix(rootPath) else dir.absolutePath @@ -900,15 +902,26 @@ object ComponentsManager { } } - fun forgetProton(context: Context, dirName: String) { - synchronized(lock) { - val id = safeName(dirName) - if (protons(context).any { it.id == id }) return - val state = loadState(context) - val selected = listOf("active", "queued").map { state.sub(it).remove(id) != null }.any { it } - if (selected && runCatching { saveState(context, state) }.onFailure { Log.w(TAG, "forget $id", it) }.isFailure) return - File(originalsDir(context), id).deleteRecursively() - } + fun forgetProton(context: Context, dirName: String): Boolean = synchronized(lock) { + val id = safeName(dirName) + if (protons(context).any { it.id == id }) return true + val state = loadState(context) + val selected = listOf("active", "queued").map { state.sub(it).remove(id) != null }.any { it } + val published = File(launchDir(context), "desired.tsv") + val listed = published.takeIf { it.isFile } + ?.useLines { rows -> rows.any { it.split('\t').getOrNull(1) == dirName } } == true + if ((selected || listed) && runCatching { saveState(context, state) }.onFailure { Log.w(TAG, "forget $id", it) }.isFailure) return false + val originals = File(originalsDir(context), id) + val store = File(launchDir(context), "store") + val used = published.takeIf { it.isFile }?.useLines { rows -> + rows.mapNotNull { it.substringAfterLast('\t').substringAfter("/store/", "").substringBefore('/').ifEmpty { null } }.toSet() + }.orEmpty() + val unpacked = originals.listFiles().orEmpty().flatMap { version -> + version.listFiles().orEmpty().map { File(store, "original-$id-${version.name}-${it.name.removeSuffix(".wcp")}") } + }.filter { it.name !in used } + if (unpacked.any { File(it, ".complete").delete(); !it.deleteRecursively() && it.exists() }) return false + originals.deleteRecursively() + true } private fun storePackage(context: Context, part: File, dest: File) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt b/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt new file mode 100644 index 000000000..cc2831bc8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt @@ -0,0 +1,216 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import android.os.StatFs +import android.util.Log +import com.droiddeck.launcher.R +import com.droiddeck.launcher.runtime.LinuxRuntime +import java.io.File +import java.io.FileOutputStream +import java.nio.file.Files +import java.security.DigestOutputStream +import java.security.MessageDigest +import java.util.zip.ZipFile +import kotlin.io.path.ExperimentalPathApi +import kotlin.io.path.deleteRecursively +import org.json.JSONObject + +object ExperimentalProtons { + private const val TAG = "ExperimentalProtons" + const val PREFIX = "Experimental-" + private const val MARKER = ".droiddeck-experimental.json" + private const val STAGING = ".droiddeck-experimental" + private const val BACKUPS = ".droiddeck-experimental-old" + private const val INCOMING = ".droiddeck-experimental-new" + private const val GUEST_TOOLS = "/root/.local/share/Steam/compatibilitytools.d" + private const val NEED_BYTES = 4L * 1024 * 1024 * 1024 + private const val USER_SETTINGS = "user_settings.py" + private val TARBALL = Regex("(?i)\\.tar(\\.(gz|xz|zst|bz2))?$") + + data class Installed(val dir: String, val label: String, val source: String) + + private fun toolsDir(context: Context) = File(LinuxRuntime.rootDir(context), GUEST_TOOLS.removePrefix("/")) + + fun installed(context: Context): List = + toolsDir(context).listFiles() + ?.filter { it.isDirectory && File(it, MARKER).isFile } + ?.map { dir -> + val info = runCatching { JSONObject(File(dir, MARKER).readText()) }.getOrDefault(JSONObject()) + Installed(dir.name, info.optString("label").ifEmpty { dir.name }, info.optString("source")) + } + ?.sortedBy { it.dir } + ?: emptyList() + + fun remove(context: Context, dir: String): Boolean { + val tools = toolsDir(context) + val target = File(tools, dir) + if (!File(target, MARKER).isFile) return false + val gone = deleteTree(target) && deleteTree(File(File(tools, BACKUPS), dir)) && deleteTree(File(File(tools, INCOMING), dir)) + if (gone) ComponentsManager.forgetProton(context, dir) + return gone + } + + internal fun dirName(tree: String, label: String?): String { + val base = ComponentsManager.safeName(tree) + val tag = label?.let(ComponentsManager::safeName)?.takeIf { it != "unnamed" && !base.contains(it, ignoreCase = true) } + return PREFIX + base + (tag?.let { "-$it" } ?: "") + } + + internal fun compatVdf(name: String): String = """"compatibilitytools" +{ + "compat_tools" + { + "$name" + { + "install_path" "." + "display_name" "$name" + "from_oslist" "windows" + "to_oslist" "linux" + } + } +} +""" + + fun installFromFile(context: Context, zip: File, onProgress: (String, Int) -> Unit): String? { + preflight(context)?.let { return it } + if (StatFs(LinuxRuntime.rootDir(context).path).availableBytes < NEED_BYTES + zip.length()) { + return context.getString(R.string.xproton_no_space) + } + return install(context, zip, zip.name.substringBeforeLast('.'), zip.name, onProgress) + } + + private fun preflight(context: Context): String? = when { + SessionState.running -> context.getString(R.string.pextra_stop_session) + !LinuxRuntime.isInstalled(context) -> context.getString(R.string.user_apps_runtime_required) + else -> null + } + + private fun install(context: Context, zip: File, label: String, source: String, onProgress: (String, Int) -> Unit): String? { + val tools = toolsDir(context).apply { mkdirs() } + val staging = File(tools, STAGING) + val forget = { name: String -> ComponentsManager.forgetProton(context, name) } + restoreInterrupted(tools, forget) + deleteTree(staging) + staging.mkdirs() + try { + LinuxRuntime.writeAccounts(context) + SessionFiles.stage(context, LinuxRuntime.rootDir(context)) + onProgress(context.getString(R.string.xproton_unzipping), -1) + val tarball = runCatching { extractTarball(zip, staging) } + .getOrElse { return it.message ?: context.getString(R.string.xproton_bad_zip) } + ?: return context.getString(R.string.xproton_bad_zip) + if (SessionState.running) return context.getString(R.string.pextra_session_started) + + onProgress(context.getString(R.string.xproton_unpacking), -1) + val unpacked = File(staging, "unpacked").apply { mkdirs() } + val status = runGuest(context, listOf("tar", "-xf", "$GUEST_TOOLS/$STAGING/${tarball.name}", "-C", "$GUEST_TOOLS/$STAGING/unpacked")) + tarball.delete() + if (status != 0) return context.getString(R.string.xproton_untar_failed, status) + + val tree = buildTree(unpacked) ?: return context.getString(R.string.xproton_no_tree) + val name = dirName(tree.name, label) + ownFile(tree, "compatibilitytool.vdf").writeText(compatVdf(name)) + ownFile(tree, MARKER).writeText( + JSONObject().put("label", name).put("source", source).put("at", System.currentTimeMillis() / 1000).toString(), + ) + val final = File(tools, name) + val settings = File(final, USER_SETTINGS) + if (Files.isRegularFile(settings.toPath(), java.nio.file.LinkOption.NOFOLLOW_LINKS)) { + settings.copyTo(ownFile(tree, USER_SETTINGS)) + } + if (!placeTree(tree, tools, name, forget)) return context.getString(R.string.xproton_place_failed) + + onProgress(context.getString(R.string.pextra_installing, name), -1) + runGuest(context, listOf("steam-compatibility", "/root/.local/share/Steam")) + return null + } catch (e: Exception) { + Log.e(TAG, "install $source", e) + return e.message ?: context.getString(R.string.xproton_bad_zip) + } finally { + deleteTree(staging) + } + } + + internal fun buildTree(unpacked: File): File? { + val root = unpacked.canonicalFile + return unpacked.listFiles()?.sortedBy { it.name }?.firstOrNull { + !Files.isSymbolicLink(it.toPath()) && it.isDirectory && it.canonicalFile.parentFile == root && + Files.isRegularFile(File(it, "toolmanifest.vdf").toPath(), java.nio.file.LinkOption.NOFOLLOW_LINKS) && + ComponentsManager.isProtonTree(it) + } + } + + @OptIn(ExperimentalPathApi::class) + internal fun deleteTree(dir: File): Boolean = + runCatching { dir.toPath().deleteRecursively() }.onFailure { Log.w(TAG, "delete $dir", it) }.isSuccess && !Files.exists(dir.toPath(), java.nio.file.LinkOption.NOFOLLOW_LINKS) + + internal fun ownFile(tree: File, name: String): File { + val file = File(tree, name) + Files.deleteIfExists(file.toPath()) + return file + } + + internal fun placeTree(tree: File, tools: File, name: String, forget: (String) -> Boolean): Boolean { + val incoming = File(File(tools, INCOMING).apply { mkdirs() }, name) + if (!deleteTree(incoming) || !tree.renameTo(incoming)) return false + return finishPlacing(tools, name, forget) + } + + private fun finishPlacing(tools: File, name: String, forget: (String) -> Boolean): Boolean { + val incoming = File(File(tools, INCOMING), name) + val final = File(tools, name) + val backup = File(File(tools, BACKUPS).apply { mkdirs() }, name) + val moved = !final.exists() || (deleteTree(backup) && final.renameTo(backup)) + val placed = moved && (!backup.exists() || forget(name)) && incoming.renameTo(final) + if (!placed) { + if (!final.exists()) backup.renameTo(final) + deleteTree(incoming) + } + if (final.exists()) deleteTree(backup) + return placed + } + + internal fun restoreInterrupted(tools: File, forget: (String) -> Boolean) { + File(tools, INCOMING).listFiles()?.forEach { finishPlacing(tools, it.name, forget) } + File(tools, BACKUPS).listFiles()?.forEach { if (File(tools, it.name).exists()) deleteTree(it) else it.renameTo(File(tools, it.name)) } + } + + private fun extractTarball(zip: File, into: File): File? = ZipFile(zip).use { z -> + val entries = z.entries().toList().filter { !it.isDirectory } + val entry = entries.filter { TARBALL.containsMatchIn(it.name) }.maxByOrNull { it.size } ?: return null + val name = File(entry.name).name + val sums = checksumEntry(entries.map { it.name }, name)?.let { checksumName -> entries.first { it.name == checksumName } } + val expected = sums?.let { e -> + z.getInputStream(e).use { checksumIn(it.readBytes().decodeToString()) } + ?: throw IllegalStateException("${File(e.name).name} holds no SHA-512 checksum") + } + val out = File(into, name) + val digest = MessageDigest.getInstance("SHA-512") + z.getInputStream(entry).use { input -> DigestOutputStream(FileOutputStream(out), digest).use { input.copyTo(it, 1 shl 16) } } + if (expected != null && !expected.equals(digest.digest().joinToString("") { "%02x".format(it) }, ignoreCase = true)) { + out.delete() + throw IllegalStateException("Checksum mismatch in $name") + } + out + } + + internal fun checksumIn(text: String): String? = Regex("(?i)\\b[0-9a-f]{128}\\b").find(text)?.value + + internal fun checksumEntry(entries: List, tarball: String): String? { + val stem = tarball.substringBefore(".tar") + return entries.firstOrNull { + val name = File(it).name + !TARBALL.containsMatchIn(name) && (name.startsWith("$tarball.") || name.startsWith("$stem.")) && name.contains("sha512", true) + } + } + + private fun runGuest(context: Context, command: List): Int { + val guest = listOf( + "/usr/bin/env", "-i", "HOME=/root", "USER=root", "PATH=/usr/local/bin:/usr/bin:/bin", + "LANG=C.UTF-8", "XDG_DATA_HOME=/root/.local/share", + ) + command + val child = ProtonExtras.guestProcess(context, guest).start() + child.inputStream.bufferedReader().useLines { lines -> lines.forEach { Log.i(TAG, it) } } + return child.waitFor() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt index 63307c159..c277b7b27 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt @@ -290,26 +290,12 @@ object ProtonExtras { val root = LinuxRuntime.rootDir(context) LinuxRuntime.writeAccounts(context) com.droiddeck.launcher.session.SessionFiles.stage(context, root) - val runtimeDir = File(context.filesDir, ".proton-install-rt").apply { mkdirs() } val guest = listOf( "/usr/bin/env", "-i", "HOME=/root", "USER=root", "PATH=/usr/local/bin:/usr/bin:/bin", "LANG=C.UTF-8", "XDG_DATA_HOME=/root/.local/share", "/usr/local/bin/droiddeck-proton-extra", "/root/.local/share/Steam", archive.absolutePath, ) - val process = if (com.droiddeck.launcher.runtime.NativeGuest.enabled(context)) { - com.droiddeck.launcher.runtime.NativeGuest.processBuilder(context, root, - LinuxRuntime.binds(context, null, runtimeDir, null, null), guest).redirectErrorStream(true) - } else { - ProcessBuilder(LinuxRuntime.command(context, null, runtimeDir, null, guest)) - .directory(root) - .redirectErrorStream(true) - .also { builder -> - val hostEnv = builder.environment() - hostEnv["PROOT_LOADER"] = LinuxRuntime.prootLoader(context).path - hostEnv["PROOT_TMP_DIR"] = LinuxRuntime.prootTempDir(context).path - LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { hostEnv["LD_LIBRARY_PATH"] = it } - } - } + val process = guestProcess(context, guest) val child = process.start() var placed: String? = null child.inputStream.bufferedReader().useLines { lines -> @@ -344,6 +330,25 @@ object ProtonExtras { } } + internal fun guestProcess(context: Context, guest: List): ProcessBuilder { + val root = LinuxRuntime.rootDir(context) + val runtimeDir = File(context.filesDir, ".proton-install-rt").apply { mkdirs() } + return if (com.droiddeck.launcher.runtime.NativeGuest.enabled(context)) { + com.droiddeck.launcher.runtime.NativeGuest.processBuilder(context, root, + LinuxRuntime.binds(context, null, runtimeDir, null, null), guest).redirectErrorStream(true) + } else { + ProcessBuilder(LinuxRuntime.command(context, null, runtimeDir, null, guest)) + .directory(root) + .redirectErrorStream(true) + .also { builder -> + val hostEnv = builder.environment() + hostEnv["PROOT_LOADER"] = LinuxRuntime.prootLoader(context).path + hostEnv["PROOT_TMP_DIR"] = LinuxRuntime.prootTempDir(context).path + LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { hostEnv["LD_LIBRARY_PATH"] = it } + } + } + } + private fun releases(tool: Tool): JSONArray? = releases(tool) { page -> Downloader.downloadString(RELEASES.format(Locale.ROOT, tool.repo, page))?.let { body -> try { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt index 62ce4cf73..13d300c5f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt @@ -539,7 +539,8 @@ fun ComponentsPage( val key = "proton:${v.proton.id}" val swaps = v.components.values.count { it.activeFile != null } val extra = protons.rows.firstOrNull { v.proton.dir.name in it.installedAll } - val removable = extra != null && protons.busyId == null && protons.runtimeReady && !protons.sessionRunning + val experimental = v.proton.dir.name in protons.experimental + val removable = (extra != null || experimental) && protons.busyId == null && protons.runtimeReady && !protons.sessionRunning ChoiceLine( v.proton.name, (if (swaps > 0) stringResource(R.string.comp_swapped, v.proton.version, swaps) else stringResource(R.string.comp_all_original, v.proton.version)) @@ -548,7 +549,10 @@ fun ComponentsPage( modifier = (if (i == 0 && !moded(l)) Modifier.focusRequester(firstRow) else Modifier).trackRow(key, rowsAt), onSelect = { if (v.proton.id != view?.proton?.id) { onProton(v.proton.id); flyHome(key, PROTON_TAB) } }, onDelete = { - if (extra != null) ask(key, right, ctx.getString(R.string.proton_remove_title, v.proton.name), ctx.getString(R.string.proton_remove_body), ctx.getString(R.string.store_remove), true, v.proton.name) { + if (experimental) ask(key, right, ctx.getString(R.string.proton_remove_title, v.proton.name), ctx.getString(R.string.proton_remove_body), ctx.getString(R.string.store_remove), true, v.proton.name) { + protonActions.onRemoveExperimental(v.proton.dir.name) + } + else if (extra != null) ask(key, right, ctx.getString(R.string.proton_remove_title, v.proton.name), ctx.getString(R.string.proton_remove_body), ctx.getString(R.string.store_remove), true, v.proton.name) { protonActions.onRemove(extra.id, v.proton.dir.name) } }, @@ -738,6 +742,10 @@ fun ComponentsPage( } } } + if (l == PROTON_TAB && DeveloperTools.on) { + Spacer(Modifier.height(12.dp)) + ExperimentalProtonGroup(protons, protonActions) + } if (l == PROTON_TAB) { Spacer(Modifier.height(12.dp)) Note(stringResource(R.string.comp_about_text)) @@ -1631,6 +1639,18 @@ private fun DeviceChip(s: GpuDriversState) { ) { face() } } +@Composable +private fun ExperimentalProtonGroup(protons: ProtonsState, actions: ProtonsActions) { + val busy = protons.busyId == com.droiddeck.launcher.ProtonMenu.EXPERIMENTAL + val idle = protons.busyId == null && protons.runtimeReady && !protons.sessionRunning + RowGroup(stringResource(R.string.xproton_title)) { + if (busy) GetLine(stringResource(R.string.xproton_title), "", progress = protons.percent, enabled = false, stage = protons.stage) {} + else Row(horizontalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.padding(start = 14.dp, top = 4.dp, bottom = 8.dp)) { + SmallButton(stringResource(R.string.xproton_pick_zip), enabled = idle, onClick = actions.onExperimentalFile) + } + } +} + class ProtonsState( val rows: List = emptyList(), val busyId: String? = null, @@ -1638,6 +1658,7 @@ class ProtonsState( val percent: Int = -1, val runtimeReady: Boolean = true, val sessionRunning: Boolean = false, + val experimental: List = emptyList(), ) class ProtonsActions( @@ -1646,6 +1667,8 @@ class ProtonsActions( val onCancel: (String) -> Unit = {}, val onRemove: (String, String) -> Unit = { _, _ -> }, val onRemoveOlder: (String) -> Unit = {}, + val onExperimentalFile: () -> Unit = {}, + val onRemoveExperimental: (String) -> Unit = {}, ) class ProtonRow( diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 49440fa05..2e20f14e1 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2406,6 +2406,18 @@ عدم تطابق المجموع الاختباري؛ تم حذف التنزيل بدأت جلسة خلال التنزيل، أوقفها قبل تثبيت أدوات التوافق جارٍ تثبيت %1$s + إصدارات تجريبية + اختر ملف .zip لإصدار Proton + تثبيت من ملف .zip + لا توجد مساحة كافية لإصدار Proton هذا + جارٍ فك الضغط + جارٍ تفريغ Proton (بضع دقائق) + ملف .zip لا يحتوي على أرشيف tar لـ Proton + فشل التفريغ (tar %1$d) + الأرشيف لا يحتوي على إصدار Proton + تعذّر وضع إصدار Proton + تعذّرت الإزالة الكاملة لـ %1$s + تم تثبيت Proton التجريبي. اختره في Steam → الخصائص → التوافق. فشل تثبيت %1$s (حالة الخروج %2$d) تعذّر تثبيت %1$s جارٍ جلب حزمة droiddeck-esync 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 745e50505..80faccb1c 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2398,6 +2398,18 @@ La suma de verificación no coincide; se eliminó la descarga Se inició una sesión durante la descarga; detenla antes de instalar herramientas de compatibilidad Instalando %1$s + Versiones experimentales + Elige un .zip de una versión de Proton + Instalar desde .zip + No hay espacio libre suficiente para esta versión de Proton + Descomprimiendo + Desempaquetando Proton (unos minutos) + El .zip no contiene ningún tarball de Proton + Error al desempaquetar (tar %1$d) + El archivo no contiene ninguna versión de Proton + No se pudo colocar la versión de Proton + No se pudo quitar %1$s por completo + Proton experimental instalado. Elígelo en Steam → Propiedades → Compatibilidad. Falló la instalación de %1$s (salida %2$d) No se pudo instalar %1$s Descargando el paquete droiddeck-esync diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 15dd8ac28..0a333b7f8 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2302,6 +2302,18 @@ Несъответствие в контролната сума; изтеглянето беше изтрито По време на изтеглянето започна сесия - спри я, преди да инсталираш инструменти за съвместимост Инсталиране на %1$s + Експериментални версии + Изберете .zip с версия на Proton + Инсталиране от .zip + Няма достатъчно свободно място за тази версия на Proton + Разархивиране + Разопаковане на Proton (няколко минути) + В .zip няма архив tar на Proton + Разопаковането не успя (tar %1$d) + Архивът не съдържа версия на Proton + Версията на Proton не можа да бъде поставена + %1$s не можа да бъде премахнат напълно + Експерименталният Proton е инсталиран. Изберете го в Steam → Свойства → Съвместимост. Инсталирането на %1$s се провали (код %2$d) %1$s не можа да бъде инсталиран Извличане на пакета droiddeck-esync diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index d1c055687..014b81269 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2354,6 +2354,18 @@ Neshoda kontrolního součtu; stahování bylo odstraněno Během stahování se spustila relace; před instalací nástrojů kompatibility ji zastavte Instalování %1$s + Experimentální sestavení + Vyberte .zip se sestavením Proton + Instalovat ze souboru .zip + Pro toto sestavení Proton není dost volného místa + Rozbalování + Rozbalování Proton (několik minut) + Soubor .zip neobsahuje archiv tar s Proton + Rozbalení se nezdařilo (tar %1$d) + Archiv neobsahuje sestavení Proton + Sestavení Proton se nepodařilo umístit + Nepodařilo se úplně odebrat %1$s + Experimentální Proton je nainstalován. Vyberte ho ve Steam → Vlastnosti → Kompatibilita. Instalace %1$s se nezdařila (návratový kód %2$d) Nepodařilo se nainstalovat %1$s Stahování balíčku droiddeck-esync diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index ecb0723cc..1e4231ae0 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2302,6 +2302,18 @@ Tjeksum stemmer ikke; downloadet blev slettet En session startede under downloadet; stop den før du installerer kompatibilitetsværktøjer Installerer %1$s + Eksperimentelle builds + Vælg en Proton-build som .zip + Installer fra .zip + Der er ikke nok ledig plads til denne Proton-build + Udpakker zip + Udpakker Proton (nogle få minutter) + Filen .zip indeholder ingen Proton-tarball + Udpakning mislykkedes (tar %1$d) + Arkivet indeholder ingen Proton-build + Kunne ikke placere Proton-builden + Kunne ikke fjerne %1$s helt + Eksperimentel Proton er installeret. Vælg den i Steam → Egenskaber → Kompatibilitet. Installation af %1$s mislykkedes (afslutningskode %2$d) Kunne ikke installere %1$s Henter droiddeck-esync-pakken diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 0c202baf5..1d4bde9bf 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2294,6 +2294,18 @@ Prüfsumme stimmt nicht überein; der Download wurde gelöscht Während des Downloads wurde eine Sitzung gestartet; beende sie, bevor du Kompatibilitätstools installierst %1$s wird installiert + Experimentelle Builds + Proton-Build als .zip auswählen + Aus .zip installieren + Nicht genug freier Speicher für diesen Proton-Build + Wird entpackt + Proton wird entpackt (einige Minuten) + Die .zip enthält kein Proton-Tarball + Entpacken fehlgeschlagen (tar %1$d) + Das Archiv enthält keinen Proton-Build + Der Proton-Build konnte nicht abgelegt werden + %1$s konnte nicht vollständig entfernt werden + Experimentelles Proton installiert. Wähle es unter Steam → Eigenschaften → Kompatibilität aus. Installation von %1$s fehlgeschlagen (Exit-Code %2$d) %1$s konnte nicht installiert werden droiddeck-esync-Paket wird abgerufen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 749f77914..c50b3adcf 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2302,6 +2302,18 @@ Αναντιστοιχία αθροίσματος ελέγχου· η λήψη διαγράφηκε Μια συνεδρία ξεκίνησε κατά τη λήψη· διακόψτε την πριν εγκαταστήσετε εργαλεία συμβατότητας Εγκατάσταση %1$s + Πειραματικές εκδόσεις + Επιλέξτε ένα .zip έκδοσης Proton + Εγκατάσταση από .zip + Δεν υπάρχει αρκετός ελεύθερος χώρος για αυτήν την έκδοση Proton + Αποσυμπίεση + Αποσυσκευασία του Proton (λίγα λεπτά) + Το .zip δεν περιέχει αρχείο tar του Proton + Η αποσυσκευασία απέτυχε (tar %1$d) + Το αρχείο δεν περιέχει έκδοση Proton + Δεν ήταν δυνατή η τοποθέτηση της έκδοσης Proton + Δεν ήταν δυνατή η πλήρης κατάργηση του %1$s + Το πειραματικό Proton εγκαταστάθηκε. Επιλέξτε το στο Steam → Ιδιότητες → Συμβατότητα. Η εγκατάσταση του %1$s απέτυχε (έξοδος %2$d) Δεν ήταν δυνατή η εγκατάσταση του %1$s Λήψη πακέτου droiddeck-esync diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e734ac3ab..bd28c243b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2328,6 +2328,18 @@ La suma de verificación no coincide; se eliminó la descarga Se inició una sesión durante la descarga; detenla antes de instalar herramientas de compatibilidad Instalando %1$s + Versiones experimentales + Elige un .zip de una versión de Proton + Instalar desde .zip + No hay espacio libre suficiente para esta versión de Proton + Descomprimiendo + Desempaquetando Proton (unos minutos) + El .zip no contiene ningún tarball de Proton + Error al desempaquetar (tar %1$d) + El archivo no contiene ninguna versión de Proton + No se pudo colocar la versión de Proton + No se pudo quitar %1$s por completo + Proton experimental instalado. Elígelo en Steam → Propiedades → Compatibilidad. Falló la instalación de %1$s (salida %2$d) No se pudo instalar %1$s Descargando el paquete droiddeck-esync diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 75505a4d0..042345d84 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2302,6 +2302,18 @@ Tarkistussumma ei täsmää; lataus poistettiin Istunto käynnistyi latauksen aikana; pysäytä se ennen yhteensopivuustyökalujen asentamista Asennetaan %1$s + Kokeelliset versiot + Valitse Proton-version .zip + Asenna .zip-tiedostosta + Tälle Proton-versiolle ei ole tarpeeksi vapaata tilaa + Puretaan zip + Puretaan Protonia (muutama minuutti) + Tiedostossa .zip ei ole Proton-tar-pakettia + Purku epäonnistui (tar %1$d) + Arkisto ei sisällä Proton-versiota + Proton-versiota ei voitu sijoittaa + Kohdetta %1$s ei voitu poistaa kokonaan + Kokeellinen Proton asennettu. Valitse se kohdassa Steam → Ominaisuudet → Yhteensopivuus. %1$s-asennus epäonnistui (poistumiskoodi %2$d) Kohdetta %1$s ei voitu asentaa Haetaan droiddeck-esync-pakettia diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index cbe2334cf..b11a5a674 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2327,6 +2327,18 @@ Somme de contrôle incorrecte ; le téléchargement a été supprimé Une session a démarré pendant le téléchargement ; arrêtez-la avant d\'installer des outils de compatibilité Installation de %1$s + Versions expérimentales + Choisir un .zip de version Proton + Installer depuis un .zip + Espace libre insuffisant pour cette version de Proton + Décompression + Extraction de Proton (quelques minutes) + Le .zip ne contient aucune archive tar de Proton + Échec de l\'extraction (tar %1$d) + L\'archive ne contient aucune version de Proton + Impossible de placer la version de Proton + Impossible de supprimer entièrement %1$s + Proton expérimental installé. Sélectionnez-le dans Steam → Propriétés → Compatibilité. Échec de l\'installation de %1$s (code %2$d) Impossible d\'installer %1$s Récupération du pack droiddeck-esync diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 199a26295..0e9ad3ed4 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2302,6 +2302,18 @@ चेकसम मेल नहीं खाया; डाउनलोड हटा दिया गया डाउनलोड के दौरान एक सेशन शुरू हुआ; कम्पैटिबिलिटी टूल इंस्टॉल करने से पहले इसे बंद करें %1$s इंस्टॉल हो रहा है + प्रायोगिक बिल्ड + Proton बिल्ड की .zip चुनें + .zip से इंस्टॉल करें + इस Proton बिल्ड के लिए पर्याप्त खाली जगह नहीं है + अनज़िप हो रहा है + Proton अनपैक हो रहा है (कुछ मिनट) + .zip में Proton का कोई tar आर्काइव नहीं है + अनपैक करना विफल रहा (tar %1$d) + आर्काइव में कोई Proton बिल्ड नहीं है + Proton बिल्ड को रखा नहीं जा सका + %1$s को पूरी तरह हटाया नहीं जा सका + प्रायोगिक Proton इंस्टॉल हो गया। इसे Steam → गुण → संगतता में चुनें। %1$s इंस्टॉलेशन विफल रहा (exit %2$d) %1$s इंस्टॉल नहीं हो सका droiddeck-esync पैक लिया जा रहा है diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index aa74d6799..f8b6fbc27 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2302,6 +2302,18 @@ Az ellenőrzőösszeg nem egyezik; a letöltés törlésre került Egy munkamenet elindult a letöltés közben; állítsa le a kompatibilitási eszközök telepítése előtt %1$s telepítése + Kísérleti buildek + Válassz egy Proton-build .zip fájlt + Telepítés .zip fájlból + Nincs elég szabad hely ehhez a Proton-buildhez + Kicsomagolás + A Proton kibontása (néhány perc) + A .zip nem tartalmaz Proton tar-csomagot + A kibontás nem sikerült (tar %1$d) + Az archívum nem tartalmaz Proton-buildet + Nem sikerült elhelyezni a Proton-buildet + Nem sikerült teljesen eltávolítani: %1$s + A kísérleti Proton telepítve. Válaszd ki a Steam → Tulajdonságok → Kompatibilitás menüben. A %1$s telepítése sikertelen (kilépési kód: %2$d) Nem sikerült telepíteni a %1$s-t droiddeck-esync csomag letöltése diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 935869a35..d85a73b7c 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2277,6 +2277,18 @@ Checksum tidak cocok; unduhan telah dihapus Sesi dimulai saat pengunduhan berlangsung; hentikan sesi tersebut sebelum menginstal alat kompatibilitas Menginstal %1$s + Build eksperimental + Pilih .zip build Proton + Instal dari .zip + Ruang kosong tidak cukup untuk build Proton ini + Mengekstrak zip + Membuka paket Proton (beberapa menit) + .zip tidak berisi tarball Proton + Gagal membuka paket (tar %1$d) + Arsip tidak berisi build Proton + Tidak dapat menempatkan build Proton + Tidak dapat menghapus %1$s sepenuhnya + Proton eksperimental terinstal. Pilih di Steam → Properti → Kompatibilitas. Instalasi %1$s gagal (keluar %2$d) Tidak dapat menginstal %1$s Mengambil paket droiddeck-esync diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6aad28b97..207e3a575 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2319,6 +2319,18 @@ Checksum non corrispondente; il download è stato eliminato È stata avviata una sessione durante il download; interrompila prima di installare strumenti di compatibilità Installazione di %1$s + Build sperimentali + Scegli uno .zip di una build di Proton + Installa da .zip + Spazio libero insufficiente per questa build di Proton + Decompressione + Estrazione di Proton (qualche minuto) + Lo .zip non contiene alcun tarball di Proton + Estrazione non riuscita (tar %1$d) + L\'archivio non contiene alcuna build di Proton + Impossibile posizionare la build di Proton + Impossibile rimuovere completamente %1$s + Proton sperimentale installato. Selezionalo in Steam → Proprietà → Compatibilità. Installazione di %1$s non riuscita (uscita %2$d) Impossibile installare %1$s Recupero del pacchetto droiddeck-esync diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index fa800884a..0e0a721ea 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2277,6 +2277,18 @@ チェックサムが一致しないため、ダウンロードを削除しました ダウンロード中にセッションが開始されました。停止してから互換性ツールをインストールしてください %1$sをインストール中 + 試験版ビルド + Protonビルドの.zipを選択 + .zipからインストール + このProtonビルド用の空き容量が足りません + 解凍中 + Protonを展開中(数分かかります) + .zipにProtonのtarballが含まれていません + 展開に失敗しました(tar %1$d) + アーカイブにProtonビルドが含まれていません + Protonビルドを配置できませんでした + %1$sを完全に削除できませんでした + 試験版Protonをインストールしました。Steam → プロパティ → 互換性 で選択してください。 %1$sのインストールに失敗しました(終了コード %2$d) %1$sをインストールできませんでした droiddeck-esyncパックを取得中 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 49c59c7fe..281827cb4 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2277,6 +2277,18 @@ 체크섬이 일치하지 않아 다운로드를 삭제했습니다 다운로드 중에 세션이 시작되었습니다. 호환성 도구를 설치하기 전에 세션을 중지하세요 %1$s 설치 중 + 실험용 빌드 + Proton 빌드 .zip 선택 + .zip에서 설치 + 이 Proton 빌드를 설치할 여유 공간이 부족합니다 + 압축 해제 중 + Proton 풀는 중 (몇 분 소요) + .zip에 Proton tar 파일이 없습니다 + 압축 풀기 실패 (tar %1$d) + 아카이브에 Proton 빌드가 없습니다 + Proton 빌드를 배치할 수 없습니다 + %1$s을(를) 완전히 제거할 수 없습니다 + 실험용 Proton이 설치되었습니다. Steam → 속성 → 호환성에서 선택하세요. %1$s 설치 실패(종료 코드 %2$d) %1$s을(를) 설치할 수 없습니다 droiddeck-esync 팩 받는 중 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 20c5977e3..a1b1f06c6 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2277,6 +2277,18 @@ Checksum tidak sepadan; muat turun telah dipadam Sesi dimulakan semasa muat turun; hentikan dahulu sebelum memasang alat keserasian Memasang %1$s + Binaan eksperimen + Pilih .zip binaan Proton + Pasang daripada .zip + Ruang kosong tidak mencukupi untuk binaan Proton ini + Menyahzip + Membuka pakej Proton (beberapa minit) + .zip tidak mengandungi tarball Proton + Gagal membuka pakej (tar %1$d) + Arkib tidak mengandungi binaan Proton + Tidak dapat meletakkan binaan Proton + Tidak dapat mengalih keluar %1$s sepenuhnya + Proton eksperimen telah dipasang. Pilihnya di Steam → Sifat → Keserasian. Pemasangan %1$s gagal (keluar %2$d) Tidak dapat memasang %1$s Mengambil pek droiddeck-esync diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 535038128..071642efc 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2302,6 +2302,18 @@ Sjekksummen stemmer ikke; nedlastingen ble slettet En sesjon startet under nedlastingen; avslutt den før du installerer kompatibilitetsverktøy Installerer %1$s + Eksperimentelle bygg + Velg en Proton-bygg som .zip + Installer fra .zip + Ikke nok ledig plass til dette Proton-bygget + Pakker ut zip + Pakker ut Proton (noen få minutter) + .zip-filen inneholder ingen Proton-tarball + Utpakking mislyktes (tar %1$d) + Arkivet inneholder ingen Proton-bygg + Kunne ikke plassere Proton-bygget + Kunne ikke fjerne %1$s helt + Eksperimentell Proton er installert. Velg den i Steam → Egenskaper → Kompatibilitet. Installasjonen av %1$s mislyktes (avslutningskode %2$d) Kunne ikke installere %1$s Henter droiddeck-esync-pakke diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index ed67b367e..ca7a52268 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2302,6 +2302,18 @@ Checksum komt niet overeen; de download is verwijderd Er is een sessie gestart tijdens het downloaden; stop die voordat je compatibiliteitstools installeert %1$s installeren + Experimentele builds + Kies een Proton-build als .zip + Installeren vanuit .zip + Niet genoeg vrije ruimte voor deze Proton-build + Uitpakken van zip + Proton uitpakken (enkele minuten) + De .zip bevat geen Proton-tarball + Uitpakken mislukt (tar %1$d) + Het archief bevat geen Proton-build + Kan de Proton-build niet plaatsen + Kan %1$s niet volledig verwijderen + Experimentele Proton geïnstalleerd. Kies het in Steam → Eigenschappen → Compatibiliteit. Installeren van %1$s is mislukt (afsluitcode %2$d) Kan %1$s niet installeren Pakket droiddeck-esync ophalen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 2ac1cbfbf..37feb93f8 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2354,6 +2354,18 @@ Niezgodna suma kontrolna; pobrany plik usunięto Podczas pobierania uruchomiono sesję; zatrzymaj ją przed instalacją narzędzi zgodności Instalowanie %1$s + Kompilacje eksperymentalne + Wybierz plik .zip z kompilacją Proton + Zainstaluj z pliku .zip + Za mało wolnego miejsca na tę kompilację Proton + Rozpakowywanie + Rozpakowywanie Proton (kilka minut) + Plik .zip nie zawiera archiwum tar z Proton + Rozpakowywanie nie powiodło się (tar %1$d) + Archiwum nie zawiera kompilacji Proton + Nie udało się umieścić kompilacji Proton + Nie udało się całkowicie usunąć %1$s + Eksperymentalny Proton został zainstalowany. Wybierz go w Steam → Właściwości → Zgodność. Instalacja %1$s nie powiodła się (kod %2$d) Nie udało się zainstalować %1$s Pobieranie pakietu droiddeck-esync diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 54cca5da9..d9911b434 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2319,6 +2319,18 @@ A soma de verificação não corresponde; a transferência foi eliminada Foi iniciada uma sessão durante a transferência; pare-a antes de instalar ferramentas de compatibilidade A instalar %1$s + Versões experimentais + Escolha um .zip de versão do Proton + Instalar a partir de .zip + Não há espaço livre suficiente para esta versão do Proton + A descompactar + A desempacotar o Proton (alguns minutos) + O .zip não contém nenhum tarball do Proton + Falha ao desempacotar (tar %1$d) + O arquivo não contém nenhuma versão do Proton + Não foi possível colocar a versão do Proton + Não foi possível remover totalmente %1$s + Proton experimental instalado. Escolha-o em Steam → Propriedades → Compatibilidade. Falha na instalação de %1$s (saída %2$d) Não foi possível instalar %1$s A obter o pacote droiddeck-esync diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 8116d2215..4358d50e8 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2327,6 +2327,18 @@ A soma de verificação não confere; o download foi excluído Uma sessão foi iniciada durante o download; pare-a antes de instalar ferramentas de compatibilidade Instalando %1$s + Builds experimentais + Escolha um .zip de build do Proton + Instalar a partir de .zip + Não há espaço livre suficiente para este build do Proton + Descompactando + Desempacotando o Proton (alguns minutos) + O .zip não contém nenhum tarball do Proton + Falha ao desempacotar (tar %1$d) + O arquivo não contém nenhum build do Proton + Não foi possível colocar o build do Proton + Não foi possível remover totalmente o %1$s + Proton experimental instalado. Escolha-o em Steam → Propriedades → Compatibilidade. Falha na instalação do %1$s (código de saída %2$d) Não foi possível instalar o %1$s Buscando o pacote droiddeck-esync diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 9315e8d9f..1d3ded24e 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2328,6 +2328,18 @@ Sumă de control incorectă; descărcarea a fost ștearsă O sesiune a pornit în timpul descărcării; oprește-o înainte de a instala instrumente de compatibilitate Se instalează %1$s + Versiuni experimentale + Alege un .zip cu o versiune Proton + Instalează din .zip + Nu există suficient spațiu liber pentru această versiune Proton + Se dezarhivează + Se despachetează Proton (câteva minute) + Fișierul .zip nu conține nicio arhivă tar Proton + Despachetarea a eșuat (tar %1$d) + Arhiva nu conține nicio versiune Proton + Versiunea Proton nu a putut fi plasată + %1$s nu a putut fi eliminat complet + Proton experimental a fost instalat. Selectează-l în Steam → Proprietăți → Compatibilitate. Instalarea %1$s a eșuat (cod de ieșire %2$d) %1$s nu a putut fi instalat Se obține pachetul droiddeck-esync diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index b4105decd..2dbd90497 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2354,6 +2354,18 @@ Контрольная сумма не совпадает; загруженный файл удален Во время загрузки запустилась сессия; остановите ее перед установкой инструментов совместимости Установка %1$s + Экспериментальные сборки + Выберите .zip со сборкой Proton + Установить из .zip + Недостаточно свободного места для этой сборки Proton + Распаковка архива + Распаковка Proton (несколько минут) + В .zip нет архива tar с Proton + Не удалось распаковать (tar %1$d) + В архиве нет сборки Proton + Не удалось разместить сборку Proton + Не удалось полностью удалить %1$s + Экспериментальная сборка Proton установлена. Выберите её в Steam → Свойства → Совместимость. Ошибка установки %1$s (код выхода %2$d) Не удалось установить %1$s Загрузка пакета droiddeck-esync diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index ed197424f..697b79493 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2302,6 +2302,18 @@ Kontrollsumman stämmer inte. Nedladdningen togs bort En session startade under nedladdningen. Stoppa den innan du installerar kompatibilitetsverktyg Installerar %1$s + Experimentella byggen + Välj en Proton-version som .zip + Installera från .zip + Inte tillräckligt med ledigt utrymme för den här Proton-versionen + Packar upp zip + Packar upp Proton (några minuter) + .zip-filen innehåller ingen Proton-tarball + Uppackningen misslyckades (tar %1$d) + Arkivet innehåller ingen Proton-version + Det gick inte att placera Proton-versionen + Det gick inte att ta bort %1$s helt + Experimentell Proton installerad. Välj den i Steam → Egenskaper → Kompatibilitet. Installationen av %1$s misslyckades (avslutningskod %2$d) Kunde inte installera %1$s Hämtar droiddeck-esync-paket diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 97e4ae05c..eb9201563 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2277,6 +2277,18 @@ ค่าตรวจสอบไม่ตรงกัน การดาวน์โหลดถูกลบแล้ว มีเซสชันเริ่มขึ้นระหว่างการดาวน์โหลด หยุดเซสชันก่อนติดตั้งเครื่องมือความเข้ากันได้ กำลังติดตั้ง %1$s + บิลด์ทดลอง + เลือกไฟล์ .zip ของบิลด์ Proton + ติดตั้งจากไฟล์ .zip + พื้นที่ว่างไม่เพียงพอสำหรับบิลด์ Proton นี้ + กำลังแตกไฟล์ zip + กำลังแตกไฟล์ Proton (ใช้เวลาไม่กี่นาที) + ไฟล์ .zip ไม่มี tarball ของ Proton + แตกไฟล์ไม่สำเร็จ (tar %1$d) + ไฟล์เก็บถาวรไม่มีบิลด์ Proton + ไม่สามารถวางบิลด์ Proton ได้ + ไม่สามารถลบ %1$s ออกให้หมดได้ + ติดตั้ง Proton รุ่นทดลองแล้ว เลือกได้ที่ Steam → คุณสมบัติ → ความเข้ากันได้ การติดตั้ง %1$s ล้มเหลว (ออกด้วยสถานะ %2$d) ไม่สามารถติดตั้ง %1$s ได้ กำลังดึงแพ็ก droiddeck-esync diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 5ee9d6ae2..0bdf53764 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2294,6 +2294,18 @@ Sağlama toplamı uyuşmuyor; indirme silindi İndirme sırasında bir oturum başladı; uyumluluk araçlarını yüklemeden önce durdurun %1$s yükleniyor + Deneysel sürümler + Bir Proton sürümü .zip dosyası seçin + Şuradan yükle: .zip + Bu Proton sürümü için yeterli boş alan yok + Zip açılıyor + Proton paketten çıkarılıyor (birkaç dakika) + .zip dosyasında Proton tar arşivi yok + Paketten çıkarma başarısız oldu (tar %1$d) + Arşivde Proton sürümü yok + Proton sürümü yerleştirilemedi + %1$s tamamen kaldırılamadı + Deneysel Proton yüklendi. Steam → Özellikler → Uyumluluk bölümünden seçin. %1$s yüklemesi başarısız oldu (çıkış %2$d) %1$s yüklenemedi droiddeck-esync paketi getiriliyor diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 20b12469d..a3ae01f71 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2354,6 +2354,18 @@ Контрольна сума не збіглася; завантаження видалено Під час завантаження розпочався сеанс; зупиніть його, перш ніж встановлювати інструменти сумісності Встановлення %1$s + Експериментальні збірки + Виберіть .zip зі збіркою Proton + Встановити з .zip + Недостатньо вільного місця для цієї збірки Proton + Розпакування архіву + Розпакування Proton (кілька хвилин) + У .zip немає архіву tar із Proton + Не вдалося розпакувати (tar %1$d) + В архіві немає збірки Proton + Не вдалося розмістити збірку Proton + Не вдалося повністю видалити %1$s + Експериментальну збірку Proton встановлено. Виберіть її в Steam → Властивості → Сумісність. Встановлення %1$s не вдалося (код виходу %2$d) Не вдалося встановити %1$s Отримання пакета droiddeck-esync diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 1e1dd1856..67403a00d 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2277,6 +2277,18 @@ Checksum không khớp; tệp tải xuống đã bị xóa Một phiên đã bắt đầu trong khi tải; hãy dừng nó trước khi cài công cụ tương thích Đang cài %1$s + Bản dựng thử nghiệm + Chọn tệp .zip bản dựng Proton + Cài đặt từ .zip + Không đủ dung lượng trống cho bản dựng Proton này + Đang giải nén zip + Đang giải nén Proton (vài phút) + Tệp .zip không chứa tarball Proton + Giải nén thất bại (tar %1$d) + Tệp lưu trữ không chứa bản dựng Proton + Không thể đặt bản dựng Proton + Không thể gỡ hoàn toàn %1$s + Đã cài Proton thử nghiệm. Hãy chọn nó trong Steam → Thuộc tính → Tương thích. Cài %1$s thất bại (mã thoát %2$d) Không thể cài %1$s Đang lấy pack droiddeck-esync diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 8b99d8285..2064b9df5 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2354,6 +2354,18 @@ 校验和不匹配;已删除下载的文件 下载期间有会话启动;请先停止它,再安装兼容性工具 正在安装 %1$s + 实验版本 + 选择 Proton 版本 .zip + 从 .zip 安装 + 可用空间不足,无法安装此 Proton 版本 + 正在解压 + 正在解包 Proton(需要几分钟) + .zip 中不含 Proton tar 包 + 解包失败(tar %1$d) + 压缩包中不含 Proton 版本 + 无法放置 Proton 版本 + 无法完全移除 %1$s + 实验版 Proton 已安装。请在 Steam → 属性 → 兼容性 中选择。 %1$s 安装失败(退出代码 %2$d) 无法安装 %1$s 正在获取 droiddeck-esync 包 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index bfe3e076f..d1fd71fc1 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2276,6 +2276,18 @@ 校驗和不符;已刪除下載的檔案 下載期間有會話啟動;請先停止該會話,再安裝兼容性工具 正在安裝 %1$s + 實驗版本 + 選擇 Proton 版本 .zip + 從 .zip 安裝 + 可用空間不足,無法安裝此 Proton 版本 + 正在解壓縮 + 正在解包 Proton(需要幾分鐘) + .zip 中不含 Proton tar 包 + 解包失敗(tar %1$d) + 壓縮檔中不含 Proton 版本 + 無法放置 Proton 版本 + 無法完全移除 %1$s + 實驗版 Proton 已安裝。請在 Steam → 內容 → 相容性 中選擇。 %1$s 安裝失敗(結束代碼 %2$d) 無法安裝 %1$s 正在下載 droiddeck-esync 套件 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 1a1c502bd..6c4037861 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2276,6 +2276,18 @@ 校驗碼不符;已刪除下載內容 下載期間有工作階段啟動;請先停止它,再安裝相容性工具 正在安裝 %1$s + 實驗版本 + 選擇 Proton 版本 .zip + 從 .zip 安裝 + 可用空間不足,無法安裝此 Proton 版本 + 正在解壓縮 + 正在解包 Proton(需要幾分鐘) + .zip 中不含 Proton tar 包 + 解包失敗(tar %1$d) + 壓縮檔中不含 Proton 版本 + 無法放置 Proton 版本 + 無法完全移除 %1$s + 實驗版 Proton 已安裝。請在 Steam → 內容 → 相容性 中選擇。 %1$s 安裝失敗(結束代碼 %2$d) 無法安裝 %1$s 正在取得 droiddeck-esync 套件 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 14bfd4d60..d61f0ad01 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2530,6 +2530,18 @@ Checksum mismatch; the download was deleted A session started during the download; stop it before installing compatibility tools Installing %1$s + Experimental builds + Pick a Proton build .zip + Install from .zip + Not enough free space for this Proton build + Unzipping + Unpacking Proton (a few minutes) + The .zip holds no Proton tarball + Unpacking failed (tar %1$d) + The archive holds no Proton build + Could not place the Proton build + Could not fully remove %1$s + Experimental Proton installed. Pick it in Steam → Properties → Compatibility. %1$s installation failed (exit %2$d) Could not install %1$s Fetching droiddeck-esync pack diff --git a/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt new file mode 100644 index 000000000..1972a0631 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt @@ -0,0 +1,155 @@ +package com.droiddeck.launcher.session + +import java.io.File +import java.nio.file.Files +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class ExperimentalProtonsTest { + @get:Rule val temp = TemporaryFolder() + + @Test + fun namesNeverCollideWithReleasedBuilds() { + val name = ExperimentalProtons.dirName("DroidDeck-Proton-11-12.8-aarch64", "pr34-build") + assertEquals("Experimental-DroidDeck-Proton-11-12.8-aarch64-pr34-build", name) + assertFalse(name.startsWith("DroidDeck-Proton")) + assertEquals("Experimental-DroidDeck-Proton-11-12.8-aarch64", + ExperimentalProtons.dirName("DroidDeck-Proton-11-12.8-aarch64", "DroidDeck-Proton-11-12.8-aarch64")) + } + + @Test + fun buildTreeSkipsLinksOutOfTheArchive() { + val outside = protonTree(temp.newFolder("installed")) + val unpacked = temp.newFolder("unpacked") + Files.createSymbolicLink(File(unpacked, "a-link").toPath(), outside.toPath()) + assertNull(ExperimentalProtons.buildTree(unpacked)) + val real = protonTree(File(unpacked, "b-build")) + assertEquals(real.canonicalFile, ExperimentalProtons.buildTree(unpacked)?.canonicalFile) + } + + @Test + fun buildTreeNeedsWhatTheCatalogNeeds() { + val unpacked = temp.newFolder("unpacked") + val tree = File(unpacked, "build").apply { mkdirs(); File(this, "toolmanifest.vdf").writeText("x") } + assertNull(ExperimentalProtons.buildTree(unpacked)) + File(tree, "proton").writeText("x") + assertNull(ExperimentalProtons.buildTree(unpacked)) + File(tree, "files/lib/wine").mkdirs() + assertEquals(tree.canonicalFile, ExperimentalProtons.buildTree(unpacked)?.canonicalFile) + } + + private fun protonTree(dir: File): File = dir.apply { + File(this, "files/lib/wine").mkdirs() + File(this, "toolmanifest.vdf").writeText("x") + File(this, "proton").writeText("x") + } + + @Test + fun ownFileReplacesALinkWithoutTouchingItsTarget() { + val victim = temp.newFile("compatibilitytool.vdf").apply { writeText("released") } + val tree = temp.newFolder("tree") + Files.createSymbolicLink(File(tree, "compatibilitytool.vdf").toPath(), victim.toPath()) + ExperimentalProtons.ownFile(tree, "compatibilitytool.vdf").writeText("experimental") + assertEquals("released", victim.readText()) + assertFalse(Files.isSymbolicLink(File(tree, "compatibilitytool.vdf").toPath())) + } + + @Test + fun deleteTreeDoesNotFollowLinks() { + val kept = temp.newFolder("kept").apply { File(this, "file").writeText("x") } + val build = temp.newFolder("build") + Files.createSymbolicLink(File(build, "lib").toPath(), kept.toPath()) + assertTrue(ExperimentalProtons.deleteTree(build)) + assertFalse(build.exists()) + assertTrue(File(kept, "file").isFile) + } + + @Test + fun checksumFileWithoutADigestIsRejected() { + assertNull(ExperimentalProtons.checksumIn("not a checksum\n")) + val digest = "a".repeat(128) + assertEquals(digest, ExperimentalProtons.checksumIn("$digest DroidDeck-Proton.tar.gz\n")) + } + + @Test + fun checksumLookupDoesNotSelectTheTarball() { + assertNull(ExperimentalProtons.checksumEntry(listOf("Proton-sha512.tar.gz"), "Proton-sha512.tar.gz")) + assertEquals("Proton-sha512.tar.gz.sha512sum", ExperimentalProtons.checksumEntry( + listOf("Proton-sha512.tar.gz", "Proton-sha512.tar.gz.sha512sum"), "Proton-sha512.tar.gz")) + assertNull(ExperimentalProtons.checksumEntry(listOf("Proton.tar.gz"), "Proton.tar.gz")) + assertEquals("Proton.tar.gz.sha512sum", ExperimentalProtons.checksumEntry( + listOf("Proton-debug.tar.gz.sha512sum", "Proton.tar.gz.sha512sum"), "Proton.tar.gz")) + assertEquals("Proton.sha512sum", ExperimentalProtons.checksumEntry(listOf("Proton.sha512sum"), "Proton.tar.gz")) + assertNull(ExperimentalProtons.checksumEntry(listOf("Proton-debug.tar.gz.sha512sum"), "Proton.tar.gz")) + } + + private fun build(dir: File, marker: String): File = dir.apply { + mkdirs() + File(this, "marker").writeText(marker) + } + + @Test + fun failedPlacementRestoresTheExistingBuild() { + val tools = temp.newFolder("tools") + build(File(tools, "Experimental-A"), "old") + assertFalse(ExperimentalProtons.placeTree(File(tools, "missing"), tools, "Experimental-A") { true }) + assertEquals("old", File(tools, "Experimental-A/marker").readText()) + assertFalse(ExperimentalProtons.placeTree(build(File(tools, "staged"), "new"), tools, "Experimental-A") { false }) + assertEquals("old", File(tools, "Experimental-A/marker").readText()) + assertTrue(tools.walkTopDown().none { it.isFile && it.readText() == "new" }) + } + + @Test + fun aReplacedBuildIsForgottenWhileNeitherBuildIsInstalled() { + val tools = temp.newFolder("tools") + build(File(tools, "Experimental-A"), "old") + val forgotten = ArrayList() + assertTrue(ExperimentalProtons.placeTree(build(File(tools, "staged"), "new"), tools, "Experimental-A") { + assertFalse(File(tools, it).exists()) + forgotten.add(it) + }) + assertEquals(listOf("Experimental-A"), forgotten) + assertEquals("new", File(tools, "Experimental-A/marker").readText()) + assertTrue(ExperimentalProtons.placeTree(build(File(tools, "staged"), "first"), tools, "Experimental-B") { forgotten.add(it) }) + assertEquals(listOf("Experimental-A"), forgotten) + assertEquals(listOf("Experimental-A", "Experimental-B"), tools.walkTopDown().filter { it.name == "marker" }.map { it.parentFile.name }.sorted().toList()) + } + + @Test + fun anInterruptedReplacementIsFinishedWithItsOldStateForgotten() { + val tools = temp.newFolder("tools") + build(File(tools, "Experimental-A"), "old") + build(File(tools, ".droiddeck-experimental-new/Experimental-A"), "new") + build(File(tools, ".droiddeck-experimental-old/Experimental-B"), "old") + build(File(tools, ".droiddeck-experimental-new/Experimental-B"), "new") + build(File(tools, ".droiddeck-experimental-old/Experimental-C"), "old") + build(File(tools, ".droiddeck-experimental-old/Experimental-D"), "old") + build(File(tools, "Experimental-D"), "new") + val forgotten = ArrayList() + ExperimentalProtons.restoreInterrupted(tools) { forgotten.add(it) } + assertEquals(listOf("Experimental-A", "Experimental-B"), forgotten.sorted()) + assertEquals(listOf("new", "new", "old", "new"), listOf("A", "B", "C", "D").map { File(tools, "Experimental-$it/marker").readText() }) + assertTrue(File(tools, ".droiddeck-experimental-old").listFiles().isNullOrEmpty()) + assertTrue(File(tools, ".droiddeck-experimental-new").listFiles().isNullOrEmpty()) + } + + @Test + fun anInterruptedReplacementKeepsTheOldBuildWhenItsStateCannotBeForgotten() { + val tools = temp.newFolder("tools") + build(File(tools, ".droiddeck-experimental-old/Experimental-A"), "old") + build(File(tools, ".droiddeck-experimental-new/Experimental-A"), "new") + ExperimentalProtons.restoreInterrupted(tools) { false } + assertEquals("old", File(tools, "Experimental-A/marker").readText()) + assertTrue(File(tools, ".droiddeck-experimental-new").listFiles().isNullOrEmpty()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt index 5f3f3891f..15e0280a7 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt @@ -222,8 +222,25 @@ class ProtonExtrasTest { assertFalse(state.getJSONObject("active").has("GE-Proton11-7")) assertFalse(state.getJSONObject("queued").has("GE-Proton11-7")) assertTrue(state.getJSONObject("active").has("GE-Proton11-8")) - ComponentsManager.forgetProton(context, kept.name) + assertTrue(ComponentsManager.forgetProton(context, kept.name)) assertTrue(File(originals, "GE-Proton11-8/GE-Proton11-8/dxvk.wcp").isFile) + val published = File(LinuxRuntime.rootDir(context), "root/.local/share/droiddeck-components/desired.tsv") + published.appendText("*\tExperimental-Gone\t11\tdxvk\tfiles/lib/wine/dxvk/x86_64-windows/dxgi.dll\t-\t-\n") + File(originals, "Experimental-Gone/11/dxvk.wcp").apply { parentFile?.mkdirs(); writeText("x") } + assertTrue(ComponentsManager.forgetProton(context, "Experimental-Gone")) + assertFalse(published.readLines().any { "Experimental-Gone" in it }) + assertFalse(File(originals, "Experimental-Gone").exists()) + + val store = File(LinuxRuntime.rootDir(context), "root/.local/share/droiddeck-components/store") + File(originals, "Experimental-Stale/11/dxvk.wcp").apply { parentFile?.mkdirs(); writeText("x") } + val stale = File(store, "original-Experimental-Stale-11-dxvk").apply { mkdirs(); File(this, ".complete").writeText("1\n") } + val other = File(store, "original-Experimental-Stale-2-11-dxvk").apply { mkdirs(); File(this, ".complete").writeText("1\n") } + File(originals, "Experimental-Stale/2-11/dxvk.wcp").apply { parentFile?.mkdirs(); writeText("x") } + published.appendText("*\tExperimental-Stale-2\t11\tdxvk\tfiles/a.dll\t0\t/root/.local/share/droiddeck-components/store/${other.name}/files/a.dll\n") + assertTrue(ComponentsManager.forgetProton(context, "Experimental-Stale")) + assertFalse(stale.exists()) + assertTrue(File(other, ".complete").isFile) + assertFalse(File(originals, "Experimental-Stale").exists()) } @Test diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index 4ad361e4e..c8ac2ceb3 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -1089,9 +1089,10 @@ NATIVE_CHOICE = object() def plan_mapping(current, installed, runnable, default, auto, native=None, picks=(), overrides=None, managed=None, - native_choices=(), tools=None): + native_choices=(), tools=None, removed=()): tools = tools or {} runnable = {n.lower() for n in runnable} + removed = {n.lower() for n in removed} - runnable installed = set(installed) picks = set(picks) | {app for app, platforms in tools.items() if "linux" not in platforms} native = native or {} @@ -1121,7 +1122,7 @@ def plan_mapping(current, installed, runnable, default, auto, native=None, picks target = native.get(app, default) if not name and (app in native_choices or (app in current and app in FEX_DEFAULT_APPS)): target = NATIVE_CHOICE - stale = unrunnable(name, runnable) + stale = unrunnable(name, runnable) or name.lower() in removed if name and not stale and (mine is None or name != mine): continue if target is NATIVE_CHOICE: @@ -1163,6 +1164,26 @@ def followers(state, current): return {app: name for app, name in current.items() if app != "0" and name == TOOL} +REPLACING = ".droiddeck-experimental-old" + + +def removed_tools(state, catalog, directory=None): + known = state.get("tools") if isinstance(state.get("tools"), list) else () + previous = {t.get("name") for t in known if isinstance(t, dict) and not t.get("valve") and t.get("name")} + removed = previous - {t["name"] for t in catalog} + if directory is None: + return removed + known_dirs = {t.get("name"): t.get("dir") for t in known if isinstance(t, dict)} + return {name for name in removed if isinstance(known_dirs.get(name), str) and + not os.path.lexists(os.path.join(directory, known_dirs[name])) and + not os.path.lexists(os.path.join(directory, REPLACING, known_dirs[name]))} + + +def removed_dirs(state, removed): + known = state.get("tools") if isinstance(state.get("tools"), list) else () + return {t["dir"] for t in known if isinstance(t, dict) and not t.get("valve") and t.get("name") in removed and isinstance(t.get("dir"), str)} - {""} + + def tool_entry(name, display, path, valve): return {"name": name, "display": display, "dir": os.path.basename(path) if path else "", "valve": valve} @@ -1248,15 +1269,19 @@ def valid_game_request(app, request): request["dir"] != "" and isinstance(request.get("valve"), bool))) -def settle_game_requests(requests, state, current, catalog, missing_is_cleared=False): +def settle_game_requests(requests, state, current, catalog, missing_is_cleared=False, removed=()): recorded = state.get("games_applied") if isinstance(recorded, dict): applied = dict(recorded) else: applied = dict(requests) if "tools" in state else {} by_name = {t["name"]: t for t in catalog} + gone = removed_dirs(state, removed) out = dict(requests) for app, request in requests.items(): + if isinstance(request, dict) and request.get("valve") is False and isinstance(request.get("dir"), str) and request["dir"] in gone: + del out[app] + continue if not valid_game_request(app, request) or app not in applied or applied[app] != request: continue if request is None: @@ -1281,10 +1306,10 @@ def settle_game_requests(requests, state, current, catalog, missing_is_cleared=F return out, out != requests -def settled_game_requests(state, current, catalog, missing_is_cleared=False, directory=None): +def settled_game_requests(state, current, catalog, missing_is_cleared=False, directory=None, removed=()): for _ in range(2): requests, text = read_game_requests(directory) - settled, moved = settle_game_requests(requests, state, current, catalog, missing_is_cleared) + settled, moved = settle_game_requests(requests, state, current, catalog, missing_is_cleared, removed) if not moved or write_game_requests(settled, text, directory): return settled return None @@ -1579,7 +1604,8 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non set_mappings(tokens, mapping, moved) current.update(moved) steam_root = os.path.dirname(os.path.dirname(os.path.abspath(config_path))) - requests = settled_game_requests(state, current, catalog, not steam_running(), directory) + removed = removed_tools(state, catalog, os.path.join(steam_root, "compatibilitytools.d")) + requests = settled_game_requests(state, current, catalog, not steam_running(), directory, removed) overrides = requested_games(requests or {}, catalog) managed = state.get("auto", {}).keys() if isinstance(state.get("auto"), dict) else () native_choices = state.get("native_choices", ()) @@ -1590,7 +1616,7 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non current.setdefault(app, "") changes, auto = plan_mapping( current, apps, names, default, followers(state, current), native, picks, - overrides, managed, native_choices, tool_platforms(steam_root)) + overrides, managed, native_choices, tool_platforms(steam_root), removed) set_mappings(tokens, mapping, changes) text = serialize(tokens) if text != serialize(tokenize(original)): diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index fbc7bdc02..898bd3a22 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -2254,6 +2254,87 @@ class ProtonDefaultTest(unittest.TestCase): self.assertEqual(changes, {"0": "GE-Proton11-7", "10": "GE-Proton11-7", "11": "GE-Proton11-7", "14": "GE-Proton11-7"}) self.assertEqual(auto, {"10": "GE-Proton11-7", "11": "GE-Proton11-7", "14": "GE-Proton11-7"}) + def test_games_on_a_removed_custom_proton_go_back_to_the_default(self): + changes, auto = COMPAT["plan_mapping"]( + {"0": self.TOOL, "311210": "bo3fix-proton", "42": "GE-Proton11-7"}, ["311210", "42"], self.NAMES, self.TOOL, {}, + removed={"bo3fix-proton"}) + self.assertEqual(changes, {"311210": self.TOOL}) + self.assertEqual(auto, {"311210": self.TOOL}) + + def test_removed_tools_are_custom_builds_missing_from_the_catalog(self): + state = {"tools": [ + {"name": self.TOOL, "valve": True}, + {"name": "bo3fix-proton", "valve": False}, + {"name": "GE-Proton11-7", "valve": False}, + ]} + self.assertEqual(COMPAT["removed_tools"](state, self.CATALOG), {"bo3fix-proton"}) + self.assertEqual(COMPAT["removed_tools"]({}, self.CATALOG), set()) + + def test_a_failed_extra_adoption_is_not_classified_as_removed(self): + with tempfile.TemporaryDirectory() as tmp: + tools = Path(tmp) / "compatibilitytools.d" + tools.mkdir() + state = {"tools": [{"name": "GE-Proton11-7", "dir": "GE-Proton11-7", "valve": False}]} + (tools / "GE-Proton11-7").mkdir() + catalog = [tool for tool in self.CATALOG if tool["name"] != "GE-Proton11-7"] + self.assertEqual(COMPAT["removed_tools"](state, catalog, str(tools)), set()) + (tools / "GE-Proton11-7").rmdir() + self.assertEqual(COMPAT["removed_tools"](state, catalog, str(tools)), {"GE-Proton11-7"}) + + def test_a_build_being_replaced_is_not_classified_as_removed(self): + with tempfile.TemporaryDirectory() as tmp: + tools = Path(tmp) / "compatibilitytools.d" + state = {"tools": [{"name": "GE-Proton11-7", "dir": "GE-Proton11-7", "valve": False}]} + catalog = [tool for tool in self.CATALOG if tool["name"] != "GE-Proton11-7"] + aside = tools / COMPAT["REPLACING"] / "GE-Proton11-7" + aside.mkdir(parents=True) + self.assertEqual(COMPAT["removed_tools"](state, catalog, str(tools)), set()) + aside.rmdir() + self.assertEqual(COMPAT["removed_tools"](state, catalog, str(tools)), {"GE-Proton11-7"}) + + def test_a_request_for_a_removed_tool_is_dropped_and_others_are_kept(self): + state = {"tools": self.CATALOG, "games_applied": {}} + requests = {"10": {"valve": False, "dir": "GE-Proton11-7"}, "11": {"valve": False, "dir": "Never-Installed"}, + "12": {"valve": True, "dir": "GE-Proton11-7"}} + catalog = [tool for tool in self.CATALOG if tool["name"] != "GE-Proton11-7"] + settled, moved = COMPAT["settle_game_requests"](requests, state, {}, catalog, removed={"GE-Proton11-7"}) + self.assertTrue(moved) + self.assertEqual(settled, {"11": requests["11"], "12": requests["12"]}) + self.assertEqual(COMPAT["settle_game_requests"](requests, state, {}, catalog), (requests, False)) + malformed = {"10": {"valve": False, "dir": []}} + self.assertEqual(COMPAT["settle_game_requests"](malformed, state, {}, catalog, removed={"GE-Proton11-7"}), (malformed, False)) + + def test_a_game_on_a_removed_tool_follows_the_default_across_registrations(self): + with tempfile.TemporaryDirectory() as tmp: + config = Path(tmp) / "config.vdf" + config.write_text(config_text([("0", self.TOOL), ("10", "GE-Proton11-7"), ("11", "GE-Proton11-7")])) + request = {"valve": False, "dir": "GE-Proton11-7"} + available = [tool for tool in self.CATALOG if tool["name"] != "GE-Proton11-7"] + (Path(tmp) / "games.json").write_text(json.dumps({"version": 1, "games": {"10": request}})) + (Path(tmp) / "state.json").write_text(json.dumps({ + "default": self.TOOL, + "tools": self.CATALOG, + })) + for default in (self.TOOL, self.TOOL, COMPAT["TOOL_11"]): + COMPAT["register_default"]( + str(config), ["10", "11"], default=default, catalog=available, + directory=tmp, + ) + self.assertEqual(mapping_of(config.read_text()), + {"0": COMPAT["TOOL_11"], "10": COMPAT["TOOL_11"], "11": COMPAT["TOOL_11"]}) + self.assertEqual(json.loads((Path(tmp) / "games.json").read_text())["games"], {}) + + def test_a_steam_pick_survives_the_removal_of_another_tool(self): + with tempfile.TemporaryDirectory() as tmp: + config = Path(tmp) / "config.vdf" + config.write_text(config_text([("0", self.TOOL), ("10", COMPAT["TOOL_11"])])) + available = [tool for tool in self.CATALOG if tool["name"] != "GE-Proton11-7"] + (Path(tmp) / "games.json").write_text(json.dumps( + {"version": 1, "games": {"10": {"valve": False, "dir": "GE-Proton11-7"}}})) + (Path(tmp) / "state.json").write_text(json.dumps({"default": self.TOOL, "tools": self.CATALOG, "auto": {}})) + COMPAT["register_default"](str(config), ["10"], default=self.TOOL, catalog=available, directory=tmp) + self.assertEqual(mapping_of(config.read_text()), {"0": self.TOOL, "10": COMPAT["TOOL_11"]}) + def test_windows_only_titles_still_follow_the_default(self): changes, auto = COMPAT["plan_mapping"]( {"0": self.TOOL}, ["42"], self.NAMES, self.TOOL, {}) @@ -2597,6 +2678,41 @@ class ProtonDefaultTest(unittest.TestCase): "11": COMPAT["TOOL_11"], }) + def test_per_game_proton_that_was_removed_goes_back_to_the_default(self): + with tempfile.TemporaryDirectory() as tmp: + config = Path(tmp) / "config.vdf" + config.write_text(config_text([ + ("0", self.TOOL), + ("10", "Experimental-DroidDeck-Proton-11-12.8-pr34-build"), + ("12", "GE-Proton9-1"), + ])) + (Path(tmp) / "games.json").write_text(json.dumps({ + "version": 1, + "games": { + "10": {"valve": False, "dir": "Experimental-DroidDeck-Proton-11-12.8-pr34-build"}, + "12": {"valve": False, "dir": "GE-Proton9-1"}, + }, + })) + (Path(tmp) / "state.json").write_text(json.dumps({ + "default": self.TOOL, + "tools": self.CATALOG + [{ + "name": "Experimental-DroidDeck-Proton-11-12.8-pr34-build", + "display": "Experimental-DroidDeck-Proton-11-12.8-pr34-build", + "dir": "Experimental-DroidDeck-Proton-11-12.8-pr34-build", "valve": False, + }], + })) + + COMPAT["register_default"]( + str(config), ["10", "12"], default=self.TOOL, + catalog=self.CATALOG, directory=tmp, + ) + + self.assertEqual(mapping_of(config.read_text()), { + "0": self.TOOL, + "10": self.TOOL, + "12": "GE-Proton9-1", + }) + def test_the_last_side_to_change_wins(self): state = {"default": self.TOOL, "applied": 5} default, state = COMPAT["choose_default"]("GE-Proton11-7", state, {"seq": 5, "dir": "Proton 11.0 (ARM64)", "valve": True}, self.CATALOG, now=100) From f2d8e9e8372b7be56e51e8e94ae9afc382deb2c1 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Thu, 19 Nov 2026 07:33:17 -0500 Subject: [PATCH 06/31] perf(storage): answer repeated SD library checks from the directory cache (#2881) --- .../thor-sd-storage-investigation.md | 66 +++++ tools/linuxfs/preload/dircache.c | 225 +++++++++++++----- tools/linuxfs/preload/pathcache.c | 27 ++- tools/tests/test_dircache_preload.py | 210 +++++++++++++++- 4 files changed, 457 insertions(+), 71 deletions(-) diff --git a/docs/development/thor-sd-storage-investigation.md b/docs/development/thor-sd-storage-investigation.md index e4315616e..5079d1dbf 100644 --- a/docs/development/thor-sd-storage-investigation.md +++ b/docs/development/thor-sd-storage-investigation.md @@ -451,3 +451,69 @@ synchronous directory updates, so SD installs stay bound by them (about 4 to 5 m 2,000 files of reserving plus commit on this card). Removing those costs needs fewer directory operations per file, not faster path translation. + +## Repeated round trips in the Steam client (2026-11-19) + +Measured on an AYANEO Pocket FIT Elite with a SanDisk 128 GB U1 card (exFAT, `dirsync`, +MediaProvider FUSE) as the second Steam library, by timing every file call the Steam +client makes under `/steamapps` during a real uninstall and install. + +Where the time went before, for one install of 3,800 files and directories: + +| Call | Total before | Total after | +| --- | --- | --- | +| `faccessat` | 31.1 s | 0 s | +| `stat` | 29.4 s | 0 s | +| `access` | 40.3 s | 13.2 s | +| `opendir` | 8.6 s | 3.3 s | +| `__xstat64` | 5.4 s | about 0 s | +| `rename` | 124.8 s | 91 to 106 s | +| file creation | about 22 s | about 22 s | + +Most of the removed calls asked the card a question the directory cache could already +answer: + +- A directory the cache holds a fresh listing for is now opened from that listing without + a `stat` of the directory first, and its own create, rename and remove calls update the + listing from what the call returned instead of re-reading the directory and the new + entry. +- `access`, `faccessat` and `__xstat64` on a name that a fresh listing shows is missing + return `ENOENT` without a round trip, including the differently cased spellings the + client probes. An absolute path passed with a directory descriptor takes the same path. +- The path cache spreads its slots with the high hash bits, which stops install paths that + differ only near the end from evicting each other. + +Results on the card (the first four rows are the 3,800 entry install; the moves are +single runs timed to about 3 s): + +| Step | Before | After | +| --- | --- | --- | +| Reserving space | 68.9 s | 27 to 28 s | +| Commit | 150.9 s | 97 to 111 s | +| Whole install | 261.0 s | 172 to 195 s | +| Uninstall | about 31 s | 28.5 to 29.4 s | +| Reserving space, second program (4.4 GB, few files) | 33.9 s | 12.5 s | +| Uninstall, second program | 12.3 s | 9.2 s | +| Steam move, internal storage to card | 156.8 s | 121.7 s | +| Steam move, card to internal storage | 56.5 s | 62.0 s | + +What is left is the card: each rename and each file creation is one synchronous directory +update, and the second program's 4.4 GB download and final commit took the same time +before and after. + +### Launching from the card + +A program started from the card was traced the same way. Three things were measured: + +- Sequential reads through the mount run at the card's own speed (88 MB/s cold), with or + without read-ahead hints. A launch that reads 1 GB spends about 12 s there on this card. +- A warm directory listing takes about 0.8 ms. A cold one takes about 77 ms for every + 128 KB directory cluster, even for a directory with one entry, so listing a 167 + directory install tree takes 12.9 s cold and 0.37 s warm. +- The listings stay warm while the device is idle, but a launch that fills memory pushes + them out again in bursts, so a program that lists its tree more than once pays the cold + price more than once. Keeping the tree warm from outside for the whole launch moved the + traced program's start-up forward by 5.5 to 7 s out of about 89 s. + +The rest of that launch was the program's own launcher and CPU-bound start-up, which did +not wait on the card in these traces. diff --git a/tools/linuxfs/preload/dircache.c b/tools/linuxfs/preload/dircache.c index e322c6cde..81c7a9ff6 100644 --- a/tools/linuxfs/preload/dircache.c +++ b/tools/linuxfs/preload/dircache.c @@ -23,10 +23,11 @@ #define MAX_ENTRIES 100000 #define MAX_HANDLES 64 #define MAX_UP 32 +#define MAX_ALIASES 4 #define FUSE_MAGIC 0x65735546 -#define WATCHED (IN_CREATE | IN_DELETE | IN_MOVED_FROM | IN_MOVED_TO | IN_DELETE_SELF | IN_MOVE_SELF | IN_ONLYDIR) -#define ABOVE (IN_DELETE_SELF | IN_MOVE_SELF | IN_ONLYDIR | IN_MASK_ADD) -#define GONE (IN_DELETE_SELF | IN_MOVE_SELF | IN_IGNORED) +#define WATCHED (IN_CREATE | IN_DELETE | IN_MOVED_FROM | IN_MOVED_TO | IN_DELETE_SELF | IN_MOVE_SELF | IN_ATTRIB | IN_ONLYDIR) +#define ABOVE (IN_DELETE_SELF | IN_MOVE_SELF | IN_ATTRIB | IN_ONLYDIR | IN_MASK_ADD) +#define GONE (IN_DELETE_SELF | IN_MOVE_SELF | IN_ATTRIB | IN_IGNORED) #define LINKED (IN_DELETE_SELF | IN_MOVE_SELF | IN_DONT_FOLLOW | IN_MASK_ADD) #if __SIZEOF_POINTER__ == 8 @@ -54,6 +55,9 @@ struct listing { size_t len; char *where; int folds; + int loose; + char *alias[MAX_ALIASES]; + int aliases; }; struct handle { @@ -78,6 +82,7 @@ static struct listing *table[MAX_LISTINGS]; static struct handle *handles[MAX_HANDLES]; static int high_water; static int cached_listings; +static int blind_listings; static int changing; static int notify = -1; static int forked; @@ -171,6 +176,7 @@ static void destroy(struct listing *l) { free(l->e); free(l->recs); free(l->where); + for (int i = 0; i < MAX_ALIASES; i++) free(l->alias[i]); free(l); } @@ -201,6 +207,7 @@ static void let_go(int wd, const int *up, int nup) { static void detach(struct listing *l) { __atomic_sub_fetch(&cached_listings, 1, __ATOMIC_RELEASE); + if (l->blind || l->where == NULL) blind_listings--; l->detached = 1; if (l->refs == 0) destroy(l); } @@ -255,6 +262,7 @@ static void pump(struct expect *x, int nx) { changed(-1, 0); continue; } + if ((ev->mask & IN_ATTRIB) && ev->len) continue; int k = 0; while (k < nx && !(x[k].wd == ev->wd && (ev->mask & x[k].mask) && ev->len && strcmp(ev->name, x[k].name) == 0)) k++; if (k < nx) { @@ -304,6 +312,7 @@ static int push(struct listing *l, ino_t ino, unsigned char type, const char *na static void install(struct listing *l) { l->detached = 0; __atomic_add_fetch(&cached_listings, 1, __ATOMIC_RELEASE); + if (l->blind || l->where == NULL) blind_listings++; int slot = find(l->dev, l->ino); if (slot >= 0) { struct listing *old = table[slot]; @@ -416,10 +425,104 @@ __attribute__((constructor)) static void resolve(void) { } #pragma GCC diagnostic pop +static int named(const struct listing *l, const char *name) { + for (size_t i = 0; i < l->n; i++) + if (strcasecmp(l->e[i].name, name) == 0) return 1; + return 0; +} + +static int folded_match(const char *where, const char *dir) { + const char *at = strstr(where, "/steamapps"); + if (at == NULL) return 0; + size_t n = (size_t)(at - where); + return strncmp(where, dir, n) == 0 && strcasecmp(where + n, dir + n) == 0; +} + +static int same_dir(const struct listing *l, const char *dir) { + struct stat st; + int saved = errno; + int same = stat(dir, &st) == 0 && st.st_dev == l->dev && st.st_ino == l->ino; + errno = saved; + return same; +} + +static int plain(const char *where, char *dir) { + const char *at = strstr(where, "/steamapps"); + int saved = errno, fine = at != NULL; + for (size_t from = fine ? (size_t)(at - where) + 1 : 0; fine && dir[from];) { + size_t to = from + strcspn(dir + from, "/"); + char kept = dir[to]; + struct stat st; + dir[to] = 0; + fine = strcmp(dir + from, ".") != 0 && strcmp(dir + from, "..") != 0 && lstat(dir, &st) == 0 && !S_ISLNK(st.st_mode); + dir[to] = kept; + from = kept ? to + 1 : to; + } + errno = saved; + return fine; +} + +static int aliased(struct listing *l, const char *dir) { + for (int i = 0; i < MAX_ALIASES; i++) + if (l->alias[i] && strcmp(l->alias[i], dir) == 0) return 1; + if (!same_dir(l, dir)) return 0; + char *copy = strdup(dir); + if (copy && !plain(l->where, copy)) { + free(copy); + copy = NULL; + } + if (copy) { + int at = l->aliases++ % MAX_ALIASES; + free(l->alias[at]); + l->alias[at] = copy; + } + return 1; +} + +static struct listing *listed(const char *dir, long long now) { + for (int i = 0; i < MAX_LISTINGS; i++) { + struct listing *l = table[i]; + if (l == NULL || l->where == NULL || l->blind || now - l->filled >= DIR_TTL_NS) continue; + if (strcmp(l->where, dir) == 0) return l; + if (l->folds && folded_match(l->where, dir)) return aliased(l, dir) ? l : NULL; + } + return NULL; +} + +static int watching(const char *path) { + return eligible(path) && __atomic_load_n(&cached_listings, __ATOMIC_ACQUIRE) > 0; +} + +static DIR *listed_open(struct handle *h, long long now) { + DIR *d = NULL; + if (__atomic_load_n(&cached_listings, __ATOMIC_ACQUIRE) == 0) return NULL; + take(&lock); + if (!changing) { + pump(NULL, 0); + struct listing *l = listed(h->path, now); + if (l && records(l) == 0) { + h->snap = l; + l->refs++; + l->used = now; + d = wrap(h); + if (d == NULL) { + unref(l); + h->snap = NULL; + } + } + } + give(&lock); + return d; +} + static DIR *hit(const struct stat *st, struct handle *h, long long now) { take(&lock); if (!changing) pump(NULL, 0); int slot = find(st->st_dev, st->st_ino); + if (slot >= 0 && table[slot]->loose && now - table[slot]->filled < DIR_TTL_NS) { + stamp(table[slot], st); + table[slot]->loose = 0; + } if (slot >= 0 && same(table[slot], st) && now - table[slot]->filled < DIR_TTL_NS && records(table[slot]) == 0) { h->snap = table[slot]; h->snap->refs++; @@ -509,8 +612,7 @@ static void untrack(struct handle *h) { DIR *opendir(const char *path) { NEXT(opendir); struct stat st; - if (!eligible(path) || stat(path, &st) != 0 || !S_ISDIR(st.st_mode) || !on_fuse(st.st_dev, path)) - return next_opendir(path); + if (!eligible(path)) return next_opendir(path); struct handle *h = calloc(1, sizeof(*h)); char *copy = strdup(path); if (h == NULL || copy == NULL) { @@ -522,7 +624,14 @@ DIR *opendir(const char *path) { h->wd = -1; h->path = copy; long long now = now_ns(); - DIR *d = hit(&st, h, now); + DIR *d = listed_open(h, now); + if (d) return d; + if (stat(path, &st) != 0 || !S_ISDIR(st.st_mode) || !on_fuse(st.st_dev, path)) { + free(h->path); + free(h); + return next_opendir(path); + } + d = hit(&st, h, now); if (d) return d; if (!track(h, path)) { free(h->path); @@ -699,7 +808,9 @@ void seekdir(DIR *d, long pos) { } } -struct side { char dir[PATH_MAX]; const char *name; struct stat before; int known; }; +struct side { char dir[PATH_MAX]; const char *name; struct stat before; int known; int trusted; }; + +struct made { int known; ino_t ino; unsigned char type; }; static int split(const char *path, struct side *s) { size_t n = strlen(path); @@ -713,10 +824,6 @@ static int split(const char *path, struct side *s) { return strchr(s->name, '/') == NULL && strcmp(s->name, ".") != 0 && strcmp(s->name, "..") != 0; } -static int watching(const char *path) { - return eligible(path) && __atomic_load_n(&cached_listings, __ATOMIC_ACQUIRE) > 0; -} - static void begin(void) { take(&lock); pump(NULL, 0); @@ -725,13 +832,42 @@ static void begin(void) { } static void before(struct side *s) { - s->known = stat(s->dir, &s->before) == 0; + take(&lock); + struct listing *l = listed(s->dir, now_ns()); + int unlisted = l == NULL && blind_listings == 0; + s->trusted = l != NULL; + if (l) { + memset(&s->before, 0, sizeof(s->before)); + s->before.st_dev = l->dev; + s->before.st_ino = l->ino; + s->before.st_size = l->size; + s->before.st_nlink = l->nlink; + s->before.st_mtim = l->mtime; + s->before.st_ctim = l->ctime; + } + give(&lock); + s->known = s->trusted || (!unlisted && stat(s->dir, &s->before) == 0); +} + +static unsigned char type_of(mode_t mode) { + return S_ISDIR(mode) ? DT_DIR : S_ISLNK(mode) ? DT_LNK : S_ISREG(mode) ? DT_REG : DT_UNKNOWN; +} + +static int made_at(const struct side *s, const char *target, struct made *m) { + struct stat t; + if (s->trusted && m && m->known) return 1; + if (lstat(target, &t) != 0) return 0; + *m = (struct made){1, t.st_ino, type_of(t.st_mode)}; + return 1; } enum { ADDED, REMOVED }; -static int patch(struct side *s, int what, uint32_t event, int ok, int error, const char *target, struct expect *x) { +static int patch(struct side *s, int what, uint32_t event, int ok, int error, const char *target, struct made *m, + struct expect *x) { struct stat now; + struct made local = {0}; + if (m == NULL) m = &local; if (!s->known) return 0; int slot = find(s->before.st_dev, s->before.st_ino); if (slot < 0) return 0; @@ -750,7 +886,7 @@ static int patch(struct side *s, int what, uint32_t event, int ok, int error, co drop(slot); return 0; } - if (stat(s->dir, &now) != 0 || now.st_ino != l->ino) { + if (!s->trusted && (stat(s->dir, &now) != 0 || now.st_ino != l->ino)) { drop(slot); return 0; } @@ -771,6 +907,7 @@ static int patch(struct side *s, int what, uint32_t event, int ok, int error, co copy->blind = l->blind; copy->where = l->where ? strdup(l->where) : NULL; copy->folds = l->folds; + copy->loose = l->loose; copy->detached = 0; stamp(copy, &s->before); table[slot] = copy; @@ -781,18 +918,17 @@ static int patch(struct side *s, int what, uint32_t event, int ok, int error, co l->recs = NULL; l->len = 0; int fine = 1, expected = 1; - struct stat t; if (what == ADDED) { if (exact < l->n) { - if (lstat(target, &t) == 0) l->e[exact].ino = t.st_ino; + if (event == IN_MOVED_TO && made_at(s, target, m)) l->e[exact].ino = m->ino; expected = event == IN_MOVED_TO; - } else if (folded < l->n || lstat(target, &t) != 0) { + } else if (folded < l->n || !made_at(s, target, m)) { fine = 0; } else { - unsigned char type = S_ISDIR(t.st_mode) ? DT_DIR : S_ISLNK(t.st_mode) ? DT_LNK : S_ISREG(t.st_mode) ? DT_REG : DT_UNKNOWN; - fine = l->n < MAX_ENTRIES && push(l, t.st_ino, type, s->name) == 0; + fine = l->n < MAX_ENTRIES && push(l, m->ino, m->type, s->name) == 0; } } else if (exact < l->n) { + *m = (struct made){1, l->e[exact].ino, l->e[exact].type}; free(l->e[exact].name); memmove(&l->e[exact], &l->e[exact + 1], (l->n - exact - 1) * sizeof(l->e[0])); l->n--; @@ -803,7 +939,8 @@ static int patch(struct side *s, int what, uint32_t event, int ok, int error, co drop(slot); return 0; } - stamp(l, &now); + if (s->trusted) l->loose = 1; + else stamp(l, &now); if (!expected) return 0; *x = (struct expect){l->wd, event, s->name}; return 1; @@ -829,8 +966,11 @@ int dd_dircache_create(int dirfd, const char *path, int flags, mode_t mode, int fd = real(dirfd, path, flags, mode); int saved = errno; struct expect x; + struct stat opened; + struct made m = {0}; + if (fd >= 0 && s.trusted && fstat(fd, &opened) == 0) m = (struct made){1, opened.st_ino, type_of(opened.st_mode)}; take(&lock); - int nx = patch(&s, ADDED, IN_CREATE, fd >= 0, saved, path, &x); + int nx = patch(&s, ADDED, IN_CREATE, fd >= 0, saved, path, &m, &x); give(&lock); end(&x, nx); give(&oplock); @@ -850,7 +990,7 @@ int dd_dircache_create(int dirfd, const char *path, int flags, mode_t mode, int saved = errno; \ struct expect x; \ take(&lock); \ - int nx = patch(&s, what, event, r == 0, saved, what == ADDED ? path : NULL, &x); \ + int nx = patch(&s, what, event, r == 0, saved, what == ADDED ? path : NULL, NULL, &x); \ if (r == 0 && what == REMOVED) forget_below(path); \ give(&lock); \ end(&x, nx); \ @@ -885,12 +1025,13 @@ ONE_PATH(remove, REMOVED, IN_DELETE, dd_descriptor_remove(path, next_remove)) int r = call(from, to); \ int saved = errno; \ struct expect x[2]; \ + struct made m = {0}; \ int nx = 0; \ take(&lock); \ - if (track_a) nx += patch(&a, REMOVED, IN_MOVED_FROM, r == 0, saved, NULL, &x[nx]); \ + if (track_a) nx += patch(&a, REMOVED, IN_MOVED_FROM, r == 0, saved, NULL, &m, &x[nx]); \ if (track_b) { \ - if (track_a && strcmp(a.dir, b.dir) == 0) b.known = stat(b.dir, &b.before) == 0; \ - nx += patch(&b, ADDED, event, r == 0, saved, to, &x[nx]); \ + if (track_a && !b.trusted && strcmp(a.dir, b.dir) == 0) b.known = stat(b.dir, &b.before) == 0; \ + nx += patch(&b, ADDED, event, r == 0, saved, to, &m, &x[nx]); \ } \ if (r == 0 && gone) { forget_below(from); forget_below(to); } \ give(&lock); \ @@ -907,37 +1048,6 @@ TWO_PATHS(rename, 1, IN_MOVED_TO, moved) TWO_PATHS(link, 0, IN_CREATE, link_or_lock) TWO_PATHS(symlink, 0, IN_CREATE, next_symlink) -static int named(const struct listing *l, const char *name) { - for (size_t i = 0; i < l->n; i++) - if (strcasecmp(l->e[i].name, name) == 0) return 1; - return 0; -} - -static int folded_match(const char *where, const char *dir) { - const char *at = strstr(where, "/steamapps"); - if (at == NULL) return 0; - size_t n = (size_t)(at - where); - return strncmp(where, dir, n) == 0 && strcasecmp(where + n, dir + n) == 0; -} - -static int same_dir(const struct listing *l, const char *dir) { - struct stat st; - int saved = errno; - int same = stat(dir, &st) == 0 && st.st_dev == l->dev && st.st_ino == l->ino; - errno = saved; - return same; -} - -static int listed_absent(const char *dir, const char *name, long long now) { - for (int i = 0; i < MAX_LISTINGS; i++) { - struct listing *l = table[i]; - if (l == NULL || l->where == NULL || l->blind || now - l->filled >= DIR_TTL_NS) continue; - if (strcmp(l->where, dir) == 0) return !named(l, name); - if (l->folds && folded_match(l->where, dir)) return same_dir(l, dir) && !named(l, name); - } - return 0; -} - int dd_dircache_absent(const char *path) __attribute__((visibility("hidden"))); int dd_dircache_absent(const char *path) { struct side s; @@ -949,7 +1059,8 @@ int dd_dircache_absent(const char *path) { int absent = 0; if (!changing) { pump(NULL, 0); - absent = listed_absent(s.dir, s.name, now); + struct listing *l = listed(s.dir, now); + absent = l != NULL && !named(l, s.name); } give(&lock); return absent; diff --git a/tools/linuxfs/preload/pathcache.c b/tools/linuxfs/preload/pathcache.c index 400a1e578..beefbfbe2 100644 --- a/tools/linuxfs/preload/pathcache.c +++ b/tools/linuxfs/preload/pathcache.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include @@ -55,12 +56,16 @@ static unsigned hash_of(const char *s, int kind, int mode, int flags) { return h; } +static struct entry *slot(unsigned h) { + return &table[(h ^ (h >> 16)) % PATH_CACHE_SLOTS]; +} + static int cacheable(const char *path) { return path != NULL && path[0] == '/' && strlen(path) < PATH_CACHE_KEY_MAX && enabled(); } static struct entry *find(const char *path, int kind, int mode, int flags, unsigned h) { - struct entry *e = &table[h % PATH_CACHE_SLOTS]; + struct entry *e = slot(h); if (e->stamp == 0 || e->hash != h || e->kind != kind || e->mode != mode || e->flags != flags) return NULL; if (now_ns() - e->stamp > PATH_CACHE_TTL_NS || strcmp(e->key, path) != 0) return NULL; @@ -68,7 +73,7 @@ static struct entry *find(const char *path, int kind, int mode, int flags, unsig } static void store(const char *path, int kind, int mode, int flags, unsigned h, const char *value) { - struct entry *e = &table[h % PATH_CACHE_SLOTS]; + struct entry *e = slot(h); char *copy = value != NULL ? strdup(value) : NULL; if (value != NULL && copy == NULL) return; @@ -172,6 +177,10 @@ static int check_cwd(const char *path, int mode, int flags) { return result; } +static int absolute(const char *path) { + return path != NULL && path[0] == '/'; +} + int access(const char *path, int mode) { return cached_access(path, mode, 0, check_cwd); } @@ -188,7 +197,7 @@ int faccessat(int dirfd, const char *path, int mode, int flags) { int (*real)(int, const char *, int, int); int err; - if (dirfd == AT_FDCWD) { + if (dirfd == AT_FDCWD || absolute(path)) { return cached_access(path, mode, flags, check_cwd); } real = next_faccessat(); @@ -202,3 +211,15 @@ int faccessat(int dirfd, const char *path, int mode, int flags) { errno = err; return -1; } + +int __xstat64(int version, const char *path, struct stat64 *out) { + static int (*real)(int, const char *, struct stat64 *); + + if (dd_dircache_absent && dd_dircache_absent(path)) { + errno = ENOENT; + return -1; + } + if (real == NULL) real = (int (*)(int, const char *, struct stat64 *))dlsym(RTLD_NEXT, "__xstat64"); + if (real != NULL) return real(version, path, out); + return stat64(path, out); +} diff --git a/tools/tests/test_dircache_preload.py b/tools/tests/test_dircache_preload.py index 9435922b4..7997bf5ae 100644 --- a/tools/tests/test_dircache_preload.py +++ b/tools/tests/test_dircache_preload.py @@ -24,6 +24,7 @@ FAKE = r""" int real_opendirs; int real_accesses; +int real_stats; static void coarse(const char *path, struct stat *st) { if (getenv("COARSE") && strstr(path, "/fuse/") && S_ISDIR(st->st_mode)) { @@ -33,25 +34,44 @@ static void coarse(const char *path, struct stat *st) { } } -int stat(const char *path, struct stat *st) { - static int (*next)(const char *, struct stat *); - if (!next) next = dlsym(RTLD_NEXT, "stat"); - char folded[4096]; +static const char *fold_case(const char *path, char *folded, size_t size) { const char *fold = getenv("FOLD"); const char *upper = fold ? strstr(path, "/STEAMAPPS") : NULL; if (!upper && fold && !strcmp(fold, "all")) upper = strcasestr(path, "/steamapps/"); - if (upper && strlen(path) < sizeof(folded)) { - strcpy(folded, path); - memcpy(folded + (upper - path) + 1, "steamapps", 9); - if (!strcmp(fold, "all")) - for (char *c = folded + (upper - path); *c; c++) if (*c >= 'A' && *c <= 'Z') *c += 'a' - 'A'; - path = folded; - } + if (!upper || strlen(path) >= size) return path; + strcpy(folded, path); + memcpy(folded + (upper - path) + 1, "steamapps", 9); + if (!strcmp(fold, "all")) + for (char *c = folded + (upper - path); *c; c++) if (*c >= 'A' && *c <= 'Z') *c += 'a' - 'A'; + return folded; +} + +static int fold_stat(const char *name, const char *path, struct stat *st) { + int (*next)(const char *, struct stat *) = dlsym(RTLD_NEXT, name); + char folded[4096]; + if (strstr(path, "/fuse/")) real_stats++; int r = next(path, st); + if (r != 0) r = next(fold_case(path, folded, sizeof(folded)), st); + return r; +} + +int stat(const char *path, struct stat *st) { + int r = fold_stat("stat", path, st); if (r == 0) coarse(path, st); return r; } +int lstat(const char *path, struct stat *st) { + return fold_stat("lstat", path, st); +} + +int __xstat64(int version, const char *path, struct stat64 *st) { + static int (*next)(int, const char *, struct stat64 *); + if (!next) next = dlsym(RTLD_NEXT, "__xstat64"); + if (strstr(path, "/fuse/")) real_stats++; + return next ? next(version, path, st) : stat64(path, st); +} + int fstat(int fd, struct stat *st) { static int (*next)(int, struct stat *); if (!next) next = dlsym(RTLD_NEXT, "fstat"); @@ -221,6 +241,7 @@ static void stress(const char *dir) { int main(int argc, char **argv) { int *opens = dlsym(RTLD_DEFAULT, "real_opendirs"); int *accesses = dlsym(RTLD_DEFAULT, "real_accesses"); + int *stats = dlsym(RTLD_DEFAULT, "real_stats"); for (int i = 1; i < argc; i++) { const char *op = argv[i], *a = argv[i + 1]; if (!strcmp(op, "list")) { list(a); i++; } @@ -309,6 +330,27 @@ int main(int argc, char **argv) { printf("%d %d\n", r, r ? errno : 0); i++; } + else if (!strcmp(op, "accessat")) { + int r = faccessat(STDIN_FILENO, a, F_OK, 0); + printf("%d %d\n", r, r ? errno : 0); + i++; + } + else if (!strcmp(op, "xstat")) { + int (*old)(int, const char *, struct stat64 *) = dlsym(RTLD_DEFAULT, "__xstat64"); + struct stat64 st; + int r = old ? old(0, a, &st) : -2; + printf("%d %d\n", r, r ? errno : 0); + i++; + } + else if (!strcmp(op, "inode")) { + DIR *d = opendir(a); + struct dirent *e; + while (d && (e = readdir(d))) + if (!strcmp(e->d_name, argv[i + 2])) printf("%llu\n", (unsigned long long)e->d_ino); + if (d) closedir(d); + i += 2; + } + else if (!strcmp(op, "stats")) printf("%d\n", stats ? *stats : -1); else if (!strcmp(op, "accesses")) printf("%d\n", accesses ? *accesses : -1); else if (!strcmp(op, "opens")) printf("%d\n", opens ? *opens : -1); } @@ -675,6 +717,152 @@ class DirCachePreloadTest(unittest.TestCase): "access", s / "x.bundle", "accesses", "opens", between=churn) self.assertEqual([s.name, "a.bundle,b.bundle", s.name, "a.bundle,b.bundle", "-1 2", "0", "3"], out) + def test_absolute_paths_checked_against_a_descriptor_are_answered_from_the_listing(self): + s = self.staging + out = self.run_program("list", s, "accessat", s / "x.bundle", "accessat", s / "y.bundle", "accesses", + "accessat", s / "a.bundle", "accessat", s / "a.bundle", "accesses", + "create", s / "x.bundle", "accessat", s / "x.bundle") + self.assertEqual(["-1 2", "-1 2", "0", "0 0", "0 0", "1", "0 0"], out[1:]) + + def test_absolute_paths_checked_against_a_descriptor_elsewhere_reach_the_filesystem(self): + s = self.staging + other = self.run_program("list", s, "accessat", s / "x.bundle", "accessat", s / "x.bundle", "accesses", + program=self.other) + self.assertEqual(["-1 2", "-1 2", "2"], other[1:]) + off = self.run_program("list", s, "accessat", s / "x.bundle", "accessat", s / "x.bundle", "accesses", + env={"DD_NO_DIR_CACHE": "1", "DD_NO_PATH_CACHE": "1"}) + self.assertEqual(["-1 2", "-1 2", "2"], off[1:]) + + def test_missing_names_asked_through_the_old_stat_entry_are_answered_from_the_listing(self): + s = self.staging + out = self.run_program("list", s, "stats", "xstat", s / "x.bundle", "stats", "xstat", s / "a.bundle", "stats", + "create", s / "x.bundle", "xstat", s / "x.bundle") + self.assertEqual(["-1 2", out[1], "0 0", str(int(out[1]) + 1), "0 0"], out[2:]) + other = self.run_program("list", s, "stats", "xstat", s / "z.bundle", "stats", program=self.other) + self.assertEqual(["-1 2", str(int(other[1]) + 1)], other[2:]) + + def test_folders_that_differ_only_in_case_stay_cached_together(self): + s = self.staging + names = ["Content/Data", "content/data", "Content/Characters", "content/characters"] + for name in names: + (s / name).mkdir(parents=True) + checks = [op for name in names for op in ("access", s / name)] + out = self.run_program(*checks, "accesses", *checks, *checks, "accesses") + self.assertEqual(out[4], out[-1]) + + def test_a_cached_listing_is_served_without_asking_the_filesystem(self): + s = self.staging + out = self.run_program("list", s, "stats", "list", s, "list", s, "access", s / "x.bundle", "stats", "opens") + self.assertEqual(out[1], out[-2]) + self.assertEqual("1", out[-1]) + + def test_own_changes_in_a_cached_folder_do_not_ask_the_filesystem(self): + s = self.staging + out = self.run_program( + "list", s, "stats", + "create", s / "c.bundle", "rename", s / "c.bundle", s / "d.bundle", "unlink", s / "a.bundle", "stats", + "list", s, "raw", s, "opens") + self.assertEqual(out[1], out[2]) + self.assertEqual(["b.bundle,d.bundle", "b.bundle,d.bundle", "1"], out[3:]) + + def test_own_changes_in_a_folder_never_listed_do_not_ask_the_filesystem(self): + s = self.staging + out = self.run_program("stats", "create", s / "c.bundle", "rename", s / "c.bundle", s / "d.bundle", + "unlink", s / "d.bundle", "stats", "list", s, "raw", s) + self.assertEqual(out[0], out[1]) + self.assertEqual(["a.bundle,b.bundle", "a.bundle,b.bundle"], out[2:]) + + def test_a_differently_cased_folder_is_checked_once(self): + s = self.staging + upper = Path(str(s).replace("downloading", "DOWNLOADING")) + out = self.run_program("list", s, "access", upper / "x.bundle", "stats", + "access", upper / "y.bundle", "access", upper / "z.bundle", "stats", "accesses", + env={"FOLD": "all"}) + self.assertEqual(out[2], out[5]) + self.assertEqual("0", out[-1]) + + def test_a_folder_reached_through_a_link_follows_the_link(self): + s = self.staging + other = self.lib / "elsewhere" / s.name + other.mkdir(parents=True) + (other / "x.bundle").touch() + link = self.lib / "DOWNLOADING" + link.symlink_to("downloading") + + def repoint(): + link.unlink() + link.symlink_to("elsewhere") + + out = self.run_paused("list", s, "access", link / s.name / "x.bundle", "pause", + "access", link / s.name / "x.bundle", between=repoint, env={"FOLD": "all"}) + self.assertEqual(["-1 2", "0 0"], out[1:]) + + def test_a_linked_last_component_follows_the_link(self): + s = self.staging + other = self.lib / "elsewhere" / s.name + other.mkdir(parents=True) + (other / "x.bundle").touch() + twin = self.lib / "DOWNLOADING" + twin.mkdir() + link = twin / s.name + link.symlink_to(s) + + def repoint(): + link.unlink() + link.symlink_to(other) + + out = self.run_paused("list", s, "access", link / "x.bundle", "pause", + "access", link / "x.bundle", between=repoint, env={"FOLD": "all"}) + self.assertEqual(["-1 2", "0 0"], out[1:]) + + def test_a_folder_reached_through_a_parent_step_is_checked_each_time(self): + s = self.staging + other = self.lib / "elsewhere" + (other / "branch").mkdir(parents=True) + (other / s.parent.name / s.name).mkdir(parents=True) + (other / s.parent.name / s.name / "x.bundle").touch() + (self.lib / "branch").mkdir() + twin = self.lib / "BRANCH" + twin.mkdir() + listed = self.lib / "branch" / ".." / s.parent.name / s.name + through = twin / ".." / s.parent.name / s.name + + def repoint(): + twin.rmdir() + twin.symlink_to(other / "branch") + + out = self.run_paused("list", listed, "access", through / "x.bundle", "pause", + "access", through / "x.bundle", between=repoint, env={"FOLD": "all"}) + self.assertEqual(["-1 2", "0 0"], out[1:]) + + def test_a_permission_change_on_the_folder_or_above_it_is_noticed(self): + s = self.staging + for target in (s, s.parent): + with self.subTest(target=target.name): + out = self.run_paused("list", s, "opens", "pause", "list", s, "opens", + between=lambda: target.chmod(0o700)) + self.assertEqual(int(out[1]) + 1, int(out[3])) + + def test_a_permission_change_on_a_file_keeps_the_listing(self): + s = self.staging + out = self.run_paused("list", s, "opens", "pause", "list", s, "opens", + between=lambda: (s / "a.bundle").chmod(0o600)) + self.assertEqual(out[1], out[3]) + + def test_opening_an_existing_link_keeps_its_entry(self): + s = self.staging + (s / "l.bundle").symlink_to("a.bundle") + out = self.run_program("list", s, "create", s / "l.bundle", "inode", s, "l.bundle", "raw", s) + self.assertEqual(str((s / "l.bundle").lstat().st_ino), out[1]) + + def test_changes_made_around_the_cache_after_own_changes_are_noticed(self): + s = self.staging + out = self.run_program("list", s, "create", s / "c.bundle", "sneak", s / "y.bundle", "list", s, "raw", s, + "access", s / "y.bundle") + self.assertEqual(out[1], out[2]) + self.assertIn("y.bundle", out[1]) + self.assertEqual("0 0", out[3]) + def test_misses_outside_the_client_or_fuse_steamapps_reach_the_filesystem(self): s = self.staging other = self.run_program("list", s, "access", s / "x.bundle", "access", s / "y.bundle", "accesses", From c2adf3b3dda01b9c4994f5de785b0691cd54f5e8 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Thu, 19 Nov 2026 07:33:20 -0500 Subject: [PATCH 07/31] feat(performance): switch the GPU top clock hold from the in-game menu (#2882) --- .../com/droiddeck/launcher/SessionActivity.kt | 14 ++++++++++++ .../droiddeck/launcher/session/GpuClockPin.kt | 22 ++++++++++++++++++- .../launcher/ui/DroidDeckHudSettings.kt | 2 ++ .../launcher/ui/PerformanceDialog.kt | 20 +++++++++++------ .../droiddeck/launcher/ui/SessionOverlay.kt | 2 ++ .../droiddeck/launcher/ui/SettingsIndex.kt | 1 + app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-b+es+419/strings.xml | 1 - app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-da/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-in/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-ms/strings.xml | 1 - app/src/main/res/values-nb/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rPT/strings.xml | 1 - app/src/main/res/values-pt/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-th/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-vi/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rHK/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - docs/settings-map.md | 1 + 40 files changed, 54 insertions(+), 41 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 52e9eecce..3249d0b3c 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -115,6 +115,7 @@ import com.droiddeck.launcher.hud.DroidDeckHudHost import com.droiddeck.launcher.session.PerfMode import com.droiddeck.launcher.session.SteamRepair import com.droiddeck.launcher.session.GameEnvironmentStore +import com.droiddeck.launcher.session.GpuClockPin import com.droiddeck.launcher.session.GameProfileFollowState import com.droiddeck.launcher.session.GameProfileInventoryCache import com.droiddeck.launcher.session.GameProfileRefreshState @@ -553,6 +554,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private var achievementsInFront by mutableStateOf(null) private var achievementsOpen by mutableStateOf(false) private var hudOn by mutableStateOf(true) + private var gpuClockPin by mutableStateOf(false) private var hudConfig by mutableStateOf>(emptyMap()) private var hudColor by mutableStateOf(SessionPrefs.HUD_COLOR_MINT) private var hudOpacity by mutableStateOf(SessionPrefs.HUD_OPACITY_DEFAULT) @@ -1407,6 +1409,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde androidApps = androidApps, hudOn = hudOn, hudConfig = hudConfig, + gpuClockPin = gpuClockPin, upscaler = upscaler, upscaleSharpness = upscaleSharpness, effects = effects, screenEffectsTarget = screenEffectsTarget, @@ -1464,6 +1467,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde secondScreenDisplays = secondScreenDisplays, selectedSecondScreenDisplay = selectedSecondScreenDisplay, onHud = { on -> SessionPrefs.setHudEnabled(this@SessionActivity, on); hudOn = on; hud.refresh() }, + onGpuClockPin = { on -> + SessionPrefs.setGpuClockPin(this@SessionActivity, on) + gpuClockPin = on + Thread { + GpuClockPin.sync(applicationContext) + runOnUiThread { gpuClockPin = gpuClockHeld() } + }.start() + }, onHudSetting = { key, value -> hudConfig = DroidDeckHudConfig.set(this@SessionActivity, key, value); hud.applyConfig() }, onHudOrder = { switches, order -> hudConfig = DroidDeckHudConfig.choose(this@SessionActivity, switches, order); hud.applyConfig() }, onHudReset = { hudConfig = DroidDeckHudConfig.reset(this@SessionActivity); hud.applyConfig() }, @@ -2471,6 +2482,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde .show() } + private fun gpuClockHeld() = SessionPrefs.gpuClockPin(this) && !GpuClockPin.failed + private fun readPrefs() { pipAutoEnter = SessionPrefs.pipAutoEnter(this) unfoldedControls = SessionPrefs.unfoldedControls(this) @@ -2478,6 +2491,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde picturePosition = SessionPrefs.picturePosition(this) integerScaling = SessionPrefs.integerScaling(this) hudOn = SessionPrefs.hudEnabled(this) + gpuClockPin = gpuClockHeld() blackFrameInsertion = SessionPrefs.blackFrameInsertion(this) hudConfig = DroidDeckHudConfig.load(this) hudColor = SessionPrefs.hudColor(this) diff --git a/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt b/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt index 40135f08d..e136df260 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt @@ -14,10 +14,22 @@ object GpuClockPin { @Volatile private var pinned = false - private val supported: Boolean by lazy { File(KGSL_NODE).exists() } + @Volatile + var failed = false + private set + + val supported: Boolean by lazy { File(KGSL_NODE).exists() } + + private var live = false @Synchronized fun start(context: Context): String { + live = true + return hold(context) + } + + private fun hold(context: Context): String { + failed = false if (!SessionPrefs.gpuClockPin(context)) return "gpu clock: governed" if (!supported) return "gpu clock: no $KGSL_NODE, left governed" return try { @@ -28,12 +40,20 @@ object GpuClockPin { } catch (t: Throwable) { File(context.filesDir, MARKER).delete() Log.w(TAG, "pin", t) + failed = true "gpu clock: pin failed" } } + @Synchronized + fun sync(context: Context) { + if (!live) return + if (SessionPrefs.gpuClockPin(context)) hold(context) else if (pinned) clear(context) + } + @Synchronized fun stop(context: Context) { + live = false if (pinned) clear(context) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt index cb5d4795f..5e86cf489 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt @@ -14,6 +14,7 @@ import androidx.compose.ui.unit.sp import com.droiddeck.launcher.R import com.droiddeck.launcher.hud.DroidDeckHudConfig import com.droiddeck.launcher.hud.DroidDeckHudSize +import com.droiddeck.launcher.session.GpuClockPin import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.session.StripMetric @@ -47,6 +48,7 @@ internal fun DroidDeckHudSettings(host: MenuHost, a: DrawerActions, track: (Stri ToggleRow(host, "hud-snap", stringResource(R.string.hud_snap), stringResource(R.string.hud_snap_hint), on("hudSnap"), chipModifier = track("hud-snap")) { a.onHudSetting("hudSnap", flag(it)) } } + if (GpuClockPin.supported) GpuClockGroup(host, a.gpuClockPin, track("gpuclock"), a.onGpuClockPin) if (a.dashboardAvailable && a.secondScreenDisplays.isNotEmpty()) BottomStripSettings(host, track) if (!a.hudOn) return diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt index 3c4db68c3..0c3947f98 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt @@ -24,6 +24,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.session.GpuClockPin import com.droiddeck.launcher.session.SessionPrefs class CoreRow(val core: Int, val label: String) @@ -122,13 +123,7 @@ fun PerformancePage( gamescopeRealtime, onChange = onGamescopeRealtime, ) } - SettingsGroup(stringResource(R.string.perf_gpu)) { - ToggleRow( - host, "gpuclock", stringResource(R.string.perf_gpuclock), - stringResource(R.string.perf_gpuclock_hint), - gpuClockPin, onChange = onGpuClockPin, - ) - } + if (GpuClockPin.supported) GpuClockGroup(host, gpuClockPin, onChange = onGpuClockPin) SettingsGroup(stringResource(R.string.perf_fixes)) { ToggleRow( host, "sysmem", stringResource(R.string.perf_sysmem), @@ -220,3 +215,14 @@ fun PerformancePage( onBack = onDismiss, ) { body() } } + +@Composable +internal fun GpuClockGroup(host: MenuHost, on: Boolean, chipModifier: Modifier = Modifier, onChange: (Boolean) -> Unit) { + SettingsGroup(stringResource(R.string.perf_gpu)) { + ToggleRow( + host, "gpuclock", stringResource(R.string.perf_gpuclock), + null, + on, chipModifier = chipModifier, onChange = onChange, + ) + } +} 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 cd1c3cd9c..49bf44892 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -218,6 +218,7 @@ class DrawerActions( val androidApps: List, val hudOn: Boolean, val hudConfig: Map = emptyMap(), + val gpuClockPin: Boolean = false, val frameGen: FrameGen.Mode, val frameGenTargetGameId: String? = null, val frameGenTargetGameName: String? = null, @@ -269,6 +270,7 @@ class DrawerActions( val selectedSecondScreenDisplay: Int, val onHud: (Boolean) -> Unit, val onHudSetting: (String, String) -> Unit = { _, _ -> }, + val onGpuClockPin: (Boolean) -> Unit = {}, val onHudOrder: (Map, List) -> Unit = { _, _ -> }, val onHudOrderReset: () -> Unit = {}, val onHudReset: () -> Unit = {}, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt index 8e3912e43..135cd79a6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt @@ -126,6 +126,7 @@ internal object SettingsIndex { d(R.string.drawer_page_display, R.string.frame_gen_title, "lsfg", "lossless", "fps"), d(R.string.drawer_page_display, R.string.display_filter, "upscale", "fsr", "sharpness"), d(R.string.drawer_hud, R.string.drawer_hud, "fps", "counter", "overlay", "performance"), + d(R.string.drawer_hud, R.string.perf_gpuclock, "gpu", "clock", "max"), d(R.string.drawer_page_controller, R.string.input_touchscreen, "touch", "mouse", "direct", "touchpad", "click"), d(R.string.drawer_page_controller, R.string.mode_osc, "on-screen", "controls", "touch controls", "buttons"), d(R.string.drawer_page_controller, R.string.osc_steam_layout, "touch layout", "edit layout", "on-screen"), diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 2e20f14e1..e8a743233 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -636,7 +636,6 @@ GPU إيقاف تثبيت GPU على أعلى تردد له - لـ Adreno فقط. تقطّع أقل، مع استهلاك أكبر للبطارية والحرارة. إصلاحات الجلسة Turnip: التصيير عبر sysmem ينطبق على عميل Steam والألعاب. مطلوب على Adreno 710/720/722. 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 80faccb1c..5547024fe 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -630,7 +630,6 @@ GPU Desactivado Mantener la GPU a su reloj máximo - Solo Adreno. Menos microcortes, más consumo de batería y calor. Correcciones de sesión Turnip: renderizado sysmem Se aplica al cliente de Steam y a los juegos. Obligatorio en Adreno 710/720/722. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 0a333b7f8..bc7259808 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -628,7 +628,6 @@ GPU Изкл. Задръжте GPU на максималната му честота - Само за Adreno. По-малко засечки, по-голямо използване на батерията и повече топлина. Корекции на сесията Turnip: рендиране sysmem Прилага се за клиента на Steam и игрите. Изисква се при Adreno 710/720/722. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 014b81269..8b846d2a9 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -632,7 +632,6 @@ GPU Vypnuto Udržet GPU na nejvyšších taktech - Jen Adreno. Méně zadrhávání, více spotřeby baterie a tepla. Opravy relace Turnip: vykreslování sysmem Platí pro klienta Steam i hry. Vyžadováno na Adreno 710/720/722. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 1e4231ae0..ab9d45679 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -628,7 +628,6 @@ GPU Fra Hold GPU’en på dens højeste clock - Kun Adreno. Færre hak, mere batteribrug og varme. Sessionsrettelser Turnip: sysmem-rendering Gælder Steam-klienten og spil. Påkrævet på Adreno 710/720/722. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1d4bde9bf..1337f8aa1 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -628,7 +628,6 @@ GPU Aus GPU auf höchstem Takt halten - Nur Adreno. Weniger Ruckler, mehr Akkuverbrauch und Wärme. Sitzungskorrekturen Turnip: Sysmem-Rendering Gilt für den Steam-Client und Spiele. Erforderlich bei Adreno 710/720/722. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index c50b3adcf..3b548067f 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -628,7 +628,6 @@ GPU Ανενεργό Διατήρηση της GPU στη μέγιστη συχνότητά της - Μόνο Adreno. Λιγότερα κολλήματα, μεγαλύτερη χρήση μπαταρίας και θερμότητα. Διορθώσεις συνεδρίας Turnip: απόδοση sysmem Ισχύει για το πρόγραμμα-πελάτη Steam και τα παιχνίδια. Απαιτείται σε Adreno 710/720/722. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index bd28c243b..126aa3b53 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -630,7 +630,6 @@ GPU Desactivado Mantener la GPU a su reloj máximo - Solo Adreno. Menos tirones, más consumo de batería y calor. Correcciones de sesión Turnip: renderizado sysmem Se aplica al cliente de Steam y a los juegos. Obligatorio en Adreno 710/720/722. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 042345d84..1fd968256 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -628,7 +628,6 @@ GPU Pois Pidä GPU huippukellotaajuudessaan - Vain Adreno. Vähemmän nykäyksiä, enemmän akun kulutusta ja lämpöä. Istunnon korjaukset Turnip: sysmem-renderöinti Koskee Steam-asiakasohjelmaa ja pelejä. Pakollinen Adreno 710/720/722:lla. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index b11a5a674..575309564 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -630,7 +630,6 @@ GPU Désactivé Maintenir le GPU à sa fréquence maximale - Uniquement pour Adreno. Moins de saccades, mais plus de consommation d\'énergie et de chaleur. Correctifs de session Turnip : rendu sysmem S’applique au client Steam et aux jeux. Requis sur Adreno 710/720/722. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 0e9ad3ed4..17d5e5cd6 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -628,7 +628,6 @@ GPU बंद GPU को उसकी टॉप क्लॉक पर बनाए रखें - सिर्फ़ Adreno के लिए। कम हिचकोले, लेकिन ज़्यादा बैटरी खर्च और गर्मी। सेशन फ़िक्स Turnip: sysmem रेंडरिंग Steam क्लाइंट और गेम पर लागू। Adreno 710/720/722 पर ज़रूरी। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index f8b6fbc27..86f9cb5ce 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -628,7 +628,6 @@ GPU Ki A GPU legmagasabb órajelen tartása - Csak Adreno. Kevesebb akadás, nagyobb akkumulátorhasználat és hőtermelés. Munkamenet-javítások Turnip: sysmem renderelés A Steam kliensre és a játékokra vonatkozik. Adreno 710/720/722-n szükséges. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index d85a73b7c..5b149f981 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -626,7 +626,6 @@ GPU Nonaktif Pertahankan GPU pada clock tertingginya - Hanya Adreno. Lebih sedikit tersendat, lebih banyak penggunaan baterai dan panas. Perbaikan sesi Turnip: rendering sysmem Berlaku untuk klien Steam dan gim. Diperlukan pada Adreno 710/720/722. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 207e3a575..d45d12ebc 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -630,7 +630,6 @@ GPU Disattivo Mantieni la GPU alla frequenza massima - Solo Adreno. Meno scatti, più consumo di batteria e più calore. Correzioni della sessione Turnip: rendering sysmem Si applica al client Steam e ai giochi. Necessario su Adreno 710/720/722. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 0e0a721ea..f8f00afd1 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -626,7 +626,6 @@ GPU オフ GPUを最高クロックに保つ - Adrenoのみ。スタッターは減りますが、消費電力と発熱が増えます。 セッション修正 Turnip:sysmemレンダリング Steamクライアントとゲームに適用。Adreno 710/720/722では必須です。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 281827cb4..803c259ed 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -626,7 +626,6 @@ GPU 끄기 GPU를 최고 클럭으로 유지 - Adreno에만 해당됩니다. 끊김이 줄어들지만 전력 소모와 발열이 증가합니다. 세션 수정 Turnip: sysmem 렌더링 Steam 클라이언트와 게임에 적용됩니다. Adreno 710/720/722에 필수입니다. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index a1b1f06c6..9e19ba193 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -626,7 +626,6 @@ GPU Mati Kekalkan GPU pada kelajuan tertinggi - Adreno sahaja. Kurang tersekat-sekat, lebih penggunaan bateri dan haba. Pembetulan sesi Turnip: rendering sysmem Terpakai pada klien Steam dan permainan. Diperlukan pada Adreno 710/720/722. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 071642efc..35fdb6550 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -628,7 +628,6 @@ GPU Av Hold GPU-en på toppfrekvens - Bare Adreno. Færre hikk, mer batteribruk og varme. Sesjonsfikser Turnip: sysmem-rendering Gjelder Steam-klienten og spill. Påkrevd på Adreno 710/720/722. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index ca7a52268..0bc195044 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -628,7 +628,6 @@ GPU Uit GPU op hoogste kloksnelheid houden - Alleen Adreno. Minder haperingen, meer batterijverbruik en warmte. Sessiefixes Turnip: sysmem-rendering Geldt voor de Steam-client en games. Vereist op Adreno 710/720/722. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 37feb93f8..cb1a3b6b7 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -632,7 +632,6 @@ GPU Wyłączony Utrzymuj GPU na najwyższym taktowaniu - Tylko Adreno. Mniej przycięć, większe zużycie baterii i więcej ciepła. Poprawki sesji Turnip: renderowanie sysmem Dotyczy klienta Steam i gier. Wymagane na Adreno 710/720/722. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index d9911b434..a6001ca08 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -630,7 +630,6 @@ GPU Desativado Manter a GPU na frequência máxima - Apenas Adreno. Menos soluços, mais consumo de bateria e mais calor. Correções da sessão Turnip: renderização em sysmem Aplica-se ao cliente Steam e aos jogos. Obrigatório no Adreno 710/720/722. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 4358d50e8..af3fece9a 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -630,7 +630,6 @@ GPU Desativado Manter a GPU no clock máximo - Só em Adreno. Menos engasgos, mais gasto de bateria e mais calor. Correções da sessão Turnip: renderização sysmem Aplica-se ao cliente Steam e aos jogos. Obrigatório nas Adreno 710/720/722. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 1d3ded24e..753853adc 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -630,7 +630,6 @@ GPU Dezactivat Fixează GPU-ul la frecvența maximă - Doar Adreno. Mai puține întreruperi, consum mai mare de baterie și căldură. Remedieri de sesiune Turnip: randare sysmem Se aplică clientului Steam și jocurilor. Necesară pe Adreno 710/720/722. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 2dbd90497..c47125f62 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -632,7 +632,6 @@ GPU Выкл. Поддерживать максимальную частоту GPU - Только для Adreno. Меньше подтормаживаний, но больше энергопотребления и нагрева. Исправления сессии Turnip: рендеринг sysmem Применяется к клиенту Steam и играм. Требуется на Adreno 710/720/722. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 697b79493..10f07aa95 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -628,7 +628,6 @@ GPU Av Håll GPU:n på dess högsta klockfrekvens - Bara Adreno. Färre hack, högre batteriförbrukning och mer värme. Sessionsfixar Turnip: sysmem-rendering Gäller Steam-klienten och spel. Krävs på Adreno 710/720/722. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index eb9201563..096235873 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -626,7 +626,6 @@ GPU ปิด ตรึง GPU ไว้ที่ความเร็วสัญญาณนาฬิกาสูงสุด - สำหรับ Adreno เท่านั้น สะดุดน้อยลง แต่ใช้แบตเตอรี่และเกิดความร้อนมากขึ้น การแก้ไขเซสชัน Turnip: การเรนเดอร์ sysmem ใช้กับไคลเอนต์ Steam และเกม จำเป็นสำหรับ Adreno 710/720/722 diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 0bdf53764..93544e4b6 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -628,7 +628,6 @@ GPU Kapalı GPU\'yu en yüksek saat hızında tut - Yalnızca Adreno. Daha az takılma, daha fazla pil tüketimi ve ısınma. Oturum düzeltmeleri Turnip: sysmem işleme Steam istemcisi ve oyunlar için geçerlidir. Adreno 710/720/722\'de gereklidir. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index a3ae01f71..f33b299e1 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -632,7 +632,6 @@ GPU Вимк. Тримати GPU на максимальній частоті - Лише Adreno. Менше запинок, вища витрата заряду та нагрів. Виправлення сеансу Turnip: рендеринг через sysmem Застосовується до клієнта Steam та ігор. Потрібно для Adreno 710/720/722. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 67403a00d..2b0435fef 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -626,7 +626,6 @@ GPU Tắt Giữ GPU ở xung nhịp cao nhất - Chỉ dành cho Adreno. Ít giật hơn, dùng nhiều pin và nhiệt hơn. Các bản sửa phiên Turnip: render sysmem Áp dụng cho ứng dụng Steam và trò chơi. Bắt buộc trên Adreno 710/720/722. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2064b9df5..31d9a2ffe 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -626,7 +626,6 @@ GPU 关闭 把 GPU 锁定在最高频率 - 仅限 Adreno。卡顿更少,但更耗电、更发热。 会话修复 Turnip:sysmem 渲染 适用于 Steam 客户端和游戏。Adreno 710/720/722 必需。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index d1fd71fc1..b19a92cd3 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -626,7 +626,6 @@ GPU 關閉 讓 GPU 保持最高頻率 - 只限 Adreno。減少卡頓,但更耗電、更發熱。 會話修正 Turnip:sysmem 渲染 適用於 Steam 用戶端和遊戲。Adreno 710/720/722 必須開啟。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 6c4037861..5d6a885a6 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -626,7 +626,6 @@ GPU 關閉 讓 GPU 保持最高頻率 - 僅適用於 Adreno。卡頓更少,但耗電和發熱更多。 工作階段修復 Turnip:sysmem 渲染 適用於 Steam 用戶端和遊戲。Adreno 710/720/722 必需。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d61f0ad01..36924a96c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -656,7 +656,6 @@ GPU Off Hold the GPU at its top clock - Adreno only. Fewer hitches, more battery use and heat. Session fixes Turnip: sysmem rendering Applies to the Steam client and games. Required on Adreno 710/720/722. diff --git a/docs/settings-map.md b/docs/settings-map.md index 694717ff8..cfbdf196d 100644 --- a/docs/settings-map.md +++ b/docs/settings-map.md @@ -75,6 +75,7 @@ Links of the form `droiddeck://settings/
` open a Settings section direc | Frame generation | In-game menu › Display | lsfg, lossless, fps | | Scaling filter | In-game menu › Display | upscale, fsr, sharpness | | Performance HUD | In-game menu › Performance HUD | fps, counter, overlay, performance | +| Hold the GPU at its top clock | In-game menu › Performance HUD | gpu, clock, max | | Touchscreen | In-game menu › Controller | touch, mouse, direct, touchpad, click | | On-screen controls | In-game menu › Controller | on-screen, controls, touch controls, buttons | | Steam touch layout | In-game menu › Controller | touch layout, edit layout, on-screen | From c4f4e18f871edea69bf8f5fa45878f45ce53a0e7 Mon Sep 17 00:00:00 2001 From: kingokksa <47888451+kingokksa@users.noreply.github.com> Date: Thu, 19 Nov 2026 21:37:43 +0800 Subject: [PATCH 08/31] fix: the virtual pads reach non-Steam programs, where udev is resolved through dlsym (#1593) --- tools/linuxfs/preload/inputudev.c | 979 ++++++++++++++++++++++++-- tools/linuxfs/preload/robust.c | 8 +- tools/tests/test_inputudev_preload.py | 529 ++++++++++++++ 3 files changed, 1456 insertions(+), 60 deletions(-) create mode 100644 tools/tests/test_inputudev_preload.py diff --git a/tools/linuxfs/preload/inputudev.c b/tools/linuxfs/preload/inputudev.c index d33a0adaa..823614bfd 100644 --- a/tools/linuxfs/preload/inputudev.c +++ b/tools/linuxfs/preload/inputudev.c @@ -4,15 +4,20 @@ #define _GNU_SOURCE #include +#include #include #include #include +#include +#include +#include #include #include #include #include #include #include +#include #define RING_MAX 4 #define UINPUT_BASE 16 @@ -29,17 +34,43 @@ "NAME=\"Xbox 360 Controller (%d)\"\n" \ "PHYS=\"usb-fakeinput/input%d\"\n" +#define PARENT_NAME "droiddeck-input" +#define PARENT_SYSPATH_FORMAT "/sys/devices/droiddeck%d/" PARENT_NAME "%d" +#define EVENT_SYSPATH_FORMAT PARENT_SYSPATH_FORMAT "/event%d" + struct pad { - char syspath[64]; + char syspath[80]; char devnode[32]; - char sysname[16]; + char sysname[24]; char uevent[256]; dev_t devnum; + int node; + int parent; + int live; }; static struct pad pads[PAD_MAX]; +static struct pad parents[PAD_MAX]; static int pad_count; static pthread_mutex_t virtual_lock = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t enumerate_lock = PTHREAD_MUTEX_INITIALIZER; + +/* The event device's parent has to answer as a separate device so that its syspath differs from + * the child's: consumers compare parent syspaths to tell gamepads apart. */ +static void make_parent(int node, const struct pad *pad, struct pad *parent) { + snprintf(parent->syspath, sizeof(parent->syspath), PARENT_SYSPATH_FORMAT, node, node); + snprintf(parent->sysname, sizeof(parent->sysname), PARENT_NAME "%d", node); + parent->devnode[0] = '\0'; + memcpy(parent->uevent, pad->uevent, sizeof(parent->uevent)); + parent->devnum = makedev(0, 0); + parent->node = node; + parent->parent = 1; + parent->live = pad->live; +} + +static void sync_parent(int node) { + make_parent(node, &pads[node], &parents[node]); +} static void discover_pads(void) { const char *spec = getenv("FAKE_EVDEV_MEMFD_PATHS"); @@ -55,12 +86,15 @@ static void discover_pads(void) { if (pad->devnode[0] == '\0') { snprintf(pad->sysname, sizeof(pad->sysname), "event%ld", slot); - snprintf(pad->syspath, sizeof(pad->syspath), "/sys/devices/virtual/input/droiddeck%ld", - slot); + snprintf(pad->syspath, sizeof(pad->syspath), EVENT_SYSPATH_FORMAT, (int)slot, (int)slot, + (int)slot); snprintf(pad->devnode, sizeof(pad->devnode), "/dev/input/event%ld", slot); snprintf(pad->uevent, sizeof(pad->uevent), PAD_UEVENT_FORMAT, (int)slot, (int)slot); pad->devnum = makedev(13, EVENT_MINOR_BASE + (unsigned int)slot); + pad->node = (int)slot; + pad->live = 1; if (slot >= pad_count) pad_count = (int)slot + 1; + sync_parent((int)slot); } } entry = strchr(entry, ';'); @@ -103,70 +137,304 @@ static int any_virtual_pad(void) { return 0; } -static void refresh_pad(int node) { - struct pad *pad; +static void refresh_locked(int node) { + struct pad *pad = &pads[node]; - if (node < 0 || node >= PAD_MAX) return; - pad = &pads[node]; - pthread_mutex_lock(&virtual_lock); if (node >= UINPUT_BASE) { char uevent[sizeof(pad->uevent)]; if (read_virtual_uevent(node, uevent, sizeof(uevent))) { snprintf(pad->sysname, sizeof(pad->sysname), "event%d", node); - snprintf(pad->syspath, sizeof(pad->syspath), "/sys/devices/virtual/input/droiddeck%d", node); + snprintf(pad->syspath, sizeof(pad->syspath), EVENT_SYSPATH_FORMAT, node, node, node); memcpy(pad->uevent, uevent, sizeof(uevent)); pad->devnum = makedev(13, EVENT_MINOR_BASE + (unsigned int)node); snprintf(pad->devnode, sizeof(pad->devnode), "/dev/input/event%d", node); + pad->node = node; + pad->live = 1; if (node >= pad_count) pad_count = node + 1; } else { pad->devnode[0] = '\0'; + pad->live = 0; + } + } else if (pad->sysname[0] != '\0') { + char path[PATH_MAX]; + const char *dir = getenv("FAKE_EVDEV_DIR"); + + if (dir == NULL || snprintf(path, sizeof(path), "%s/event%d", dir, node) >= (int)sizeof(path) || + access(path, F_OK) != 0) { + pad->devnode[0] = '\0'; + pad->live = 0; + } else { + snprintf(pad->devnode, sizeof(pad->devnode), "/dev/input/event%d", node); + pad->live = 1; + if (uinput_enabled()) + snprintf(pad->uevent, sizeof(pad->uevent), + any_virtual_pad() ? PAD_PHYSICAL_UEVENT_FORMAT : PAD_UEVENT_FORMAT, node, node); } - } else if (pad->devnode[0] != '\0' && uinput_enabled()) { - snprintf(pad->uevent, sizeof(pad->uevent), - any_virtual_pad() ? PAD_PHYSICAL_UEVENT_FORMAT : PAD_UEVENT_FORMAT, node, node); } - pthread_mutex_unlock(&virtual_lock); + sync_parent(node); } -static struct pad *pad_for_syspath(const char *syspath) { +static int snapshot_pad(int node, int parent, struct pad *out) { + int found; + + if (node < 0 || node >= PAD_MAX) return 0; + ensure_pads(); + pthread_mutex_lock(&virtual_lock); + refresh_locked(node); + found = parent ? parents[node].live : pads[node].devnode[0] != '\0'; + if (found) *out = parent ? parents[node] : pads[node]; + pthread_mutex_unlock(&virtual_lock); + return found; +} + +static int parse_number(const char **cursor) { + int value = 0; + + if (**cursor < '0' || **cursor > '9') return -1; + while (**cursor >= '0' && **cursor <= '9') { + if (value < PAD_MAX) value = value * 10 + (*(*cursor) - '0'); + (*cursor)++; + } + return value; +} + +static int match_numbered(const char **cursor, const char *literal, int node) { + char expected[32]; + int length = snprintf(expected, sizeof(expected), "%s%d", literal, node); + + if (strncmp(*cursor, expected, (size_t)length) != 0) return 0; + *cursor += length; + return 1; +} + +/* Returns the pad node behind one of our syspaths, -1 for anything else. */ +static int node_from_syspath(const char *syspath, int *child) { + static const char virtual_prefix[] = "/sys/devices/virtual/input/droiddeck"; + static const char child_prefix[] = "/sys/devices/droiddeck"; + const char *cursor; + int node; + + if (syspath == NULL) return -1; + if (strncmp(syspath, virtual_prefix, sizeof(virtual_prefix) - 1) == 0) { + cursor = syspath + sizeof(virtual_prefix) - 1; + *child = 0; + } else if (strncmp(syspath, child_prefix, sizeof(child_prefix) - 1) == 0) { + cursor = syspath + sizeof(child_prefix) - 1; + *child = 1; + } else { + return -1; + } + node = parse_number(&cursor); + if (node < 0 || node >= PAD_MAX) return -1; + if (!*child) { + if (*cursor == '\0') return node; + return match_numbered(&cursor, "/event", node) && *cursor == '\0' ? node : -1; + } + if (!match_numbered(&cursor, "/" PARENT_NAME, node)) return -1; + if (*cursor == '\0') return node; + if (!match_numbered(&cursor, "/event", node) || *cursor != '\0') return -1; + *child = 0; + return node; +} + +static int syspath_pad(const char *syspath, struct pad *out) { + int child = 0; + int node = node_from_syspath(syspath, &child); + + return node >= 0 && snapshot_pad(node, child, out); +} + +static int sysname_pad(const char *sysname, struct pad *out) { + static const char parent_name[] = PARENT_NAME; + const char *cursor; + int parent; + int node; + + if (strncmp(sysname, "event", 5) == 0) { + cursor = sysname + 5; + parent = 0; + } else if (strncmp(sysname, parent_name, sizeof(parent_name) - 1) == 0) { + cursor = sysname + sizeof(parent_name) - 1; + parent = 1; + } else { + return 0; + } + node = parse_number(&cursor); + return node >= 0 && *cursor == '\0' && snapshot_pad(node, parent, out); +} + +/* Each construction hands out its own handle bound to the context that built it, so one consumer + * releasing its libudev context can never leave another consumer's device with a dangling one. */ +#define HANDLE_MAX 256 + +static const char *const property_keys[] = {"DEVNAME", "DEVPATH", "ID_INPUT", "ID_INPUT_JOYSTICK"}; + +#define PROPERTY_COUNT (sizeof(property_keys) / sizeof(property_keys[0])) + +struct handle { + struct pad info; + void *udev; + struct handle *parent; + int refs; + char properties[PROPERTY_COUNT]; +}; + +static struct handle handles[HANDLE_MAX]; +static pthread_mutex_t handle_lock = PTHREAD_MUTEX_INITIALIZER; + +static struct handle *live_handle(void *device) { + uintptr_t offset = (uintptr_t)device - (uintptr_t)handles; + struct handle *handle; + + if (offset >= sizeof(handles) || offset % sizeof(handles[0]) != 0) return NULL; + handle = &handles[offset / sizeof(handles[0])]; + return handle->refs > 0 ? handle : NULL; +} + +static struct handle *claim_slot(const struct pad *info, void *udev) { int i; - if (syspath == NULL) return NULL; - ensure_pads(); - for (i = 0; i < pad_count; i++) { - if (pads[i].devnode[0] != '\0' && strcmp(pads[i].syspath, syspath) == 0) return &pads[i]; + for (i = 0; i < HANDLE_MAX; i++) { + if (handles[i].refs == 0) { + handles[i].refs = 1; + handles[i].info = *info; + handles[i].udev = udev; + handles[i].parent = NULL; + return &handles[i]; + } } return NULL; } -static struct pad *pad_for_device(void *device) { - int i; +static void *claim_handle(const struct pad *info, void *udev) { + struct handle *handle; + + pthread_mutex_lock(&handle_lock); + handle = claim_slot(info, udev); + pthread_mutex_unlock(&handle_lock); + return handle; +} + +static int retain_handle(void *device) { + struct handle *handle; + + pthread_mutex_lock(&handle_lock); + handle = live_handle(device); + if (handle != NULL) handle->refs++; + pthread_mutex_unlock(&handle_lock); + return handle != NULL; +} + +static int release_handle(void *device) { + struct handle *handle; + int found; + + pthread_mutex_lock(&handle_lock); + handle = live_handle(device); + found = handle != NULL; + while (handle != NULL && --handle->refs == 0) { + struct handle *parent = handle->parent; + + handle->parent = NULL; + handle = parent; + } + pthread_mutex_unlock(&handle_lock); + return found; +} + +static struct handle *device_handle(void *device) { + struct handle *handle; if (device == NULL) return NULL; - ensure_pads(); - for (i = 0; i < pad_count; i++) { - if (&pads[i] == device) return pads[i].devnode[0] != '\0' ? &pads[i] : NULL; + pthread_mutex_lock(&handle_lock); + handle = live_handle(device); + pthread_mutex_unlock(&handle_lock); + return handle; +} + +static struct pad *device_pad(void *device) { + struct handle *handle = device_handle(device); + + return handle != NULL ? &handle->info : NULL; +} + +/* The parent belongs to the child that handed it out and goes away with it, as in libudev. */ +static void *parent_device(void *device, struct pad *pad) { + struct handle *handle; + struct handle *parent = NULL; + struct pad info; + + if (pad->parent) return NULL; + make_parent(pad->node, pad, &info); + pthread_mutex_lock(&handle_lock); + handle = live_handle(device); + if (handle != NULL) { + if (handle->parent == NULL) handle->parent = claim_slot(&info, handle->udev); + parent = handle->parent; } + pthread_mutex_unlock(&handle_lock); + return parent; +} + +static const char *pad_property(const struct pad *pad, const char *key) { + if (key == NULL) return NULL; + if (strcmp(key, "ID_INPUT") == 0 || strcmp(key, "ID_INPUT_JOYSTICK") == 0) return "1"; + if (strcmp(key, "DEVNAME") == 0) return !pad->parent && pad->devnode[0] != '\0' ? pad->devnode : NULL; + if (strcmp(key, "DEVPATH") == 0) return pad->syspath + 4; return NULL; } -static struct pad *pad_for_syslink(const char *path) { +static struct handle *property_handle(void *entry, size_t *index) { + uintptr_t offset = (uintptr_t)entry - (uintptr_t)handles; + size_t within; + + if (offset >= sizeof(handles)) return NULL; + within = offset % sizeof(handles[0]); + if (within < offsetof(struct handle, properties) || + within >= offsetof(struct handle, properties) + PROPERTY_COUNT) + return NULL; + *index = within - offsetof(struct handle, properties); + return &handles[offset / sizeof(handles[0])]; +} + +static void *next_property(struct handle *handle, size_t from) { + size_t i; + + for (i = from; i < PROPERTY_COUNT; i++) + if (pad_property(&handle->info, property_keys[i]) != NULL) return &handle->properties[i]; + return NULL; +} + +static int syslink_pad(const char *path, struct pad *out) { static const char prefix[] = "/sys/class/input/"; - const char *name; - int i; - if (path == NULL || strncmp(path, prefix, sizeof(prefix) - 1) != 0) return NULL; - name = path + sizeof(prefix) - 1; - ensure_pads(); - if (strncmp(name, "event", 5) == 0 && name[5] >= '0' && name[5] <= '9') refresh_pad(atoi(name + 5)); - for (i = 0; i < pad_count; i++) { - if (pads[i].devnode[0] != '\0' && strcmp(pads[i].sysname, name) == 0) return &pads[i]; - } - return NULL; + if (path == NULL || strncmp(path, prefix, sizeof(prefix) - 1) != 0) return 0; + return sysname_pad(path + sizeof(prefix) - 1, out); } -static void *next_symbol(const char *name) { return dlsym(RTLD_NEXT, name); } +static void *real_dlsym(void); + +/* libudev is often opened with RTLD_LOCAL, which keeps it out of the global scope that RTLD_NEXT + * searches, so the handle the program opened is the only way back to the real implementation. */ +static _Atomic(void *) udev_handle; + +__attribute__((visibility("hidden"))) void bl_inputudev_note_dlopen(const char *path, void *handle) { + if (handle != NULL && path != NULL && strstr(path, "libudev") != NULL) + atomic_store_explicit(&udev_handle, handle, memory_order_release); +} + +static void *next_symbol(const char *name) { + void *(*forward)(void *, const char *) = real_dlsym(); + void *symbol; + + if (forward == NULL) return NULL; + if (strncmp(name, "udev_", 5) == 0) { + symbol = atomic_load_explicit(&udev_handle, memory_order_acquire); + if (symbol != NULL && (symbol = forward(symbol, name)) != NULL) return symbol; + } + return forward(RTLD_NEXT, name); +} char *dd_cached_realpath(const char *path, char *resolved, char *(*real)(const char *, char *)) __attribute__((visibility("hidden"))); @@ -194,12 +462,11 @@ __attribute__((visibility("hidden"))) int dd_winebus_rumble_ioctl(int (*real)(in char *realpath(const char *path, char *resolved) { static char *(*real_realpath)(const char *, char *); - void *caller = __builtin_return_address(0); - struct pad *pad = caller_is_winebus(caller) ? pad_for_syslink(path) : NULL; + struct pad pad; - if (pad != NULL) { - if (resolved == NULL) return strdup(pad->syspath); - memcpy(resolved, pad->syspath, strlen(pad->syspath) + 1); + if (syslink_pad(path, &pad)) { + if (resolved == NULL) return strdup(pad.syspath); + memcpy(resolved, pad.syspath, strlen(pad.syspath) + 1); return resolved; } if (real_realpath == NULL) real_realpath = next_symbol("realpath"); @@ -209,10 +476,9 @@ char *realpath(const char *path, char *resolved) { void *udev_device_new_from_syspath(void *udev, const char *syspath) { static void *(*real_new)(void *, const char *); - void *caller = __builtin_return_address(0); - struct pad *pad = caller_is_winebus(caller) ? pad_for_syspath(syspath) : NULL; + struct pad pad; - if (pad != NULL) return pad; + if (syspath_pad(syspath, &pad)) return claim_handle(&pad, udev); if (real_new == NULL) real_new = next_symbol("udev_device_new_from_syspath"); if (real_new == NULL) return NULL; return real_new(udev, syspath); @@ -221,7 +487,7 @@ void *udev_device_new_from_syspath(void *udev, const char *syspath) { void *udev_device_ref(void *device) { static void *(*real_ref)(void *); - if (pad_for_device(device) != NULL) return device; + if (retain_handle(device)) return device; if (real_ref == NULL) real_ref = next_symbol("udev_device_ref"); if (real_ref == NULL) return NULL; return real_ref(device); @@ -230,7 +496,7 @@ void *udev_device_ref(void *device) { void *udev_device_unref(void *device) { static void *(*real_unref)(void *); - if (pad_for_device(device) != NULL) return NULL; + if (release_handle(device)) return NULL; if (real_unref == NULL) real_unref = next_symbol("udev_device_unref"); if (real_unref == NULL) return NULL; return real_unref(device); @@ -238,9 +504,9 @@ void *udev_device_unref(void *device) { const char *udev_device_get_devnode(void *device) { static const char *(*real_get)(void *); - struct pad *pad = pad_for_device(device); + struct pad *pad = device_pad(device); - if (pad != NULL) return pad->devnode; + if (pad != NULL) return pad->parent || pad->devnode[0] == '\0' ? NULL : pad->devnode; if (real_get == NULL) real_get = next_symbol("udev_device_get_devnode"); if (real_get == NULL) return NULL; return real_get(device); @@ -248,7 +514,7 @@ const char *udev_device_get_devnode(void *device) { const char *udev_device_get_syspath(void *device) { static const char *(*real_get)(void *); - struct pad *pad = pad_for_device(device); + struct pad *pad = device_pad(device); if (pad != NULL) return pad->syspath; if (real_get == NULL) real_get = next_symbol("udev_device_get_syspath"); @@ -256,9 +522,19 @@ const char *udev_device_get_syspath(void *device) { return real_get(device); } +const char *udev_device_get_devpath(void *device) { + static const char *(*real_get)(void *); + struct pad *pad = device_pad(device); + + if (pad != NULL) return pad->syspath + 4; + if (real_get == NULL) real_get = next_symbol("udev_device_get_devpath"); + if (real_get == NULL) return NULL; + return real_get(device); +} + const char *udev_device_get_sysname(void *device) { static const char *(*real_get)(void *); - struct pad *pad = pad_for_device(device); + struct pad *pad = device_pad(device); if (pad != NULL) return pad->sysname; if (real_get == NULL) real_get = next_symbol("udev_device_get_sysname"); @@ -266,9 +542,19 @@ const char *udev_device_get_sysname(void *device) { return real_get(device); } +const char *udev_device_get_sysnum(void *device) { + static const char *(*real_get)(void *); + struct pad *pad = device_pad(device); + + if (pad != NULL) return pad->sysname + strcspn(pad->sysname, "0123456789"); + if (real_get == NULL) real_get = next_symbol("udev_device_get_sysnum"); + if (real_get == NULL) return NULL; + return real_get(device); +} + const char *udev_device_get_subsystem(void *device) { static const char *(*real_get)(void *); - struct pad *pad = pad_for_device(device); + struct pad *pad = device_pad(device); if (pad != NULL) return "input"; if (real_get == NULL) real_get = next_symbol("udev_device_get_subsystem"); @@ -278,7 +564,7 @@ const char *udev_device_get_subsystem(void *device) { const char *udev_device_get_devtype(void *device) { static const char *(*real_get)(void *); - struct pad *pad = pad_for_device(device); + struct pad *pad = device_pad(device); if (pad != NULL) return NULL; if (real_get == NULL) real_get = next_symbol("udev_device_get_devtype"); @@ -288,7 +574,7 @@ const char *udev_device_get_devtype(void *device) { const char *udev_device_get_action(void *device) { static const char *(*real_get)(void *); - struct pad *pad = pad_for_device(device); + struct pad *pad = device_pad(device); if (pad != NULL) return NULL; if (real_get == NULL) real_get = next_symbol("udev_device_get_action"); @@ -298,7 +584,7 @@ const char *udev_device_get_action(void *device) { dev_t udev_device_get_devnum(void *device) { static dev_t (*real_get)(void *); - struct pad *pad = pad_for_device(device); + struct pad *pad = device_pad(device); if (pad != NULL) return pad->devnum; if (real_get == NULL) real_get = next_symbol("udev_device_get_devnum"); @@ -306,13 +592,31 @@ dev_t udev_device_get_devnum(void *device) { return real_get(device); } +void *udev_device_get_udev(void *device) { + static void *(*real_get)(void *); + struct handle *handle = device_handle(device); + + if (handle != NULL) return handle->udev; + if (real_get == NULL) real_get = next_symbol("udev_device_get_udev"); + return real_get != NULL ? real_get(device) : NULL; +} + +int udev_device_get_is_initialized(void *device) { + static int (*real_get)(void *); + + if (device_pad(device) != NULL) return 1; + if (real_get == NULL) real_get = next_symbol("udev_device_get_is_initialized"); + return real_get != NULL ? real_get(device) : 0; +} + void *udev_device_get_parent_with_subsystem_devtype(void *device, const char *subsystem, const char *devtype) { static void *(*real_get)(void *, const char *, const char *); - struct pad *pad = pad_for_device(device); + struct pad *pad = device_pad(device); if (pad != NULL) { - if (subsystem != NULL && strcmp(subsystem, "input") == 0 && devtype == NULL) return pad; + if (subsystem != NULL && strcmp(subsystem, "input") == 0 && devtype == NULL) + return parent_device(device, pad); return NULL; } if (real_get == NULL) real_get = next_symbol("udev_device_get_parent_with_subsystem_devtype"); @@ -322,7 +626,7 @@ void *udev_device_get_parent_with_subsystem_devtype(void *device, const char *su const char *udev_device_get_sysattr_value(void *device, const char *attr) { static const char *(*real_get)(void *, const char *); - struct pad *pad = pad_for_device(device); + struct pad *pad = device_pad(device); if (pad != NULL) return attr != NULL && strcmp(attr, "uevent") == 0 ? pad->uevent : NULL; if (real_get == NULL) real_get = next_symbol("udev_device_get_sysattr_value"); @@ -332,10 +636,567 @@ const char *udev_device_get_sysattr_value(void *device, const char *attr) { const char *udev_device_get_property_value(void *device, const char *key) { static const char *(*real_get)(void *, const char *); - struct pad *pad = pad_for_device(device); + struct pad *pad = device_pad(device); - if (pad != NULL) return key != NULL && strcmp(key, "ID_INPUT_JOYSTICK") == 0 ? "1" : NULL; + if (pad != NULL) return pad_property(pad, key); if (real_get == NULL) real_get = next_symbol("udev_device_get_property_value"); if (real_get == NULL) return NULL; return real_get(device, key); } + +void *udev_device_get_parent(void *device) { + static void *(*real_get)(void *); + struct pad *pad = device_pad(device); + + if (pad != NULL) return parent_device(device, pad); + if (real_get == NULL) real_get = next_symbol("udev_device_get_parent"); + return real_get != NULL ? real_get(device) : NULL; +} + +int udev_device_has_tag(void *device, const char *tag) { + static int (*real_has)(void *, const char *); + + if (device_pad(device) != NULL) return 0; + if (real_has == NULL) real_has = next_symbol("udev_device_has_tag"); + return real_has != NULL ? real_has(device, tag) : 0; +} + +void *udev_device_get_properties_list_entry(void *device) { + static void *(*real_get)(void *); + struct handle *handle = device_handle(device); + + if (handle != NULL) return next_property(handle, 0); + if (real_get == NULL) real_get = next_symbol("udev_device_get_properties_list_entry"); + return real_get != NULL ? real_get(device) : NULL; +} + +void *udev_device_get_tags_list_entry(void *device) { + static void *(*real_get)(void *); + + if (device_pad(device) != NULL) return NULL; + if (real_get == NULL) real_get = next_symbol("udev_device_get_tags_list_entry"); + return real_get != NULL ? real_get(device) : NULL; +} + +void *udev_device_get_sysattr_list_entry(void *device) { + static void *(*real_get)(void *); + + if (device_pad(device) != NULL) return NULL; + if (real_get == NULL) real_get = next_symbol("udev_device_get_sysattr_list_entry"); + return real_get != NULL ? real_get(device) : NULL; +} + +void *udev_device_new_from_devnum(void *udev, char type, dev_t devnum) { + static void *(*real_new)(void *, char, dev_t); + struct pad pad; + int node; + + for (node = 0; node < PAD_MAX; node++) + if (snapshot_pad(node, 0, &pad) && pad.devnum == devnum) return claim_handle(&pad, udev); + if (real_new == NULL) real_new = next_symbol("udev_device_new_from_devnum"); + return real_new != NULL ? real_new(udev, type, devnum) : NULL; +} + +void *udev_device_new_from_subsystem_sysname(void *udev, const char *subsystem, const char *sysname) { + static void *(*real_new)(void *, const char *, const char *); + struct pad pad; + + if (subsystem != NULL && sysname != NULL && strcmp(subsystem, "input") == 0 && sysname_pad(sysname, &pad)) + return claim_handle(&pad, udev); + if (real_new == NULL) real_new = next_symbol("udev_device_new_from_subsystem_sysname"); + return real_new != NULL ? real_new(udev, subsystem, sysname) : NULL; +} + +#define ENTRY_MAX (PAD_MAX * 2) + +struct enumerate { + struct enumerate *next; + void *real; + void *real_head; + int matched; + int filtered; + int parent_node; + int real_parent; + int real_listed; + int scanned; + int refs; + char names[ENTRY_MAX][sizeof(pads[0].syspath)]; +}; + +static struct enumerate *enumerates; + +static struct enumerate *entry_state(void *entry, int *slot) { + struct enumerate *state; + + pthread_mutex_lock(&enumerate_lock); + for (state = enumerates; state != NULL; state = state->next) { + uintptr_t offset = (uintptr_t)entry - (uintptr_t)state->names; + + if (offset < sizeof(state->names) && offset % sizeof(state->names[0]) == 0) { + *slot = (int)(offset / sizeof(state->names[0])); + break; + } + } + pthread_mutex_unlock(&enumerate_lock); + return state; +} + +static struct enumerate *enumerate_state(void *enumerate) { + struct enumerate *state; + + pthread_mutex_lock(&enumerate_lock); + for (state = enumerates; state != NULL && state->real != enumerate; state = state->next) { + } + pthread_mutex_unlock(&enumerate_lock); + return state; +} + +void *udev_enumerate_new(void *udev) { + static void *(*real_new)(void *); + void *enumerate; + struct enumerate *state; + + if (real_new == NULL) real_new = next_symbol("udev_enumerate_new"); + if (real_new == NULL) return NULL; + enumerate = real_new(udev); + if (enumerate == NULL) return NULL; + state = calloc(1, sizeof(*state)); + if (state == NULL) return enumerate; + state->real = enumerate; + state->parent_node = -1; + state->refs = 1; + pthread_mutex_lock(&enumerate_lock); + state->next = enumerates; + enumerates = state; + pthread_mutex_unlock(&enumerate_lock); + return enumerate; +} + +void *udev_enumerate_ref(void *enumerate) { + static void *(*real_ref)(void *); + struct enumerate *state = enumerate_state(enumerate); + + if (state != NULL) { + pthread_mutex_lock(&enumerate_lock); + state->refs++; + pthread_mutex_unlock(&enumerate_lock); + } + if (real_ref == NULL) real_ref = next_symbol("udev_enumerate_ref"); + return real_ref != NULL ? real_ref(enumerate) : enumerate; +} + +void *udev_enumerate_unref(void *enumerate) { + static void *(*real_unref)(void *); + struct enumerate *state = enumerate_state(enumerate); + + if (state != NULL) { + pthread_mutex_lock(&enumerate_lock); + if (--state->refs <= 0) { + struct enumerate **link; + + for (link = &enumerates; *link != NULL && *link != state; link = &(*link)->next) { + } + if (*link != NULL) *link = state->next; + } else { + state = NULL; + } + pthread_mutex_unlock(&enumerate_lock); + free(state); + } + if (real_unref == NULL) real_unref = next_symbol("udev_enumerate_unref"); + return real_unref != NULL ? real_unref(enumerate) : NULL; +} + +int udev_enumerate_add_match_subsystem(void *enumerate, const char *subsystem) { + static int (*real_add)(void *, const char *); + struct enumerate *state = enumerate_state(enumerate); + int rc; + + if (real_add == NULL) real_add = next_symbol("udev_enumerate_add_match_subsystem"); + rc = real_add != NULL ? real_add(enumerate, subsystem) : 0; + if (rc == 0 && state != NULL && subsystem != NULL) { + pthread_mutex_lock(&enumerate_lock); + state->filtered = 1; + state->matched = state->matched || strcmp(subsystem, "input") == 0; + pthread_mutex_unlock(&enumerate_lock); + } + return rc; +} + +int udev_enumerate_add_match_parent(void *enumerate, void *parent) { + static int (*real_add)(void *, void *); + struct enumerate *state = enumerate_state(enumerate); + struct pad *pad = device_pad(parent); + int rc; + + if (pad != NULL) { + if (state == NULL) return -EINVAL; + pthread_mutex_lock(&enumerate_lock); + state->parent_node = pad->node; + state->real_parent = 0; + pthread_mutex_unlock(&enumerate_lock); + return 0; + } + if (real_add == NULL) real_add = next_symbol("udev_enumerate_add_match_parent"); + rc = real_add != NULL ? real_add(enumerate, parent) : -ENOSYS; + if (rc == 0 && state != NULL) { + pthread_mutex_lock(&enumerate_lock); + state->parent_node = -1; + state->real_parent = 1; + pthread_mutex_unlock(&enumerate_lock); + } + return rc; +} + +static void *real_get_list_entry(void *enumerate) { + static void *(*real_get)(void *); + + if (real_get == NULL) real_get = next_symbol("udev_enumerate_get_list_entry"); + return real_get != NULL ? real_get(enumerate) : NULL; +} + +int udev_enumerate_scan_devices(void *enumerate) { + static int (*real_scan)(void *); + struct enumerate *state = enumerate_state(enumerate); + char names[ENTRY_MAX][sizeof(pads[0].syspath)]; + int include; + int parent_node; + int added = 0; + int node; + int rc; + + if (real_scan == NULL) real_scan = next_symbol("udev_enumerate_scan_devices"); + rc = real_scan != NULL ? real_scan(enumerate) : -1; + if (state == NULL) return rc; + pthread_mutex_lock(&enumerate_lock); + parent_node = state->parent_node; + include = !state->real_parent && (state->filtered ? state->matched : parent_node >= 0); + pthread_mutex_unlock(&enumerate_lock); + for (node = 0; node < PAD_MAX; node++) { + struct pad pad; + + names[2 * node][0] = '\0'; + names[2 * node + 1][0] = '\0'; + if (!include || (parent_node >= 0 && parent_node != node)) continue; + if (parent_node >= 0 && snapshot_pad(node, 1, &pad)) { + memcpy(names[2 * node], pad.syspath, sizeof(names[0])); + added++; + } + if (snapshot_pad(node, 0, &pad)) { + memcpy(names[2 * node + 1], pad.syspath, sizeof(names[0])); + added++; + } + } + pthread_mutex_lock(&enumerate_lock); + memcpy(state->names, names, sizeof(names)); + state->scanned = 1; + state->real_listed = rc == 0 && parent_node < 0; + state->real_head = NULL; + pthread_mutex_unlock(&enumerate_lock); + /* Both browsers abandon the enumeration when the scan reports an error, and the real scan always + fails here because Android hides /sys/class from readdir. */ + if (added > 0 && rc < 0) rc = 0; + return rc; +} + +static void *next_pad_entry(struct enumerate *state, int from) { + void *entry; + int slot; + + pthread_mutex_lock(&enumerate_lock); + for (slot = from; slot < ENTRY_MAX && state->names[slot][0] == '\0'; slot++) { + } + entry = slot < ENTRY_MAX ? (void *)state->names[slot] : state->real_head; + pthread_mutex_unlock(&enumerate_lock); + return entry; +} + +void *udev_enumerate_get_list_entry(void *enumerate) { + struct enumerate *state = enumerate_state(enumerate); + void *head = NULL; + int own; + int real_listed; + + if (state == NULL) return real_get_list_entry(enumerate); + pthread_mutex_lock(&enumerate_lock); + own = state->scanned && (state->matched || state->parent_node >= 0); + real_listed = state->real_listed; + pthread_mutex_unlock(&enumerate_lock); + if (!own) return real_get_list_entry(enumerate); + if (real_listed) head = real_get_list_entry(enumerate); + pthread_mutex_lock(&enumerate_lock); + state->real_head = head; + pthread_mutex_unlock(&enumerate_lock); + return next_pad_entry(state, 0); +} + +void *udev_list_entry_get_next(void *entry) { + static void *(*real_get)(void *); + struct enumerate *state; + struct handle *handle; + size_t index; + int slot; + + if ((state = entry_state(entry, &slot)) != NULL) return next_pad_entry(state, slot + 1); + if ((handle = property_handle(entry, &index)) != NULL) return next_property(handle, index + 1); + if (real_get == NULL) real_get = next_symbol("udev_list_entry_get_next"); + return real_get != NULL ? real_get(entry) : NULL; +} + +void *udev_list_entry_get_by_name(void *entry, const char *name) { + static void *(*real_get)(void *, const char *); + struct enumerate *state; + struct handle *handle; + size_t index; + int slot; + + if ((state = entry_state(entry, &slot)) != NULL) { + if (name == NULL) return NULL; + pthread_mutex_lock(&enumerate_lock); + for (slot = 0; slot < ENTRY_MAX && (state->names[slot][0] == '\0' || strcmp(state->names[slot], name) != 0); + slot++) { + } + entry = slot < ENTRY_MAX ? (void *)state->names[slot] : state->real_head; + pthread_mutex_unlock(&enumerate_lock); + if (entry == NULL || slot < ENTRY_MAX) return entry; + } else if ((handle = property_handle(entry, &index)) != NULL) { + for (index = 0; index < PROPERTY_COUNT; index++) + if (name != NULL && strcmp(property_keys[index], name) == 0 && pad_property(&handle->info, name) != NULL) + return &handle->properties[index]; + return NULL; + } + if (real_get == NULL) real_get = next_symbol("udev_list_entry_get_by_name"); + return real_get != NULL ? real_get(entry, name) : NULL; +} + +const char *udev_list_entry_get_name(void *entry) { + static const char *(*real_get)(void *); + size_t index; + int slot; + + if (entry_state(entry, &slot) != NULL) return entry; + if (property_handle(entry, &index) != NULL) return property_keys[index]; + if (real_get == NULL) real_get = next_symbol("udev_list_entry_get_name"); + return real_get != NULL ? real_get(entry) : NULL; +} + +const char *udev_list_entry_get_value(void *entry) { + static const char *(*real_get)(void *); + struct handle *handle; + size_t index; + int slot; + + if (entry_state(entry, &slot) != NULL) return ""; + if ((handle = property_handle(entry, &index)) != NULL) return pad_property(&handle->info, property_keys[index]); + if (real_get == NULL) real_get = next_symbol("udev_list_entry_get_value"); + return real_get != NULL ? real_get(entry) : NULL; +} + +struct udev_symbol { + const char *name; + void *address; +}; + +static const struct udev_symbol udev_symbols[] = { + {"udev_device_new_from_syspath", (void *)udev_device_new_from_syspath}, + {"udev_device_new_from_devnum", (void *)udev_device_new_from_devnum}, + {"udev_device_new_from_subsystem_sysname", (void *)udev_device_new_from_subsystem_sysname}, + {"udev_device_ref", (void *)udev_device_ref}, + {"udev_device_unref", (void *)udev_device_unref}, + {"udev_device_get_devnode", (void *)udev_device_get_devnode}, + {"udev_device_get_syspath", (void *)udev_device_get_syspath}, + {"udev_device_get_devpath", (void *)udev_device_get_devpath}, + {"udev_device_get_sysname", (void *)udev_device_get_sysname}, + {"udev_device_get_sysnum", (void *)udev_device_get_sysnum}, + {"udev_device_get_subsystem", (void *)udev_device_get_subsystem}, + {"udev_device_get_devtype", (void *)udev_device_get_devtype}, + {"udev_device_get_action", (void *)udev_device_get_action}, + {"udev_device_get_devnum", (void *)udev_device_get_devnum}, + {"udev_device_get_sysattr_value", (void *)udev_device_get_sysattr_value}, + {"udev_device_get_property_value", (void *)udev_device_get_property_value}, + {"udev_device_get_parent_with_subsystem_devtype", + (void *)udev_device_get_parent_with_subsystem_devtype}, + {"udev_device_get_parent", (void *)udev_device_get_parent}, + {"udev_device_get_udev", (void *)udev_device_get_udev}, + {"udev_device_get_is_initialized", (void *)udev_device_get_is_initialized}, + {"udev_device_has_tag", (void *)udev_device_has_tag}, + {"udev_device_get_properties_list_entry", (void *)udev_device_get_properties_list_entry}, + {"udev_device_get_tags_list_entry", (void *)udev_device_get_tags_list_entry}, + {"udev_device_get_sysattr_list_entry", (void *)udev_device_get_sysattr_list_entry}, + {"udev_enumerate_new", (void *)udev_enumerate_new}, + {"udev_enumerate_ref", (void *)udev_enumerate_ref}, + {"udev_enumerate_unref", (void *)udev_enumerate_unref}, + {"udev_enumerate_add_match_subsystem", (void *)udev_enumerate_add_match_subsystem}, + {"udev_enumerate_add_match_parent", (void *)udev_enumerate_add_match_parent}, + {"udev_enumerate_scan_devices", (void *)udev_enumerate_scan_devices}, + {"udev_enumerate_get_list_entry", (void *)udev_enumerate_get_list_entry}, + {"udev_list_entry_get_next", (void *)udev_list_entry_get_next}, + {"udev_list_entry_get_by_name", (void *)udev_list_entry_get_by_name}, + {"udev_list_entry_get_name", (void *)udev_list_entry_get_name}, + {"udev_list_entry_get_value", (void *)udev_list_entry_get_value}, +}; + +static void *own_udev_symbol(const char *name) { + size_t i; + + for (i = 0; i < sizeof(udev_symbols) / sizeof(udev_symbols[0]); i++) + if (strcmp(udev_symbols[i].name, name) == 0) return udev_symbols[i].address; + return NULL; +} + +static void *dlvsym_any(const char *name) { + static const char *versions[] = {"GLIBC_2.17", "GLIBC_2.2.5", "GLIBC_2.0", "GLIBC_2.34"}; + size_t i; + void *resolved = NULL; + + for (i = 0; i < sizeof(versions) / sizeof(versions[0]) && resolved == NULL; i++) + resolved = dlvsym(RTLD_NEXT, name, versions[i]); + return resolved; +} + +/* A versioned lookup only ever finds libc, so the next dlsym in line is asked for by plain name to + * keep another preload's dlsym in the chain. */ +static void *real_dlsym(void) { + static void *resolved; + + if (resolved == NULL) { + void *(*libc)(void *, const char *) = dlvsym_any("dlsym"); + void *next = libc != NULL ? libc(RTLD_NEXT, "dlsym") : NULL; + + resolved = next != NULL ? next : (void *)libc; + } + return resolved; +} + +static int steam_runtime_path(const char *path) { + static const char *const runtimes[] = {"steamrtarm64", "steamrt64"}; + const char *name = strrchr(path, '/'); + size_t i; + + if (name == NULL || strcmp(name + 1, "steam") != 0) return 0; + for (i = 0; i < sizeof(runtimes) / sizeof(runtimes[0]); i++) { + size_t length = strlen(runtimes[i]); + + if ((size_t)(name - path) > length && name[-(ptrdiff_t)length - 1] == '/' && + memcmp(name - length, runtimes[i], length) == 0) + return 1; + } + return 0; +} + +/* The Steam client reads the pads straight from /dev/input and hands whatever the udev enumeration + * gives it back to the real libudev, which cannot read these synthetic devices. */ +static int steam_client_process(void) { + static _Atomic int cached = -1; + char path[PATH_MAX]; + ssize_t length; + int result = atomic_load_explicit(&cached, memory_order_acquire); + + if (result >= 0) return result; + result = 0; + length = readlink("/proc/self/exe", path, sizeof(path) - 1); + if (length > 0) { + path[length] = '\0'; + result = steam_runtime_path(path); + } + atomic_store_explicit(&cached, result, memory_order_release); + return result; +} + +static void *missing_dlsym(void *handle, const char *name) { + (void)handle; + (void)name; + return NULL; +} + +static void *own_dlsym(void *handle, const char *name) { + (void)handle; + return own_udev_symbol(name); +} + +/* Returns what dlsym jumps to. Anything outside the udev_ names has to reach the real dlsym without + * a single interposable call on the way, because other preloads resolve their own symbols from + * inside one-time initialisers that those calls would re-enter. */ +__attribute__((visibility("hidden"), used)) void *inputudev_dlsym_target(void *handle, const char *name) { + void *forward = real_dlsym(); + + (void)handle; + if (name != NULL && strncmp(name, "udev_", 5) == 0 && own_udev_symbol(name) != NULL && + !steam_client_process()) + return (void *)own_dlsym; + return forward != NULL ? forward : (void *)missing_dlsym; +} + +/* Browsers resolve libudev through dlopen and dlsym, which skips symbol interposition, so the + * devices have to be handed out from here as well. The real dlsym is entered with a jump so that it + * still sees the original caller, which is what RTLD_NEXT and RTLD_DEFAULT lookups are relative to. */ +#if defined(__aarch64__) +__asm__(".text\n" + ".globl dlsym\n" + ".type dlsym, %function\n" + "dlsym:\n" + ".cfi_startproc\n" + "hint #34\n" + "stp x29, x30, [sp, #-32]!\n" + ".cfi_adjust_cfa_offset 32\n" + ".cfi_offset x29, -32\n" + ".cfi_offset x30, -24\n" + "mov x29, sp\n" + "stp x0, x1, [sp, #16]\n" + "bl inputudev_dlsym_target\n" + "mov x16, x0\n" + "ldp x0, x1, [sp, #16]\n" + "ldp x29, x30, [sp], #32\n" + ".cfi_adjust_cfa_offset -32\n" + ".cfi_restore x29\n" + ".cfi_restore x30\n" + "br x16\n" + ".cfi_endproc\n" + ".size dlsym, .-dlsym\n"); +#elif defined(__x86_64__) +__asm__(".text\n" + ".globl dlsym\n" + ".type dlsym, @function\n" + "dlsym:\n" + ".cfi_startproc\n" + "pushq %rdi\n" + ".cfi_adjust_cfa_offset 8\n" + "pushq %rsi\n" + ".cfi_adjust_cfa_offset 8\n" + "subq $8, %rsp\n" + ".cfi_adjust_cfa_offset 8\n" + "call inputudev_dlsym_target\n" + "addq $8, %rsp\n" + ".cfi_adjust_cfa_offset -8\n" + "popq %rsi\n" + ".cfi_adjust_cfa_offset -8\n" + "popq %rdi\n" + ".cfi_adjust_cfa_offset -8\n" + "jmp *%rax\n" + ".cfi_endproc\n" + ".size dlsym, .-dlsym\n"); +#elif defined(__i386__) +__asm__(".text\n" + ".globl dlsym\n" + ".type dlsym, @function\n" + "dlsym:\n" + ".cfi_startproc\n" + "subl $12, %esp\n" + ".cfi_adjust_cfa_offset 12\n" + "movl 20(%esp), %eax\n" + "movl %eax, 4(%esp)\n" + "movl 16(%esp), %eax\n" + "movl %eax, (%esp)\n" + "call inputudev_dlsym_target\n" + "addl $12, %esp\n" + ".cfi_adjust_cfa_offset -12\n" + "jmp *%eax\n" + ".cfi_endproc\n" + ".size dlsym, .-dlsym\n"); +#else +void *dlsym(void *handle, const char *name) { + void *(*target)(void *, const char *) = inputudev_dlsym_target(handle, name); + + return target(handle, name); +} +#endif diff --git a/tools/linuxfs/preload/robust.c b/tools/linuxfs/preload/robust.c index 6d3393b50..9d5707e35 100644 --- a/tools/linuxfs/preload/robust.c +++ b/tools/linuxfs/preload/robust.c @@ -100,7 +100,11 @@ static long path_statx(int dirfd, const char *path, int flags, unsigned int mask return next_statx(dirfd, path, flags, mask, out); } +void bl_inputudev_note_dlopen(const char *path, void *handle) __attribute__((weak, visibility("hidden"))); + void *dlopen(const char *filename, int flags) { + void *handle; + if (!real_dlopen) { real_dlopen = (void *(*)(const char *, int))dlsym(RTLD_NEXT, "dlopen"); } @@ -109,7 +113,9 @@ void *dlopen(const char *filename, int flags) { if (basename && strcmp(basename, "vrclient.so") == 0) { flags &= ~RTLD_DEEPBIND; } - return real_dlopen(filename, flags); + handle = real_dlopen != NULL ? real_dlopen(filename, flags) : NULL; + if (handle != NULL && bl_inputudev_note_dlopen != NULL) bl_inputudev_note_dlopen(filename, handle); + return handle; } int dd_fsync_syscall(long number, const long *args, long *ret) __attribute__((visibility("hidden"))); diff --git a/tools/tests/test_inputudev_preload.py b/tools/tests/test_inputudev_preload.py new file mode 100644 index 000000000..c1d970fd1 --- /dev/null +++ b/tools/tests/test_inputudev_preload.py @@ -0,0 +1,529 @@ +from pathlib import Path +import os +import shutil +import subprocess +import sys +import tempfile +import unittest + +PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" + +ONCE = r""" +#define _GNU_SOURCE +#include +#include +#include +#include + +static pthread_once_t once = PTHREAD_ONCE_INIT; +static long (*next_syscall)(long, ...); + +static void init(void) { next_syscall = (long (*)(long, ...))dlsym(RTLD_NEXT, "syscall"); } + +ssize_t readlink(const char *path, char *buf, size_t size) { + pthread_once(&once, init); + return next_syscall(SYS_readlinkat, -100, path, buf, size); +} + +__attribute__((constructor)) static void start(void) { + char link[4096]; + readlink("/proc/self/exe", link, sizeof(link)); +} +""" + +FIRST = r""" +#define _GNU_SOURCE +#include +#include + +int marker(void) { return 1; } + +int next_marker(void) { + int (*next)(void) = (int (*)(void))dlsym(RTLD_NEXT, "marker"); + return next != NULL ? next() : 0; +} +""" + +SECOND = "int marker(void) { return 2; }\n" + +CHAIN = r""" +#define _GNU_SOURCE +#include +#include + +static int calls; + +int chained(void) { return calls > 1; } + +void *dlsym(void *handle, const char *name) { + static void *(*real)(void *, const char *); + if (real == NULL) real = (void *(*)(void *, const char *))dlvsym(RTLD_NEXT, "dlsym", "GLIBC_2.2.5"); + if (real == NULL) real = (void *(*)(void *, const char *))dlvsym(RTLD_NEXT, "dlsym", "GLIBC_2.17"); + if (real == NULL) real = (void *(*)(void *, const char *))dlvsym(RTLD_NEXT, "dlsym", "GLIBC_2.34"); + calls++; + return real(handle, name); +} +""" + +MARK = r""" +#include +#include + +char *realpath(const char *path, char *resolved) { + (void)path; + if (resolved == NULL) return strdup("marked"); + strcpy(resolved, "marked"); + return resolved; +} +""" + +UDEV = r""" +#include +#include +#include + +struct list { const char *name; struct list *next; }; +struct enumerate { struct list head; struct list added; char name[16]; int fail; }; + +void *udev_enumerate_new(void *udev) { + static int count; + struct enumerate *enumerate = calloc(1, sizeof(*enumerate)); + (void)udev; + snprintf(enumerate->name, sizeof(enumerate->name), "real%d", count++); + enumerate->head.name = enumerate->name; + enumerate->added.name = "added"; + return enumerate; +} +void *udev_enumerate_unref(void *enumerate) { free(enumerate); return NULL; } +int udev_enumerate_add_match_subsystem(void *enumerate, const char *subsystem) { + if (strcmp(subsystem, "fail") == 0) ((struct enumerate *)enumerate)->fail = 1; + return 0; +} +int udev_enumerate_add_match_parent(void *enumerate, void *parent) { + if (parent == NULL) return -1; + ((struct enumerate *)enumerate)->head.name = "parented"; + return 0; +} +int udev_enumerate_add_syspath(void *enumerate, const char *syspath) { + (void)syspath; + ((struct enumerate *)enumerate)->head.next = &((struct enumerate *)enumerate)->added; + return 0; +} +int udev_enumerate_scan_devices(void *enumerate) { return ((struct enumerate *)enumerate)->fail ? -1 : 0; } +void *udev_enumerate_get_list_entry(void *enumerate) { return &((struct enumerate *)enumerate)->head; } +void *udev_list_entry_get_next(void *entry) { return ((struct list *)entry)->next; } +void *udev_list_entry_get_by_name(void *entry, const char *name) { + return strcmp(((struct list *)entry)->name, name) == 0 ? entry : NULL; +} +const char *udev_list_entry_get_name(void *entry) { return ((struct list *)entry)->name; } +void *udev_device_new_from_syspath(void *udev, const char *syspath) { (void)udev; (void)syspath; return NULL; } +void *udev_device_new_from_subsystem_sysname(void *udev, const char *subsystem, const char *sysname) { + (void)udev; (void)subsystem; (void)sysname; + return NULL; +} +void *udev_device_unref(void *device) { (void)device; return NULL; } +void *udev_device_ref(void *device) { (void)device; return NULL; } +void *udev_device_get_parent(void *device) { (void)device; return NULL; } +void *udev_device_get_udev(void *device) { (void)device; return NULL; } +const char *udev_device_get_syspath(void *device) { (void)device; return "real"; } +const char *udev_device_get_sysnum(void *device) { (void)device; return "real"; } +""" + +PROGRAM = r""" +#define _GNU_SOURCE +#include +#include +#include +#include +#include + +#define PAD "/sys/devices/virtual/input/droiddeck0" +#define PARENT0 "/sys/devices/droiddeck0/droiddeck-input0" +#define EVENT0 PARENT0 "/event0" +#define EVENT1 "/sys/devices/droiddeck1/droiddeck-input1/event1" +#define HANDLES 256 + +int next_marker(void); + +static void *lib; +static void *(*new_device)(void *, const char *); +static void *(*new_sysname)(void *, const char *, const char *); +static void *(*ref)(void *); +static void *(*unref)(void *); +static void *(*get_parent)(void *); +static void *(*get_udev)(void *); +static const char *(*syspath)(void *); +static const char *(*sysname)(void *); +static const char *(*sysnum)(void *); +static const char *(*devnode)(void *); +static const char *(*property)(void *, const char *); +static void *(*properties)(void *); +static void *(*enumerate_new)(void *); +static int (*match)(void *, const char *); +static int (*match_parent)(void *, void *); +static int (*add_syspath)(void *, const char *); +static int (*scan)(void *); +static void *(*list)(void *); +static void *(*next)(void *); +static void *(*by_name)(void *, const char *); +static const char *(*name)(void *); +static const char *(*value)(void *); + +static void *sym(const char *symbol) { return dlsym(lib, symbol); } + +static const char *entry_name(void *entry) { return entry != NULL ? name(entry) : "none"; } + +static void print_list(const char *label, void *entry) { + printf("%s", label); + for (; entry != NULL; entry = next(entry)) printf(" %s", name(entry)); + printf("\n"); +} + +static void print_properties(const char *label, void *device) { + void *entry; + + printf("%s", label); + for (entry = properties(device); entry != NULL; entry = next(entry)) printf(" %s=%s", name(entry), value(entry)); + printf("\n"); +} + +static void *matched(void *udev, const char *subsystem) { + void *enumerate = enumerate_new(udev); + + match(enumerate, subsystem); + return enumerate; +} + +static void pad_file(const char *node, int present) { + char path[4096]; + FILE *file; + + snprintf(path, sizeof(path), "%s/%s", getenv("FAKE_EVDEV_DIR"), node); + if (!present) { + unlink(path); + } else if ((file = fopen(path, "w")) != NULL) { + fclose(file); + } +} + +static void run_udev(void) { + int udev_a, udev_b, i, failures = 0; + void *device, *parent, *other, *entry, *held[HANDLES] = {0}; + char resolved[4096]; + const char *path; + + printf("missing %d\n", sym("udev_no_such_symbol") == NULL); + printf("plain %d\n", dlsym(RTLD_DEFAULT, "printf") != NULL); + device = new_device(&udev_a, PAD); + printf("syspath %s sysnum %s devnode %s\n", syspath(device), sysnum(device), devnode(device)); + parent = get_parent(device); + printf("nested %d\n", strncmp(syspath(device), syspath(parent), strlen(syspath(parent))) == 0 && + syspath(device)[strlen(syspath(parent))] == '/'); + other = new_device(&udev_a, EVENT0); + printf("canonical %s\n", other != NULL ? syspath(other) : "none"); + if (other != NULL) unref(other); + printf("parent %s sysname %s stable %d\n", syspath(parent), sysname(parent), parent == get_parent(device)); + print_properties("device properties", device); + print_properties("parent properties", parent); + entry = properties(device); + printf("joystick %s unknown %d\n", value(by_name(entry, "ID_INPUT_JOYSTICK")), by_name(entry, "NO_SUCH_KEY") == NULL); + ref(device); + unref(device); + printf("held %s\n", syspath(device)); + ref(parent); + unref(device); + printf("retained %s\n", syspath(parent)); + unref(parent); + for (i = 0; i < 1000; i++) { + device = new_device(&udev_a, PAD); + if (device == NULL || get_parent(device) == NULL || get_parent(device) != get_parent(device) || + strcmp(syspath(device), EVENT0) != 0) + failures++; + if (device != NULL) unref(device); + } + printf("reuse failures %d\n", failures); + for (i = 0; i < HANDLES && (held[i] = new_device(&udev_a, PAD)) != NULL; i++) { + } + printf("full %d extra %d parent %d\n", i, new_device(&udev_a, PAD) == NULL, get_parent(held[0]) == NULL); + unref(held[1]); + parent = get_parent(held[0]); + printf("freed parent %s stable %d\n", parent != NULL ? syspath(parent) : "none", parent == get_parent(held[0])); + for (i = 0; i < HANDLES; i++) + if (i != 1 && held[i] != NULL) unref(held[i]); + path = realpath("/sys/class/input/droiddeck-input0", resolved); + printf("parent link %s\n", path != NULL ? path : "none"); + path = realpath("/sys/class/input/input0", resolved); + printf("kernel link shadowed %d\n", path != NULL && strncmp(path, "/sys/devices/droiddeck", 22) == 0); + printf("kernel sysname shadowed %d\n", new_sysname(&udev_a, "input", "input0") != NULL); + other = new_sysname(&udev_a, "input", "droiddeck-input0"); + printf("parent sysname %s\n", other != NULL ? syspath(other) : "none"); + if (other != NULL) unref(other); + device = new_device(&udev_a, PAD); + other = new_device(&udev_b, PAD); + printf("contexts %d %d\n", get_udev(device) == (void *)&udev_a, get_udev(other) == (void *)&udev_b); +} + +static void run_stable(void) { + int udev; + char copy[64]; + void *device = new_device(&udev, PAD); + const char *before = devnode(device); + + snprintf(copy, sizeof(copy), "%s", before); + pad_file("event0", 0); + printf("gone %d\n", new_device(&udev, PAD) == NULL); + printf("devnode %s same %d property %s\n", devnode(device), devnode(device) == before && strcmp(before, copy) == 0, + property(device, "DEVNAME")); +} + +static void run_enumerate(void) { + int udev, i; + void *first, *entry, *found, *missing, *failed, *parented, *real_parent, *device, *parent, *other; + + first = matched(&udev, "input"); + scan(first); + entry = list(first); + print_list("scan", entry); + pad_file("event1", 1); + print_list("same scan", list(first)); + entry = list(first); + found = by_name(entry, EVENT0); + missing = by_name(entry, EVENT1); + printf("by name %s missing %d\n", entry_name(found), missing == NULL); + for (i = 0; i < 20; i++) { + void *other = matched(&udev, "input"); + scan(other); + list(other); + } + printf("kept tail %s\n", entry_name(next(entry))); + scan(first); + print_list("rescan", list(first)); + printf("rescan by name %s\n", entry_name(by_name(list(first), EVENT1))); + add_syspath(first, "/sys/devices/added"); + print_list("added", list(first)); + failed = matched(&udev, "input"); + match(failed, "fail"); + printf("failed scan %d\n", scan(failed)); + print_list("failed", list(failed)); + device = new_device(&udev, PAD); + parent = get_parent(device); + parented = enumerate_new(&udev); + printf("synthetic parent %d\n", match_parent(parented, parent)); + scan(parented); + print_list("parented", list(parented)); + real_parent = enumerate_new(&udev); + printf("real parent %d\n", match_parent(real_parent, &udev)); + scan(real_parent); + print_list("real parent list", list(real_parent)); + other = matched(&udev, "input"); + match_parent(other, &udev); + scan(other); + print_list("real parent suppressed", list(other)); + other = matched(&udev, "input"); + match_parent(other, parent); + match_parent(other, &udev); + scan(other); + print_list("real replaces synthetic", list(other)); + other = matched(&udev, "input"); + match_parent(other, &udev); + match_parent(other, parent); + scan(other); + print_list("synthetic replaces real", list(other)); + other = matched(&udev, "input"); + match_parent(other, parent); + printf("bad parent %d\n", match_parent(other, NULL)); + scan(other); + print_list("bad parent kept", list(other)); + other = enumerate_new(&udev); + match(other, "fail"); + match_parent(other, parent); + printf("nothing added scan %d\n", scan(other)); +} + +static void run_probe(void) { + int udev; + + printf("pad %d\n", new_device(&udev, PAD) != NULL); +} + +int main(int argc, char **argv) { + char link[4096]; + + if (strcmp(argv[1], "once") == 0) { + printf("readlink %d\n", readlink("/proc/self/exe", link, sizeof(link)) > 0); + return 0; + } + if (strcmp(argv[1], "next") == 0) { + int (*chained)(void) = (int (*)(void))dlsym(RTLD_DEFAULT, "chained"); + printf("next %d\n", next_marker()); + if (chained != NULL) printf("chained %d\n", chained()); + return 0; + } + lib = dlopen(argv[2], RTLD_NOW | RTLD_LOCAL); + if (strcmp(argv[1], "realpath") == 0) { + printf("realpath %s\n", realpath("/no/such/inputudev/path", link)); + return 0; + } + new_device = sym("udev_device_new_from_syspath"); + new_sysname = sym("udev_device_new_from_subsystem_sysname"); + ref = sym("udev_device_ref"); + unref = sym("udev_device_unref"); + get_parent = sym("udev_device_get_parent"); + get_udev = sym("udev_device_get_udev"); + syspath = sym("udev_device_get_syspath"); + sysname = sym("udev_device_get_sysname"); + sysnum = sym("udev_device_get_sysnum"); + devnode = sym("udev_device_get_devnode"); + property = sym("udev_device_get_property_value"); + properties = sym("udev_device_get_properties_list_entry"); + enumerate_new = sym("udev_enumerate_new"); + match = sym("udev_enumerate_add_match_subsystem"); + match_parent = sym("udev_enumerate_add_match_parent"); + add_syspath = sym("udev_enumerate_add_syspath"); + scan = sym("udev_enumerate_scan_devices"); + list = sym("udev_enumerate_get_list_entry"); + next = sym("udev_list_entry_get_next"); + by_name = sym("udev_list_entry_get_by_name"); + name = sym("udev_list_entry_get_name"); + value = sym("udev_list_entry_get_value"); + if (strcmp(argv[1], "probe") == 0) run_probe(); + else if (strcmp(argv[1], "stable") == 0) run_stable(); + else if (strcmp(argv[1], "enumerate") == 0) run_enumerate(); + else run_udev(); + fflush(stdout); + return 0; +} +""" + + +def compile_c(*args): + result = subprocess.run(["cc", *args], capture_output=True, text=True) + if result.returncode != 0: + raise AssertionError(f"cc {' '.join(args)} failed:\n{result.stderr}") + return result.stdout + + +@unittest.skipUnless(sys.platform == "linux" and shutil.which("cc"), "needs Linux and cc") +class InputUdevPreloadTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + cls.dir = Path(tempfile.mkdtemp()) + cls.addClassCleanup(shutil.rmtree, cls.dir, ignore_errors=True) + build = cls.dir / "build" + build.mkdir() + if "__GLIBC__" not in compile_c("-dM", "-E", "-x", "c", "-include", "limits.h", "/dev/null"): + raise unittest.SkipTest("needs a glibc toolchain") + sources = (("once.c", ONCE), ("first.c", FIRST), ("second.c", SECOND), ("chain.c", CHAIN), ("mark.c", MARK), + ("udev.c", UDEV), ("program.c", PROGRAM)) + for name, text in sources: + (build / name).write_text(text) + cls.lib = cls.dir / "libddsession.so" + compile_c("-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-o", str(cls.lib), + *map(str, sorted(PRELOAD.glob("*.c"))), "-ldl") + for name in ("once", "first", "second", "chain", "mark"): + compile_c("-shared", "-fPIC", "-O0", "-pthread", "-o", str(cls.dir / f"lib{name}.so"), + str(build / f"{name}.c"), "-ldl") + cls.udev = cls.dir / "libudev.so.1" + compile_c("-shared", "-fPIC", "-O2", "-o", str(cls.udev), str(build / "udev.c")) + cls.program = cls.dir / "program" + compile_c("-O0", "-o", str(cls.program), str(build / "program.c"), str(cls.dir / "libfirst.so"), "-ldl") + cls.pads = cls.pad_dir("pads", "event0") + + @classmethod + def pad_dir(cls, name, *nodes): + pads = cls.dir / name + pads.mkdir() + for node in nodes: + (pads / node).write_text("") + return pads + + def run_program(self, mode, *preloads, pads=None, slots="0=/pad", program=None): + env = dict(os.environ, LD_PRELOAD=":".join(str(self.dir / name) for name in ("libddsession.so", *preloads)), + FAKE_EVDEV_MEMFD_PATHS=slots, FAKE_EVDEV_DIR=str(pads or self.pads)) + env.pop("FAKE_EVDEV_UINPUT", None) + result = subprocess.run([str(program or self.program), mode, str(self.udev)], env=env, capture_output=True, text=True, + timeout=20) + self.assertEqual(result.returncode, 0, result.stderr) + return result.stdout.splitlines() + + def test_a_lookup_from_another_preloads_initialiser_does_not_reenter_it(self): + self.assertEqual(self.run_program("once", "libonce.so"), ["readlink 1"]) + + def test_the_real_lookup_still_sees_the_original_caller(self): + self.assertEqual(self.run_program("next", "libfirst.so", "libsecond.so"), ["next 2"]) + + def test_another_preloads_dlsym_stays_in_the_chain(self): + self.assertEqual(self.run_program("next", "libfirst.so", "libchain.so", "libsecond.so"), ["next 2", "chained 1"]) + + def test_non_udev_lookups_skip_the_opened_libudev(self): + self.assertEqual(self.run_program("realpath", "libmark.so"), ["realpath marked"]) + + def test_a_program_resolving_udev_through_dlsym_gets_the_pads(self): + parent = "/sys/devices/droiddeck0/droiddeck-input0" + pad = f"{parent}/event0" + self.assertEqual(self.run_program("udev"), [ + "missing 1", + "plain 1", + f"syspath {pad} sysnum 0 devnode /dev/input/event0", + "nested 1", + f"canonical {pad}", + f"parent {parent} sysname droiddeck-input0 stable 1", + f"device properties DEVNAME=/dev/input/event0 DEVPATH={pad[4:]} ID_INPUT=1 ID_INPUT_JOYSTICK=1", + f"parent properties DEVPATH={parent[4:]} ID_INPUT=1 ID_INPUT_JOYSTICK=1", + "joystick 1 unknown 1", + f"held {pad}", + f"retained {parent}", + "reuse failures 0", + "full 256 extra 1 parent 1", + f"freed parent {parent} stable 1", + f"parent link {parent}", + "kernel link shadowed 0", + "kernel sysname shadowed 0", + f"parent sysname {parent}", + "contexts 1 1", + ]) + + def test_a_handle_keeps_its_strings_after_the_pad_goes_away(self): + self.assertEqual(self.run_program("stable", pads=self.pad_dir("stable", "event0")), [ + "gone 1", + "devnode /dev/input/event0 same 1 property /dev/input/event0", + ]) + + def test_enumerations_keep_their_scan_and_their_state(self): + parent = "/sys/devices/droiddeck0/droiddeck-input0" + pad = f"{parent}/event0" + pad1 = "/sys/devices/droiddeck1/droiddeck-input1/event1" + self.assertEqual(self.run_program("enumerate", pads=self.pad_dir("enumerate", "event0"), slots="0=/pad;1=/pad"), [ + f"scan {pad} real0", + f"same scan {pad} real0", + f"by name {pad} missing 1", + "kept tail real0", + f"rescan {pad} {pad1} real0", + f"rescan by name {pad1}", + f"added {pad} {pad1} real0 added", + "failed scan 0", + f"failed {pad} {pad1}", + "synthetic parent 0", + f"parented {parent} {pad}", + "real parent 0", + "real parent list parented", + "real parent suppressed parented", + "real replaces synthetic parented", + f"synthetic replaces real {parent} {pad}", + "bad parent -1", + f"bad parent kept {parent} {pad}", + "nothing added scan -1", + ]) + + def test_only_the_steam_client_runtime_path_gets_the_real_libudev(self): + for path, pad in (("steamrt64/steam", 0), ("steamrtarm64/steam", 0), ("steamrt64/steam-probe", 1), + ("xsteamrt64/steam", 1), ("steamrt64/xsteam", 1), ("steamrt/steam", 1)): + with self.subTest(path=path): + client = self.dir / "clients" / path + client.parent.mkdir(parents=True, exist_ok=True) + shutil.copy(self.program, client) + self.assertEqual(self.run_program("probe", program=client), [f"pad {pad}"]) + + +if __name__ == "__main__": + unittest.main() From 697f8e73fac635941da6072c7893852fc8981834 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 19 Nov 2026 10:11:22 -0500 Subject: [PATCH 09/31] fix: enable Steam shader pre-caching by default (#2888) --- .../java/com/droiddeck/launcher/session/SessionPrefs.kt | 2 +- .../droiddeck/launcher/session/ShaderPrecachePrefsTest.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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 39d92312b..3e37adb58 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -772,7 +772,7 @@ object SessionPrefs { val prefs = prefs(context) if (!prefs.contains("shaderPrecache")) { if (steamConfig(context).exists()) return null - prefs.edit().putBoolean("shaderPrecache", false).apply() + prefs.edit().putBoolean("shaderPrecache", true).apply() } val on = prefs.getBoolean("shaderPrecache", true) val applied = shaderPrecacheApplied(context) diff --git a/app/src/test/java/com/droiddeck/launcher/session/ShaderPrecachePrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ShaderPrecachePrefsTest.kt index b4d8d81f8..92eef3092 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ShaderPrecachePrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ShaderPrecachePrefsTest.kt @@ -20,9 +20,9 @@ class ShaderPrecachePrefsTest { SessionPrefs.steamRoot(context, SessionPrefs.steamClientArch(context)).deleteRecursively() } - @Test fun clientWithoutConfigStartsWithPrecachingOff() { - assertEquals(false, SessionPrefs.pendingShaderPrecache(context)) - assertEquals(false, SessionPrefs.shaderPrecache(context)) + @Test fun clientWithoutConfigStartsWithPrecachingOn() { + assertEquals(true, SessionPrefs.pendingShaderPrecache(context)) + assertEquals(true, SessionPrefs.shaderPrecache(context)) } @Test fun existingConfigKeepsTheClientsChoice() { From 2ea857a07cc5884e27bb3a8c152969193f1053c7 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 19 Nov 2026 10:57:00 -0500 Subject: [PATCH 10/31] fix(agent): keep the closed pet chat off the app below (#2868) --- .../main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt index cea5fcaf3..72e5d0b63 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt @@ -397,11 +397,14 @@ internal class PetWindows(private val context: Context) { /** * The chat window is always drawn; closed, it waits off the screen and takes neither touches nor - * keys, so opening it is a move and not a first layout. + * keys, so opening it is a move and not a first layout. Only FLAG_LAYOUT_NO_LIMITS keeps it off the + * screen: without it the system moves the window back over the app below, where every touch reaches + * that app marked obscured, and apps that filter obscured touches, such as GitHub, ignore them all. */ private fun showChat(on: Boolean) { chat.params.x = if (on) 0 else OFFSCREEN - val quiet = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE + val quiet = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or + WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS chat.params.flags = if (on) chat.params.flags and quiet.inv() else chat.params.flags or quiet if (added) runCatching { windows.updateViewLayout(chat.view, chat.params) } } From d852b1a4e53db276e938c2c6da00242ae02e73b5 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 19 Nov 2026 11:00:59 -0500 Subject: [PATCH 11/31] fix(storage): let launcher prefixes and Linux system caches be removed (#2867) --- .../droiddeck/launcher/storage/StorageScan.kt | 8 +- .../launcher/storage/StorageState.kt | 51 +++++- .../launcher/storage/StorageSummary.kt | 54 ++++++ .../launcher/storage/SystemCaches.kt | 58 ++++++ .../launcher/stores/download/DownloadQueue.kt | 2 + .../droiddeck/launcher/ui/AgentSetupView.kt | 8 +- .../com/droiddeck/launcher/ui/StoragePage.kt | 165 ++++++++++++++---- app/src/main/res/values-ar/strings.xml | 11 +- app/src/main/res/values-b+es+419/strings.xml | 11 +- app/src/main/res/values-bg/strings.xml | 11 +- app/src/main/res/values-cs/strings.xml | 11 +- app/src/main/res/values-da/strings.xml | 11 +- app/src/main/res/values-de/strings.xml | 11 +- app/src/main/res/values-el/strings.xml | 11 +- app/src/main/res/values-es/strings.xml | 11 +- app/src/main/res/values-fi/strings.xml | 11 +- app/src/main/res/values-fr/strings.xml | 11 +- app/src/main/res/values-hi/strings.xml | 11 +- app/src/main/res/values-hu/strings.xml | 11 +- app/src/main/res/values-in/strings.xml | 11 +- app/src/main/res/values-it/strings.xml | 11 +- app/src/main/res/values-ja/strings.xml | 11 +- app/src/main/res/values-ko/strings.xml | 11 +- app/src/main/res/values-ms/strings.xml | 11 +- app/src/main/res/values-nb/strings.xml | 11 +- app/src/main/res/values-nl/strings.xml | 11 +- app/src/main/res/values-pl/strings.xml | 11 +- app/src/main/res/values-pt-rPT/strings.xml | 11 +- app/src/main/res/values-pt/strings.xml | 11 +- app/src/main/res/values-ro/strings.xml | 11 +- app/src/main/res/values-ru/strings.xml | 11 +- app/src/main/res/values-sv/strings.xml | 11 +- app/src/main/res/values-th/strings.xml | 11 +- app/src/main/res/values-tr/strings.xml | 11 +- app/src/main/res/values-uk/strings.xml | 11 +- app/src/main/res/values-vi/strings.xml | 11 +- app/src/main/res/values-zh-rCN/strings.xml | 11 +- app/src/main/res/values-zh-rHK/strings.xml | 11 +- app/src/main/res/values-zh-rTW/strings.xml | 11 +- app/src/main/res/values/strings.xml | 11 +- .../launcher/storage/KeptPrefixRemovalTest.kt | 42 +++++ .../launcher/storage/StorageSummaryTest.kt | 27 +++ .../launcher/storage/SystemCachesTest.kt | 53 ++++++ 43 files changed, 757 insertions(+), 74 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/storage/StorageSummary.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/storage/SystemCaches.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/storage/KeptPrefixRemovalTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/storage/StorageSummaryTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/storage/SystemCachesTest.kt 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 dc07daaba..aec3e5f66 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt @@ -71,7 +71,10 @@ class StorageReport( val kept: List, val leftoversChecked: Boolean, val storeGames: List = emptyList(), + val systemCaches: List = emptyList(), + val checkouts: List = emptyList(), ) { + val systemCacheBytes: Long get() = systemCaches.sumOf { it.bytes } val otherPrefixes: Long get() = kept.sumOf { it.bytes } val droiddeck: Long get() = buckets.values.sum() val installedShaders: Long get() = games.sumOf { it.shaders } @@ -358,6 +361,9 @@ object StorageScan { val stores = m(File(rootfs, "root/Games")) val flatpak = m(File(rootfs, "root/.local/share/flatpak")) val rootfsBytes = m(rootfs) + val systemCaches = SystemCaches.find(rootfs, clientRoots, System.currentTimeMillis()) + .map { (kind, found) -> SystemCacheUsage(kind, found, found.sumOf { walker.measure(it) }) }.filter { it.bytes > 0 } + val checkouts = SystemCaches.checkouts(rootfs).map { CheckoutUsage(it, walker.measure(it)) }.sortedByDescending { it.bytes } val privateBytes = privateRoots.sumOf { m(it) } val system = rootfsBytes - installs - inApps("compatdata") - inApps("shadercache") - workshop - compatTools - stores - flatpak @@ -381,7 +387,7 @@ object StorageScan { ), prefixes, shaders, workshop, flatpak, games.sortedByDescending { it.total }, tools.values.toList(), leftovers, logs, logBytes, - components, flatpakApps, flatpakRuntimes, kept, everyLibraryRead, storeGames, + components, flatpakApps, flatpakRuntimes, kept, everyLibraryRead, storeGames, systemCaches, checkouts, ) } } 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 40a48a366..2aa3f53e1 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt @@ -15,7 +15,7 @@ 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 } +enum class CleanItem { OLD_TOOLS, LEFTOVERS, LEFTOVERS_UNSURE, LOGS, SYSTEM_CACHES, UNUSED_CUSTOM, UNUSED_COMPONENTS, SHADERS } object StorageState { private const val TAG = "StorageState" @@ -61,8 +61,17 @@ object StorageState { }, "storage-store-sizes").start() } + /** The last scan's overview from disk, shown until this run's first scan lands. */ + var saved by mutableStateOf(null) + private set + private fun publish(app: Context, result: StorageReport) { report = result + val summary = StorageSummary.of(result) + saved = summary + Thread({ + runCatching { StorageSummary.file(app.filesDir).writeText(summary.toJson()) }.onFailure { Log.w(TAG, "could not keep the storage summary", it) } + }, "storage-summary").start() val live = result.storeGames.mapTo(HashSet()) { sizeKey(it) } storeSizes.keys.retainAll(live) measureStoreGames(app) @@ -88,6 +97,9 @@ object StorageState { fun refresh(context: Context, force: Boolean = false) { val current = report + if (current == null && saved == null) { + saved = runCatching { StorageSummary.fromJson(StorageSummary.file(context.applicationContext.filesDir).readText()) }.getOrNull() + } if (scanning || cleaning) { if (force) refreshAgain = true return @@ -122,9 +134,10 @@ object StorageState { CleanItem.UNUSED_CUSTOM -> report.unusedTools.filter { it.reason == ToolReason.CUSTOM }.sumOf { it.bytes } CleanItem.UNUSED_COMPONENTS -> report.unusedComponents.sumOf { it.bytes } CleanItem.SHADERS -> report.installedShaders + CleanItem.SYSTEM_CACHES -> report.systemCacheBytes } - val SAFE = setOf(CleanItem.OLD_TOOLS, CleanItem.LEFTOVERS, CleanItem.LOGS) + val SAFE = setOf(CleanItem.OLD_TOOLS, CleanItem.LEFTOVERS, CleanItem.LOGS, CleanItem.SYSTEM_CACHES) fun safeBytes(report: StorageReport): Long = SAFE.sumOf { bytes(report, it) } @@ -200,10 +213,19 @@ object StorageState { true }) + /** + * Whether a kept prefix may be removed. A store app's prefix can go, as Wine makes a new one and the app can be set up + * again, but not while a store game is installed inside it, as Battle.net does on drive C, or while a download may write to it. + */ + internal fun keptRemovable(report: StorageReport, prefix: KeptPrefix): Boolean = + prefix.owner != PrefixOwner.LAUNCHER || (report.storeGames.none { it.game.folder.path.startsWith(prefix.dir.path + "/") } && + !com.droiddeck.launcher.stores.download.DownloadQueue.anyActive()) + 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" } + val kept = fresh.kept.firstOrNull { it.dir.path == prefix.dir.path && it.owner == prefix.owner } + ?.takeIf { keptRemovable(fresh, it) } ?: return@act false + val reset = kept.owner == PrefixOwner.SHARED || kept.owner == PrefixOwner.GAME + (listOf(kept.dir) + listOfNotNull(kept.shaders?.takeUnless { reset })).forEach { check(FileOps.delete(it)) { "cannot delete $it" } } true }) @@ -225,9 +247,25 @@ object StorageState { com.droiddeck.launcher.stores.StoresState.uninstall(app, next.game) { uninstallNext(app, rest.drop(1)) } } + /** Clears one cache, as found by a fresh scan, so a file that became busy since stays. */ + fun clearSystemCache(context: Context, kind: SystemCache) = act(context, "cache-$kind", { _, fresh -> + val files = fresh.systemCaches.firstOrNull { it.kind == kind }?.files.orEmpty() + files.forEach { FileOps.delete(it) } + files.isNotEmpty() + }) + + /** Deletes a checkout the fresh scan still lists, and the main repository's record of it if it was a worktree. */ + fun removeCheckout(context: Context, dir: java.io.File) = act(context, "checkout-${dir.name}", { app, fresh -> + val checkout = fresh.checkouts.firstOrNull { it.dir.path == dir.path } ?: return@act false + val record = SystemCaches.worktreeRecord(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(app), checkout.dir) + check(FileOps.delete(checkout.dir)) { "cannot delete ${checkout.dir}" } + record?.let { FileOps.delete(it) } + true + }) + 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 } + fresh.kept.filter { keptRemovable(fresh, it) }.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") @@ -283,6 +321,7 @@ object StorageState { CleanItem.LEFTOVERS_UNSURE -> report.leftovers.filter { !it.safe }.forEach(::deleteLeftover) CleanItem.LOGS -> report.logs.forEach { FileOps.delete(it) } CleanItem.SHADERS -> report.games.flatMap { it.shaderDirs }.forEach { FileOps.delete(it) } + CleanItem.SYSTEM_CACHES -> report.systemCaches.flatMap { it.files }.forEach { FileOps.delete(it) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/storage/StorageSummary.kt b/app/src/main/java/com/droiddeck/launcher/storage/StorageSummary.kt new file mode 100644 index 000000000..e8b4ca529 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/storage/StorageSummary.kt @@ -0,0 +1,54 @@ +package com.droiddeck.launcher.storage + +import org.json.JSONObject +import java.io.File + +/** + * What the Storage overview shows, kept on disk so the page opens at once after DroidDeck restarts, as it does on + * every update, while a fresh scan of the whole userland runs behind it. + */ +class StorageSummary( + val at: Long, val total: Long, val free: Long, val buckets: Map, val safe: Long, + val games: Int, val gamesOnSd: Int, val prefixes: Long, val workshop: Long, val shaders: Long, + val tools: Int, val unusedTools: Long, val components: Int, val unusedComponents: Long, + val storeGames: Int, val flatpakApps: Int, val flatpakShared: Long, val logBytes: Long, val systemClearable: Long, +) { + val droiddeck: Long get() = buckets.values.sum() + + fun toJson(): String = JSONObject().apply { + put("v", VERSION) + put("at", at); put("total", total); put("free", free); put("safe", safe) + put("buckets", JSONObject().apply { buckets.forEach { (b, v) -> put(b.name, v) } }) + put("games", games); put("gamesOnSd", gamesOnSd); put("prefixes", prefixes); put("workshop", workshop); put("shaders", shaders) + put("tools", tools); put("unusedTools", unusedTools); put("components", components); put("unusedComponents", unusedComponents) + put("storeGames", storeGames); put("flatpakApps", flatpakApps); put("flatpakShared", flatpakShared) + put("logBytes", logBytes); put("systemClearable", systemClearable) + }.toString() + + companion object { + private const val VERSION = 1 + + fun of(r: StorageReport) = StorageSummary( + r.at, r.total, r.free, r.buckets, StorageState.safeBytes(r), + r.games.size, r.gamesOnSd, r.prefixes, r.workshop, r.shaders, + r.tools.size, r.unusedTools.sumOf { it.bytes }, r.components.size, r.unusedComponents.sumOf { it.bytes }, + r.storeGames.size, r.flatpakApps.size, r.flatpakRuntimes + r.flatpakCache, r.logBytes, + r.systemCacheBytes + r.checkouts.sumOf { it.bytes }, + ) + + /** A summary another version wrote, or a damaged file, reads as none, so the page measures as before. */ + fun fromJson(text: String): StorageSummary? = runCatching { + val o = JSONObject(text) + if (o.optInt("v") != VERSION) return null + val b = o.getJSONObject("buckets") + StorageSummary( + o.getLong("at"), o.getLong("total"), o.getLong("free"), Bucket.entries.associateWith { b.optLong(it.name) }, o.getLong("safe"), + o.getInt("games"), o.getInt("gamesOnSd"), o.getLong("prefixes"), o.getLong("workshop"), o.getLong("shaders"), + o.getInt("tools"), o.getLong("unusedTools"), o.getInt("components"), o.getLong("unusedComponents"), + o.getInt("storeGames"), o.getInt("flatpakApps"), o.getLong("flatpakShared"), o.getLong("logBytes"), o.getLong("systemClearable"), + ) + }.getOrNull() + + fun file(filesDir: File) = File(filesDir, "storage-summary.json") + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/storage/SystemCaches.kt b/app/src/main/java/com/droiddeck/launcher/storage/SystemCaches.kt new file mode 100644 index 000000000..95277a312 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/storage/SystemCaches.kt @@ -0,0 +1,58 @@ +package com.droiddeck.launcher.storage + +import java.io.File +import java.nio.file.Files +import java.nio.file.LinkOption +import java.nio.file.attribute.BasicFileAttributes + +/** Parts of the Linux userland that the system and Steam make again when needed, so clearing them loses nothing. */ +enum class SystemCache { TEMP, PACKAGES, STEAM_WEB, STEAM_CORRUPT } + +class SystemCacheUsage(val kind: SystemCache, val files: List, val bytes: Long) + +/** A git checkout in the home folder, such as one the agent made with `git worktree add`. */ +class CheckoutUsage(val dir: File, val bytes: Long) + +object SystemCaches { + /** Temporary files nothing has touched for a day belong to no program still running. */ + const val TEMP_IDLE_MS = 24L * 60 * 60 * 1000 + + /** + * What each cache would delete. In /tmp, hidden entries (X11, ICE and other sockets' folders) stay, as does + * anything changed within [TEMP_IDLE_MS] or holding a socket or pipe. apt keeps only its downloaded packages + * here, and Steam's web cache and the download chunks it set aside as corrupt come back or are not needed. + */ + fun find(rootfs: File, steamRoots: List, now: Long): Map> = linkedMapOf( + SystemCache.TEMP to File(rootfs, "tmp").listFiles().orEmpty().filter { !it.name.startsWith(".") && idle(it, now) }, + SystemCache.PACKAGES to File(rootfs, "var/cache/apt/archives").let { dir -> + dir.listFiles().orEmpty().filter { it.isFile && it.name.endsWith(".deb") } + File(dir, "partial").listFiles().orEmpty() + }, + SystemCache.STEAM_WEB to steamRoots.map { File(it, "config/htmlcache") }.filter { it.isDirectory }, + SystemCache.STEAM_CORRUPT to steamRoots.map { File(it, "steamapps/corrupt") }.filter { it.isDirectory }, + ) + + /** The home folder's git checkouts but the DroidDeck source, which the Agent tab's own entry covers. */ + fun checkouts(rootfs: File): List = File(rootfs, "root").listFiles().orEmpty() + .filter { it.isDirectory && it.name != "DroidDeck" && File(it, ".git").exists() } + + /** + * The main repository's record of a worktree, which `git worktree prune` would drop once the folder is gone. + * Only a path inside some `.git/worktrees/` under [rootfs] counts. + */ + fun worktreeRecord(rootfs: File, checkout: File): File? { + val link = File(checkout, ".git").takeIf { it.isFile } ?: return null + val path = runCatching { link.readText() }.getOrNull()?.lineSequence()?.firstOrNull { it.startsWith("gitdir:") } + ?.removePrefix("gitdir:")?.trim()?.takeIf { it.startsWith("/") && "/.git/worktrees/" in it && "/../" !in it } ?: return null + return File(rootfs, path.removePrefix("/")).takeIf { it.isDirectory } + } + + /** Nothing inside changed for [TEMP_IDLE_MS] and nothing is a socket or pipe; links are not followed. */ + internal fun idle(file: File, now: Long): Boolean = runCatching { + Files.walk(file.toPath()).use { paths -> + paths.allMatch { p -> + val a = Files.readAttributes(p, BasicFileAttributes::class.java, LinkOption.NOFOLLOW_LINKS) + !a.isOther && now - a.lastModifiedTime().toMillis() >= TEMP_IDLE_MS + } + } + }.getOrDefault(false) +} 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 19dc8ea17..917b2c0ba 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 @@ -178,6 +178,8 @@ object DownloadQueue { fun isActive(key: String): Boolean = entry(key)?.isActive == true + fun anyActive(): Boolean = synchronized(lock) { items.values.any { it.entry.isActive } } + fun enqueue(context: Context, entry: DownloadEntry, factory: () -> DownloadJob) { val app = context.applicationContext synchronized(lock) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt index 3f7293b74..25b01904d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt @@ -220,9 +220,9 @@ private fun StorageCard() { modifier = Modifier.fillMaxWidth().heightIn(min = 60.dp).padding(horizontal = 14.dp, vertical = 10.dp), ) { Column(Modifier.weight(1f)) { - Text(stringResource(storageTitle(item)), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground) + Text(stringResource(agentStorageTitle(item)), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground) Text( - if (armed) stringResource(storageWarning(item)) else Formatter.formatShortFileSize(context, AgentStorage.sizes[item] ?: 0L), + if (armed) stringResource(agentStorageWarning(item)) else Formatter.formatShortFileSize(context, AgentStorage.sizes[item] ?: 0L), fontSize = 13.sp, color = if (armed) AttentionAmber else pal.onSurfaceVariant, ) } @@ -241,7 +241,7 @@ private fun StorageCard() { } } -private fun storageTitle(item: AgentStorage.Item) = when (item) { +internal fun agentStorageTitle(item: AgentStorage.Item) = when (item) { AgentStorage.Item.CLAUDE_CODE -> R.string.agent_storage_claude AgentStorage.Item.CODEX -> R.string.agent_storage_codex AgentStorage.Item.OPENCODE -> R.string.agent_storage_opencode @@ -250,7 +250,7 @@ private fun storageTitle(item: AgentStorage.Item) = when (item) { AgentStorage.Item.CACHES -> R.string.agent_storage_caches } -private fun storageWarning(item: AgentStorage.Item) = when (item) { +internal fun agentStorageWarning(item: AgentStorage.Item) = when (item) { AgentStorage.Item.SOURCE -> R.string.agent_storage_source_warning AgentStorage.Item.CACHES -> R.string.agent_storage_caches_warning else -> R.string.agent_storage_reinstall_warning 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 7856fdcfe..f34161f6a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt @@ -91,8 +91,12 @@ 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.SystemCache +import com.droiddeck.launcher.agent.AgentHost +import com.droiddeck.launcher.agent.AgentStorage import com.droiddeck.launcher.storage.StorageReport import com.droiddeck.launcher.storage.StorageState +import com.droiddeck.launcher.storage.StorageSummary import com.droiddeck.launcher.storage.ToolReason import com.droiddeck.launcher.storage.ToolState import com.droiddeck.launcher.storage.ToolUsage @@ -124,9 +128,10 @@ internal fun StoragePanel(s: FrontEndState, a: FrontEndActions) { var view by remember { mutableStateOf("overview") } var cleanup by remember { mutableStateOf(false) } val report = StorageState.report - LaunchedEffect(Unit) { StorageState.refresh(ctx) } + val summary = report?.let { remember(it) { StorageSummary.of(it) } } ?: StorageState.saved + LaunchedEffect(Unit) { StorageState.refresh(ctx); AgentStorage.measure(ctx) } LaunchedEffect(s.sessionRunning) { if (!s.sessionRunning) StorageState.refresh(ctx, force = report != null) } - if (report == null) { + if (summary == null) { Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.fillMaxWidth().padding(top = 8.dp).clip(Shape14).background(MaterialTheme.colorScheme.surface) @@ -140,7 +145,7 @@ internal fun StoragePanel(s: FrontEndState, a: FrontEndActions) { } return } - if (cleanup) CleanUpDialog(report, s.sessionRunning) { cleanup = false } + if (cleanup && report != null) CleanUpDialog(report, s.sessionRunning) { cleanup = false } val top = remember { androidx.compose.foundation.relocation.BringIntoViewRequester() } LaunchedEffect(view) { StorageState.lastFreed = null @@ -148,14 +153,17 @@ internal fun StoragePanel(s: FrontEndState, a: FrontEndActions) { runCatching { top.bringIntoView() } } Box(Modifier.fillMaxWidth().height(1.dp).bringIntoViewRequester(top)) - when (view) { + // Until this run's scan lands, the saved overview shows; a section opened meanwhile appears once it does. + if (report == null) Overview(summary, s.sessionRunning, onCleanUp = { cleanup = true }, onOpen = { view = it }) + else when (view) { "games" -> GamesView(report, s.sessionRunning, a) { view = "overview" } "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 }) + "system" -> SystemView(report, s.sessionRunning) { view = "overview" } + else -> Overview(summary, s.sessionRunning, onCleanUp = { cleanup = true }, onOpen = { view = it }) } } @@ -267,7 +275,7 @@ private fun DefaultStorageGroup() { } @Composable -private fun Overview(report: StorageReport, sessionRunning: Boolean, onCleanUp: () -> Unit, onOpen: (String) -> Unit) { +private fun Overview(report: StorageSummary, sessionRunning: Boolean, onCleanUp: () -> Unit, onOpen: (String) -> Unit) { val narrowPane = LocalNarrowPane.current BoxWithConstraints(Modifier.fillMaxWidth()) { val wide = !narrowPane && maxWidth >= WIDE_OVERVIEW @@ -280,11 +288,11 @@ private val NARROW_ROW = 640.dp @OptIn(ExperimentalLayoutApi::class) @Composable -private fun OverviewContent(report: StorageReport, sessionRunning: Boolean, wide: Boolean, onCleanUp: () -> Unit, onOpen: (String) -> Unit) { +private fun OverviewContent(report: StorageSummary, sessionRunning: Boolean, wide: Boolean, onCleanUp: () -> Unit, onOpen: (String) -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val used = report.total - report.free - val safe = StorageState.safeBytes(report) + val safe = report.safe val low = report.free < StorageState.LOW_SPACE_BYTES ActionStatus() val summary = Modifier.fillMaxWidth().padding(top = 8.dp).clip(Shape14).background(colors.surface).border(1.dp, pal.line, Shape14) @@ -311,7 +319,7 @@ private fun OverviewContent(report: StorageReport, sessionRunning: Boolean, wide 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.busy, compact = true, onClick = onCleanUp) + PrimaryButton(stringResource(R.string.storage_clean_up), enabled = !sessionRunning && !StorageState.busy && StorageState.report != null, compact = true, onClick = onCleanUp) } } if (wide) Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(18.dp), modifier = summary) { usage(Modifier.weight(1f)) @@ -328,11 +336,11 @@ private fun OverviewContent(report: StorageReport, sessionRunning: Boolean, wide } DefaultStorageGroup() SectionTitle(stringResource(R.string.storage_where), null) - val unused = report.unusedTools.sumOf { it.bytes } + val unused = report.unusedTools val tiles = listOf<@Composable (Modifier) -> Unit>( { m -> BucketCard(Bucket.GAMES, Icons.Outlined.VideogameAsset, stringResource(R.string.storage_games), - pluralStringResource(R.plurals.storage_games_installed, report.games.size, report.games.size) + + pluralStringResource(R.plurals.storage_games_installed, report.games, report.games) + if (report.gamesOnSd > 0) " · " + pluralStringResource(R.plurals.storage_games_on_sd, report.gamesOnSd, report.gamesOnSd) else "", report.buckets.getValue(Bucket.GAMES), m) { onOpen("games") } }, @@ -343,30 +351,32 @@ private fun OverviewContent(report: StorageReport, sessionRunning: Boolean, wide }, { m -> BucketCard(Bucket.TOOLS, Icons.Outlined.Layers, stringResource(R.string.storage_tools), - if (unused > 0) stringResource(R.string.storage_tools_unused, gb(unused)) else pluralStringResource(R.plurals.storage_tools_count, report.tools.size, report.tools.size), + if (unused > 0) stringResource(R.string.storage_tools_unused, gb(unused)) else pluralStringResource(R.plurals.storage_tools_count, report.tools, report.tools), report.buckets.getValue(Bucket.TOOLS), m, attention = unused > 0) { onOpen("tools") } }, { m -> - val unusedComponents = report.unusedComponents.sumOf { it.bytes } + val unusedComponents = report.unusedComponents BucketCard(Bucket.COMPONENTS, Icons.Outlined.Extension, stringResource(R.string.storage_components), if (unusedComponents > 0) stringResource(R.string.storage_tools_unused, gb(unusedComponents)) - else pluralStringResource(R.plurals.storage_components_count, report.components.size, report.components.size), + else pluralStringResource(R.plurals.storage_components_count, report.components, report.components), report.buckets.getValue(Bucket.COMPONENTS), m, attention = unusedComponents > 0) { onOpen("components") } }, { m -> BucketCard(Bucket.STORES, Icons.Outlined.ShoppingBag, stringResource(R.string.storage_stores), - pluralStringResource(R.plurals.storage_games_installed, report.storeGames.size, report.storeGames.size), + pluralStringResource(R.plurals.storage_games_installed, report.storeGames, report.storeGames), report.buckets.getValue(Bucket.STORES), m) { onOpen("stores") } }, { m -> BucketCard(Bucket.DESKTOP, Icons.Outlined.Monitor, stringResource(R.string.storage_desktop), - pluralStringResource(R.plurals.storage_desktop_apps, report.flatpakApps.size, report.flatpakApps.size) + - " · " + stringResource(R.string.storage_desktop_shared, gb(report.flatpakRuntimes + report.flatpakCache)), + pluralStringResource(R.plurals.storage_desktop_apps, report.flatpakApps, report.flatpakApps) + + " · " + stringResource(R.string.storage_desktop_shared, gb(report.flatpakShared)), report.buckets.getValue(Bucket.DESKTOP), m) { onOpen("desktop") } }, { m -> + val clearable = report.systemClearable + agentBytes().sumOf { it.second } BucketCard(Bucket.SYSTEM, Icons.Outlined.Storage, stringResource(R.string.storage_system), - stringResource(R.string.storage_system_hint), report.buckets.getValue(Bucket.SYSTEM), m, locked = true) + if (clearable >= ONE_MB) stringResource(R.string.storage_system_clearable, gb(clearable)) else stringResource(R.string.storage_system_hint), + report.buckets.getValue(Bucket.SYSTEM), m) { onOpen("system") } }, { m -> BucketCard(Bucket.DROIDDECK, Icons.Outlined.Folder, stringResource(R.string.storage_app_data), @@ -397,7 +407,7 @@ private fun bucketLabel(bucket: Bucket) = stringResource(when (bucket) { }) @Composable -private fun UsageBar(report: StorageReport, modifier: Modifier) { +private fun UsageBar(report: StorageSummary, modifier: Modifier) { val total = report.total.coerceAtLeast(1).toFloat() val other = (report.total - report.free - report.droiddeck).coerceAtLeast(0) Row(modifier.fillMaxWidth().height(14.dp).clip(RoundedCornerShape(7.dp)).background(Color(0xFF0A0C0F))) { @@ -532,6 +542,7 @@ private fun CleanRow(item: CleanItem, report: StorageReport, on: Boolean, modifi CleanItem.UNUSED_CUSTOM -> Triple(custom.joinToString(", ") { it.name }, stringResource(R.string.storage_item_custom_detail), 1) 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) + CleanItem.SYSTEM_CACHES -> Triple(stringResource(R.string.storage_item_system_caches), stringResource(R.string.storage_item_system_caches_detail), 0) } ToggleRow( title, detail, StorageState.bytes(report, item), on, modifier, @@ -962,7 +973,7 @@ private fun GameDataView(report: StorageReport, sessionRunning: Boolean, onBack: } 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 } + kept.filter { StorageState.keptRemovable(report, it) } .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] } @@ -1019,7 +1030,8 @@ private fun GameDataView(report: StorageReport, sessionRunning: Boolean, onBack: 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 removable = StorageState.keptRemovable(report, k) + val reset = k.owner == PrefixOwner.SHARED || k.owner == PrefixOwner.GAME val key = "kept:${k.dir.path}" ItemRow( keptName(k), @@ -1028,13 +1040,14 @@ private fun GameDataView(report: StorageReport, sessionRunning: Boolean, onBack: 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) + PrefixOwner.UNKNOWN -> stringResource(R.string.storage_leftover_unsure_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 } } + pill = if (!removable) { { Pill(stringResource(R.string.storage_tag_required), MaterialTheme.colorScheme.onSurfaceVariant) } } + else if (k.owner == PrefixOwner.UNKNOWN) { { Pill(stringResource(R.string.storage_tag_saves), AttentionAmber) } } else null, + selected = if (removable) key in picked else null, slot = true, selectable = !busy, onSelect = { toggle(key) }, + action = if (removable) { + { SecondaryButton(stringResource(if (reset) R.string.storage_reset_prefix else R.string.storage_remove), compact = true, enabled = !busy) { confirmKept = k } } } else null, ) } @@ -1051,11 +1064,16 @@ private fun GameDataView(report: StorageReport, sessionRunning: Boolean, onBack: onDismiss = { confirmBulk = false }, ) confirmKept?.let { k -> + val reset = k.owner == PrefixOwner.SHARED || k.owner == PrefixOwner.GAME 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), + stringResource(if (reset) R.string.storage_reset_prefix_title else R.string.storage_remove_title, keptName(k)), + when (k.owner) { + PrefixOwner.SHARED -> stringResource(R.string.storage_reset_shared_confirm, gb(k.bytes)) + PrefixOwner.GAME -> stringResource(R.string.storage_reset_prefix_confirm, gb(k.bytes), k.library) + PrefixOwner.LAUNCHER -> stringResource(R.string.storage_remove_launcher_confirm, gb(k.bytes + k.shaderBytes)) + PrefixOwner.UNKNOWN -> stringResource(R.string.storage_leftover_confirm, gb(k.bytes + k.shaderBytes)) + }, + stringResource(if (reset) R.string.storage_reset_prefix else R.string.storage_remove), onConfirm = { StorageState.resetKept(ctx, k) }, onDismiss = { confirmKept = null }, ) } @@ -1181,6 +1199,93 @@ private fun StoreGamesView(report: StorageReport, sessionRunning: Boolean, onBac } } +/** What the Agent tab added to the Linux userland, with sizes once measured. */ +private fun agentBytes(): List> = + AgentStorage.Item.entries.mapNotNull { item -> AgentStorage.sizes[item]?.takeIf { it >= ONE_MB }?.let { item to it } } + +private fun cacheName(kind: SystemCache) = when (kind) { + SystemCache.TEMP -> R.string.storage_cache_temp + SystemCache.PACKAGES -> R.string.storage_cache_packages + SystemCache.STEAM_WEB -> R.string.storage_cache_steam_web + SystemCache.STEAM_CORRUPT -> R.string.storage_cache_steam_corrupt +} + +/** + * The Linux system bucket opened up: caches that come back on their own, what the Agent tab installed, and the rest, + * which runs everything and stays. + */ +@Composable +private fun SystemView(report: StorageReport, sessionRunning: Boolean, onBack: () -> Unit) { + val ctx = LocalContext.current + val busy = sessionRunning || StorageState.busy + var confirmAgent by remember { mutableStateOf(null) } + var confirmCheckout by remember { mutableStateOf(null) } + val removing = AgentStorage.removing.size + var wasRemoving by remember { mutableStateOf(false) } + LaunchedEffect(removing) { + if (wasRemoving && removing == 0) StorageState.refresh(ctx, force = true) + wasRemoving = removing > 0 + } + val caches = report.systemCaches.sortedByDescending { it.bytes } + val agent = agentBytes().sortedByDescending { it.second } + val checkouts = report.checkouts.filter { it.bytes >= ONE_MB } + val agentTotal = agent.sumOf { it.second } + checkouts.sumOf { it.bytes } + val rest = (report.buckets.getValue(Bucket.SYSTEM) - report.systemCacheBytes - agentTotal).coerceAtLeast(0) + SubHeader(stringResource(R.string.storage_system), stringResource(R.string.storage_system_clearable, gb(report.systemCacheBytes + agentTotal)), onBack) { + if (caches.isNotEmpty()) PrimaryButton(stringResource(R.string.storage_free_button, gb(report.systemCacheBytes)), compact = true, enabled = !busy) { + StorageState.clean(ctx, setOf(CleanItem.SYSTEM_CACHES)) { } + } + } + ActionStatus() + if (sessionRunning) { Note(stringResource(R.string.storage_session_running)); Spacer(Modifier.height(4.dp)) } + if (caches.isNotEmpty()) { + SectionTitle(stringResource(R.string.storage_item_system_caches), gb(report.systemCacheBytes)) + ListCard { + caches.forEachIndexed { i, c -> + ItemRow(stringResource(cacheName(c.kind)), stringResource(R.string.storage_cache_detail), c.bytes, i == caches.lastIndex, + pill = { Pill(stringResource(R.string.storage_tag_safe), LocalPalette.current.good) }, + action = { SecondaryButton(stringResource(R.string.storage_clear), compact = true, enabled = !busy) { StorageState.clearSystemCache(ctx, c.kind) } }) + } + } + } + if (agent.isNotEmpty() || checkouts.isNotEmpty()) { + SectionTitle(stringResource(R.string.rail_agent), gb(agentTotal)) + ListCard { + agent.forEachIndexed { i, (item, bytes) -> + ItemRow(stringResource(agentStorageTitle(item)), stringResource(agentStorageWarning(item)), bytes, i == agent.lastIndex && checkouts.isEmpty(), + action = { + SecondaryButton(stringResource(R.string.storage_remove), compact = true, + enabled = AgentStorage.removing[item] != true && AgentHost.state != AgentHost.State.WORKING) { confirmAgent = item } + }) + } + checkouts.forEachIndexed { i, c -> + ItemRow(c.dir.name, stringResource(R.string.agent_storage_source_warning), c.bytes, i == checkouts.lastIndex, + action = { + SecondaryButton(stringResource(R.string.storage_remove), compact = true, + enabled = !busy && AgentHost.state != AgentHost.State.WORKING) { confirmCheckout = c } + }) + } + } + } + SectionTitle(stringResource(R.string.storage_in_use), gb(rest)) + ListCard { + ItemRow(stringResource(R.string.storage_system), stringResource(R.string.storage_system_hint), rest, true, + action = { Icon(Icons.Outlined.Lock, contentDescription = null, tint = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.size(16.dp)) }) + } + confirmAgent?.let { item -> + ConfirmDialog( + stringResource(R.string.storage_remove_title, stringResource(agentStorageTitle(item))), stringResource(agentStorageWarning(item)), + stringResource(R.string.storage_remove), onConfirm = { AgentStorage.remove(ctx, item) }, onDismiss = { confirmAgent = null }, + ) + } + confirmCheckout?.let { c -> + ConfirmDialog( + stringResource(R.string.storage_remove_title, c.dir.name), stringResource(R.string.agent_storage_source_warning), + stringResource(R.string.storage_remove), onConfirm = { StorageState.removeCheckout(ctx, c.dir) }, onDismiss = { confirmCheckout = null }, + ) + } +} + @Composable internal fun ComponentsView(report: StorageReport, sessionRunning: Boolean, onBack: () -> Unit) { val ctx = LocalContext.current diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index e8a743233..9522e44de 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -3493,10 +3493,19 @@ بادئة Steam المشتركة يشغّل Steam مساعدات Windows الخاصة به هنا يحذفها (%1$s). ينشئ Steam بادئة جديدة في المرة التالية التي يحتاجها فيها. + يحذف بادئة Wine وذاكرة التظليل المؤقتة لتطبيق المتجر هذا (%1$s)، مع تسجيل الدخول وأي حفظ موجود فيها فقط. تحصل الألعاب التي تعمل فيها على بادئة جديدة، وقد تحتاج إلى إعداد التطبيق مرة أخرى. تبقى عمليات الحفظ السحابية في حسابك. + يمكن مسح %1$s + ذاكرات Linux وSteam المؤقتة + الملفات المؤقتة القديمة والحزم المنزّلة وذاكرة الويب المؤقتة لـ Steam + الملفات المؤقتة القديمة + الحزم المنزّلة + ذاكرة الويب المؤقتة لـ Steam + تنزيلات Steam التالفة + تُنشأ مجددًا عند الحاجة + مسح تطبيق متجر والألعاب التي تعمل به مستخدَمة بواسطة %1$s لعبة خارج Steam %1$s - غير مطابقة لأي لعبة، لذا يُحتفظ بها حذف المحدد · %1$s إلغاء تثبيت المحدد · %1$s بادئات Wine 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 5547024fe..1582f3c19 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -3348,10 +3348,19 @@ 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. + Borra el prefijo de Wine y la caché de shaders de esta app de tienda (%1$s), junto con su inicio de sesión y cualquier partida guardada solo ahí. Los juegos que se ejecutan en él reciben un prefijo nuevo y quizá debas configurar la app otra vez. Las partidas en la nube se quedan en tu cuenta. + Se pueden liberar %1$s + Cachés de Linux y Steam + Archivos temporales viejos, paquetes descargados y la caché web de Steam + Archivos temporales viejos + Paquetes descargados + Caché web de Steam + Descargas dañadas de Steam + Se vuelven a crear cuando hacen falta + Borrar 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 diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index bc7259808..9b6629c97 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -3345,10 +3345,19 @@ Споделен Steam префикс Steam изпълнява тук свои помощни програми за Windows Изтрива го (%1$s). Steam създава нов следващия път, когато му потрябва. + Изтрива Wine префикса и кеша на шейдърите на това приложение на магазин (%1$s), заедно с влизането и записите, пазени само там. Игрите, които работят в него, получават нов префикс и може да се наложи да настроите приложението отново. Записите в облака остават в профила ви. + Може да се изчистят %1$s + Кешове на Linux и Steam + Стари временни файлове, изтеглени пакети и уеб кешът на Steam + Стари временни файлове + Изтеглени пакети + Уеб кеш на Steam + Повредени изтегляния на Steam + Създават се отново при нужда + Изчисти Приложение магазин и игрите, които работят с него Използва се от %1$s Игра извън Steam %1$s - Не е свързан с игра, затова се запазва Премахни избраните · %1$s Деинсталирай избраните · %1$s Префикси на Wine diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 8b846d2a9..7c2f59aee 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -3419,10 +3419,19 @@ 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. + Smaže Wine prefix a mezipaměť shaderů této aplikace obchodu (%1$s) včetně přihlášení a uložených pozic, které jsou jen tam. Hry, které v něm běží, dostanou nový prefix a aplikaci možná bude třeba znovu nastavit. Cloudové uložené pozice zůstanou ve vašem účtu. + Lze uvolnit %1$s + Mezipaměti Linuxu a Steamu + Staré dočasné soubory, stažené balíčky a webová mezipaměť Steamu + Staré dočasné soubory + Stažené balíčky + Webová mezipaměť Steamu + Poškozená stahování Steamu + V případě potřeby se vytvoří znovu + Vymazat 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 diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index ab9d45679..f86af3f9b 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -3345,10 +3345,19 @@ 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. + Sletter denne butiksapps Wine-præfiks og shader-cache (%1$s) sammen med login og gemte spil, der kun ligger der. Spil, der kører i det, får et nyt præfiks, og du skal måske sætte appen op igen. Gemte spil i skyen bliver på din konto. + %1$s kan ryddes + Linux- og Steam-cache + Gamle midlertidige filer, hentede pakker og Steams webcache + Gamle midlertidige filer + Hentede pakker + Steams webcache + Beskadigede Steam-downloads + Oprettes igen efter behov + Ryd 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 diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1337f8aa1..2deaec977 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -3345,10 +3345,19 @@ 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. + Löscht Wine-Präfix und Shader-Cache dieser Store-App (%1$s), samt Anmeldung und Speicherständen, die nur dort liegen. Spiele, die darin laufen, bekommen ein neues Präfix, und die App muss eventuell neu eingerichtet werden. Cloud-Speicherstände bleiben im Konto. + %1$s können geleert werden + Linux- und Steam-Caches + Alte temporäre Dateien, heruntergeladene Pakete und Steams Web-Cache + Alte temporäre Dateien + Heruntergeladene Pakete + Steam-Web-Cache + Beschädigte Steam-Downloads + Wird bei Bedarf neu erstellt + Leeren 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 diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 3b548067f..43d687e02 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -3345,10 +3345,19 @@ Κοινό prefix του Steam Το Steam εκτελεί εδώ τα δικά του βοηθητικά προγράμματα Windows Το διαγράφει (%1$s). Το Steam δημιουργεί νέο την επόμενη φορά που θα το χρειαστεί. + Διαγράφει το πρόθεμα Wine και την cache των shader αυτής της εφαρμογής καταστήματος (%1$s), μαζί με τη σύνδεση και όσες αποθηκεύσεις υπάρχουν μόνο εκεί. Τα παιχνίδια που τρέχουν σε αυτό παίρνουν νέο πρόθεμα και ίσως χρειαστεί να ρυθμίσετε ξανά την εφαρμογή. Οι αποθηκεύσεις στο cloud μένουν στον λογαριασμό σας. + Μπορούν να εκκαθαριστούν %1$s + Cache του Linux και του Steam + Παλιά προσωρινά αρχεία, πακέτα που κατέβηκαν και η cache ιστού του Steam + Παλιά προσωρινά αρχεία + Πακέτα που κατέβηκαν + Cache ιστού του Steam + Κατεστραμμένες λήψεις Steam + Δημιουργούνται ξανά όταν χρειάζεται + Εκκαθάριση Μια εφαρμογή καταστήματος και τα παιχνίδια που τρέχουν με αυτήν Χρησιμοποιείται από %1$s Παιχνίδι εκτός Steam %1$s - Δεν αντιστοιχεί σε παιχνίδι, οπότε διατηρείται Αφαίρεση επιλεγμένων · %1$s Κατάργηση επιλεγμένων · %1$s Prefix Wine diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 126aa3b53..4a4137032 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -3382,10 +3382,19 @@ 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. + Borra el prefijo de Wine y la caché de shaders de esta app de tienda (%1$s), junto con su inicio de sesión y las partidas guardadas solo ahí. Los juegos que se ejecutan en él reciben un prefijo nuevo y puede que tengas que configurar la app de nuevo. Las partidas en la nube se quedan en tu cuenta. + Se pueden liberar %1$s + Cachés de Linux y Steam + Archivos temporales antiguos, paquetes descargados y la caché web de Steam + Archivos temporales antiguos + Paquetes descargados + Caché web de Steam + Descargas dañadas de Steam + Se vuelven a crear cuando hacen falta + Borrar 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 diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 1fd968256..0e9ef5f06 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -3345,10 +3345,19 @@ Steamin jaettu etuliite Steam suorittaa täällä omia Windows-apuohjelmiaan Poistaa sen (%1$s). Steam luo uuden, kun tarvitsee sitä seuraavan kerran. + Poistaa tämän kauppasovelluksen Wine-etuliitteen ja varjostinvälimuistin (%1$s) sekä kirjautumisen ja vain siellä olevat tallennukset. Siinä toimivat pelit saavat uuden etuliitteen, ja sovellus pitää ehkä ottaa uudelleen käyttöön. Pilvitallennukset säilyvät tililläsi. + %1$s voidaan tyhjentää + Linuxin ja Steamin välimuistit + Vanhat väliaikaistiedostot, ladatut paketit ja Steamin verkkovälimuisti + Vanhat väliaikaistiedostot + Ladatut paketit + Steamin verkkovälimuisti + Vioittuneet Steam-lataukset + Luodaan tarvittaessa uudelleen + Tyhjennä 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 diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 575309564..a40f61aed 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -3381,10 +3381,19 @@ 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. + Supprime le préfixe Wine et le cache de shaders de cette app de boutique (%1$s), avec sa connexion et les sauvegardes présentes uniquement là. Les jeux qui s\'y exécutent reçoivent un nouveau préfixe, et il faudra peut-être reconfigurer l\'app. Les sauvegardes cloud restent dans votre compte. + %1$s peuvent être libérés + Caches de Linux et de Steam + Anciens fichiers temporaires, paquets téléchargés et cache web de Steam + Anciens fichiers temporaires + Paquets téléchargés + Cache web de Steam + Téléchargements Steam endommagés + Recréés au besoin + Vider 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 diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 17d5e5cd6..9ffe130bc 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -3345,10 +3345,19 @@ Steam का साझा प्रीफ़िक्स Steam यहाँ अपने Windows हेल्पर चलाता है इसे डिलीट करता है (%1$s)। अगली बार ज़रूरत पड़ने पर Steam नया बना लेता है। + इस स्टोर ऐप का Wine प्रीफ़िक्स और शेडर कैश (%1$s) हटाता है, साथ में इसका साइन-इन और सिर्फ़ वहीं रखे सेव भी। इसमें चलने वाले गेम को नया प्रीफ़िक्स मिलता है, और ऐप को फिर से सेट अप करना पड़ सकता है। क्लाउड सेव आपके खाते में रहते हैं। + %1$s साफ़ किया जा सकता है + Linux और Steam कैश + पुरानी अस्थायी फ़ाइलें, डाउनलोड किए गए पैकेज और Steam का वेब कैश + पुरानी अस्थायी फ़ाइलें + डाउनलोड किए गए पैकेज + Steam वेब कैश + खराब Steam डाउनलोड + ज़रूरत पड़ने पर फिर से बनते हैं + साफ़ करें एक स्टोर ऐप और उसके साथ चलने वाले गेम %1$s द्वारा इस्तेमाल गैर-Steam गेम %1$s - किसी गेम से मेल नहीं खाता, इसलिए रखा जाता है चुने गए हटाएँ · %1$s चुने गए अनइंस्टॉल करें · %1$s Wine प्रीफ़िक्स diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 86f9cb5ce..dbacff4fc 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -3345,10 +3345,19 @@ 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á. + Törli ennek az áruházalkalmazásnak a Wine-prefixét és shadergyorsítótárát (%1$s), a bejelentkezéssel és a csak ott tárolt mentésekkel együtt. A benne futó játékok új prefixet kapnak, és lehet, hogy az alkalmazást újra be kell állítani. A felhőmentések a fiókodban maradnak. + %1$s üríthető + Linux- és Steam-gyorsítótárak + Régi ideiglenes fájlok, letöltött csomagok és a Steam webes gyorsítótára + Régi ideiglenes fájlok + Letöltött csomagok + Steam webes gyorsítótár + Sérült Steam-letöltések + Szükség esetén újra létrejön + Ürítés 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 diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 5b149f981..d57f4fce8 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -3316,10 +3316,19 @@ Prefix Steam bersama Steam menjalankan helper Windows-nya sendiri di sini Menghapusnya (%1$s). Steam membuat yang baru saat membutuhkannya lagi. + Menghapus prefiks Wine dan cache shader aplikasi toko ini (%1$s), beserta info masuk dan simpanan yang hanya ada di sana. Game yang berjalan di dalamnya mendapat prefiks baru, dan Anda mungkin perlu menyiapkan aplikasinya lagi. Simpanan cloud tetap ada di akun Anda. + %1$s dapat dibersihkan + Cache Linux dan Steam + File sementara lama, paket yang diunduh, dan cache web Steam + File sementara lama + Paket yang diunduh + Cache web Steam + Unduhan Steam yang rusak + Dibuat lagi saat diperlukan + Bersihkan 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 diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d45d12ebc..9762487af 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -3381,10 +3381,19 @@ 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. + Elimina il prefisso Wine e la cache degli shader di questa app dello store (%1$s), con il suo accesso e i salvataggi presenti solo lì. I giochi che vi girano ricevono un nuovo prefisso e potrebbe essere necessario configurare di nuovo l\'app. I salvataggi cloud restano nel tuo account. + Si possono liberare %1$s + Cache di Linux e Steam + Vecchi file temporanei, pacchetti scaricati e cache web di Steam + Vecchi file temporanei + Pacchetti scaricati + Cache web di Steam + Download di Steam danneggiati + Ricreati quando servono + Svuota 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 diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index f8f00afd1..4368eb3b7 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -3316,10 +3316,19 @@ Steam の共有プレフィックス Steam が独自の Windows ヘルパーをここで実行します 削除します(%1$s)。次に必要になったとき Steam が新しく作成します。 + このストアアプリの Wine プレフィックスとシェーダーキャッシュ(%1$s)を、サインイン情報やそこにしかないセーブデータごと削除します。中で動くゲームは新しいプレフィックスで始まり、アプリの再セットアップが必要になる場合があります。クラウドのセーブデータはアカウントに残ります。 + %1$s を消去できます + Linux と Steam のキャッシュ + 古い一時ファイル、ダウンロード済みパッケージ、Steam のウェブキャッシュ + 古い一時ファイル + ダウンロード済みパッケージ + Steam のウェブキャッシュ + 破損した Steam ダウンロード + 必要なときに再作成されます + 消去 ストアアプリとそれで動くゲーム %1$s が使用 Steam 以外のゲーム %1$s - どのゲームにも一致しないため保持されます 選択項目を削除 · %1$s 選択項目をアンインストール · %1$s Wineプレフィックス diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 803c259ed..65be1ca18 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -3316,10 +3316,19 @@ Steam의 공유 프리픽스 Steam이 자체 Windows 도우미를 여기서 실행합니다 삭제합니다(%1$s). 다음에 필요할 때 Steam이 새로 만듭니다. + 이 스토어 앱의 Wine 접두사와 셰이더 캐시(%1$s)를 로그인 정보 및 그곳에만 있는 저장 데이터와 함께 삭제합니다. 그 안에서 실행되는 게임은 새 접두사를 받으며, 앱을 다시 설정해야 할 수 있습니다. 클라우드 저장 데이터는 계정에 남습니다. + %1$s 정리 가능 + Linux 및 Steam 캐시 + 오래된 임시 파일, 다운로드한 패키지, Steam 웹 캐시 + 오래된 임시 파일 + 다운로드한 패키지 + Steam 웹 캐시 + 손상된 Steam 다운로드 + 필요할 때 다시 만들어집니다 + 지우기 스토어 앱과 이 앱으로 실행되는 게임 사용 중: %1$s Steam이 아닌 게임 %1$s - 일치하는 게임이 없어 유지됩니다 선택 항목 제거 · %1$s 선택 항목 제거 · %1$s Wine 프리픽스 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 9e19ba193..35583d3e7 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -3316,10 +3316,19 @@ Awalan Steam dikongsi Steam menjalankan pembantu Windowsnya sendiri di sini Memadamnya (%1$s). Steam mencipta yang baharu apabila memerlukannya lagi. + Memadam prefiks Wine dan cache shader apl kedai ini (%1$s), bersama log masuk dan simpanan yang hanya ada di situ. Permainan yang berjalan di dalamnya mendapat prefiks baharu, dan anda mungkin perlu menyediakan apl itu semula. Simpanan awan kekal dalam akaun anda. + %1$s boleh dikosongkan + Cache Linux dan Steam + Fail sementara lama, pakej yang dimuat turun dan cache web Steam + Fail sementara lama + Pakej yang dimuat turun + Cache web Steam + Muat turun Steam yang rosak + Dibuat semula apabila perlu + Kosongkan 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 diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 35fdb6550..f503b384b 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -3345,10 +3345,19 @@ Steams delte prefiks Steam kjører sine egne Windows-hjelpere her Sletter det (%1$s). Steam oppretter et nytt neste gang det trengs. + Sletter denne butikkappens Wine-prefiks og shader-buffer (%1$s), sammen med innlogging og lagringer som bare finnes der. Spill som kjører i det, får et nytt prefiks, og du må kanskje sette opp appen igjen. Skylagringer blir værende på kontoen din. + %1$s kan tømmes + Linux- og Steam-buffere + Gamle midlertidige filer, nedlastede pakker og Steams nettbuffer + Gamle midlertidige filer + Nedlastede pakker + Steams nettbuffer + Skadede Steam-nedlastinger + Lages på nytt ved behov + Tøm 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 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 0bc195044..f505680b3 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -3345,10 +3345,19 @@ 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. + Verwijdert de Wine-prefix en shadercache van deze winkel-app (%1$s), met de aanmelding en saves die alleen daar staan. Games die erin draaien krijgen een nieuwe prefix, en je moet de app misschien opnieuw instellen. Cloudsaves blijven in je account. + %1$s kan worden gewist + Linux- en Steam-caches + Oude tijdelijke bestanden, gedownloade pakketten en de webcache van Steam + Oude tijdelijke bestanden + Gedownloade pakketten + Steam-webcache + Beschadigde Steam-downloads + Wordt opnieuw gemaakt wanneer nodig + Wissen 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 diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index cb1a3b6b7..db86d683b 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -3419,10 +3419,19 @@ 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. + Usuwa prefiks Wine i pamięć podręczną shaderów tej aplikacji sklepu (%1$s) wraz z logowaniem i zapisami przechowywanymi tylko tam. Gry, które w nim działają, dostaną nowy prefiks, a aplikację może trzeba będzie skonfigurować ponownie. Zapisy w chmurze zostają na koncie. + Można wyczyścić %1$s + Pamięć podręczna Linuksa i Steam + Stare pliki tymczasowe, pobrane pakiety i pamięć podręczna stron Steam + Stare pliki tymczasowe + Pobrane pakiety + Pamięć podręczna stron Steam + Uszkodzone pobrania Steam + Tworzone ponownie w razie potrzeby + Wyczyść 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 diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index a6001ca08..855d84d3c 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -3381,10 +3381,19 @@ 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. + Apaga o prefixo Wine e a cache de shaders desta app de loja (%1$s), com a sessão iniciada e os jogos guardados apenas aí. Os jogos que correm nele recebem um prefixo novo, e poderá ter de configurar a app outra vez. Os jogos guardados na nuvem ficam na sua conta. + É possível libertar %1$s + Caches do Linux e do Steam + Ficheiros temporários antigos, pacotes transferidos e a cache web do Steam + Ficheiros temporários antigos + Pacotes transferidos + Cache web do Steam + Transferências danificadas do Steam + Recriados quando necessário + Limpar 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 diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index af3fece9a..46df26d46 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -3389,10 +3389,19 @@ 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. + Apaga o prefixo do Wine e o cache de shaders deste app de loja (%1$s), com o login e os saves guardados só ali. Os jogos que rodam nele recebem um prefixo novo, e talvez seja preciso configurar o app de novo. Os saves na nuvem continuam na sua conta. + Dá para liberar %1$s + Caches do Linux e da Steam + Arquivos temporários antigos, pacotes baixados e o cache web da Steam + Arquivos temporários antigos + Pacotes baixados + Cache web da Steam + Downloads danificados da Steam + Recriados quando necessário + Limpar 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 diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 753853adc..bea73bdab 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -3382,10 +3382,19 @@ Prefixul Steam partajat Steam rulează aici propriile utilitare Windows Îl șterge (%1$s). Steam creează unul nou data viitoare când are nevoie. + Șterge prefixul Wine și memoria cache de shadere ale acestei aplicații de magazin (%1$s), cu autentificarea și salvările păstrate doar acolo. Jocurile care rulează în el primesc un prefix nou și poate fi nevoie să configurezi din nou aplicația. Salvările din cloud rămân în cont. + Se pot elibera %1$s + Cache-uri Linux și Steam + Fișiere temporare vechi, pachete descărcate și cache-ul web Steam + Fișiere temporare vechi + Pachete descărcate + Cache web Steam + Descărcări Steam deteriorate + Se recreează când e nevoie + Golește 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 diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c47125f62..f03f4b301 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -3419,10 +3419,19 @@ Общий префикс Steam Steam запускает здесь свои вспомогательные программы Windows Удаляет его (%1$s). Steam создаст новый, когда он снова понадобится. + Удаляет префикс Wine и кеш шейдеров этого приложения магазина (%1$s) вместе со входом в аккаунт и сохранениями, которые есть только там. Игры, работающие в нём, получат новый префикс, а приложение, возможно, придётся настроить заново. Облачные сохранения остаются в аккаунте. + Можно очистить %1$s + Кеши Linux и Steam + Старые временные файлы, скачанные пакеты и веб-кеш Steam + Старые временные файлы + Скачанные пакеты + Веб-кеш Steam + Повреждённые загрузки Steam + Создаются заново при необходимости + Очистить Приложение магазина и игры, которые с ним работают Используется: %1$s Игра не из Steam %1$s - Не сопоставлен с игрой, поэтому сохраняется Удалить выбранные · %1$s Удалить выбранные · %1$s Префиксы Wine diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 10f07aa95..0db21cecc 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -3345,10 +3345,19 @@ 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. + Tar bort den här butiksappens Wine-prefix och shadercache (%1$s), med inloggning och sparfiler som bara finns där. Spel som körs i det får ett nytt prefix, och du kan behöva konfigurera appen igen. Molnsparningar finns kvar på ditt konto. + %1$s kan rensas + Linux- och Steam-cacheminnen + Gamla tillfälliga filer, hämtade paket och Steams webbcache + Gamla tillfälliga filer + Hämtade paket + Steams webbcache + Skadade Steam-nedladdningar + Skapas igen vid behov + Rensa 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 diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 096235873..902fbb36b 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -3316,10 +3316,19 @@ Prefix Steam ที่ใช้ร่วมกัน Steam รันตัวช่วย Windows ของตัวเองที่นี่ ลบ prefix นี้ (%1$s) Steam จะสร้างใหม่เมื่อต้องใช้ครั้งถัดไป + ลบ Wine prefix และแคชเชเดอร์ของแอปร้านค้านี้ (%1$s) พร้อมการลงชื่อเข้าใช้และเซฟที่อยู่ในนั้นเท่านั้น เกมที่รันในนั้นจะได้ prefix ใหม่ และคุณอาจต้องตั้งค่าแอปอีกครั้ง เซฟบนคลาวด์ยังอยู่ในบัญชีของคุณ + ล้างได้ %1$s + แคชของ Linux และ Steam + ไฟล์ชั่วคราวเก่า แพ็กเกจที่ดาวน์โหลด และแคชเว็บของ Steam + ไฟล์ชั่วคราวเก่า + แพ็กเกจที่ดาวน์โหลด + แคชเว็บของ Steam + ไฟล์ดาวน์โหลด Steam ที่เสียหาย + สร้างใหม่เมื่อจำเป็น + ล้าง แอปสโตร์และเกมที่ทำงานกับแอปนั้น ใช้โดย %1$s เกมนอก Steam %1$s - ไม่ตรงกับเกมใด จึงเก็บไว้ นำรายการที่เลือกออก · %1$s ถอนการติดตั้งรายการที่เลือก · %1$s Wine prefix diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 93544e4b6..9569a8ccd 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -3345,10 +3345,19 @@ 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. + Bu mağaza uygulamasının Wine önekini ve gölgelendirici önbelleğini (%1$s), oturum açma bilgisi ve yalnızca orada duran kayıtlarla birlikte siler. İçinde çalışan oyunlar yeni bir önek alır ve uygulamayı yeniden kurmanız gerekebilir. Bulut kayıtları hesabınızda kalır. + %1$s temizlenebilir + Linux ve Steam önbellekleri + Eski geçici dosyalar, indirilen paketler ve Steam’in web önbelleği + Eski geçici dosyalar + İndirilen paketler + Steam web önbelleği + Hasarlı Steam indirmeleri + Gerektiğinde yeniden oluşturulur + Temizle 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 diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index f33b299e1..a0cd852b6 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -3419,10 +3419,19 @@ Спільний префікс Steam Steam запускає тут власні допоміжні програми Windows Видаляє його (%1$s). Steam створить новий, коли він знову знадобиться. + Видаляє префікс Wine і кеш шейдерів цього застосунку крамниці (%1$s) разом із входом в обліковий запис і збереженнями, що є лише там. Ігри, які в ньому працюють, отримають новий префікс, а застосунок, можливо, доведеться налаштувати знову. Хмарні збереження лишаються в обліковому записі. + Можна очистити %1$s + Кеші Linux і Steam + Старі тимчасові файли, завантажені пакети й вебкеш Steam + Старі тимчасові файли + Завантажені пакети + Вебкеш Steam + Пошкоджені завантаження Steam + Створюються знову за потреби + Очистити Застосунок магазину та ігри, які з ним працюють Використовується: %1$s Не-Steam гра %1$s - Не зіставлено з грою, тому зберігається Видалити вибрані · %1$s Видалити вибрані · %1$s Префікси Wine diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 2b0435fef..a5cf10eab 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -3316,10 +3316,19 @@ 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. + Xóa prefix Wine và bộ nhớ đệm shader của ứng dụng cửa hàng này (%1$s), cùng thông tin đăng nhập và các bản lưu chỉ có ở đó. Trò chơi chạy trong đó sẽ nhận prefix mới, và bạn có thể phải thiết lập lại ứng dụng. Bản lưu trên đám mây vẫn còn trong tài khoản của bạn. + Có thể dọn %1$s + Bộ nhớ đệm của Linux và Steam + Tệp tạm cũ, gói đã tải xuống và bộ nhớ đệm web của Steam + Tệp tạm cũ + Gói đã tải xuống + Bộ nhớ đệm web của Steam + Tệp tải xuống Steam bị hỏng + Được tạo lại khi cần + Dọ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 diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 31d9a2ffe..0ba97dd1f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -3316,10 +3316,19 @@ Steam 的共享前缀 Steam 在此运行其自带的 Windows 辅助程序 删除该前缀(%1$s)。Steam 下次需要时会新建一个。 + 删除此商店应用的 Wine 前缀和着色器缓存(%1$s),包括其登录信息和仅存于其中的存档。在其中运行的游戏会获得新的前缀,你可能需要重新设置该应用。云存档仍保留在你的账户中。 + 可清理 %1$s + Linux 和 Steam 缓存 + 旧临时文件、已下载的软件包和 Steam 网页缓存 + 旧临时文件 + 已下载的软件包 + Steam 网页缓存 + 损坏的 Steam 下载 + 需要时会重新生成 + 清理 商店应用及通过它运行的游戏 由 %1$s 使用 非 Steam 游戏 %1$s - 未匹配到游戏,因此保留 移除所选 · %1$s 卸载所选 · %1$s Wine 前缀 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index b19a92cd3..083c59195 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -3313,10 +3313,19 @@ Steam 的共用前綴 Steam 在此執行其自帶的 Windows 輔助程式 刪除該前綴(%1$s)。Steam 下次需要時會新建一個。 + 刪除此商店應用程式的 Wine 前綴和著色器快取(%1$s),包括其登入資料和只存於其中的存檔。在其中執行的遊戲會獲得新的前綴,你可能需要重新設定該應用程式。雲端存檔仍會保留在你的帳戶中。 + 可清理 %1$s + Linux 和 Steam 快取 + 舊暫存檔、已下載的套件和 Steam 網頁快取 + 舊暫存檔 + 已下載的套件 + Steam 網頁快取 + 損壞的 Steam 下載 + 需要時會重新建立 + 清理 商店應用程式及透過它執行的遊戲 由 %1$s 使用 非 Steam 遊戲 %1$s - 未配對到任何遊戲,因此保留 移除所選 · %1$s 解除安裝所選 · %1$s Wine 前綴 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 5d6a885a6..12fa80e1e 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -3313,10 +3313,19 @@ Steam 的共用前綴 Steam 在此執行其自帶的 Windows 輔助程式 刪除該前綴(%1$s)。Steam 下次需要時會新建一個。 + 刪除此商店應用程式的 Wine 前置詞和著色器快取(%1$s),包括其登入資訊和僅存於其中的存檔。在其中執行的遊戲會取得新的前置詞,你可能需要重新設定該應用程式。雲端存檔仍會保留在你的帳戶中。 + 可清除 %1$s + Linux 和 Steam 快取 + 舊暫存檔、已下載的套件和 Steam 網頁快取 + 舊暫存檔 + 已下載的套件 + Steam 網頁快取 + 損毀的 Steam 下載 + 需要時會重新建立 + 清除 商店應用程式及透過它執行的遊戲 由 %1$s 使用 非 Steam 遊戲 %1$s - 未配對到任何遊戲,因此保留 移除所選 · %1$s 解除安裝所選 · %1$s Wine 前綴 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 36924a96c..29e4d9428 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3622,10 +3622,19 @@ 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. + Deletes this store app’s Wine prefix and shader cache (%1$s), with its sign-in and any saves kept only there. Games that run in it get a fresh prefix, and you may need to set the app up again. Cloud saves stay in your account. + %1$s can be cleared + Linux and Steam caches + Old temporary files, downloaded packages and Steam’s web cache + Old temporary files + Downloaded packages + Steam web cache + Damaged Steam downloads + Made again when needed + Clear 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 diff --git a/app/src/test/java/com/droiddeck/launcher/storage/KeptPrefixRemovalTest.kt b/app/src/test/java/com/droiddeck/launcher/storage/KeptPrefixRemovalTest.kt new file mode 100644 index 000000000..f4412a41c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/storage/KeptPrefixRemovalTest.kt @@ -0,0 +1,42 @@ +package com.droiddeck.launcher.storage + +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreGameSidecar +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], application = android.app.Application::class) +class KeptPrefixRemovalTest { + private val compat = File("/rootfs/root/.local/share/Steam/steamapps/compatdata") + + private fun kept(id: String, owner: PrefixOwner) = KeptPrefix(File(compat, id), owner, null, 1L shl 30, "Internal", false) + + private fun report(kept: List, storeFolders: List = emptyList()) = StorageReport( + 0, 0, 0, emptyMap(), 0, 0, 0, 0, emptyList(), emptyList(), emptyList(), emptyList(), 0, emptyList(), emptyList(), 0, + kept, true, storeFolders.map { StoreGameUsage(InstalledStoreGame(StoreGameSidecar(Store.BATTLENET, "pro", "Game", "Game.exe"), it), -1, false) }, + ) + + @Test fun launcherAndUnknownPrefixesCanBeRemoved() { + val launcher = kept("2929927072", PrefixOwner.LAUNCHER) + val unknown = kept("1234", PrefixOwner.UNKNOWN) + val r = report(listOf(launcher, unknown)) + assertTrue(StorageState.keptRemovable(r, launcher)) + assertTrue(StorageState.keptRemovable(r, unknown)) + assertTrue(StorageState.keptRemovable(r, kept("0", PrefixOwner.SHARED))) + } + + @Test fun aLauncherPrefixHoldingAnInstalledGameStays() { + val bnet = kept("2611429436", PrefixOwner.LAUNCHER) + val inside = File(bnet.dir, "pfx/drive_c/Program Files (x86)/Overwatch") + assertFalse(StorageState.keptRemovable(report(listOf(bnet), listOf(inside)), bnet)) + val elsewhere = File(compat, "2611429436-other/Overwatch") + assertTrue(StorageState.keptRemovable(report(listOf(bnet), listOf(elsewhere)), bnet)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/storage/StorageSummaryTest.kt b/app/src/test/java/com/droiddeck/launcher/storage/StorageSummaryTest.kt new file mode 100644 index 000000000..0139a3b87 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/storage/StorageSummaryTest.kt @@ -0,0 +1,27 @@ +package com.droiddeck.launcher.storage + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], application = android.app.Application::class) +class StorageSummaryTest { + @Test fun theSavedOverviewReadsBackAsWritten() { + val buckets = Bucket.entries.mapIndexed { i, b -> b to (i + 1) * 1_000_000_000L }.toMap() + val s = StorageSummary(42, 103L shl 30, 49L shl 30, buckets, 234L shl 20, 3, 1, 7L shl 30, 9L shl 20, 350L shl 20, + 12, 226L shl 20, 8, 73L shl 20, 0, 0, 105L shl 20, 9L shl 20, 8L shl 30) + val back = StorageSummary.fromJson(s.toJson())!! + assertEquals(s.toJson(), back.toJson()) + assertEquals(buckets, back.buckets) + assertEquals(s.droiddeck, back.droiddeck) + } + + @Test fun anOtherVersionOrDamagedFileReadsAsNone() { + assertNull(StorageSummary.fromJson("{\"v\":0}")) + assertNull(StorageSummary.fromJson("not json")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/storage/SystemCachesTest.kt b/app/src/test/java/com/droiddeck/launcher/storage/SystemCachesTest.kt new file mode 100644 index 000000000..4c0ed681c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/storage/SystemCachesTest.kt @@ -0,0 +1,53 @@ +package com.droiddeck.launcher.storage + +import org.junit.Assert.assertEquals +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File + +class SystemCachesTest { + @get:Rule val tmp = TemporaryFolder() + + private val now = 10L * 24 * 60 * 60 * 1000 + private val old = now - SystemCaches.TEMP_IDLE_MS - 1000 + + private fun file(path: String, modified: Long) = File(tmp.root, path).apply { parentFile!!.mkdirs(); writeText("x"); setLastModified(modified) } + + @Test fun onlyIdleVisibleTemporaryFilesAreCleared() { + file("rootfs/tmp/old.deb", old) + file("rootfs/tmp/oldDir/a", old).parentFile!!.setLastModified(old) + file("rootfs/tmp/busyDir/a", old) + file("rootfs/tmp/busyDir/b", now - 1000).parentFile!!.setLastModified(old) + file("rootfs/tmp/.X11-unix/X0", old).parentFile!!.setLastModified(old) + file("rootfs/tmp/fresh.log", now) + val found = SystemCaches.find(File(tmp.root, "rootfs"), emptyList(), now) + assertEquals(listOf("old.deb", "oldDir"), found.getValue(SystemCache.TEMP).map { it.name }.sorted()) + } + + @Test fun packagesAndSteamCachesAreFound() { + file("rootfs/var/cache/apt/archives/git_1_arm64.deb", now) + file("rootfs/var/cache/apt/archives/lock", now) + file("rootfs/var/cache/apt/archives/partial/perl.deb", now) + val steam = File(tmp.root, "rootfs/root/.local/share/Steam") + file("rootfs/root/.local/share/Steam/config/htmlcache/Cache/data_0", now) + file("rootfs/root/.local/share/Steam/steamapps/corrupt/1_2_ab_corrupt.chunk", now) + val found = SystemCaches.find(File(tmp.root, "rootfs"), listOf(steam, File(tmp.root, "missing")), now) + assertEquals(listOf("git_1_arm64.deb", "perl.deb"), found.getValue(SystemCache.PACKAGES).map { it.name }.sorted()) + assertEquals(listOf(File(steam, "config/htmlcache")), found.getValue(SystemCache.STEAM_WEB)) + assertEquals(listOf(File(steam, "steamapps/corrupt")), found.getValue(SystemCache.STEAM_CORRUPT)) + } + + @Test fun checkoutsAndTheirWorktreeRecordsAreFound() { + val rootfs = File(tmp.root, "rootfs") + File(rootfs, "root/DroidDeck/.git/worktrees/dd-pet").mkdirs() + file("rootfs/root/dd-pet/.git", now).writeText("gitdir: /root/DroidDeck/.git/worktrees/dd-pet\n") + file("rootfs/root/own/.git/HEAD", now) + file("rootfs/root/notes/readme", now) + file("rootfs/root/bad/.git", now).writeText("gitdir: /root/DroidDeck/.git/worktrees/../../../etc\n") + assertEquals(listOf("bad", "dd-pet", "own"), SystemCaches.checkouts(rootfs).map { it.name }.sorted()) + assertEquals(File(rootfs, "root/DroidDeck/.git/worktrees/dd-pet"), SystemCaches.worktreeRecord(rootfs, File(rootfs, "root/dd-pet"))) + assertEquals(null, SystemCaches.worktreeRecord(rootfs, File(rootfs, "root/own"))) + assertEquals(null, SystemCaches.worktreeRecord(rootfs, File(rootfs, "root/bad"))) + } +} From 674e0d6fa48c99527421dab719b7c38a8f2fdc82 Mon Sep 17 00:00:00 2001 From: FryMcNugget Date: Thu, 19 Nov 2026 16:03:08 +0000 Subject: [PATCH 12/31] feat(agent): keep the unsent message across leaving the Agent tab (#2863) --- .../droiddeck/launcher/agent/AgentDraft.kt | 27 +++++++++++++++++++ .../com/droiddeck/launcher/ui/AgentPage.kt | 3 ++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/agent/AgentDraft.kt diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentDraft.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentDraft.kt new file mode 100644 index 000000000..3a36be973 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentDraft.kt @@ -0,0 +1,27 @@ +package com.droiddeck.launcher.agent + +import android.content.Context +import androidx.compose.runtime.MutableState +import androidx.compose.runtime.mutableStateOf + +/** The text typed in the Agent tab and not yet sent, kept across leaving the tab and restarts. */ +object AgentDraft { + private const val KEY = "draft" + private var state: MutableState? = null + + fun state(context: Context): MutableState = state ?: run { + val prefs = AgentHost.prefs(context.applicationContext) + val backing = mutableStateOf(prefs.getString(KEY, "") ?: "") + object : MutableState { + override var value: String + get() = backing.value + set(text) { + if (text == backing.value) return + backing.value = text + prefs.edit().apply { if (text.isEmpty()) remove(KEY) else putString(KEY, text) }.apply() + } + override fun component1() = value + override fun component2(): (String) -> Unit = { value = it } + }.also { state = it } + } +} 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 01a486b57..225b81444 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -122,6 +122,7 @@ import androidx.compose.ui.unit.sp import androidx.compose.ui.window.DialogWindowProvider import com.droiddeck.launcher.R import com.droiddeck.launcher.agent.AgentAttachments +import com.droiddeck.launcher.agent.AgentDraft import com.droiddeck.launcher.agent.AgentHost import com.droiddeck.launcher.agent.AgentHost.Entry import com.droiddeck.launcher.agent.AgentSetup @@ -207,7 +208,7 @@ private fun AgentPageContent( } remember { AgentSetup.check(context) } var setup by rememberSaveable { mutableStateOf(false) } - val draft = rememberSaveable { mutableStateOf("") } + val draft = remember { AgentDraft.state(context) } if (setup || AgentHost.state == AgentHost.State.MISSING || !(AgentSetup.ready || AgentSetup.completed(context))) { AgentSetupView(modifier, firstControl = inputModifier, onDone = { setup = false }) return From 786166ba1a28551d60469e7778a63f4ea18a087d Mon Sep 17 00:00:00 2001 From: FryMcNugget Date: Thu, 19 Nov 2026 16:03:56 +0000 Subject: [PATCH 13/31] fix(lab): Fast Lab builds no longer run out of memory compiling the app (#2862) --- tools/agent/dd-lab-build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/agent/dd-lab-build b/tools/agent/dd-lab-build index 33fa47d99..459b12e64 100755 --- a/tools/agent/dd-lab-build +++ b/tools/agent/dd-lab-build @@ -116,10 +116,11 @@ if [ ! -d "$ANDROID_HOME/platforms/android-34" ]; then "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" "platforms;android-34" "build-tools;35.0.0" >/dev/null fi -# A full Kotlin compile of the app runs out of memory with 2.4 GB of heap, and Gradle needs about 1 GB, -# so devices with less memory to spare swap rather than fail. Both daemons end with this script's -# process when the build is done. -heap=${DD_LAB_HEAP_MB:-4096} +# A full Kotlin compile of the app runs out of memory with 2.7 GB of heap, and Gradle needs about 1 GB, +# so devices with less memory to spare swap rather than fail. This script does not stop either daemon: +# when the app runs it, proot's --kill-on-exit ends both with it; run by hand, they outlive it, and the +# Kotlin daemon stays warm for the next incremental compile. +heap=${DD_LAB_HEAP_MB:-6144} kotlin_heap=$(( heap * 2 / 3 )); gradle_heap=$(( heap - kotlin_heap )) # Only the Kotlin daemon compiles incrementally; in-process compiles always redo the whole app, and the From 1456c0529da101c5b49865591c2b7c78d4c46c7c Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 19 Nov 2026 11:04:34 -0500 Subject: [PATCH 14/31] feat(agent): launch and quit store games, list the library, and run Xbox and cloud save commands from droiddeckctl (#2860) --- .../launcher/agent/AgentBridgeProvider.kt | 3 + .../droiddeck/launcher/agent/AgentStores.kt | 91 +++++++++++++++++++ .../session/EnhancedSessionLogShare.kt | 5 +- docs/agent-control.md | 25 ++++- tools/droiddeckctl | 85 ++++++++++++++++- tools/tests/test_droiddeckctl.py | 54 +++++++++++ 6 files changed, 255 insertions(+), 8 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/agent/AgentStores.kt diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt index 93922c805..1b5756227 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt @@ -76,6 +76,9 @@ class AgentBridgeProvider : ContentProvider() { "stop" -> stop(context) "resume" -> resume(context) "launch" -> launch(context, request) + "library" -> AgentStores.library(context, request) + "xodus" -> AgentStores.xodus(context, request) + "cloud" -> AgentStores.cloud(context, request) "focus" -> guest(context, JSONObject().put("kind", "focus"), 15_000) "quit" -> guest(context, JSONObject().put("kind", "quit").put("appId", request.opt("appId")) .put("timeout", request.optDouble("timeout", 15.0)), timeoutMs(request, 15.0, 30_000)) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentStores.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentStores.kt new file mode 100644 index 000000000..82ce426c8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentStores.kt @@ -0,0 +1,91 @@ +package com.droiddeck.launcher.agent + +import android.content.Context +import com.droiddeck.launcher.frontend.LibraryCache +import com.droiddeck.launcher.stores.CloudSaves +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.xbox.Xodus +import java.io.ByteArrayOutputStream +import java.io.InputStream +import java.util.concurrent.TimeUnit +import org.json.JSONArray +import org.json.JSONObject + +internal object AgentStores { + private const val OUTPUT_CAP = 160 * 1024 + + fun library(context: Context, request: JSONObject): JSONObject { + val query = request.optString("query").trim() + val source = request.optString("source").trim() + val games = JSONArray() + LibraryCache.load(context) + .filter { (query.isEmpty() || it.name.contains(query, ignoreCase = true)) && (source.isEmpty() || it.source.equals(source, ignoreCase = true)) } + .forEach { + games.put(JSONObject().put("id", it.gameIdString).put("name", it.name).put("source", it.source) + .put("storeId", it.storeId ?: JSONObject.NULL).put("folder", it.gameFiles?.path ?: JSONObject.NULL)) + } + return JSONObject().put("ok", true).put("command", "library").put("games", games) + } + + fun xodus(context: Context, request: JSONObject): JSONObject { + AgentAccess.requireCommands(context) + val list = request.optJSONArray("args") + val args = if (list == null) emptyList() else List(list.length()) { list.optString(it) } + if (args.isEmpty() || args.any { it.isEmpty() }) throw AgentException("INVALID_REQUEST", "xodus needs its arguments") + val timeoutMs = (request.optDouble("timeout", 120.0) * 1000).toLong().coerceIn(1_000L, 900_000L) + return Xodus.start(context.applicationContext, args).use { child -> + val out = Tail(child.process.inputStream) + val err = Tail(child.process.errorStream) + val finished = child.process.waitFor(timeoutMs, TimeUnit.MILLISECONDS) + if (!finished) child.close() + JSONObject().put("ok", true).put("command", "xodus").put("timedOut", !finished) + .put("exit", if (finished) child.process.exitValue() else JSONObject.NULL) + .put("stdout", out.text()).put("stderr", err.text()) + } + } + + fun cloud(context: Context, request: JSONObject): JSONObject { + AgentAccess.requireCommands(context) + val store = Store.byId(request.optString("store"))?.takeIf(CloudSaves::supports) + ?: throw AgentException("INVALID_REQUEST", "store must be one with cloud saves") + val id = request.optString("id").ifEmpty { throw AgentException("INVALID_REQUEST", "cloud needs a game id") } + val force = request.optBoolean("force") + val result = when (val direction = request.optString("direction")) { + "down" -> CloudSaves.download(context.applicationContext, store, id, force) + "up" -> CloudSaves.upload(context.applicationContext, store, id, force) + else -> throw AgentException("INVALID_REQUEST", "direction '$direction' is not down or up") + } + return JSONObject().put("ok", true).put("command", "cloud").put("result", result.result).put("files", result.files) + .put("bytes", result.bytes).put("reason", result.reason).put("conflicts", result.conflicts).put("detail", result.detail) + } + + private class Tail(stream: InputStream) { + private val kept = ByteArrayOutputStream() + private var dropped = false + private val reader = Thread({ + val buffer = ByteArray(8192) + stream.use { input -> + while (true) { + val n = runCatching { input.read(buffer) }.getOrDefault(-1) + if (n < 0) break + synchronized(kept) { + kept.write(buffer, 0, n) + if (kept.size() > OUTPUT_CAP * 2) { + val bytes = kept.toByteArray() + kept.reset() + kept.write(bytes, bytes.size - OUTPUT_CAP, OUTPUT_CAP) + dropped = true + } + } + } + } + }, "agent-xodus-output").apply { isDaemon = true; start() } + + fun text(): String { + reader.join(2_000) + val bytes = synchronized(kept) { kept.toByteArray() } + val tail = if (bytes.size > OUTPUT_CAP) bytes.copyOfRange(bytes.size - OUTPUT_CAP, bytes.size) else bytes + return (if (dropped || bytes.size > OUTPUT_CAP) "...\n" else "") + String(tail, Charsets.UTF_8) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/EnhancedSessionLogShare.kt b/app/src/main/java/com/droiddeck/launcher/session/EnhancedSessionLogShare.kt index 6f9f36453..b437f3ae4 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/EnhancedSessionLogShare.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/EnhancedSessionLogShare.kt @@ -708,10 +708,10 @@ internal object EnhancedSessionLogShare { } val logs = LinuxRuntime.logDir(context) for ((name, root) in listOf(SessionLogShare.STORES_DIR to File(logs, SessionLogShare.STORES_DIR), SessionPaths.TOOLS_DIR to File(logs, SessionPaths.TOOLS_DIR))) { - val scan = directFiles(root, remaining(maxFiles, out.size)) + val scan = directFiles(root, STORE_LOG_SCAN) truncated = truncated || scan.truncated partial = partial || scan.partial - scan.files.asSequence().filter { recent(it) } + scan.files.filter { recent(it) }.sortedByDescending { it.lastModified() }.take(remaining(maxFiles, out.size)) .forEach { add(it, root, "$name/${it.name}", name) } } if (legacy) { @@ -965,6 +965,7 @@ internal object EnhancedSessionLogShare { "events.jsonl", "memory.csv", "capture.json", "crash.log", ) private const val RECENT_MILLIS = 7L * 24 * 60 * 60 * 1000 + private const val STORE_LOG_SCAN = 512 private const val COPY_BUFFER_BYTES = 64 * 1024 private const val TRACE_SCAN_BYTES = 16L * 1024 * 1024 private const val LEGACY_LOG_MAX_BYTES = 8L * 1024 * 1024 diff --git a/docs/agent-control.md b/docs/agent-control.md index ed9fbcf1e..13bf1c232 100644 --- a/docs/agent-control.md +++ b/docs/agent-control.md @@ -122,9 +122,12 @@ tools/droiddeckctl stop tools/droiddeckctl resume tools/droiddeckctl launch 489830 --wait +tools/droiddeckctl library --source xbox +tools/droiddeckctl launch --game "dead space" --wait tools/droiddeckctl wait focused 489830 tools/droiddeckctl wait game tools/droiddeckctl quit 489830 +tools/droiddeckctl quit tools/droiddeckctl focus tools/droiddeckctl input key ENTER @@ -145,6 +148,10 @@ tools/droiddeckctl ui click --match "Play" tools/droiddeckctl ui set-text some-field --text abc tools/droiddeckctl guest -- xprop -root GAMESCOPE_FOCUSED_APP +tools/droiddeckctl native -- ls /usr/local/lib/droiddeck-xbox +tools/droiddeckctl xodus --timeout 60 -- resolve-package 9N51S9QZMSB6 --json --market US +tools/droiddeckctl cloud down ubisoft 92c79ab6-a69a-411d-ba2b-625ab104235d +tools/droiddeckctl cloud up ea DR:105641400 --force tools/droiddeckctl cdp targets tools/droiddeckctl cdp eval 'SteamClient.Apps.GetMyRunningApps?.()' tools/droiddeckctl env set DXVK_HUD=fps @@ -209,9 +216,24 @@ every 10 s until the battery is under that temperature, so runs being compared s `input` needs a session that has drawn its first frame. Pad input goes through the session screen's virtual pad, the same one the on-screen controls drive, so games that ignore touch still respond. -`launch`, `quit` and `cdp` need a Steam session; `focus` and `wait focused` need gamescope (every +`launch` with an app id and `cdp` need a Steam session; `focus` and `wait focused` need gamescope (every mode except the desktop). +Store and added games (Xbox, EA, Ubisoft, GOG, Epic, Battle.net, Rockstar, a folder added by hand) are +launched by their library id, the same `droiddeck://game/` link a home screen shortcut opens, so +they go through the front end's own launch path and start a session when none is running. `library` +lists the ids with each game's name, source, store id and folder (`--query` and `--source` narrow it), +and `launch --game` takes an id or a unique part of a name; an ambiguous name exits with +`GAME_AMBIGUOUS` and lists the matches. With `--wait` it returns once a game other than the Steam +client has focus. `quit` without an id quits the focused game, so store games close the same way. + +`xodus` runs the Xbox backend with the app's own credentials and runtime, as the Xbox store does, +and returns its exit code with the last 160 KiB of stdout and stderr (`--timeout` stops it). +`cloud down|up ` syncs one game's cloud saves now, without launching it, with the +`result`, `files`, `bytes`, `reason`, `conflicts` and `detail` the game page shows; `--force` takes +that side over conflicts. The store id is the one in the game's install record (`library` shows +it). Both need Setup > Developer > Debugging tools. + `input pen` does not go through the app. It registers a virtual pen with `adb shell uinput -`, so Android's own input reader makes the stylus events, as for a built-in pen, and it works on whatever is on screen, without a session or Setup > Developer > Debugging tools. Positions are fractions of @@ -402,6 +424,7 @@ Automator show them: | Tag | Where | |---|---| | `rail-steam`, `rail-games` (the Library), `rail-desktop`, `rail-store`, `rail-components`, `rail-android-apps`, `rail-setup`, `rail-updates` | the front end's rail | +| `dual-rail-` (`dual-rail-games`, `dual-rail-downloads`, ...) | the rail on the second screen of a dual-screen device | | `play-steam` | Play on the Steam page, and on the Library when it has no games | | `library-source-` | the Library's source filter chips (`all`, `steam`, `gog`, ...) | | `game-tab-` | the open tab of a game page | diff --git a/tools/droiddeckctl b/tools/droiddeckctl index 15675a179..50ff42423 100755 --- a/tools/droiddeckctl +++ b/tools/droiddeckctl @@ -153,6 +153,31 @@ def checked(response: dict, default_code: str) -> dict: return response +def find_game(adb: str, serial: str, wanted: str) -> dict: + games = checked(provider_call(adb, serial, "library", request={}), "LIBRARY_FAILED").get("games") or [] + exact = [g for g in games if g.get("id") == wanted] + if exact: + return exact[0] + named = [g for g in games if wanted.casefold() in str(g.get("name", "")).casefold()] + if len(named) == 1: + return named[0] + if not named: + raise ControlError(f"No library game matches {wanted!r}; list them with library", "GAME_NOT_FOUND") + names = ", ".join(f"{g.get('name')} ({g.get('id')})" for g in named[:10]) + raise ControlError(f"{wanted!r} matches {len(named)} games: {names}", "GAME_AMBIGUOUS") + + +def open_game_link(adb: str, serial: str, game_id: str) -> None: + if not game_id.isdigit(): + raise ControlError(f"Library id {game_id!r} is not a number", "INVALID_GAME_ID") + result = run_adb(adb, serial, "shell", "am", "start", "-W", "-a", "android.intent.action.VIEW", + "-d", f"droiddeck://game/{game_id}", "-n", f"{PACKAGE}/com.droiddeck.launcher.FrontEndActivity", + timeout=60) + output = (result.stdout + result.stderr).decode(errors="replace") + if result.returncode != 0 or "error" in output.lower(): + raise ControlError(output.strip() or "The game link did not open", "ACTIVITY_START_FAILED") + + def start_agent_activity(adb: str, serial: str, request: dict) -> None: encoded = encode_request(request) result = run_adb( @@ -949,6 +974,17 @@ def execute(args: argparse.Namespace, adb: str, serial: str) -> dict: return add_serial(checked(provider_call(adb, serial, "resume"), "RESUME_FAILED"), serial) if command == "launch": + if (args.app_id is None) == (args.game is None): + raise ControlError("launch takes a Steam app id or --game, not both", "INVALID_ARGUMENTS") + if args.game is not None: + game = find_game(adb, serial, args.game) + open_game_link(adb, serial, game["id"]) + response = {"ok": True, "command": "launch", "game": game} + if args.wait: + state = wait_until(adb, serial, f"{game['name']} to have focus", + lambda s: focused(s, None), args.timeout, 0.5) + response["focus"] = state["session"].get("focus") + return add_serial(response, serial) response = checked(provider_call(adb, serial, "launch", request={"appId": str(args.app_id)}), "LAUNCH_FAILED") if args.wait: state = wait_until(adb, serial, f"app {args.app_id} to have focus", @@ -957,10 +993,33 @@ def execute(args: argparse.Namespace, adb: str, serial: str) -> dict: return add_serial(response, serial) if command == "quit": - response = provider_call(adb, serial, "quit", request={"appId": args.app_id, "timeout": args.timeout}, + app_id = args.app_id + if app_id is None: + current = (get_state(adb, serial)["session"].get("focus") or {}).get("focusedApp") + if current in (None, 0, STEAM_CLIENT_APP): + raise ControlError("No game has focus; name the app id to quit", "NO_FOCUSED_GAME") + app_id = current + response = provider_call(adb, serial, "quit", request={"appId": app_id, "timeout": args.timeout}, timeout=args.timeout + 40) return add_serial(checked(response, "QUIT_FAILED"), serial) + if command == "library": + request = {"query": args.query or "", "source": args.source or ""} + return add_serial(checked(provider_call(adb, serial, "library", request=request), "LIBRARY_FAILED"), serial) + + if command == "xodus": + argv = args.argv[1:] if args.argv[:1] == ["--"] else args.argv + if not argv: + raise ControlError("xodus needs its arguments after --", "INVALID_ARGUMENTS") + response = provider_call(adb, serial, "xodus", request={"args": argv, "timeout": args.timeout}, + timeout=args.timeout + 30) + return add_serial(checked(response, "XODUS_FAILED"), serial) + + if command == "cloud": + request = {"direction": args.direction, "store": args.store, "id": args.game_id, "force": args.force} + response = provider_call(adb, serial, "cloud", request=request, timeout=args.timeout) + return add_serial(checked(response, "CLOUD_FAILED"), serial) + if command == "focus": return add_serial(checked(provider_call(adb, serial, "focus", timeout=40), "FOCUS_FAILED"), serial) @@ -1224,15 +1283,31 @@ def build_parser() -> argparse.ArgumentParser: stop.add_argument("--artifact-timeout", type=float, default=300) commands.add_parser("resume", help="resume a suspended session") - launch = commands.add_parser("launch", help="launch a Steam game in the running Steam session") - launch.add_argument("app_id", type=int) + launch = commands.add_parser("launch", help="launch a Steam game in the running Steam session, or any library game with --game") + launch.add_argument("app_id", type=int, nargs="?") + launch.add_argument("--game", help="a library game id or a unique part of its name (store and added games too)") launch.add_argument("--wait", action="store_true", help="wait until the game has focus") launch.add_argument("--timeout", type=float, default=180) - quit_ = commands.add_parser("quit", help="quit a running game (through the client, then signals)") - quit_.add_argument("app_id", type=int) + quit_ = commands.add_parser("quit", help="quit a running game (through the client, then signals); the focused one by default") + quit_.add_argument("app_id", type=int, nargs="?") quit_.add_argument("--timeout", type=float, default=15) + library = commands.add_parser("library", help="the library games the front end lists, with the ids launch --game takes") + library.add_argument("--query", help="only games whose name contains this") + library.add_argument("--source", help="only games from this source, e.g. steam, xbox, ea, ubisoft, gog, epic") + + xodus = commands.add_parser("xodus", help="run the Xbox backend with the app's credentials (debugging tools)") + xodus.add_argument("--timeout", type=float, default=120) + xodus.add_argument("argv", nargs=argparse.REMAINDER) + + cloud = commands.add_parser("cloud", help="sync a store game's cloud saves now (debugging tools)") + cloud.add_argument("direction", choices=["down", "up"]) + cloud.add_argument("store", help="gog, epic, ea or ubisoft") + cloud.add_argument("game_id", help="the store's id for the game, as its install record names it") + cloud.add_argument("--force", action="store_true", help="take this side even over conflicts") + cloud.add_argument("--timeout", type=float, default=300) + commands.add_parser("focus", help="gamescope's focus and every Xwayland server's windows, fresh") guest = commands.add_parser("guest", help="run a command inside the session (debugging tools)") diff --git a/tools/tests/test_droiddeckctl.py b/tools/tests/test_droiddeckctl.py index 9dd7dff67..59f187a7f 100644 --- a/tools/tests/test_droiddeckctl.py +++ b/tools/tests/test_droiddeckctl.py @@ -274,6 +274,60 @@ class DroiddeckctlTest(FakeAdbTest): self.assertEqual(0, code) self.assertEqual(489830, out["focus"]["focusedApp"]) + LIBRARY = {"ok": True, "command": "library", "games": [ + {"id": "9227380185612091392", "name": "TimeSplitters Future Perfect", "source": "xbox", "storeId": "9N51S9QZMSB6", "folder": "/g/ts"}, + {"id": "12302733539203571712", "name": "Dead Space (2008)", "source": "ea", "storeId": "DR:105641400", "folder": "/g/ds"}, + {"id": "12302733539203571999", "name": "Dead Space 2", "source": "ea", "storeId": "DR:1", "folder": "/g/ds2"}, + ]} + + def test_launch_by_name_opens_the_game_link_and_waits_for_a_game(self): + self.configure({"library": self.LIBRARY, "state": [state(focused=769, focusable=[769]), state(focused=7, focusable=[7, 769])]}) + code, out = self.run_ctl("launch", "--game", "timesplitters", "--wait", "--timeout", "5") + self.assertEqual(0, code) + self.assertEqual("TimeSplitters Future Perfect", out["game"]["name"]) + self.assertEqual(7, out["focus"]["focusedApp"]) + started = [e["args"] for e in self.calls() if e["args"][:3] == ["shell", "am", "start"]] + self.assertIn("droiddeck://game/9227380185612091392", started[0]) + self.assertIn("com.droiddeck.launcher/com.droiddeck.launcher.FrontEndActivity", started[0]) + self.assertFalse(self.calls("launch")) + + def test_launch_by_name_refuses_an_ambiguous_or_missing_game(self): + self.configure({"library": self.LIBRARY}) + code, out = self.run_ctl("launch", "--game", "dead space") + self.assertNotEqual(0, code) + self.assertEqual("GAME_AMBIGUOUS", out["error"]["code"]) + self.assertIn("Dead Space 2 (12302733539203571999)", out["error"]["message"]) + code, out = self.run_ctl("launch", "--game", "12302733539203571712") + self.assertEqual(0, code) + self.assertEqual("ea", out["game"]["source"]) + code, out = self.run_ctl("launch", "--game", "halo") + self.assertEqual("GAME_NOT_FOUND", out["error"]["code"]) + code, out = self.run_ctl("launch") + self.assertEqual("INVALID_ARGUMENTS", out["error"]["code"]) + self.assertFalse([e for e in self.calls() if e["args"][:3] == ["shell", "am", "start"] and "droiddeck://game/12302733539203571999" in e["args"]]) + + def test_quit_without_an_app_quits_the_focused_game(self): + self.configure({"state": state(focused=4040, focusable=[4040, 769]), "quit": {"ok": True, "command": "quit"}}) + code, _ = self.run_ctl("quit") + self.assertEqual(0, code) + self.assertEqual(4040, self.calls("quit")[0]["request"]["appId"]) + self.configure({"state": state(focused=769, focusable=[769])}) + code, out = self.run_ctl("quit") + self.assertEqual("NO_FOCUSED_GAME", out["error"]["code"]) + self.assertEqual(1, len(self.calls("quit"))) + + def test_library_xodus_and_cloud_pass_their_requests(self): + self.configure({"library": self.LIBRARY, "xodus": {"ok": True, "command": "xodus", "exit": 0, "stdout": "{}", "stderr": ""}, + "cloud": {"ok": True, "command": "cloud", "result": "ok", "files": 2, "reason": "downloaded"}}) + self.assertEqual(0, self.run_ctl("library", "--source", "ea", "--query", "dead")[0]) + self.assertEqual({"query": "dead", "source": "ea"}, self.calls("library")[0]["request"]) + self.assertEqual(0, self.run_ctl("xodus", "--timeout", "30", "--", "license", "abc", "--market", "US")[0]) + self.assertEqual({"args": ["license", "abc", "--market", "US"], "timeout": 30.0}, self.calls("xodus")[0]["request"]) + code, out = self.run_ctl("cloud", "down", "ubisoft", "92c79ab6", "--force") + self.assertEqual(0, code) + self.assertEqual("downloaded", out["reason"]) + self.assertEqual({"direction": "down", "store": "ubisoft", "id": "92c79ab6", "force": True}, self.calls("cloud")[0]["request"]) + def test_start_reuse_keeps_a_running_session(self): running = state(focused=769) running["session"]["mode"] = "steam" From 8f34554516e58029aa4eed6fffff0464139c7c9d Mon Sep 17 00:00:00 2001 From: Tushar Gandhe <19225304+2-Shar@users.noreply.github.com> Date: Thu, 19 Nov 2026 21:36:19 +0530 Subject: [PATCH 15/31] feat(game): shape the tab bar's LB and RB keys to the bar's rounded ends (#2856) --- .../com/droiddeck/launcher/ui/GameDetail.kt | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index edd95faab..9697fc289 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -79,6 +79,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.font.FontWeight @@ -359,7 +360,7 @@ private fun GameTabBar( val colors = MaterialTheme.colorScheme val pal = LocalPalette.current Row(modifier.fillMaxWidth().glass(CircleShape).padding(4.dp), verticalAlignment = Alignment.CenterVertically) { - if (bumpers) BumperKey("LB", stringResource(R.string.widgets_prev_tab)) { onSelect((selected + tabs.size - 1) % tabs.size) } + if (bumpers) TabBarBumper("LB", stringResource(R.string.widgets_prev_tab), leading = true) { onSelect((selected + tabs.size - 1) % tabs.size) } tabs.forEachIndexed { i, label -> val on = i == selected val src = remember { MutableInteractionSource() } @@ -383,7 +384,30 @@ private fun GameTabBar( ) } } - if (bumpers) BumperKey("RB", stringResource(R.string.widgets_next_tab)) { onSelect((selected + 1) % tabs.size) } + if (bumpers) TabBarBumper("RB", stringResource(R.string.widgets_next_tab), leading = false) { onSelect((selected + 1) % tabs.size) } + } +} + +@Composable +private fun TabBarBumper(label: String, description: String, leading: Boolean, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val round = 22.dp + val flat = 7.dp + val cap = if (leading) RoundedCornerShape(round, flat, flat, round) else RoundedCornerShape(flat, round, round, flat) + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.padding(start = if (leading) 0.dp else 3.dp, end = if (leading) 3.dp else 0.dp) + .size(width = 46.dp, height = 44.dp) + .clip(cap).background(colors.surfaceVariant).border(1.dp, pal.line2, cap) + .focusProperties { canFocus = false } + .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null, role = Role.Button, onClick = onClick) + .semantics { contentDescription = description }, + ) { + Text( + label, fontSize = 12.sp, fontWeight = FontWeight.Bold, color = colors.onSurfaceVariant, + modifier = Modifier.padding(start = if (leading) 4.dp else 0.dp, end = if (leading) 0.dp else 4.dp), + ) } } From 71989b4cdb745e93e6dad499336511f1b8bdc6f7 Mon Sep 17 00:00:00 2001 From: LunaDL <91587464+EnzoDLofi@users.noreply.github.com> Date: Thu, 19 Nov 2026 12:07:55 -0400 Subject: [PATCH 16/31] Feat: Adds customizable theme and fix inner gamer theme (#2850) --- .../launcher/session/SessionPrefs.kt | 39 +++++++++++ .../droiddeck/launcher/ui/FrontEndSetup.kt | 40 +++++++++++ .../java/com/droiddeck/launcher/ui/Theme.kt | 67 ++++++++++++++++++- app/src/main/res/values-ar/strings.xml | 14 ++++ app/src/main/res/values-b+es+419/strings.xml | 14 ++++ app/src/main/res/values-bg/strings.xml | 14 ++++ app/src/main/res/values-cs/strings.xml | 14 ++++ app/src/main/res/values-da/strings.xml | 14 ++++ app/src/main/res/values-de/strings.xml | 14 ++++ app/src/main/res/values-el/strings.xml | 14 ++++ app/src/main/res/values-es/strings.xml | 14 ++++ app/src/main/res/values-fi/strings.xml | 14 ++++ app/src/main/res/values-fr/strings.xml | 14 ++++ app/src/main/res/values-hi/strings.xml | 14 ++++ app/src/main/res/values-hu/strings.xml | 14 ++++ app/src/main/res/values-in/strings.xml | 14 ++++ app/src/main/res/values-it/strings.xml | 14 ++++ app/src/main/res/values-ja/strings.xml | 14 ++++ app/src/main/res/values-ko/strings.xml | 14 ++++ app/src/main/res/values-ms/strings.xml | 14 ++++ app/src/main/res/values-nb/strings.xml | 14 ++++ app/src/main/res/values-nl/strings.xml | 14 ++++ app/src/main/res/values-pl/strings.xml | 14 ++++ app/src/main/res/values-pt-rPT/strings.xml | 14 ++++ app/src/main/res/values-pt/strings.xml | 14 ++++ app/src/main/res/values-ro/strings.xml | 14 ++++ app/src/main/res/values-ru/strings.xml | 14 ++++ app/src/main/res/values-sv/strings.xml | 14 ++++ app/src/main/res/values-th/strings.xml | 14 ++++ app/src/main/res/values-tr/strings.xml | 14 ++++ app/src/main/res/values-uk/strings.xml | 14 ++++ app/src/main/res/values-vi/strings.xml | 14 ++++ app/src/main/res/values-zh-rCN/strings.xml | 14 ++++ app/src/main/res/values-zh-rHK/strings.xml | 14 ++++ app/src/main/res/values-zh-rTW/strings.xml | 14 ++++ app/src/main/res/values/strings.xml | 14 ++++ .../droiddeck/launcher/ui/ThemeColorsTest.kt | 41 ++++++++++++ docs/development/themes.md | 27 +++++--- 38 files changed, 663 insertions(+), 13 deletions(-) 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 3e37adb58..5c9d0eb17 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -1534,6 +1534,45 @@ object SessionPrefs { prefs(context).edit().putInt("gradientPrimary", primary).putInt("gradientSecondary", secondary).apply() } + fun customThemeColors(context: Context): com.droiddeck.launcher.ui.CustomThemeColors = + prefs(context).let { p -> + val defaults = com.droiddeck.launcher.ui.CustomThemeColors() + com.droiddeck.launcher.ui.CustomThemeColors( + background = p.getInt("customThemeBackground", defaults.background), + surface = p.getInt("customThemeSurface", defaults.surface), + surfaceVariant = p.getInt("customThemeSurfaceVariant", defaults.surfaceVariant), + line = p.getInt("customThemeLine", defaults.line), + line2 = p.getInt("customThemeLine2", defaults.line2), + onBackground = p.getInt("customThemeOnBackground", defaults.onBackground), + onSurfaceVariant = p.getInt("customThemeOnSurfaceVariant", defaults.onSurfaceVariant), + primary = p.getInt("customThemePrimary", defaults.primary), + onPrimary = p.getInt("customThemeOnPrimary", defaults.onPrimary), + signal = p.getInt("customThemeSignal", defaults.signal), + good = p.getInt("customThemeGood", defaults.good), + error = p.getInt("customThemeError", defaults.error), + ) + } + + fun setCustomThemeColors( + context: Context, + colors: com.droiddeck.launcher.ui.CustomThemeColors, + ) { + prefs(context).edit() + .putInt("customThemeBackground", colors.background) + .putInt("customThemeSurface", colors.surface) + .putInt("customThemeSurfaceVariant", colors.surfaceVariant) + .putInt("customThemeLine", colors.line) + .putInt("customThemeLine2", colors.line2) + .putInt("customThemeOnBackground", colors.onBackground) + .putInt("customThemeOnSurfaceVariant", colors.onSurfaceVariant) + .putInt("customThemePrimary", colors.primary) + .putInt("customThemeOnPrimary", colors.onPrimary) + .putInt("customThemeSignal", colors.signal) + .putInt("customThemeGood", colors.good) + .putInt("customThemeError", colors.error) + .apply() + } + fun trueBlackHighlight(context: Context): Int = prefs(context).getInt("trueBlackHighlight", com.droiddeck.launcher.ui.Themes.DEFAULT_HIGHLIGHT) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 9f457566b..8815ea43a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -437,6 +437,7 @@ internal fun SetupPanel( } if (s.theme == Themes.INNER_GAMER) RgbSpeedRow() if (s.theme == Themes.GRADIENT) GradientColorRows() + if (s.theme == Themes.CUSTOM) CustomColorRows() if (s.theme == Themes.TRUE_BLACK) HighlightColorRow() ChoiceRow( host, "app-scale", stringResource(R.string.setup_app_scale), stringResource(R.string.setup_app_scale_hint), @@ -1212,3 +1213,42 @@ private fun GradientColorRows() { if (picking == 1) Themes.setGradient(ctx, argb, secondary) else Themes.setGradient(ctx, primary, argb) } } + +@Composable +private fun CustomColorRows() { + val ctx = androidx.compose.ui.platform.LocalContext.current.applicationContext + val colors = Themes.customColors + var picking by remember { mutableStateOf(null) } + + val rows = listOf( + Triple("background", stringResource(R.string.theme_custom_background), colors.background), + Triple("surface", stringResource(R.string.theme_custom_surface), colors.surface), + Triple("surfaceVariant", stringResource(R.string.theme_custom_surface_variant), colors.surfaceVariant), + Triple("line", stringResource(R.string.theme_custom_line), colors.line), + Triple("line2", stringResource(R.string.theme_custom_line2), colors.line2), + Triple("onBackground", stringResource(R.string.theme_custom_on_background), colors.onBackground), + Triple("onSurfaceVariant", stringResource(R.string.theme_custom_on_surface_variant), colors.onSurfaceVariant), + Triple("primary", stringResource(R.string.theme_custom_primary), colors.primary), + Triple("onPrimary", stringResource(R.string.theme_custom_on_primary), colors.onPrimary), + Triple("signal", stringResource(R.string.theme_custom_signal), colors.signal), + Triple("good", stringResource(R.string.theme_custom_good), colors.good), + Triple("error", stringResource(R.string.theme_custom_error), colors.error), + ) + + rows.forEach { (key, label, argb) -> + SettingsRow(label, null) { + ColorCube(Color(argb), label) { picking = key } + } + } + + val selected = rows.firstOrNull { it.first == picking } + if (selected != null) { + ColorPickerDialog( + selected.second, + selected.third, + onDismiss = { picking = null }, + ) { argb -> + Themes.setCustomColor(ctx, selected.first, argb) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt index 6b4dd7d99..8cf7013d0 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt @@ -41,6 +41,21 @@ class Palette( val good: Color, val error: Color = Color(0xFFFF8A80), ) +data class CustomThemeColors( + val background: Int = 0xFF0A0B0D.toInt(), + val surface: Int = 0xFF121417.toInt(), + val surfaceVariant: Int = 0xFF1A1D22.toInt(), + val line: Int = 0xFF262A31.toInt(), + val line2: Int = 0xFF343A43.toInt(), + val onBackground: Int = 0xFFF2F4F7.toInt(), + val onSurfaceVariant: Int = 0xFF9AA3AF.toInt(), + val primary: Int = 0xFF1A9FFF.toInt(), + val onPrimary: Int = 0xFF03111F.toInt(), + val signal: Int = 0xFF1A9FFF.toInt(), + val good: Int = 0xFF4CD37F.toInt(), + val error: Int = 0xFFFF8A80.toInt(), +) + object Themes { const val GRAPHITE = "graphite" const val PAPER = "paper" @@ -48,6 +63,7 @@ object Themes { const val ELECTRIC = "electric" const val INNER_GAMER = "inner_gamer" const val GRADIENT = "gradient" + const val CUSTOM = "custom" const val DEFAULT_PRIMARY = 0xFF8B5CF6.toInt() const val DEFAULT_SECONDARY = 0xFF22D3EE.toInt() @@ -55,6 +71,9 @@ object Themes { var gradientColors by mutableStateOf(DEFAULT_PRIMARY to DEFAULT_SECONDARY) private set + var customColors by mutableStateOf(CustomThemeColors()) + private set + const val RGB_SPEEDS = 10 const val DEFAULT_RGB_SPEED = 3 const val RGB_HUE_STEP = 3f @@ -87,6 +106,7 @@ object Themes { gradientColors = SessionPrefs.gradientColors(context) rgbSpeed = SessionPrefs.rgbSpeed(context) trueBlackHighlight = SessionPrefs.trueBlackHighlight(context) + customColors = SessionPrefs.customThemeColors(context) } fun setTrueBlackHighlight(context: Context, highlight: Int) { @@ -104,9 +124,51 @@ object Themes { gradientColors = primary to secondary } + fun setCustomColors(context: Context, colors: CustomThemeColors) { + SessionPrefs.setCustomThemeColors(context, colors) + customColors = colors + } + + fun setCustomColor(context: Context, key: String, color: Int) { + val current = customColors + val updated = when (key) { + "background" -> current.copy(background = color) + "surface" -> current.copy(surface = color) + "surfaceVariant" -> current.copy(surfaceVariant = color) + "line" -> current.copy(line = color) + "line2" -> current.copy(line2 = color) + "onBackground" -> current.copy(onBackground = color) + "onSurfaceVariant" -> current.copy(onSurfaceVariant = color) + "primary" -> current.copy(primary = color) + "onPrimary" -> current.copy(onPrimary = color) + "signal" -> current.copy(signal = color) + "good" -> current.copy(good = color) + "error" -> current.copy(error = color) + else -> return + } + setCustomColors(context, updated) + } + + private fun customPalette(colors: CustomThemeColors): Palette = Palette( + CUSTOM, R.string.theme_custom, R.string.theme_custom_detail, + background = Color(colors.background), + surface = Color(colors.surface), + surfaceVariant = Color(colors.surfaceVariant), + line = Color(colors.line), + line2 = Color(colors.line2), + onBackground = Color(colors.onBackground), + onSurfaceVariant = Color(colors.onSurfaceVariant), + primary = Color(colors.primary), + primary2 = Color(colors.primary), + onPrimary = Color(colors.onPrimary), + signal = Color(colors.signal), + good = Color(colors.good), + error = Color(colors.error), + ) + fun current(context: Context): Palette { val id = SessionPrefs.theme(context) - if (id == GRADIENT || id == INNER_GAMER || id == TRUE_BLACK) loadGradient(context) + if (id == GRADIENT || id == INNER_GAMER || id == TRUE_BLACK || id == CUSTOM) loadGradient(context) return byId(id) } @@ -149,11 +211,13 @@ object Themes { ), innerGamer(0f), ThemeColors.palette(DEFAULT_PRIMARY, DEFAULT_SECONDARY, R.string.theme_gradient, R.string.theme_gradient_detail), + customPalette(customColors), ) fun byId(id: String): Palette { if (id == INNER_GAMER) return innerGamer(rgbHue) if (id == TRUE_BLACK) return ThemeColors.trueBlack(trueBlackHighlight) + if (id == CUSTOM) return customPalette(customColors) if (id == GRADIENT) return ThemeColors.palette(gradientColors.first, gradientColors.second, R.string.theme_gradient, R.string.theme_gradient_detail) return all.firstOrNull { it.id == id } ?: all[0] } @@ -203,7 +267,6 @@ private val ContentDirected = Typography().run { @Composable private fun InnerGamerHue(speed: Int) { - if (Motion.scale == 0f) return key(speed) { InnerGamerCycle(speed) } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 9522e44de..dc432165d 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -4262,4 +4262,18 @@ عدد صحيح ملاءمة تنعيم الحواف + مخصص + اختر كل لون في الواجهة بشكل مستقل. + الخلفية + اللوحات + اللوحات المرتفعة + الفواصل + الحدود + النص الرئيسي + النص الثانوي + الأزرار واللون الأساسي + نص الأزرار + الإبرازات + نجاح + خطأ \ No newline at end of file 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 1582f3c19..e6b952e05 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -4142,4 +4142,18 @@ Entero Ajustar Antialiasing + Personalizado + Elige cada color de la interfaz por separado. + Fondo + Paneles + Paneles elevados + Separadores + Bordes + Texto principal + Texto secundario + Botones y color principal + Texto de los botones + Destacados + Éxito + Error \ No newline at end of file diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 9b6629c97..68e8f04c5 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -4102,4 +4102,18 @@ Цяло число Побиране Заглаждане на ръбовете + Персонализирана + Изберете поотделно всеки цвят на интерфейса. + Фон + Панели + Повдигнати панели + Разделители + Рамки + Основен текст + Вторичен текст + Бутони и основен акцент + Текст на бутоните + Акценти + Успех + Грешка \ No newline at end of file diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 7c2f59aee..9adcee02c 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -4182,4 +4182,18 @@ Celé číslo Přizpůsobit Vyhlazování hran + Vlastní + Vyberte samostatně každou barvu rozhraní. + Pozadí + Panely + Vyvýšené panely + Oddělovače + Ohraničení + Hlavní text + Vedlejší text + Tlačítka a hlavní zvýraznění + Text tlačítek + Zvýraznění + Úspěch + Chyba \ No newline at end of file diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f86af3f9b..e46157c60 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -4102,4 +4102,18 @@ Heltal Tilpas Kantudjævning + Tilpasset + Vælg hver grænsefladefarve individuelt. + Baggrund + Paneler + Hævede paneler + Skillestreger + Kanter + Primær tekst + Sekundær tekst + Knapper og hovedaccent + Knaptekst + Fremhævninger + Succes + Fejl \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 2deaec977..c3d3db896 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -4102,4 +4102,18 @@ Ganzzahlig Anpassen Kantenglättung + Benutzerdefiniert + Wähle jede Farbe der Oberfläche einzeln aus. + Hintergrund + Flächen + Erhöhte Flächen + Trennlinien + Rahmen + Haupttext + Sekundärtext + Schaltflächen und Hauptakzent + Schaltflächentext + Hervorhebungen + Erfolg + Fehler \ No newline at end of file diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 43d687e02..1c4e366e1 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -4102,4 +4102,18 @@ Ακέραιος Προσαρμογή Εξομάλυνση ακμών + Προσαρμοσμένο + Επιλέξτε ξεχωριστά κάθε χρώμα της διεπαφής. + Φόντο + Πλαίσια + Ανυψωμένα πλαίσια + Διαχωριστικά + Περιγράμματα + Κύριο κείμενο + Δευτερεύον κείμενο + Κουμπιά και κύριο χρώμα έμφασης + Κείμενο κουμπιών + Επισημάνσεις + Επιτυχία + Σφάλμα \ No newline at end of file diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 4a4137032..bd4fddf71 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -4142,4 +4142,18 @@ Entero Ajustar Suavizado de bordes + Personalizado + Elige cada color de la interfaz por separado. + Fondo + Paneles + Paneles elevados + Separadores + Bordes + Texto principal + Texto secundario + Botones y color principal + Texto de los botones + Destacados + Éxito + Error \ No newline at end of file diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 0e9ef5f06..5bb3bd1af 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -4102,4 +4102,18 @@ Kokonaisluku Sovita Reunanpehmennys + Mukautettu + Valitse käyttöliittymän jokainen väri erikseen. + Tausta + Paneelit + Korotetut paneelit + Erottimet + Reunat + Pääteksti + Toissijainen teksti + Painikkeet ja pääkorostus + Painikkeiden teksti + Korostukset + Onnistuminen + Virhe \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a40f61aed..1177bfc17 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -4141,4 +4141,18 @@ Entier Ajuster Anticrénelage + Personnalisé + Choisissez séparément chaque couleur de l’interface. + Arrière-plan + Panneaux + Panneaux surélevés + Séparateurs + Bordures + Texte principal + Texte secondaire + Boutons et accent principal + Texte des boutons + Mises en évidence + Succès + Erreur \ No newline at end of file diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 9ffe130bc..c92d69ca9 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -4102,4 +4102,18 @@ पूर्णांक फ़िट एंटी-अलियासिंग + कस्टम + इंटरफ़ेस का हर रंग अलग-अलग चुनें। + पृष्ठभूमि + पैनल + उभरे हुए पैनल + विभाजक + किनारे + मुख्य टेक्स्ट + द्वितीयक टेक्स्ट + बटन और मुख्य हाइलाइट + बटन का टेक्स्ट + हाइलाइट + सफलता + त्रुटि \ No newline at end of file diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index dbacff4fc..301db987d 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -4102,4 +4102,18 @@ Egész szám Igazítás Élsimítás + Egyéni + Válaszd ki külön a felület minden színét. + Háttér + Panelek + Kiemelt panelek + Elválasztók + Szegélyek + Fő szöveg + Másodlagos szöveg + Gombok és fő kiemelés + Gombok szövege + Kiemelések + Siker + Hiba \ No newline at end of file diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index d57f4fce8..29598f398 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -4072,4 +4072,18 @@ Bilangan bulat Sesuaikan Anti-aliasing + Kustom + Pilih setiap warna antarmuka secara terpisah. + Latar belakang + Panel + Panel terangkat + Pemisah + Batas + Teks utama + Teks sekunder + Tombol dan aksen utama + Teks tombol + Sorotan + Berhasil + Kesalahan \ No newline at end of file diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 9762487af..7b4d3f287 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -4141,4 +4141,18 @@ Intero Adatta Antialiasing + Personalizzato + Scegli separatamente ogni colore dell’interfaccia. + Sfondo + Pannelli + Pannelli rialzati + Separatori + Bordi + Testo principale + Testo secondario + Pulsanti e colore principale + Testo dei pulsanti + Evidenziazioni + Successo + Errore \ No newline at end of file diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 4368eb3b7..e5cdba295 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -4072,4 +4072,18 @@ 整数 画面に合わせる アンチエイリアス + カスタム + インターフェースの各色を個別に選択します。 + 背景 + パネル + 浮き上がったパネル + 区切り線 + 境界線 + メインテキスト + サブテキスト + ボタンとメインアクセント + ボタンのテキスト + 強調表示 + 成功 + エラー \ No newline at end of file diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 65be1ca18..536d33210 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -4072,4 +4072,18 @@ 정수 화면에 맞춤 안티앨리어싱 + 사용자 지정 + 인터페이스의 각 색상을 개별적으로 선택하세요. + 배경 + 패널 + 돌출 패널 + 구분선 + 테두리 + 기본 텍스트 + 보조 텍스트 + 버튼 및 기본 강조색 + 버튼 텍스트 + 강조 표시 + 성공 + 오류 \ No newline at end of file diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 35583d3e7..bcc31c2f0 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -4072,4 +4072,18 @@ Integer Muat Anti-aliasing + Tersuai + Pilih setiap warna antara muka secara berasingan. + Latar belakang + Panel + Panel timbul + Pemisah + Sempadan + Teks utama + Teks sekunder + Butang dan aksen utama + Teks butang + Sorotan + Berjaya + Ralat \ No newline at end of file diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index f503b384b..2c1878427 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -4102,4 +4102,18 @@ Heltall Tilpass Kantutjevning + Egendefinert + Velg hver grensesnittfarge individuelt. + Bakgrunn + Paneler + Hevede paneler + Skillelinjer + Kanter + Hovedtekst + Sekundærtekst + Knapper og hovedfarge + Knappetekst + Uthevinger + Suksess + Feil \ No newline at end of file diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f505680b3..8134e019e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -4102,4 +4102,18 @@ Geheel getal Passend Anti-aliasing + Aangepast + Kies elke interfacekleur afzonderlijk. + Achtergrond + Panelen + Verhoogde panelen + Scheidingslijnen + Randen + Hoofdtekst + Secundaire tekst + Knoppen en hoofdkleur + Knoptekst + Accenten + Geslaagd + Fout \ No newline at end of file diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index db86d683b..6bae94dd4 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -4182,4 +4182,18 @@ Liczba całkowita Dopasuj Wygładzanie krawędzi + Niestandardowy + Wybierz osobno każdy kolor interfejsu. + Tło + Panele + Wyniesione panele + Separatory + Obramowania + Tekst główny + Tekst dodatkowy + Przyciski i główny akcent + Tekst przycisków + Wyróżnienia + Sukces + Błąd \ No newline at end of file diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 855d84d3c..bda1ae561 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1842,6 +1842,20 @@ Saturação Brilho Cor hexadecimal + Personalizado + Escolha individualmente cada cor da interface. + Fundo + Painéis + Painéis elevados + Divisórias + Contornos + Texto principal + Texto secundário + Botões e destaque principal + Texto dos botões + Destaques e indicadores + Sucesso + Erro Esc Ins Del diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 46df26d46..e49853cb6 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1850,6 +1850,20 @@ Saturação Brilho Cor hexadecimal + Personalizado + Escolha individualmente cada cor da interface. + Fundo + Painéis + Painéis elevados + Divisórias + Bordas + Texto principal + Texto secundário + Botões e destaque principal + Texto dos botões + Destaques e indicadores + Sucesso + Erro Esc Ins Del diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index bea73bdab..940364de7 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -4142,4 +4142,18 @@ Număr întreg Potrivire Antialiasing + Personalizat + Alege separat fiecare culoare a interfeței. + Fundal + Panouri + Panouri ridicate + Separatoare + Margini + Text principal + Text secundar + Butoane și accent principal + Textul butoanelor + Evidențieri + Succes + Eroare \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index f03f4b301..2673ee7cc 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -4182,4 +4182,18 @@ Целое число По размеру Сглаживание + Пользовательская + Выберите каждый цвет интерфейса отдельно. + Фон + Панели + Приподнятые панели + Разделители + Границы + Основной текст + Вторичный текст + Кнопки и основной акцент + Текст кнопок + Выделения + Успех + Ошибка \ No newline at end of file diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 0db21cecc..8e169e62a 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -4102,4 +4102,18 @@ Heltal Anpassa Kantutjämning + Anpassat + Välj varje gränssnittsfärg separat. + Bakgrund + Paneler + Upphöjda paneler + Avdelare + Kanter + Huvudtext + Sekundär text + Knappar och huvudaccent + Knapptext + Markeringar + Lyckades + Fel \ No newline at end of file diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 902fbb36b..243108da7 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -4072,4 +4072,18 @@ จำนวนเต็ม พอดีหน้าจอ การลบรอยหยัก + กำหนดเอง + เลือกสีแต่ละสีของอินเทอร์เฟซแยกกัน + พื้นหลัง + แผง + แผงยกสูง + ตัวแบ่ง + เส้นขอบ + ข้อความหลัก + ข้อความรอง + ปุ่มและสีเน้นหลัก + ข้อความบนปุ่ม + จุดเน้น + สำเร็จ + ข้อผิดพลาด \ No newline at end of file diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 9569a8ccd..25944dc95 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -4102,4 +4102,18 @@ Tam sayı Sığdır Kenar yumuşatma + Özel + Arayüzdeki her rengi ayrı ayrı seçin. + Arka plan + Paneller + Yükseltilmiş paneller + Ayırıcılar + Kenarlıklar + Ana metin + İkincil metin + Düğmeler ve ana vurgu + Düğme metni + Vurgular + Başarılı + Hata \ No newline at end of file diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index a0cd852b6..55bd3196c 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -4182,4 +4182,18 @@ Ціле число За розміром Згладжування + Власна тема + Виберіть окремо кожен колір інтерфейсу. + Тло + Панелі + Підняті панелі + Роздільники + Межі + Основний текст + Вторинний текст + Кнопки й основний акцент + Текст кнопок + Виділення + Успіх + Помилка \ No newline at end of file diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a5cf10eab..347822317 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -4072,4 +4072,18 @@ Số nguyên Vừa màn hình Khử răng cưa + Tùy chỉnh + Chọn riêng từng màu của giao diện. + Nền + Bảng + Bảng nổi + Đường phân cách + Đường viền + Văn bản chính + Văn bản phụ + Nút và màu nhấn chính + Văn bản trên nút + Điểm nhấn + Thành công + Lỗi \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 0ba97dd1f..2ece3be68 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -4072,4 +4072,18 @@ 整数 适应 抗锯齿 + 自定义 + 分别选择界面的每种颜色。 + 背景 + 面板 + 凸起面板 + 分隔线 + 边框 + 主要文本 + 次要文本 + 按钮和主要强调色 + 按钮文字 + 高亮 + 成功 + 错误 \ No newline at end of file diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 083c59195..8ba6d09f9 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -4072,4 +4072,18 @@ 整數 配合畫面 抗鋸齒 + 自訂 + 分別選擇介面的每種顏色。 + 背景 + 面板 + 凸起面板 + 分隔線 + 邊框 + 主要文字 + 次要文字 + 按鈕和主要強調色 + 按鈕文字 + 重點標示 + 成功 + 錯誤 \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 12fa80e1e..dfb1bc732 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -4072,4 +4072,18 @@ 整數 符合畫面 抗鋸齒 + 自訂 + 分別選擇介面的每種顏色。 + 背景 + 面板 + 浮起面板 + 分隔線 + 邊框 + 主要文字 + 次要文字 + 按鈕與主要強調色 + 按鈕文字 + 醒目標示 + 成功 + 錯誤 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 29e4d9428..05a387b64 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2039,6 +2039,20 @@ Saturation Brightness Hex color + Custom + Choose each interface color independently. + Background + Panels + Raised panels + Dividers + Borders + Main text + Secondary text + Buttons and main accent + Button text + Highlights + Success + Error Esc Ins Del diff --git a/app/src/test/java/com/droiddeck/launcher/ui/ThemeColorsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/ThemeColorsTest.kt index 2f2cc3cd3..b98d0f1ee 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/ThemeColorsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/ThemeColorsTest.kt @@ -188,4 +188,45 @@ class ThemeColorsTest { SessionPrefs.setTheme(app, Themes.TRUE_BLACK) assertEquals(Color(0xFFFF8800), Themes.current(app).primary) } + + @Test fun customThemeRestoresIndependentColorsAndUsesASolidAccent() { + val chosen = CustomThemeColors( + background = 0xFF101112.toInt(), + surface = 0xFF202122.toInt(), + surfaceVariant = 0xFF303132.toInt(), + line = 0xFF404142.toInt(), + line2 = 0xFF505152.toInt(), + onBackground = 0xFFF1F2F3.toInt(), + onSurfaceVariant = 0xFFD1D2D3.toInt(), + primary = 0xFF336699.toInt(), + onPrimary = 0xFFFFFFFF.toInt(), + signal = 0xFFFFAA00.toInt(), + good = 0xFF00CC66.toInt(), + error = 0xFFFF4433.toInt(), + ) + + Themes.setCustomColors(app, CustomThemeColors()) + SessionPrefs.setCustomThemeColors(app, chosen) + SessionPrefs.setTheme(app, Themes.CUSTOM) + + assertEquals(chosen, SessionPrefs.customThemeColors(app)) + + val palette = Themes.current(app) + assertEquals(Themes.CUSTOM, palette.id) + assertEquals(Color(chosen.background), palette.background) + assertEquals(Color(chosen.surface), palette.surface) + assertEquals(Color(chosen.surfaceVariant), palette.surfaceVariant) + assertEquals(Color(chosen.line), palette.line) + assertEquals(Color(chosen.line2), palette.line2) + assertEquals(Color(chosen.onBackground), palette.onBackground) + assertEquals(Color(chosen.onSurfaceVariant), palette.onSurfaceVariant) + assertEquals(Color(chosen.primary), palette.primary) + assertEquals(Color(chosen.primary), palette.primary2) + assertEquals(Color(chosen.onPrimary), palette.onPrimary) + assertEquals(Color(chosen.signal), palette.signal) + assertEquals(Color(chosen.good), palette.good) + assertEquals(Color(chosen.error), palette.error) + assertTrue(Themes.all.any { it.id == Themes.CUSTOM }) + } + } diff --git a/docs/development/themes.md b/docs/development/themes.md index 4bb122c6f..8fbae5568 100644 --- a/docs/development/themes.md +++ b/docs/development/themes.md @@ -8,10 +8,7 @@ A theme is a `Palette` (`ui/Theme.kt`): a dark background scale (`background`, ` ## Gradient theme -`Themes.GRADIENT` is the one theme whose colours the person picks: a primary and a secondary, -kept in `SessionPrefs.gradientColors` and in `Themes.gradientColors`, a Compose state, so a change -restyles the whole app at once. `App.onCreate` loads the saved colours; code outside a composition -uses `Themes.current(context)`. +`Themes.GRADIENT` is the one of the theme whose colours the person picks: a primary and a secondary, kept in `SessionPrefs.gradientColors` and in `Themes.gradientColors`, a Compose state, so a change restyles the whole app at once. `App.onCreate` loads the saved colours; code outside a composition uses `Themes.current(context)`. `ThemeColors.palette` builds the full palette from the two colours: primary becomes `primary` / `signal`, secondary becomes `primary2`, the background scale is a dark neutral tinted with @@ -24,16 +21,24 @@ square. It opens `ColorPickerDialog`: a wheel (hue and saturation, touch), hue / brightness sliders (they work with a controller) and a hex box, with the old and new colour side by side. OK applies it. +## Custom theme + +`Themes.CUSTOM` stores a separate preference for every configurable palette colour: +background, surfaces, borders, text, accent, button text, signals, success and error. +`SessionPrefs.customThemeColors` restores the saved values, while `Themes.customColors` +is Compose state so changes update the interface immediately. + +The custom palette does not derive its surfaces from the accent. `primary2` intentionally +equals `primary`, keeping components that use the existing two-stop button and launch +effects visually solid. The colour picker reused from Gradient supports the wheel, sliders +and hexadecimal input. + ## Inner Gamer theme `Themes.INNER_GAMER` is an RGB theme: the accent walks round the colour wheel. It sits just above -Gradient in the list, and Setup shows a Speed slider (1 to 10, `SessionPrefs.rgbSpeed`) under the -theme while it is chosen. +Gradient in the list, and Setup shows a Speed slider (1 to 10, `SessionPrefs.rgbSpeed`) under the theme while it is chosen. -`Themes.innerGamer(hue)` builds the palette for one hue through `ThemeColors.palette`, so button text -keeps the same contrast along the gradient at every hue. `DroidDeckTheme` runs one -`rememberInfiniteTransition` while Inner Gamer is chosen, so the system's animation clock drives it. -Compose applies Android's animator scale to it, and the colour holds still when animations are off -in the app (`Motion.scale`) or in Android's own settings. The hue is written to `Themes.rgbHue` in 3° steps, which restyles the +`Themes.innerGamer(hue)` builds the palette for one hue through `ThemeColors.palette`, so button text keeps the same contrast along the gradient at every hue. `DroidDeckTheme` runs one `rememberInfiniteTransition` while Inner Gamer is chosen, so the system's animation clock drives it. +Compose applies Android's animator scale to it, and the colour holds still when animations are off in the app (`Motion.scale`) or in Android's own settings. The hue is written to `Themes.rgbHue` in 3° steps, which restyles the app only when the colour visibly moves; a slow cycle costs few recompositions. From de73e429ccd26945b285a4d34fe996014c485dad Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Thu, 19 Nov 2026 13:41:57 -0500 Subject: [PATCH 17/31] feat(proton): list prerelease builds under Experimental and install from any archive (#2889) * feat(proton): install prerelease builds * fix(proton): harden prerelease archive installs * refactor(proton): drop the superseded test build path * fix(proton): list only current prerelease builds and label the file install * fix(proton): hide prerelease rows that are already installed * fix(proton): keep relative links and modes when unpacking zip and 7z builds * fix(proton): name file installs without the archive suffix * fix(proton): confirm a release is gone before removing its build and tighten archive handling * Show the Experimental section without Developer tools * Share the refresh guard, recheck sessions before removal, skip other architectures The update check guard is shared between menu instances and held until the result is published, so a recreated screen joins the running check and results arrive in order. Automatic removal rechecks for a running session after each release lookup. Experimental assets for other CPU architectures are ignored, and in-tree links may start with the current directory. * Keep an experimental build in place when a session starts during its removal Removal and session start now share one lock. The tree is renamed out of the tools folder under that lock only while no session is running, and deleted afterwards, so a session that starts first keeps its build. --- .../droiddeck/launcher/FrontEndActivity.kt | 7 +- .../java/com/droiddeck/launcher/ProtonMenu.kt | 47 ++- .../droiddeck/launcher/core/Downloader.java | 6 + .../launcher/session/ExperimentalProtons.kt | 236 +++++++++++++-- .../launcher/session/ProtonExtras.kt | 86 +++--- .../launcher/session/SessionService.kt | 10 +- .../launcher/session/SessionState.kt | 2 + .../droiddeck/launcher/ui/ComponentsPage.kt | 32 +- app/src/main/res/values-ar/strings.xml | 10 +- app/src/main/res/values-b+es+419/strings.xml | 10 +- app/src/main/res/values-bg/strings.xml | 10 +- app/src/main/res/values-cs/strings.xml | 10 +- app/src/main/res/values-da/strings.xml | 10 +- app/src/main/res/values-de/strings.xml | 10 +- app/src/main/res/values-el/strings.xml | 10 +- app/src/main/res/values-es/strings.xml | 10 +- app/src/main/res/values-fi/strings.xml | 10 +- app/src/main/res/values-fr/strings.xml | 10 +- app/src/main/res/values-hi/strings.xml | 10 +- app/src/main/res/values-hu/strings.xml | 10 +- app/src/main/res/values-in/strings.xml | 10 +- app/src/main/res/values-it/strings.xml | 10 +- app/src/main/res/values-ja/strings.xml | 10 +- app/src/main/res/values-ko/strings.xml | 10 +- app/src/main/res/values-ms/strings.xml | 10 +- app/src/main/res/values-nb/strings.xml | 10 +- app/src/main/res/values-nl/strings.xml | 10 +- app/src/main/res/values-pl/strings.xml | 10 +- app/src/main/res/values-pt-rPT/strings.xml | 10 +- app/src/main/res/values-pt/strings.xml | 10 +- app/src/main/res/values-ro/strings.xml | 10 +- app/src/main/res/values-ru/strings.xml | 10 +- app/src/main/res/values-sv/strings.xml | 10 +- app/src/main/res/values-th/strings.xml | 10 +- app/src/main/res/values-tr/strings.xml | 10 +- app/src/main/res/values-uk/strings.xml | 10 +- app/src/main/res/values-vi/strings.xml | 10 +- app/src/main/res/values-zh-rCN/strings.xml | 10 +- app/src/main/res/values-zh-rHK/strings.xml | 10 +- app/src/main/res/values-zh-rTW/strings.xml | 10 +- app/src/main/res/values/strings.xml | 8 +- .../droiddeck/launcher/CompatLaunchTest.kt | 2 +- .../droiddeck/launcher/ProtonMenuAutoTest.kt | 88 +++++- .../session/ExperimentalProtonsTest.kt | 280 ++++++++++++++++++ .../launcher/session/ProtonExtrasTest.kt | 165 +++++------ 45 files changed, 897 insertions(+), 392 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 629986abf..c15996d8f 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -99,6 +99,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet this, ui, idle = { !busy && flood == null && compatLaunch == null && pkgStage == null && components.compBusy == null }, onInstalled = { if (!OfflineMode.enabled(this)) components.checkComponentUpdates(force = false) }, + onRemoved = { components.refreshComponents() }, ) private var installed by mutableStateOf(null) @@ -2433,17 +2434,18 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet protons = com.droiddeck.launcher.ui.ProtonsState( rows = protons.protonRows, busyId = protons.protonBusyId, stage = protons.protonStage, percent = protons.protonPercent, runtimeReady = ready && !busy, sessionRunning = SessionState.running, experimental = protons.experimentalDirs, + experimentalReleases = protons.experimentalReleases, ), protonActions = com.droiddeck.launcher.ui.ProtonsActions( onInstall = { id -> protons.installProton(id) }, - onInstallTest = { id -> protons.installProton(id, test = true) }, onCancel = { id -> ProtonExtras.tools.firstOrNull { it.id == id }?.let { ProtonExtras.unqueue(this, it) }; protons.refreshProtons() }, onRemove = { id, dir -> protons.removeProton(id, dir) }, onRemoveOlder = { id -> protons.removeProton(id, older = true) }, onExperimentalFile = { - pickExperimentalProton.launch(InAppFilePicker.buildIntent(this, ZIP_EXT, getString(R.string.xproton_pick), + pickExperimentalProton.launch(InAppFilePicker.buildIntent(this, EXPERIMENTAL_PROTON_EXT, getString(R.string.xproton_install_file), android.os.Environment.getExternalStoragePublicDirectory(android.os.Environment.DIRECTORY_DOWNLOADS).path)) }, + onExperimentalRelease = { release -> protons.installExperimentalRelease(release) }, onRemoveExperimental = { dir -> protons.removeExperimental(dir) }, ), protonOptions = { @@ -3413,6 +3415,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet private const val KEY_SWITCH_DEADLINE = "switch_deadline" private val SESSION_ENDED = setOf(SessionPhase.IDLE, SessionPhase.FAILED) private val ZIP_EXT = listOf("zip") + private val EXPERIMENTAL_PROTON_EXT = listOf("zip", "7z", "tar", "gz", "xz", "zst", "bz2", "tgz", "txz", "tbz2", "tzst") private val WCP_EXT = listOf("wcp") } } diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt index c076df220..aaaa2cf34 100644 --- a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt @@ -20,6 +20,7 @@ internal class ProtonMenu( private val activity: android.app.Activity, private val ui: Handler, private val onInstalled: () -> Unit = {}, + private val onRemoved: () -> Unit = {}, private val idle: () -> Boolean = { true }, ) { private object Operation { @@ -29,6 +30,9 @@ internal class ProtonMenu( val percent = mutableIntStateOf(-1) val problem = mutableStateOf(null) val experimental = mutableStateOf>(emptyList()) + val experimentalReleases = mutableStateOf>(emptyList()) + var fetchedReleases = emptyList() + val checking = java.util.concurrent.atomic.AtomicBoolean(false) } var protonRows by Operation.rows var protonBusyId by Operation.busyId @@ -36,14 +40,16 @@ internal class ProtonMenu( var protonPercent by Operation.percent var protonProblem by Operation.problem var experimentalDirs by Operation.experimental + var experimentalReleases by Operation.experimentalReleases companion object { const val EXPERIMENTAL = "experimental" } - private val checking = java.util.concurrent.atomic.AtomicBoolean(false) - @VisibleForTesting internal var installer: (ProtonExtras.Tool, Boolean, (String, Int) -> Unit) -> String? = - { tool, test, progress -> ProtonExtras.install(activity, tool, test, progress) } + @VisibleForTesting internal var latestCheck: (Boolean) -> Boolean = { force -> ProtonExtras.checkLatest(activity, force) } + @VisibleForTesting internal var experimentalRefresh: () -> List? = { ExperimentalProtons.refresh(activity) } + @VisibleForTesting internal var installer: (ProtonExtras.Tool, (String, Int) -> Unit) -> String? = + { tool, progress -> ProtonExtras.install(activity, tool, progress) } - fun installProton(id: String, automatic: Boolean = false, test: Boolean = false) { + fun installProton(id: String, automatic: Boolean = false) { val tool = ProtonExtras.tools.firstOrNull { it.id == id } ?: return if (protonBusyId != null || ProtonExtras.installInProgress || SessionState.running) return ProtonExtras.unqueue(activity, tool) @@ -53,7 +59,7 @@ internal class ProtonMenu( protonPercent = -1 Thread({ val problem = runCatching { - installer(tool, test) { label, value -> + installer(tool) { label, value -> ui.post { protonStage = label; protonPercent = value } } }.getOrElse { it.message ?: it.javaClass.simpleName } @@ -114,6 +120,10 @@ internal class ProtonMenu( }, "install-proton-experimental").start() } + fun installExperimentalRelease(release: ExperimentalProtons.Release) { + installExperimental { progress -> ExperimentalProtons.installRelease(activity, release, progress) } + } + fun removeExperimental(dir: String) { if (protonBusyId != null || SessionState.running) return protonBusyId = EXPERIMENTAL @@ -131,22 +141,37 @@ internal class ProtonMenu( }, "remove-proton-experimental").start() } + private fun refreshExperimental() { + val installed = ExperimentalProtons.installed(activity) + experimentalDirs = installed.map { it.dir } + experimentalReleases = ExperimentalProtons.available(Operation.fetchedReleases, installed) + } + fun refreshProtons() { - experimentalDirs = ExperimentalProtons.installed(activity).map { it.dir } + refreshExperimental() protonRows = ProtonExtras.tools.map { val all = ProtonExtras.installedAll(activity, it) - ProtonRow(it.id, it.name, all.lastOrNull(), ProtonExtras.queued(activity, it), all, ProtonExtras.update(activity, it), ProtonExtras.testBuild(activity, it)) + ProtonRow(it.id, it.name, all.lastOrNull(), ProtonExtras.queued(activity, it), all, ProtonExtras.update(activity, it)) } } fun checkUpdates(force: Boolean = false) { - if (!checking.compareAndSet(false, true)) return + if (!Operation.checking.compareAndSet(false, true)) return Thread({ - val asked = try { ProtonExtras.checkLatest(activity, force) } catch (_: Throwable) { false } finally { checking.set(false) } - ui.post { - if (asked) refreshProtons() + val asked = runCatching { latestCheck(force) }.getOrDefault(false) + val experimental = runCatching { experimentalRefresh() }.getOrNull() + val published = ui.post { + try { + val before = experimentalDirs + Operation.fetchedReleases = experimental ?: emptyList() + if (asked) refreshProtons() else refreshExperimental() + if (!experimentalDirs.containsAll(before)) onRemoved() + } finally { + Operation.checking.set(false) + } ensureAutoUpdates() } + if (!published) Operation.checking.set(false) }, "proton-updates").start() } diff --git a/app/src/main/java/com/droiddeck/launcher/core/Downloader.java b/app/src/main/java/com/droiddeck/launcher/core/Downloader.java index 7d5427a8c..7990e5707 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/Downloader.java +++ b/app/src/main/java/com/droiddeck/launcher/core/Downloader.java @@ -122,6 +122,12 @@ public final class Downloader { return null; } + public static Boolean gone(String url) { + Fetch fetch = fetch(url); + if (fetch.body != null) return Boolean.FALSE; + return fetch.fatal ? Boolean.TRUE : null; + } + public static String downloadDirect(String url) { LAST_FAILURE.remove(); return fetch(url).body; diff --git a/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt b/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt index cc2831bc8..c02858e44 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt @@ -3,16 +3,23 @@ package com.droiddeck.launcher.session import android.content.Context import android.os.StatFs import android.util.Log +import com.droiddeck.launcher.core.Downloader +import com.droiddeck.launcher.core.Hashes import com.droiddeck.launcher.R import com.droiddeck.launcher.runtime.LinuxRuntime import java.io.File import java.io.FileOutputStream +import java.io.InputStream import java.nio.file.Files +import java.nio.file.attribute.PosixFilePermission import java.security.DigestOutputStream import java.security.MessageDigest import java.util.zip.ZipFile +import org.apache.commons.compress.archivers.sevenz.SevenZFile +import org.apache.commons.compress.archivers.zip.ZipFile as CommonsZipFile import kotlin.io.path.ExperimentalPathApi import kotlin.io.path.deleteRecursively +import org.json.JSONArray import org.json.JSONObject object ExperimentalProtons { @@ -22,12 +29,17 @@ object ExperimentalProtons { private const val STAGING = ".droiddeck-experimental" private const val BACKUPS = ".droiddeck-experimental-old" private const val INCOMING = ".droiddeck-experimental-new" + private const val REMOVED = ".droiddeck-experimental-gone" private const val GUEST_TOOLS = "/root/.local/share/Steam/compatibilitytools.d" private const val NEED_BYTES = 4L * 1024 * 1024 * 1024 private const val USER_SETTINGS = "user_settings.py" - private val TARBALL = Regex("(?i)\\.tar(\\.(gz|xz|zst|bz2))?$") + internal val TARBALL = Regex("(?i)\\.tar(\\.(gz|xz|zst|bz2))?$") + internal val FOREIGN_ARCH = Regex("(?i)(^|[^a-z0-9])(x86|x64|amd64|i[3-6]86)([^a-z0-9]|$)") + private val DOWNLOAD_PREFIX = "droiddeck-" - data class Installed(val dir: String, val label: String, val source: String) + data class Installed(val dir: String, val label: String, val source: String, val releaseTag: String? = null) + data class Release(val tag: String, val asset: String, val url: String, val sha512: String?, val size: Long, val name: String = tag) + enum class ArchiveType { ZIP, SEVEN_Z, TAR, UNKNOWN } private fun toolsDir(context: Context) = File(LinuxRuntime.rootDir(context), GUEST_TOOLS.removePrefix("/")) @@ -36,7 +48,7 @@ object ExperimentalProtons { ?.filter { it.isDirectory && File(it, MARKER).isFile } ?.map { dir -> val info = runCatching { JSONObject(File(dir, MARKER).readText()) }.getOrDefault(JSONObject()) - Installed(dir.name, info.optString("label").ifEmpty { dir.name }, info.optString("source")) + Installed(dir.name, info.optString("label").ifEmpty { dir.name }, info.optString("source"), info.optString("releaseTag").ifEmpty { null }) } ?.sortedBy { it.dir } ?: emptyList() @@ -45,9 +57,15 @@ object ExperimentalProtons { val tools = toolsDir(context) val target = File(tools, dir) if (!File(target, MARKER).isFile) return false - val gone = deleteTree(target) && deleteTree(File(File(tools, BACKUPS), dir)) && deleteTree(File(File(tools, INCOMING), dir)) - if (gone) ComponentsManager.forgetProton(context, dir) - return gone + val doomed = File(File(tools, REMOVED).apply { mkdirs() }, dir) + if (!deleteTree(doomed)) return false + val detached = synchronized(SessionState.startLock) { !SessionState.running && target.renameTo(doomed) } + if (!detached) return false + ComponentsManager.forgetProton(context, dir) + deleteTree(doomed) + deleteTree(File(File(tools, BACKUPS), dir)) + deleteTree(File(File(tools, INCOMING), dir)) + return true } internal fun dirName(tree: String, label: String?): String { @@ -56,6 +74,49 @@ object ExperimentalProtons { return PREFIX + base + (tag?.let { "-$it" } ?: "") } + fun refresh(context: Context): List? { + val tool = ProtonExtras.tools.first { it.id == ProtonExtras.OWN } + val fetched = ProtonExtras.releasesForRemoval(tool) ?: return null + val assets = ProtonExtras.assets(tool, fetched.releases, prerelease = true) + val rows = assets.map { Release(it.tag, it.name, it.url, it.sha512, it.size, it.releaseName) }.distinctBy { it.tag } + if (!SessionState.running) { + reconcile(context, fetched) + if (fetched.complete) removeStaleDownloads(context, fetched.releases.tags()) + } + return rows + } + + private fun JSONArray.tags(): Set = (0 until length()).mapNotNull { optJSONObject(it)?.optString("tag_name")?.takeIf(String::isNotEmpty) }.toSet() + + internal fun removeStaleDownloads(context: Context, availableTags: Set) { + val downloads = File(context.filesDir, "proton-downloads") + downloads.listFiles()?.filter { file -> + file.isFile && file.name.startsWith(DOWNLOAD_PREFIX) && availableTags.none { tag -> file.name.startsWith("$DOWNLOAD_PREFIX${ComponentsManager.safeName(tag)}-") } + }?.forEach { it.delete() } + } + + internal fun available(releases: List, installed: List): List = + releases.filter { release -> installed.none { it.releaseTag == release.tag } } + + internal fun shouldRemove(installedReleaseTag: String?, fetched: ProtonExtras.ReleaseFetch, gone: (String) -> Boolean): Boolean { + val tag = installedReleaseTag ?: return false + val release = (0 until fetched.releases.length()).asSequence() + .mapNotNull { fetched.releases.optJSONObject(it) } + .firstOrNull { it.optString("tag_name") == tag } + return if (release != null) !release.optBoolean("prerelease", false) else fetched.complete && gone(tag) + } + + internal fun reconcile( + context: Context, + fetched: ProtonExtras.ReleaseFetch, + gone: (String) -> Boolean = { tag -> ProtonExtras.releaseGone(ProtonExtras.tools.first { it.id == ProtonExtras.OWN }, tag) }, + ) { + for (build in installed(context)) { + if (SessionState.running) return + if (shouldRemove(build.releaseTag, fetched, gone)) remove(context, build.dir) + } + } + internal fun compatVdf(name: String): String = """"compatibilitytools" { "compat_tools" @@ -71,21 +132,55 @@ object ExperimentalProtons { } """ - fun installFromFile(context: Context, zip: File, onProgress: (String, Int) -> Unit): String? { + fun installFromFile(context: Context, file: File, onProgress: (String, Int) -> Unit): String? { preflight(context)?.let { return it } - if (StatFs(LinuxRuntime.rootDir(context).path).availableBytes < NEED_BYTES + zip.length()) { + if (StatFs(LinuxRuntime.rootDir(context).path).availableBytes < NEED_BYTES + file.length()) { return context.getString(R.string.xproton_no_space) } - return install(context, zip, zip.name.substringBeforeLast('.'), zip.name, onProgress) + return install(context, file, fileLabel(file.name), file.name, null, onProgress, false) } + internal fun fileLabel(name: String): String = + if (TARBALL.containsMatchIn(name)) name.replace(TARBALL, "") else name.substringBeforeLast('.') + + fun installRelease(context: Context, release: Release, onProgress: (String, Int) -> Unit): String? { + preflight(context)?.let { return it } + val downloads = File(context.filesDir, "proton-downloads").apply { mkdirs() } + val archive = File(downloads, "droiddeck-${ComponentsManager.safeName(release.tag)}-${release.asset}") + if (release.size > 0 && archive.length() > release.size) archive.delete() + val missing = (release.size - archive.length()).coerceAtLeast(0L) + val copyBytes = if (sameFileStore(archive, toolsDir(context))) 0L else release.size + if (StatFs(LinuxRuntime.rootDir(context).path).availableBytes < NEED_BYTES + missing + copyBytes) return context.getString(R.string.xproton_no_space) + val title = context.getString(R.string.pextra_downloading, "Proton", release.tag) + onProgress(title, 0) + if (!Downloader.downloadFile(release.url, archive, true) { fraction -> + onProgress(title, if (fraction < 0) -1 else (fraction * 100f).toInt().coerceIn(0, 100)) + }) return context.getString(R.string.pextra_download_failed) + if (release.size > 0 && archive.length() != release.size) return context.getString(R.string.pextra_incomplete) + if (release.sha512 != null) { + val expected = Downloader.downloadDirect(release.sha512)?.let(::checksumIn) + ?: return context.getString(R.string.pextra_checksum_unreadable) + if (!expected.equals(Hashes.sha512(archive), true)) { + archive.delete() + return context.getString(R.string.pextra_checksum_mismatch) + } + } + return try { install(context, archive, release.tag, release.tag, release.tag, onProgress, true) } + finally { archive.delete() } + } + + private fun sameFileStore(file: File, directory: File): Boolean = runCatching { + directory.mkdirs() + Files.getFileStore((file.takeIf(File::exists) ?: file.parentFile).toPath()) == Files.getFileStore(directory.toPath()) + }.getOrDefault(false) + private fun preflight(context: Context): String? = when { SessionState.running -> context.getString(R.string.pextra_stop_session) !LinuxRuntime.isInstalled(context) -> context.getString(R.string.user_apps_runtime_required) else -> null } - private fun install(context: Context, zip: File, label: String, source: String, onProgress: (String, Int) -> Unit): String? { + private fun install(context: Context, archive: File, label: String, source: String, releaseTag: String?, onProgress: (String, Int) -> Unit, downloaded: Boolean): String? { val tools = toolsDir(context).apply { mkdirs() } val staging = File(tools, STAGING) val forget = { name: String -> ComponentsManager.forgetProton(context, name) } @@ -95,23 +190,40 @@ object ExperimentalProtons { try { LinuxRuntime.writeAccounts(context) SessionFiles.stage(context, LinuxRuntime.rootDir(context)) - onProgress(context.getString(R.string.xproton_unzipping), -1) - val tarball = runCatching { extractTarball(zip, staging) } - .getOrElse { return it.message ?: context.getString(R.string.xproton_bad_zip) } - ?: return context.getString(R.string.xproton_bad_zip) + onProgress(context.getString(R.string.xproton_unpacking), -1) + val unpacked = File(staging, "unpacked").apply { mkdirs() } + val type = archiveType(archive) if (SessionState.running) return context.getString(R.string.pextra_session_started) onProgress(context.getString(R.string.xproton_unpacking), -1) - val unpacked = File(staging, "unpacked").apply { mkdirs() } - val status = runGuest(context, listOf("tar", "-xf", "$GUEST_TOOLS/$STAGING/${tarball.name}", "-C", "$GUEST_TOOLS/$STAGING/unpacked")) - tarball.delete() - if (status != 0) return context.getString(R.string.xproton_untar_failed, status) + when (type) { + ArchiveType.ZIP -> { + val tarball = extractTarball(archive, staging) + if (tarball == null) { + extractDirect(archive, unpacked, ArchiveType.ZIP) + } else { + val status = runGuest(context, listOf("tar", "-xf", "$GUEST_TOOLS/$STAGING/${tarball.name}", "-C", "$GUEST_TOOLS/$STAGING/unpacked")) + tarball.delete() + if (status != 0) return context.getString(R.string.xproton_untar_failed, status) + } + } + ArchiveType.SEVEN_Z -> extractDirect(archive, unpacked, ArchiveType.SEVEN_Z) + ArchiveType.TAR -> { + val stagedArchive = File(staging, archive.name) + if (!archive.canonicalFile.equals(stagedArchive.canonicalFile) && !(downloaded && archive.renameTo(stagedArchive))) { + archive.copyTo(stagedArchive, overwrite = true) + } + val status = runGuest(context, listOf("tar", "-xf", "$GUEST_TOOLS/$STAGING/${stagedArchive.name}", "-C", "$GUEST_TOOLS/$STAGING/unpacked")) + if (status != 0) return context.getString(R.string.xproton_untar_failed, status) + } + ArchiveType.UNKNOWN -> return context.getString(R.string.xproton_archive_invalid) + } val tree = buildTree(unpacked) ?: return context.getString(R.string.xproton_no_tree) val name = dirName(tree.name, label) ownFile(tree, "compatibilitytool.vdf").writeText(compatVdf(name)) ownFile(tree, MARKER).writeText( - JSONObject().put("label", name).put("source", source).put("at", System.currentTimeMillis() / 1000).toString(), + JSONObject().put("label", name).put("source", source).putOpt("releaseTag", releaseTag).put("at", System.currentTimeMillis() / 1000).toString(), ) val final = File(tools, name) val settings = File(final, USER_SETTINGS) @@ -125,7 +237,7 @@ object ExperimentalProtons { return null } catch (e: Exception) { Log.e(TAG, "install $source", e) - return e.message ?: context.getString(R.string.xproton_bad_zip) + return if (e is UnsafeArchiveException) context.getString(R.string.xproton_archive_unsafe) else context.getString(R.string.xproton_archive_invalid) } finally { deleteTree(staging) } @@ -171,10 +283,22 @@ object ExperimentalProtons { } internal fun restoreInterrupted(tools: File, forget: (String) -> Boolean) { + deleteTree(File(tools, REMOVED)) File(tools, INCOMING).listFiles()?.forEach { finishPlacing(tools, it.name, forget) } File(tools, BACKUPS).listFiles()?.forEach { if (File(tools, it.name).exists()) deleteTree(it) else it.renameTo(File(tools, it.name)) } } + internal fun archiveType(file: File): ArchiveType { + val head = runCatching { file.inputStream().use { ByteArray(300).also { b -> it.read(b) } } }.getOrNull() ?: return ArchiveType.UNKNOWN + fun at(i: Int, vararg bytes: Int) = bytes.indices.all { head.getOrNull(i + it) == bytes[it].toByte() } + return when { + at(0, 0x50, 0x4B) -> ArchiveType.ZIP + at(0, 0x37, 0x7A, 0xBC, 0xAF, 0x27, 0x1C) -> ArchiveType.SEVEN_Z + at(0, 0x1F, 0x8B) || at(0, 0x42, 0x5A, 0x68) || at(0, 0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00) || at(0, 0x28, 0xB5, 0x2F, 0xFD) || at(257, 0x75, 0x73, 0x74, 0x61, 0x72) -> ArchiveType.TAR + else -> ArchiveType.UNKNOWN + } + } + private fun extractTarball(zip: File, into: File): File? = ZipFile(zip).use { z -> val entries = z.entries().toList().filter { !it.isDirectory } val entry = entries.filter { TARBALL.containsMatchIn(it.name) }.maxByOrNull { it.size } ?: return null @@ -194,6 +318,78 @@ object ExperimentalProtons { out } + internal class UnsafeArchiveException : Exception() + + internal fun extractDirect(archive: File, into: File, type: ArchiveType) { + val root = into.toPath().toAbsolutePath().normalize() + fun target(name: String): File { + val clean = name.replace('\\', '/') + val parts = clean.split('/') + if (clean.startsWith('/') || parts.any { it == ".." }) throw UnsafeArchiveException() + val path = root.resolve(clean).normalize() + if (!path.startsWith(root)) throw UnsafeArchiveException() + var parent = path.parent + while (parent != null && parent.startsWith(root) && parent != root) { + if (Files.isSymbolicLink(parent)) throw UnsafeArchiveException() + parent = parent.parent + } + return path.toFile() + } + fun applyMode(file: File, mode: Int) { + val permissions = mutableSetOf() + if (mode and 0x100 != 0) permissions += PosixFilePermission.OWNER_READ + if (mode and 0x80 != 0) permissions += PosixFilePermission.OWNER_WRITE + if (mode and 0x40 != 0) permissions += PosixFilePermission.OWNER_EXECUTE + if (mode and 0x20 != 0) permissions += PosixFilePermission.GROUP_READ + if (mode and 0x10 != 0) permissions += PosixFilePermission.GROUP_WRITE + if (mode and 0x08 != 0) permissions += PosixFilePermission.GROUP_EXECUTE + if (mode and 0x04 != 0) permissions += PosixFilePermission.OTHERS_READ + if (mode and 0x02 != 0) permissions += PosixFilePermission.OTHERS_WRITE + if (mode and 0x01 != 0) permissions += PosixFilePermission.OTHERS_EXECUTE + if (permissions.isNotEmpty()) Files.setPosixFilePermissions(file.toPath(), permissions) + } + val directoryModes = mutableListOf>() + fun place(name: String, mode: Int, directory: Boolean, content: () -> InputStream) { + val file = target(name) + when { + mode and 0xF000 == 0xA000 -> { + val link = content().use { it.readBytes().decodeToString() } + val parent = file.parentFile ?: throw UnsafeArchiveException() + val climbsLater = link.split('/').filter { it != "." }.dropWhile { it == ".." }.any { it == ".." } + if (link.startsWith('/') || climbsLater || !parent.toPath().resolve(link).normalize().startsWith(root)) throw UnsafeArchiveException() + parent.mkdirs() + Files.deleteIfExists(file.toPath()) + Files.createSymbolicLink(file.toPath(), java.nio.file.Paths.get(link)) + } + directory -> { + file.mkdirs() + directoryModes += file to mode + } + else -> { + if (Files.isSymbolicLink(file.toPath())) throw UnsafeArchiveException() + file.parentFile?.mkdirs() + content().use { input -> file.outputStream().use { output -> input.copyTo(output, 1 shl 16) } } + applyMode(file, mode) + } + } + } + when (type) { + ArchiveType.ZIP -> CommonsZipFile.builder().setFile(archive).get().use { zip -> + for (entry in zip.entries) place(entry.name, entry.unixMode, entry.isDirectory) { zip.getInputStream(entry) } + } + ArchiveType.SEVEN_Z -> Files.newByteChannel(archive.toPath()).use { channel -> + SevenZFile.builder().setSeekableByteChannel(channel).get().use { seven -> + for (entry in seven.entries) { + val unix = entry.hasWindowsAttributes && entry.windowsAttributes and 0x8000 != 0 + place(entry.name, if (unix) entry.windowsAttributes ushr 16 else 0, entry.isDirectory) { seven.getInputStream(entry) } + } + } + } + else -> error("Unsupported direct archive") + } + directoryModes.sortedByDescending { it.first.path.length }.forEach { (directory, mode) -> applyMode(directory, mode) } + } + internal fun checksumIn(text: String): String? = Regex("(?i)\\b[0-9a-f]{128}\\b").find(text)?.value internal fun checksumEntry(entries: List, tarball: String): String? { diff --git a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt index c277b7b27..0d0e20c41 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt @@ -16,8 +16,10 @@ import org.json.JSONObject object ProtonExtras { private const val TAG = "ProtonExtras" private const val NEED_BYTES = 4L * 1024 * 1024 * 1024 - private const val RELEASES = "https://api.github.com/repos/%s/releases?per_page=15&page=%d" + private const val RELEASE_PAGE_SIZE = 15 + private const val RELEASES = "https://api.github.com/repos/%s/releases?per_page=$RELEASE_PAGE_SIZE&page=%d" private const val RELEASE_PAGES = 5 + private const val RELEASE_TAG = "https://api.github.com/repos/%s/releases/tags/%s" const val CHECK_EVERY_MS = 60L * 60 * 1000 @Volatile var installInProgress = false @@ -28,7 +30,8 @@ object ProtonExtras { class Tool(val id: String, val name: String, val prefix: String, val repo: String, val assetPattern: Regex) internal data class Asset(val tag: String, val name: String, val url: String, val sha512: String?, val size: Long, - val sha256: String? = null) + val sha256: String? = null, val releaseName: String = tag) + internal data class ReleaseFetch(val releases: JSONArray, val complete: Boolean) const val OWN = "droiddeck" @@ -106,12 +109,6 @@ object ProtonExtras { fun cachedLatest(context: Context, tool: Tool): String? = readJson(latestFile(context)).optJSONObject(tool.id)?.optString("tag")?.ifEmpty { null } - fun testBuild(context: Context, tool: Tool): String? = - testFor(installedTags(context, tool), readJson(latestFile(context)).optJSONObject(tool.id)?.optString("test")?.ifEmpty { null }) - - internal fun testFor(installed: List, test: String?): String? = - test?.takeIf { it !in installed && (installed.isEmpty() || updateFor(installed, it) != null) } - private val checkLock = Any() private const val RETRY_MS = 15L * 60 * 1000 private const val USER_SETTINGS = "user_settings.py" @@ -135,20 +132,18 @@ object ProtonExtras { } } - internal fun recordLatest(latest: JSONObject, tool: Tool, tag: String, test: Boolean, now: Long): Boolean { - if (test) return false + internal fun recordLatest(latest: JSONObject, tool: Tool, tag: String, now: Long): Boolean { val entry = latest.optJSONObject(tool.id) val known = entry?.optString("tag") if (!known.isNullOrEmpty() && compareVersions(tag, known) < 0) return false - val ahead = entry?.optString("test")?.takeIf { it.isNotEmpty() && compareVersions(it, tag) > 0 } - latest.put(tool.id, JSONObject().put("tag", tag).put("at", now).putOpt("test", ahead)) + latest.put(tool.id, JSONObject().put("tag", tag).put("at", now)) return true } - private fun record(context: Context, tool: Tool, dir: String?, tag: String, test: Boolean) { + private fun record(context: Context, tool: Tool, dir: String?, tag: String) { runCatching { val latest = readJson(latestFile(context)) - if (recordLatest(latest, tool, tag, test, System.currentTimeMillis())) latestFile(context).writeText(latest.toString()) + if (recordLatest(latest, tool, tag, System.currentTimeMillis())) latestFile(context).writeText(latest.toString()) if (dir != null) { val releases = readJson(releasesFile(context)) val present = toolsDir(context).list()?.toSet() ?: emptySet() @@ -221,17 +216,17 @@ object ProtonExtras { } @Synchronized - fun install(context: Context, tool: Tool, test: Boolean = false, onProgress: (String, Int) -> Unit): String? { + fun install(context: Context, tool: Tool, onProgress: (String, Int) -> Unit): String? { if (installInProgress) return context.getString(R.string.pextra_busy) installInProgress = true - return try { installNow(context, tool, test, onProgress) } finally { installInProgress = false } + return try { installNow(context, tool, onProgress) } finally { installInProgress = false } } - private fun installNow(context: Context, tool: Tool, test: Boolean, onProgress: (String, Int) -> Unit): String? { + private fun installNow(context: Context, tool: Tool, onProgress: (String, Int) -> Unit): String? { if (SessionState.running) return context.getString(R.string.pextra_stop_session) if (!LinuxRuntime.isInstalled(context)) return context.getString(R.string.user_apps_runtime_required) - val asset = releases(tool)?.let { pickAsset(tool, it, test && tool.id == OWN) } ?: return context.getString(R.string.pextra_no_release, tool.name) + val asset = releases(tool)?.let { pickAsset(tool, it) } ?: return context.getString(R.string.pextra_no_release, tool.name) val downloads = File(context.filesDir, "proton-downloads").apply { mkdirs() } val archive = File(downloads, "${tool.id}-${asset.name}") if (asset.size > 0 && archive.length() > asset.size) archive.delete() @@ -312,7 +307,7 @@ object ProtonExtras { else { archive.delete() unqueue(context, tool) - record(context, tool, placed, asset.tag, test) + record(context, tool, placed, asset.tag) if (tool.id == OWN) replaceOlder(context, tool) if (EsyncPacks.enabled(context)) { onProgress(context.getString(R.string.esync_fetching), -1) @@ -349,7 +344,7 @@ object ProtonExtras { } } - private fun releases(tool: Tool): JSONArray? = releases(tool) { page -> + internal fun releases(tool: Tool): JSONArray? = releases(tool) { page -> Downloader.downloadString(RELEASES.format(Locale.ROOT, tool.repo, page))?.let { body -> try { JSONArray(body) @@ -361,51 +356,70 @@ object ProtonExtras { } internal fun releases(tool: Tool, fetch: (Int) -> JSONArray?): JSONArray? { + return releasesResult(tool, fetch, stopAtStable = true)?.releases + } + + internal fun releasesForRemoval(tool: Tool, fetch: (Int) -> JSONArray? = { page -> + Downloader.downloadString(RELEASES.format(Locale.ROOT, tool.repo, page))?.let { body -> + runCatching { JSONArray(body) }.getOrNull() + } + }): ReleaseFetch? = releasesResult(tool, fetch, stopAtStable = false) + + internal fun releaseGone(tool: Tool, tag: String): Boolean = + Downloader.gone(RELEASE_TAG.format(Locale.ROOT, tool.repo, java.net.URLEncoder.encode(tag, "UTF-8").replace("+", "%20"))) == true + + private fun releasesResult(tool: Tool, fetch: (Int) -> JSONArray?, stopAtStable: Boolean): ReleaseFetch? { val all = fetch(1) ?: return null var page = 1 var last = all.length() - while (last > 0 && page < RELEASE_PAGES && pickAsset(tool, all) == null) { + var complete = last < RELEASE_PAGE_SIZE + while (!complete && page < RELEASE_PAGES && (!stopAtStable || pickAsset(tool, all) == null)) { val next = fetch(++page) ?: return null for (i in 0 until next.length()) all.put(next.opt(i)) last = next.length() + complete = last < RELEASE_PAGE_SIZE } - return all + return ReleaseFetch(all, complete) } - internal fun pickAsset(tool: Tool, array: JSONArray, test: Boolean = false): Asset? { + internal fun assets(tool: Tool, array: JSONArray, prerelease: Boolean): List { + val releases = (0 until array.length()).mapNotNull { array.optJSONObject(it) }.filter { !it.optBoolean("draft", false) } + val stableAt = releases.filter { !it.optBoolean("prerelease", false) }.maxOfOrNull { it.optString("published_at") }.orEmpty() + return releases + .filter { it.optBoolean("prerelease", false) == prerelease && (!prerelease || it.optString("published_at") > stableAt) } + .mapNotNull { assetOf(tool, it, experimental = prerelease) } + } + + internal fun pickAsset(tool: Tool, array: JSONArray): Asset? { val candidates = (0 until array.length()).asSequence() .mapNotNull { array.optJSONObject(it) } - .filter { !it.optBoolean("draft", false) && it.optBoolean("prerelease", false) == test } - if (!test) return candidates.firstNotNullOfOrNull { assetOf(tool, it) } - val stable = pickAsset(tool, array)?.tag ?: return null - return candidates - .filter { it.optString("tag_name").startsWith(tool.prefix) && updateFor(listOf(stable), it.optString("tag_name")) != null } - .mapNotNull { assetOf(tool, it, requireChecksum = true) } - .maxWithOrNull { a, b -> compareVersions(a.tag, b.tag) } + .filter { !it.optBoolean("draft", false) && !it.optBoolean("prerelease", false) } + return candidates.firstNotNullOfOrNull { assetOf(tool, it) } } internal fun updateLatest(cache: JSONObject, tool: Tool, array: JSONArray?, now: Long) { if (array == null) return - val test = if (tool.id == OWN) pickAsset(tool, array, test = true)?.tag else null val tag = pickAsset(tool, array)?.tag if (tag == null) { - cache.optJSONObject(tool.id)?.remove("test") return } - cache.put(tool.id, JSONObject().put("tag", tag).put("at", now).putOpt("test", test)) + cache.put(tool.id, JSONObject().put("tag", tag).put("at", now)) } - private fun assetOf(tool: Tool, release: JSONObject, requireChecksum: Boolean = false): Asset? = try { + internal fun assetOf(tool: Tool, release: JSONObject, requireChecksum: Boolean = false, experimental: Boolean = false): Asset? = try { val assets = release.optJSONArray("assets") val entries = assets?.let { list -> (0 until list.length()).mapNotNull { list.optJSONObject(it) } }.orEmpty() - entries.sortedBy { it.optString("name") }.filter { tool.assetPattern.containsMatchIn(it.optString("name")) }.mapNotNull { archive -> + entries.sortedBy { it.optString("name") }.filter { + val name = it.optString("name") + if (experimental && tool.id == OWN) name.startsWith(release.optString("tag_name")) && ExperimentalProtons.TARBALL.containsMatchIn(name) && !ExperimentalProtons.FOREIGN_ARCH.containsMatchIn(name) else tool.assetPattern.containsMatchIn(name) + }.mapNotNull { archive -> val name = archive.optString("name") val stem = name.substringBefore(".tar") val checksum = entries.firstOrNull { it.optString("name").startsWith(stem) && it.optString("name").contains("sha512", ignoreCase = true) }?.optString("browser_download_url")?.takeIf { it.startsWith("http") } archive.optString("browser_download_url").takeIf { it.startsWith("http") }?.let { url -> - Asset(release.optString("tag_name"), name, url, checksum, archive.optLong("size", 0L), Hashes.githubSha256(archive.optString("digest"))) + Asset(release.optString("tag_name"), name, url, checksum, archive.optLong("size", 0L), Hashes.githubSha256(archive.optString("digest")), release.optString("name").ifEmpty { release.optString("tag_name") }) } }.let { found -> if (requireChecksum) found.firstOrNull { it.sha256 != null || it.sha512 != null } else found.firstOrNull() } } catch (e: Exception) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index aaf77c3f5..e15fac1c6 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -417,10 +417,12 @@ class SessionService : Service() { SessionPrefs.screenEffectsProfileId(SessionState.mode, resolvedGameId, SessionState.program), ) com.droiddeck.launcher.stores.battlenet.BattleNetClient.clearRequests(LinuxRuntime.sessionRoot(this)) - val gen = synchronized(stopLock) { - SessionState.steamClientArch = null - SessionState.running = true - ++sessionGen + val gen = synchronized(SessionState.startLock) { + synchronized(stopLock) { + SessionState.steamClientArch = null + SessionState.running = true + ++sessionGen + } } if (SessionState.stopRequested) { stopSession(0) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt index 5f17212e5..612494715 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt @@ -43,6 +43,8 @@ object SessionState { @Volatile var stopRequested = false + val startLock = Any() + @Volatile var running = false @Volatile diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt index 13d300c5f..908f229e3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt @@ -84,6 +84,7 @@ import com.droiddeck.launcher.R import com.droiddeck.launcher.session.ComponentUpdater import com.droiddeck.launcher.session.ComponentUpdates import com.droiddeck.launcher.session.ComponentsManager +import com.droiddeck.launcher.session.ExperimentalProtons import com.droiddeck.launcher.session.ComponentsManager.CatalogItem import com.droiddeck.launcher.session.ComponentsManager.Snapshot import kotlinx.coroutines.delay @@ -597,11 +598,9 @@ fun ComponentsPage( if (rows.isEmpty()) EmptyLine(stringResource(R.string.comp_nothing_new)) for (row in rows) { val idle = protons.busyId == null && protons.runtimeReady && !protons.sessionRunning - val test = row.test != null && (nightlyPicked[row.id] == true || row.installed != null && row.update == null) GetLine( row.name, when { - test -> row.test!! row.update != null -> stringResource(R.string.proton_update_available, row.update) row.queued -> stringResource(R.string.proton_queued) else -> stringResource(R.string.proton_not_installed) @@ -610,11 +609,8 @@ fun ComponentsPage( stage = if (protons.busyId == row.id) protons.stage else null, enabled = idle, onCancel = if (row.queued && protons.busyId == null && !protons.sessionRunning) ({ protonActions.onCancel(row.id) }) else null, - action = if (!test && row.update != null) stringResource(R.string.common_update) else null, - channel = if (row.test != null) ({ - ChannelToggle(test, enabled = idle && (row.installed == null || row.update != null), other = R.string.comp_channel_test) { nightlyPicked[row.id] = !test } - }) else null, - ) { if (test) protonActions.onInstallTest(row.id) else protonActions.onInstall(row.id) } + action = if (row.update != null) stringResource(R.string.common_update) else null, + ) { protonActions.onInstall(row.id) } } } else -> { @@ -742,11 +738,9 @@ fun ComponentsPage( } } } - if (l == PROTON_TAB && DeveloperTools.on) { + if (l == PROTON_TAB) { Spacer(Modifier.height(12.dp)) ExperimentalProtonGroup(protons, protonActions) - } - if (l == PROTON_TAB) { Spacer(Modifier.height(12.dp)) Note(stringResource(R.string.comp_about_text)) } @@ -1645,8 +1639,15 @@ private fun ExperimentalProtonGroup(protons: ProtonsState, actions: ProtonsActio val idle = protons.busyId == null && protons.runtimeReady && !protons.sessionRunning RowGroup(stringResource(R.string.xproton_title)) { if (busy) GetLine(stringResource(R.string.xproton_title), "", progress = protons.percent, enabled = false, stage = protons.stage) {} - else Row(horizontalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.padding(start = 14.dp, top = 4.dp, bottom = 8.dp)) { - SmallButton(stringResource(R.string.xproton_pick_zip), enabled = idle, onClick = actions.onExperimentalFile) + else { + protons.experimentalReleases.forEach { release -> + GetLine(release.name, release.tag, progress = null, enabled = idle, action = stringResource(R.string.proton_install_now)) { + actions.onExperimentalRelease(release) + } + } + Row(horizontalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.padding(start = 14.dp, top = 4.dp, bottom = 8.dp)) { + SmallButton(stringResource(R.string.xproton_install_file), enabled = idle, onClick = actions.onExperimentalFile) + } } } } @@ -1659,23 +1660,24 @@ class ProtonsState( val runtimeReady: Boolean = true, val sessionRunning: Boolean = false, val experimental: List = emptyList(), + val experimentalReleases: List = emptyList(), ) class ProtonsActions( val onInstall: (String) -> Unit = {}, - val onInstallTest: (String) -> Unit = {}, val onCancel: (String) -> Unit = {}, val onRemove: (String, String) -> Unit = { _, _ -> }, val onRemoveOlder: (String) -> Unit = {}, val onExperimentalFile: () -> Unit = {}, + val onExperimentalRelease: (ExperimentalProtons.Release) -> Unit = {}, val onRemoveExperimental: (String) -> Unit = {}, ) class ProtonRow( val id: String, val name: String, val installed: String?, val queued: Boolean, - val installedAll: List = listOfNotNull(installed), val update: String? = null, val test: String? = null, + val installedAll: List = listOfNotNull(installed), val update: String? = null, ) { - val available: Boolean get() = installed == null || update != null || test != null + val available: Boolean get() = installed == null || update != null } @Composable diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index dc432165d..52c5f64a1 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -585,7 +585,6 @@ في الإصدارات الليلية · %1$d مستقر ليلي - تجريبي حدّث لعرض الحزم في إصدارات Nightlies وDroidDeck. لا جديد منذ آخر فحص. استيراد ملف ‎.wcp @@ -2406,12 +2405,11 @@ بدأت جلسة خلال التنزيل، أوقفها قبل تثبيت أدوات التوافق جارٍ تثبيت %1$s إصدارات تجريبية - اختر ملف .zip لإصدار Proton - تثبيت من ملف .zip + تثبيت من ملف + يحتوي الأرشيف على رابط أو مسار غير آمن + أرشيف غير مدعوم أو غير صالح لا توجد مساحة كافية لإصدار Proton هذا - جارٍ فك الضغط جارٍ تفريغ Proton (بضع دقائق) - ملف .zip لا يحتوي على أرشيف tar لـ Proton فشل التفريغ (tar %1$d) الأرشيف لا يحتوي على إصدار Proton تعذّر وضع إصدار Proton @@ -4276,4 +4274,4 @@ الإبرازات نجاح خطأ - \ No newline at end of file + 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 e6b952e05..6bb03b842 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -579,7 +579,6 @@ En las Nightlies · %1$d Estable Nocturna - Prueba Actualiza para listar los paquetes de Nightlies y DroidDeck. Nada nuevo desde la última comprobación. Importar .wcp @@ -2398,12 +2397,11 @@ Se inició una sesión durante la descarga; detenla antes de instalar herramientas de compatibilidad Instalando %1$s Versiones experimentales - Elige un .zip de una versión de Proton - Instalar desde .zip + Instalar desde archivo + El archivo contiene un enlace o una ruta no segura + Archivo no compatible o no válido No hay espacio libre suficiente para esta versión de Proton - Descomprimiendo Desempaquetando Proton (unos minutos) - El .zip no contiene ningún tarball de Proton Error al desempaquetar (tar %1$d) El archivo no contiene ninguna versión de Proton No se pudo colocar la versión de Proton @@ -4156,4 +4154,4 @@ Destacados Éxito Error - \ No newline at end of file + diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 68e8f04c5..cc99224c9 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -577,7 +577,6 @@ В Nightlies · %1$d Стабилна Нощна - Тестова Обновете, за да видите пакетите в Nightlies и DroidDeck. Нищо ново от последната проверка. Импортиране на .wcp @@ -2302,12 +2301,11 @@ По време на изтеглянето започна сесия - спри я, преди да инсталираш инструменти за съвместимост Инсталиране на %1$s Експериментални версии - Изберете .zip с версия на Proton - Инсталиране от .zip + Инсталиране от файл + Архивът съдържа опасна връзка или път + Неподдържан или невалиден архив Няма достатъчно свободно място за тази версия на Proton - Разархивиране Разопаковане на Proton (няколко минути) - В .zip няма архив tar на Proton Разопаковането не успя (tar %1$d) Архивът не съдържа версия на Proton Версията на Proton не можа да бъде поставена @@ -4116,4 +4114,4 @@ Акценти Успех Грешка - \ No newline at end of file + diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 9adcee02c..15df9624b 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -581,7 +581,6 @@ Na Nightlies · %1$d Stabilní Noční - Testovací Obnovte pro zobrazení balíčků na Nightlies a DroidDeck. Od poslední kontroly nic nového. Importovat .wcp @@ -2354,12 +2353,11 @@ Během stahování se spustila relace; před instalací nástrojů kompatibility ji zastavte Instalování %1$s Experimentální sestavení - Vyberte .zip se sestavením Proton - Instalovat ze souboru .zip + Instalovat ze souboru + Archiv obsahuje nebezpečný odkaz nebo cestu + Nepodporovaný nebo neplatný archiv Pro toto sestavení Proton není dost volného místa - Rozbalování Rozbalování Proton (několik minut) - Soubor .zip neobsahuje archiv tar s Proton Rozbalení se nezdařilo (tar %1$d) Archiv neobsahuje sestavení Proton Sestavení Proton se nepodařilo umístit @@ -4196,4 +4194,4 @@ Zvýraznění Úspěch Chyba - \ No newline at end of file + diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index e46157c60..4a5dac730 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -577,7 +577,6 @@ På Nightlies · %1$d Stabil Nightly - Test Opdater for at se pakker på Nightlies og DroidDeck. Intet nyt siden sidste kontrol. Importer .wcp @@ -2302,12 +2301,11 @@ En session startede under downloadet; stop den før du installerer kompatibilitetsværktøjer Installerer %1$s Eksperimentelle builds - Vælg en Proton-build som .zip - Installer fra .zip + Installer fra fil + Arkivet indeholder et usikkert link eller en sti + Ikke-understøttet eller ugyldigt arkiv Der er ikke nok ledig plads til denne Proton-build - Udpakker zip Udpakker Proton (nogle få minutter) - Filen .zip indeholder ingen Proton-tarball Udpakning mislykkedes (tar %1$d) Arkivet indeholder ingen Proton-build Kunne ikke placere Proton-builden @@ -4116,4 +4114,4 @@ Fremhævninger Succes Fejl - \ No newline at end of file + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c3d3db896..068f519c5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -577,7 +577,6 @@ In den Nightlies · %1$d Stabil Nightly - Test Aktualisiere, um die Pakete in den Nightlies und bei DroidDeck aufzulisten. Nichts Neues seit der letzten Prüfung. .wcp importieren @@ -2294,12 +2293,11 @@ Während des Downloads wurde eine Sitzung gestartet; beende sie, bevor du Kompatibilitätstools installierst %1$s wird installiert Experimentelle Builds - Proton-Build als .zip auswählen - Aus .zip installieren + Aus Datei installieren + Das Archiv enthält einen unsicheren Link oder Pfad + Nicht unterstütztes oder ungültiges Archiv Nicht genug freier Speicher für diesen Proton-Build - Wird entpackt Proton wird entpackt (einige Minuten) - Die .zip enthält kein Proton-Tarball Entpacken fehlgeschlagen (tar %1$d) Das Archiv enthält keinen Proton-Build Der Proton-Build konnte nicht abgelegt werden @@ -4116,4 +4114,4 @@ Hervorhebungen Erfolg Fehler - \ No newline at end of file + diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 1c4e366e1..f4873ceb7 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -577,7 +577,6 @@ Στα Nightlies · %1$d Σταθερή Νυχτερινή - Δοκιμαστική Ανανεώστε για να εμφανιστούν τα πακέτα στα Nightlies και στο DroidDeck. Τίποτα νέο από τον τελευταίο έλεγχο. Εισαγωγή .wcp @@ -2302,12 +2301,11 @@ Μια συνεδρία ξεκίνησε κατά τη λήψη· διακόψτε την πριν εγκαταστήσετε εργαλεία συμβατότητας Εγκατάσταση %1$s Πειραματικές εκδόσεις - Επιλέξτε ένα .zip έκδοσης Proton - Εγκατάσταση από .zip + Εγκατάσταση από αρχείο + Το αρχείο περιέχει μη ασφαλή σύνδεσμο ή διαδρομή + Μη υποστηριζόμενο ή μη έγκυρο αρχείο Δεν υπάρχει αρκετός ελεύθερος χώρος για αυτήν την έκδοση Proton - Αποσυμπίεση Αποσυσκευασία του Proton (λίγα λεπτά) - Το .zip δεν περιέχει αρχείο tar του Proton Η αποσυσκευασία απέτυχε (tar %1$d) Το αρχείο δεν περιέχει έκδοση Proton Δεν ήταν δυνατή η τοποθέτηση της έκδοσης Proton @@ -4116,4 +4114,4 @@ Επισημάνσεις Επιτυχία Σφάλμα - \ No newline at end of file + diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index bd4fddf71..e39fae7b8 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -579,7 +579,6 @@ En las Nightlies · %1$d Estable Nocturna - Prueba Actualiza para listar los paquetes de Nightlies y DroidDeck. Nada nuevo desde la última comprobación. Importar .wcp @@ -2328,12 +2327,11 @@ Se inició una sesión durante la descarga; detenla antes de instalar herramientas de compatibilidad Instalando %1$s Versiones experimentales - Elige un .zip de una versión de Proton - Instalar desde .zip + Instalar desde archivo + El archivo contiene un enlace o una ruta no segura + Archivo no compatible o no válido No hay espacio libre suficiente para esta versión de Proton - Descomprimiendo Desempaquetando Proton (unos minutos) - El .zip no contiene ningún tarball de Proton Error al desempaquetar (tar %1$d) El archivo no contiene ninguna versión de Proton No se pudo colocar la versión de Proton @@ -4156,4 +4154,4 @@ Destacados Éxito Error - \ No newline at end of file + diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 5bb3bd1af..e9dacd8e0 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -577,7 +577,6 @@ Nightliesissä · %1$d Vakaa Yöversio - Testi Päivitä nähdäksesi Nightliesin ja DroidDeckin paketit. Ei mitään uutta viimeisimmän tarkistuksen jälkeen. Tuo .wcp @@ -2302,12 +2301,11 @@ Istunto käynnistyi latauksen aikana; pysäytä se ennen yhteensopivuustyökalujen asentamista Asennetaan %1$s Kokeelliset versiot - Valitse Proton-version .zip - Asenna .zip-tiedostosta + Asenna tiedostosta + Arkisto sisältää vaarallisen linkin tai polun + Arkistoa ei tueta tai se on virheellinen Tälle Proton-versiolle ei ole tarpeeksi vapaata tilaa - Puretaan zip Puretaan Protonia (muutama minuutti) - Tiedostossa .zip ei ole Proton-tar-pakettia Purku epäonnistui (tar %1$d) Arkisto ei sisällä Proton-versiota Proton-versiota ei voitu sijoittaa @@ -4116,4 +4114,4 @@ Korostukset Onnistuminen Virhe - \ No newline at end of file + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1177bfc17..e76d3e6da 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -579,7 +579,6 @@ Dans Nightlies · %1$d Stable Nightly - Test Actualiser pour lister les paquets dans Nightlies et DroidDeck. Aucun nouvel élément depuis la dernière vérification. Importer .wcp @@ -2327,12 +2326,11 @@ Une session a démarré pendant le téléchargement ; arrêtez-la avant d\'installer des outils de compatibilité Installation de %1$s Versions expérimentales - Choisir un .zip de version Proton - Installer depuis un .zip + Installer depuis un fichier + L’archive contient un lien ou chemin dangereux + Archive non prise en charge ou invalide Espace libre insuffisant pour cette version de Proton - Décompression Extraction de Proton (quelques minutes) - Le .zip ne contient aucune archive tar de Proton Échec de l\'extraction (tar %1$d) L\'archive ne contient aucune version de Proton Impossible de placer la version de Proton @@ -4155,4 +4153,4 @@ Mises en évidence Succès Erreur - \ No newline at end of file + diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index c92d69ca9..2f5d3957f 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -577,7 +577,6 @@ Nightlies पर · %1$d स्थिर नाइटली - परीक्षण Nightlies और DroidDeck के पैकेज सूचीबद्ध करने के लिए रीफ़्रेश करें। पिछली जांच के बाद कुछ नया नहीं है। .wcp इंपोर्ट करें @@ -2302,12 +2301,11 @@ डाउनलोड के दौरान एक सेशन शुरू हुआ; कम्पैटिबिलिटी टूल इंस्टॉल करने से पहले इसे बंद करें %1$s इंस्टॉल हो रहा है प्रायोगिक बिल्ड - Proton बिल्ड की .zip चुनें - .zip से इंस्टॉल करें + फ़ाइल से इंस्टॉल करें + आर्काइव में असुरक्षित लिंक या पथ है + असमर्थित या अमान्य आर्काइव इस Proton बिल्ड के लिए पर्याप्त खाली जगह नहीं है - अनज़िप हो रहा है Proton अनपैक हो रहा है (कुछ मिनट) - .zip में Proton का कोई tar आर्काइव नहीं है अनपैक करना विफल रहा (tar %1$d) आर्काइव में कोई Proton बिल्ड नहीं है Proton बिल्ड को रखा नहीं जा सका @@ -4116,4 +4114,4 @@ हाइलाइट सफलता त्रुटि - \ No newline at end of file + diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 301db987d..50d616a3c 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -577,7 +577,6 @@ A Nightliesen · %1$d Stabil Nightly - Teszt Frissítsen a Nightlies és a DroidDeck csomagjainak listázásához. Nincs semmi új az utolsó ellenőrzés óta. .wcp importálása @@ -2302,12 +2301,11 @@ Egy munkamenet elindult a letöltés közben; állítsa le a kompatibilitási eszközök telepítése előtt %1$s telepítése Kísérleti buildek - Válassz egy Proton-build .zip fájlt - Telepítés .zip fájlból + Telepítés fájlból + Az archívum nem biztonságos hivatkozást vagy útvonalat tartalmaz + Nem támogatott vagy érvénytelen archívum Nincs elég szabad hely ehhez a Proton-buildhez - Kicsomagolás A Proton kibontása (néhány perc) - A .zip nem tartalmaz Proton tar-csomagot A kibontás nem sikerült (tar %1$d) Az archívum nem tartalmaz Proton-buildet Nem sikerült elhelyezni a Proton-buildet @@ -4116,4 +4114,4 @@ Kiemelések Siker Hiba - \ No newline at end of file + diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 29598f398..1191dc3ac 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -575,7 +575,6 @@ Di Nightlies · %1$d Stabil Nightly - Uji Segarkan untuk melihat daftar paket di Nightlies dan DroidDeck. Tidak ada yang baru sejak pemeriksaan terakhir. Impor .wcp @@ -2277,12 +2276,11 @@ Sesi dimulai saat pengunduhan berlangsung; hentikan sesi tersebut sebelum menginstal alat kompatibilitas Menginstal %1$s Build eksperimental - Pilih .zip build Proton - Instal dari .zip + Instal dari file + Arsip berisi tautan atau jalur yang tidak aman + Arsip tidak didukung atau tidak valid Ruang kosong tidak cukup untuk build Proton ini - Mengekstrak zip Membuka paket Proton (beberapa menit) - .zip tidak berisi tarball Proton Gagal membuka paket (tar %1$d) Arsip tidak berisi build Proton Tidak dapat menempatkan build Proton @@ -4086,4 +4084,4 @@ Sorotan Berhasil Kesalahan - \ No newline at end of file + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 7b4d3f287..66fcd52a1 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -579,7 +579,6 @@ Nelle Nightlies · %1$d Stabile Nightly - Test Aggiorna per elencare i pacchetti nelle Nightlies e in DroidDeck. Niente di nuovo dall\'ultimo controllo. Importa .wcp @@ -2319,12 +2318,11 @@ È stata avviata una sessione durante il download; interrompila prima di installare strumenti di compatibilità Installazione di %1$s Build sperimentali - Scegli uno .zip di una build di Proton - Installa da .zip + Installa da file + L\'archivio contiene un collegamento o percorso non sicuro + Archivio non supportato o non valido Spazio libero insufficiente per questa build di Proton - Decompressione Estrazione di Proton (qualche minuto) - Lo .zip non contiene alcun tarball di Proton Estrazione non riuscita (tar %1$d) L\'archivio non contiene alcuna build di Proton Impossibile posizionare la build di Proton @@ -4155,4 +4153,4 @@ Evidenziazioni Successo Errore - \ No newline at end of file + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index e5cdba295..a274e0c63 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -575,7 +575,6 @@ Nightlies内 · %1$d 安定版 ナイトリー - テスト 更新してNightliesとDroidDeckのパッケージを一覧表示します。 前回の確認以降、新しいものはありません。 .wcpをインポート @@ -2277,12 +2276,11 @@ ダウンロード中にセッションが開始されました。停止してから互換性ツールをインストールしてください %1$sをインストール中 試験版ビルド - Protonビルドの.zipを選択 - .zipからインストール + ファイルからインストール + アーカイブに安全でないリンクまたはパスが含まれています + 未対応または無効なアーカイブ このProtonビルド用の空き容量が足りません - 解凍中 Protonを展開中(数分かかります) - .zipにProtonのtarballが含まれていません 展開に失敗しました(tar %1$d) アーカイブにProtonビルドが含まれていません Protonビルドを配置できませんでした @@ -4086,4 +4084,4 @@ 強調表示 成功 エラー - \ No newline at end of file + diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 536d33210..c3bd68537 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -575,7 +575,6 @@ Nightlies 내 · %1$d 안정판 나이틀리 - 테스트 새로 고쳐 Nightlies 및 DroidDeck의 패키지를 나열합니다. 마지막 확인 이후 새로운 내용이 없습니다. .wcp 가져오기 @@ -2277,12 +2276,11 @@ 다운로드 중에 세션이 시작되었습니다. 호환성 도구를 설치하기 전에 세션을 중지하세요 %1$s 설치 중 실험용 빌드 - Proton 빌드 .zip 선택 - .zip에서 설치 + 파일에서 설치 + 압축 파일에 안전하지 않은 링크 또는 경로가 포함되어 있습니다 + 지원되지 않거나 잘못된 압축 파일 이 Proton 빌드를 설치할 여유 공간이 부족합니다 - 압축 해제 중 Proton 풀는 중 (몇 분 소요) - .zip에 Proton tar 파일이 없습니다 압축 풀기 실패 (tar %1$d) 아카이브에 Proton 빌드가 없습니다 Proton 빌드를 배치할 수 없습니다 @@ -4086,4 +4084,4 @@ 강조 표시 성공 오류 - \ No newline at end of file + diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index bcc31c2f0..134f1702c 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -575,7 +575,6 @@ Pada Nightlies · %1$d Stabil Nightly - Ujian Segarkan semula untuk menyenaraikan pakej pada Nightlies dan DroidDeck. Tiada apa-apa yang baharu sejak semakan terakhir. Import .wcp @@ -2277,12 +2276,11 @@ Sesi dimulakan semasa muat turun; hentikan dahulu sebelum memasang alat keserasian Memasang %1$s Binaan eksperimen - Pilih .zip binaan Proton - Pasang daripada .zip + Pasang daripada fail + Arkib mengandungi pautan atau laluan tidak selamat + Arkib tidak disokong atau tidak sah Ruang kosong tidak mencukupi untuk binaan Proton ini - Menyahzip Membuka pakej Proton (beberapa minit) - .zip tidak mengandungi tarball Proton Gagal membuka pakej (tar %1$d) Arkib tidak mengandungi binaan Proton Tidak dapat meletakkan binaan Proton @@ -4086,4 +4084,4 @@ Sorotan Berjaya Ralat - \ No newline at end of file + diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 2c1878427..de0bac7fc 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -577,7 +577,6 @@ På Nightlies · %1$d Stabil Nightly - Test Oppdater for å liste pakker på Nightlies og DroidDeck. Ingenting nytt siden siste sjekk. Importer .wcp @@ -2302,12 +2301,11 @@ En sesjon startet under nedlastingen; avslutt den før du installerer kompatibilitetsverktøy Installerer %1$s Eksperimentelle bygg - Velg en Proton-bygg som .zip - Installer fra .zip + Installer fra fil + Arkivet inneholder en utrygg lenke eller bane + Arkivet støttes ikke eller er ugyldig Ikke nok ledig plass til dette Proton-bygget - Pakker ut zip Pakker ut Proton (noen få minutter) - .zip-filen inneholder ingen Proton-tarball Utpakking mislyktes (tar %1$d) Arkivet inneholder ingen Proton-bygg Kunne ikke plassere Proton-bygget @@ -4116,4 +4114,4 @@ Uthevinger Suksess Feil - \ No newline at end of file + diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 8134e019e..16b5a74ec 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -577,7 +577,6 @@ In de Nightlies · %1$d Stabiel Nightly - Test Vernieuw om de pakketten in de Nightlies en bij DroidDeck te tonen. Niets nieuws sinds de laatste controle. .wcp importeren @@ -2302,12 +2301,11 @@ Er is een sessie gestart tijdens het downloaden; stop die voordat je compatibiliteitstools installeert %1$s installeren Experimentele builds - Kies een Proton-build als .zip - Installeren vanuit .zip + Installeren vanuit bestand + Archief bevat een onveilige link of pad + Niet-ondersteund of ongeldig archief Niet genoeg vrije ruimte voor deze Proton-build - Uitpakken van zip Proton uitpakken (enkele minuten) - De .zip bevat geen Proton-tarball Uitpakken mislukt (tar %1$d) Het archief bevat geen Proton-build Kan de Proton-build niet plaatsen @@ -4116,4 +4114,4 @@ Accenten Geslaagd Fout - \ No newline at end of file + diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 6bae94dd4..8b624db10 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -581,7 +581,6 @@ W wersjach nightly · %1$d Stabilna Nightly - Testowa Odśwież, aby wyświetlić pakiety w Nightlies i DroidDeck. Nic nowego od ostatniego sprawdzenia. Importuj .wcp @@ -2354,12 +2353,11 @@ Podczas pobierania uruchomiono sesję; zatrzymaj ją przed instalacją narzędzi zgodności Instalowanie %1$s Kompilacje eksperymentalne - Wybierz plik .zip z kompilacją Proton - Zainstaluj z pliku .zip + Instaluj z pliku + Archiwum zawiera niebezpieczne łącze lub ścieżkę + Nieobsługiwane lub nieprawidłowe archiwum Za mało wolnego miejsca na tę kompilację Proton - Rozpakowywanie Rozpakowywanie Proton (kilka minut) - Plik .zip nie zawiera archiwum tar z Proton Rozpakowywanie nie powiodło się (tar %1$d) Archiwum nie zawiera kompilacji Proton Nie udało się umieścić kompilacji Proton @@ -4196,4 +4194,4 @@ Wyróżnienia Sukces Błąd - \ No newline at end of file + diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index bda1ae561..732df24c4 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -579,7 +579,6 @@ Nas Nightlies · %1$d Estável Nightly - Teste Atualize para listar os pacotes nas Nightlies e no DroidDeck. Nada de novo desde a última verificação. Importar .wcp @@ -2333,12 +2332,11 @@ Foi iniciada uma sessão durante a transferência; pare-a antes de instalar ferramentas de compatibilidade A instalar %1$s Versões experimentais - Escolha um .zip de versão do Proton - Instalar a partir de .zip + Instalar a partir de ficheiro + O arquivo contém uma ligação ou caminho inseguro + Arquivo não suportado ou inválido Não há espaço livre suficiente para esta versão do Proton - A descompactar A desempacotar o Proton (alguns minutos) - O .zip não contém nenhum tarball do Proton Falha ao desempacotar (tar %1$d) O arquivo não contém nenhuma versão do Proton Não foi possível colocar a versão do Proton @@ -4155,4 +4153,4 @@ Inteiro Ajustar Suavização de serrilhado - \ No newline at end of file + diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index e49853cb6..f0814f45b 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -579,7 +579,6 @@ Nas Nightlies · %1$d Estável Nightly - Teste Atualize para listar os pacotes nas Nightlies e no DroidDeck. Nada novo desde a última verificação. Importar .wcp @@ -2341,12 +2340,11 @@ Uma sessão foi iniciada durante o download; pare-a antes de instalar ferramentas de compatibilidade Instalando %1$s Builds experimentais - Escolha um .zip de build do Proton - Instalar a partir de .zip + Instalar do arquivo + O arquivo contém um link ou caminho inseguro + Arquivo sem suporte ou inválido Não há espaço livre suficiente para este build do Proton - Descompactando Desempacotando o Proton (alguns minutos) - O .zip não contém nenhum tarball do Proton Falha ao desempacotar (tar %1$d) O arquivo não contém nenhum build do Proton Não foi possível colocar o build do Proton @@ -4163,4 +4161,4 @@ Inteiro Ajustar Suavização de serrilhado - \ No newline at end of file + diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 940364de7..c22897954 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -579,7 +579,6 @@ Pe versiunile nightly · %1$d Stabilă Nightly - Test Reîmprospătează pentru a lista pachetele din Nightlies și DroidDeck. Nimic nou de la ultima verificare. Importă .wcp @@ -2328,12 +2327,11 @@ O sesiune a pornit în timpul descărcării; oprește-o înainte de a instala instrumente de compatibilitate Se instalează %1$s Versiuni experimentale - Alege un .zip cu o versiune Proton - Instalează din .zip + Instalează din fișier + Arhiva conține o legătură sau o cale nesigură + Arhivă neacceptată sau nevalidă Nu există suficient spațiu liber pentru această versiune Proton - Se dezarhivează Se despachetează Proton (câteva minute) - Fișierul .zip nu conține nicio arhivă tar Proton Despachetarea a eșuat (tar %1$d) Arhiva nu conține nicio versiune Proton Versiunea Proton nu a putut fi plasată @@ -4156,4 +4154,4 @@ Evidențieri Succes Eroare - \ No newline at end of file + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 2673ee7cc..58a3c4e74 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -581,7 +581,6 @@ В Nightlies · %1$d Стабильная Ночная - Тестовая Обновите, чтобы увидеть пакеты в Nightlies и DroidDeck. С момента последней проверки нового нет. Импорт .wcp @@ -2354,12 +2353,11 @@ Во время загрузки запустилась сессия; остановите ее перед установкой инструментов совместимости Установка %1$s Экспериментальные сборки - Выберите .zip со сборкой Proton - Установить из .zip + Установить из файла + Архив содержит небезопасную ссылку или путь + Неподдерживаемый или недействительный архив Недостаточно свободного места для этой сборки Proton - Распаковка архива Распаковка Proton (несколько минут) - В .zip нет архива tar с Proton Не удалось распаковать (tar %1$d) В архиве нет сборки Proton Не удалось разместить сборку Proton @@ -4196,4 +4194,4 @@ Выделения Успех Ошибка - \ No newline at end of file + diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 8e169e62a..73c1f9dbe 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -577,7 +577,6 @@ I nattbyggena · %1$d Stabil Nattbygge - Test Uppdatera för att lista paket i Nightlies och DroidDeck. Inget nytt sedan senaste kontrollen. Importera .wcp @@ -2302,12 +2301,11 @@ En session startade under nedladdningen. Stoppa den innan du installerar kompatibilitetsverktyg Installerar %1$s Experimentella byggen - Välj en Proton-version som .zip - Installera från .zip + Installera från fil + Arkivet innehåller en osäker länk eller sökväg + Arkivet stöds inte eller är ogiltigt Inte tillräckligt med ledigt utrymme för den här Proton-versionen - Packar upp zip Packar upp Proton (några minuter) - .zip-filen innehåller ingen Proton-tarball Uppackningen misslyckades (tar %1$d) Arkivet innehåller ingen Proton-version Det gick inte att placera Proton-versionen @@ -4116,4 +4114,4 @@ Markeringar Lyckades Fel - \ No newline at end of file + diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 243108da7..43c49d86f 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -575,7 +575,6 @@ ใน Nightlies · %1$d เสถียร Nightly - ทดสอบ รีเฟรชเพื่อแสดงรายการแพ็กเกจใน Nightlies และ DroidDeck ไม่มีอะไรใหม่ตั้งแต่การตรวจสอบครั้งล่าสุด นำเข้า .wcp @@ -2277,12 +2276,11 @@ มีเซสชันเริ่มขึ้นระหว่างการดาวน์โหลด หยุดเซสชันก่อนติดตั้งเครื่องมือความเข้ากันได้ กำลังติดตั้ง %1$s บิลด์ทดลอง - เลือกไฟล์ .zip ของบิลด์ Proton - ติดตั้งจากไฟล์ .zip + ติดตั้งจากไฟล์ + ไฟล์เก็บถาวรมีลิงก์หรือเส้นทางที่ไม่ปลอดภัย + ไฟล์เก็บถาวรไม่รองรับหรือไม่ถูกต้อง พื้นที่ว่างไม่เพียงพอสำหรับบิลด์ Proton นี้ - กำลังแตกไฟล์ zip กำลังแตกไฟล์ Proton (ใช้เวลาไม่กี่นาที) - ไฟล์ .zip ไม่มี tarball ของ Proton แตกไฟล์ไม่สำเร็จ (tar %1$d) ไฟล์เก็บถาวรไม่มีบิลด์ Proton ไม่สามารถวางบิลด์ Proton ได้ @@ -4086,4 +4084,4 @@ จุดเน้น สำเร็จ ข้อผิดพลาด - \ No newline at end of file + diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 25944dc95..7fd0d204d 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -577,7 +577,6 @@ Nightlies içinde · %1$d Kararlı Nightly - Test Nightlies ve DroidDeck paketlerini listelemek için yenileyin. Son kontrolden beri yeni bir şey yok. .wcp içe aktar @@ -2294,12 +2293,11 @@ İndirme sırasında bir oturum başladı; uyumluluk araçlarını yüklemeden önce durdurun %1$s yükleniyor Deneysel sürümler - Bir Proton sürümü .zip dosyası seçin - Şuradan yükle: .zip + Dosyadan yükle + Arşiv güvenli olmayan bir bağlantı veya yol içeriyor + Desteklenmeyen veya geçersiz arşiv Bu Proton sürümü için yeterli boş alan yok - Zip açılıyor Proton paketten çıkarılıyor (birkaç dakika) - .zip dosyasında Proton tar arşivi yok Paketten çıkarma başarısız oldu (tar %1$d) Arşivde Proton sürümü yok Proton sürümü yerleştirilemedi @@ -4116,4 +4114,4 @@ Vurgular Başarılı Hata - \ No newline at end of file + diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 55bd3196c..be20c1fb0 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -581,7 +581,6 @@ У нічних збірках · %1$d Стабільна Нічна - Тестова Оновіть, щоб побачити пакети з Nightlies і DroidDeck. Нічого нового з часу останньої перевірки. Імпортувати .wcp @@ -2354,12 +2353,11 @@ Під час завантаження розпочався сеанс; зупиніть його, перш ніж встановлювати інструменти сумісності Встановлення %1$s Експериментальні збірки - Виберіть .zip зі збіркою Proton - Встановити з .zip + Встановити з файлу + Архів містить небезпечне посилання або шлях + Непідтримуваний або недійсний архів Недостатньо вільного місця для цієї збірки Proton - Розпакування архіву Розпакування Proton (кілька хвилин) - У .zip немає архіву tar із Proton Не вдалося розпакувати (tar %1$d) В архіві немає збірки Proton Не вдалося розмістити збірку Proton @@ -4196,4 +4194,4 @@ Виділення Успіх Помилка - \ No newline at end of file + diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 347822317..33796ad9c 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -575,7 +575,6 @@ Trên Nightlies · %1$d Ổn định Nightly - Thử nghiệm Làm mới để liệt kê các gói trên Nightlies và DroidDeck. Không có gì mới từ lần kiểm tra trước. Nhập tệp .wcp @@ -2277,12 +2276,11 @@ Một phiên đã bắt đầu trong khi tải; hãy dừng nó trước khi cài công cụ tương thích Đang cài %1$s Bản dựng thử nghiệm - Chọn tệp .zip bản dựng Proton - Cài đặt từ .zip + Cài đặt từ tệp + Tệp lưu trữ chứa liên kết hoặc đường dẫn không an toàn + Tệp lưu trữ không được hỗ trợ hoặc không hợp lệ Không đủ dung lượng trống cho bản dựng Proton này - Đang giải nén zip Đang giải nén Proton (vài phút) - Tệp .zip không chứa tarball Proton Giải nén thất bại (tar %1$d) Tệp lưu trữ không chứa bản dựng Proton Không thể đặt bản dựng Proton @@ -4086,4 +4084,4 @@ Điểm nhấn Thành công Lỗi - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2ece3be68..667f1cb9c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -575,7 +575,6 @@ 在 Nightlies 上 · %1$d 稳定版 每夜版 - 测试 刷新以列出 Nightlies 和 DroidDeck 上的软件包。 自上次检查以来没有新内容。 导入 .wcp @@ -2354,12 +2353,11 @@ 下载期间有会话启动;请先停止它,再安装兼容性工具 正在安装 %1$s 实验版本 - 选择 Proton 版本 .zip - 从 .zip 安装 + 从文件安装 + 压缩包包含不安全的链接或路径 + 不支持或无效的压缩包 可用空间不足,无法安装此 Proton 版本 - 正在解压 正在解包 Proton(需要几分钟) - .zip 中不含 Proton tar 包 解包失败(tar %1$d) 压缩包中不含 Proton 版本 无法放置 Proton 版本 @@ -4086,4 +4084,4 @@ 高亮 成功 错误 - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 8ba6d09f9..2ec673e61 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -575,7 +575,6 @@ Nightlies · %1$d 穩定版 每夜版 - 測試 重新整理以列出 Nightlies 及 DroidDeck 中的軟件包。 自上次檢查以來沒有新內容。 匯入 .wcp @@ -2276,12 +2275,11 @@ 下載期間有會話啟動;請先停止該會話,再安裝兼容性工具 正在安裝 %1$s 實驗版本 - 選擇 Proton 版本 .zip - 從 .zip 安裝 + 從檔案安裝 + 壓縮檔包含不安全的連結或路徑 + 不支援或無效的壓縮檔 可用空間不足,無法安裝此 Proton 版本 - 正在解壓縮 正在解包 Proton(需要幾分鐘) - .zip 中不含 Proton tar 包 解包失敗(tar %1$d) 壓縮檔中不含 Proton 版本 無法放置 Proton 版本 @@ -4086,4 +4084,4 @@ 重點標示 成功 錯誤 - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index dfb1bc732..d6d003730 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -575,7 +575,6 @@ Nightlies 中 · %1$d 穩定版 每夜版 - 測試 重新整理以列出 Nightlies 和 DroidDeck 中的套件。 自上次檢查以來沒有新內容。 匯入 .wcp @@ -2276,12 +2275,11 @@ 下載期間有工作階段啟動;請先停止它,再安裝相容性工具 正在安裝 %1$s 實驗版本 - 選擇 Proton 版本 .zip - 從 .zip 安裝 + 從檔案安裝 + 壓縮檔包含不安全的連結或路徑 + 不支援或無效的壓縮檔 可用空間不足,無法安裝此 Proton 版本 - 正在解壓縮 正在解包 Proton(需要幾分鐘) - .zip 中不含 Proton tar 包 解包失敗(tar %1$d) 壓縮檔中不含 Proton 版本 無法放置 Proton 版本 @@ -4086,4 +4084,4 @@ 醒目標示 成功 錯誤 - \ No newline at end of file + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 05a387b64..965ab2322 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -605,7 +605,6 @@ On the Nightlies · %1$d Stable Nightly - Test Refresh to list packages on the Nightlies and DroidDeck releases. Nothing new since the last check. Import .wcp @@ -2544,12 +2543,11 @@ A session started during the download; stop it before installing compatibility tools Installing %1$s Experimental builds - Pick a Proton build .zip - Install from .zip + Install from file + Archive contains an unsafe link or path + Unsupported or invalid archive Not enough free space for this Proton build - Unzipping Unpacking Proton (a few minutes) - The .zip holds no Proton tarball Unpacking failed (tar %1$d) The archive holds no Proton build Could not place the Proton build diff --git a/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt b/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt index 8e48d3c35..e19b1d634 100644 --- a/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt @@ -202,7 +202,7 @@ class CompatLaunchTest { val entered = CountDownLatch(1) val finish = CountDownLatch(1) protons.protonBusyId = null - protons.installer = { _, _, progress -> + protons.installer = { _, progress -> progress("Verifying download", 64) entered.countDown() check(finish.await(5, TimeUnit.SECONDS)) diff --git a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt index 270b9de48..2e06a6d8f 100644 --- a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt @@ -7,6 +7,7 @@ import android.os.Looper import androidx.compose.ui.geometry.Rect import com.droiddeck.launcher.frontend.AutoComponents import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.ExperimentalProtons import com.droiddeck.launcher.session.ProtonExtras import com.droiddeck.launcher.session.SessionState import com.droiddeck.launcher.session.SessionPhase @@ -25,7 +26,9 @@ import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config import org.robolectric.util.ReflectionHelpers import java.io.File +import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicInteger @RunWith(RobolectricTestRunner::class) @Config(sdk = [28], manifest = Config.NONE) @@ -60,7 +63,7 @@ class ProtonMenuAutoTest { menu.protonProblem = null menu.protonStage = null menu.protonPercent = -1 - menu.installer = { tool, _, progress -> + menu.installer = { tool, progress -> progress("Installing ${tool.name}", 50) install("${tool.prefix}-11-12") null @@ -88,6 +91,67 @@ class ProtonMenuAutoTest { File(this, "proton").apply { writeText(""); setExecutable(true) } } + private fun prerelease(tag: String) = ExperimentalProtons.Release(tag, "$tag.tar.xz", "https://github.com/o/r/releases/download/$tag/$tag.tar.xz", null, 1L) + + private fun recreatedMenu(refreshes: AtomicInteger, tag: String) = ProtonMenu(activity, Handler(Looper.getMainLooper())) { idle }.apply { + installer = menu.installer + latestCheck = { false } + experimentalRefresh = { + refreshes.incrementAndGet() + listOf(prerelease(tag)) + } + } + + @Test + fun aRecreatedMenuJoinsTheRunningRefresh() { + idle = false + val started = CountDownLatch(1) + val gate = CountDownLatch(1) + val refreshes = AtomicInteger() + menu.latestCheck = { false } + menu.experimentalRefresh = { + started.countDown() + gate.await(5, TimeUnit.SECONDS) + listOf(prerelease("first")) + } + menu.checkUpdates() + assertTrue(started.await(5, TimeUnit.SECONDS)) + val recreated = recreatedMenu(refreshes, "second") + recreated.checkUpdates() + gate.countDown() + waitUntil { recreated.experimentalReleases.map { it.tag } == listOf("first") } + assertEquals(0, refreshes.get()) + recreated.checkUpdates() + waitUntil { recreated.experimentalReleases.map { it.tag } == listOf("second") } + assertEquals(1, refreshes.get()) + } + + @Test + fun aFinishedRefreshIsPublishedBeforeTheNextOneStarts() { + idle = false + val finished = CountDownLatch(1) + val refreshes = AtomicInteger() + menu.experimentalReleases = emptyList() + menu.latestCheck = { false } + menu.experimentalRefresh = { + finished.countDown() + listOf(prerelease("older")) + } + menu.checkUpdates() + assertTrue(finished.await(5, TimeUnit.SECONDS)) + val recreated = recreatedMenu(refreshes, "newer") + repeat(20) { + recreated.checkUpdates() + Thread.sleep(10) + } + assertEquals(0, refreshes.get()) + assertTrue(recreated.experimentalReleases.isEmpty()) + waitUntil { recreated.experimentalReleases.map { it.tag } == listOf("older") } + recreated.checkUpdates() + waitUntil { recreated.experimentalReleases.map { it.tag } == listOf("newer") } + assertEquals(1, refreshes.get()) + } + private fun waitUntil(done: () -> Boolean) { val deadline = System.nanoTime() + 5_000_000_000L while (System.nanoTime() < deadline) { @@ -116,7 +180,7 @@ class ProtonMenuAutoTest { @Test fun downloadsWaitForTheSessionNetworkPowerAndOtherInstallWork() { install("DroidDeck-Proton-11-11.1") - menu.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } + menu.installer = { tool, _ -> attempts.add(tool.id); "failed" } SessionState.running = true menu.ensureAutoUpdates() SessionState.running = false @@ -139,11 +203,11 @@ class ProtonMenuAutoTest { @Test fun aFinishedInstallStartsTheComponentCheckAndAFailedOneDoesNot() { var checks = 0 val watched = ProtonMenu(activity, Handler(Looper.getMainLooper()), onInstalled = { checks++ }) { idle } - watched.installer = { tool, _, _ -> install("${tool.prefix}-11-12"); null } + watched.installer = { tool, _ -> install("${tool.prefix}-11-12"); null } watched.installProton("droiddeck") waitUntil { watched.protonBusyId == null && checks == 1 } assertEquals(1, checks) - watched.installer = { _, _, _ -> "failed" } + watched.installer = { _, _ -> "failed" } watched.installProton("ge") waitUntil { watched.protonBusyId == null } assertEquals(1, checks) @@ -152,7 +216,7 @@ class ProtonMenuAutoTest { @Test fun aFailedUpdateDoesNotLoopOrBlockOtherInstalledFamilies() { val ge = install("GE-Proton11-11") install("DroidDeck-Proton-11-11.1") - menu.installer = { tool, _, _ -> + menu.installer = { tool, _ -> attempts.add(tool.id) if (tool.id == "ge") throw IllegalStateException("download failed") install("${tool.prefix}-11-12") @@ -171,7 +235,7 @@ class ProtonMenuAutoTest { @Test fun anUninstalledRuntimeOrCurrentProtonDoesNotStartADownload() { install("DroidDeck-Proton-11-12") - menu.installer = { tool, _, _ -> attempts.add(tool.id); null } + menu.installer = { tool, _ -> attempts.add(tool.id); null } menu.ensureAutoUpdates() assertTrue(attempts.isEmpty()) install("GE-Proton11-11") @@ -183,12 +247,12 @@ class ProtonMenuAutoTest { @Test fun aFailedReleaseIsNotRetriedAfterRecreatingTheLauncher() { install("DroidDeck-Proton-11-11.1") - menu.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } + menu.installer = { tool, _ -> attempts.add(tool.id); "failed" } menu.ensureAutoUpdates() waitUntil { menu.protonBusyId == null } val recreated = Robolectric.buildActivity(Activity::class.java).setup().get() val next = ProtonMenu(recreated, Handler(Looper.getMainLooper())) - next.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } + next.installer = { tool, _ -> attempts.add(tool.id); "failed" } next.ensureAutoUpdates() assertNull(next.protonBusyId) assertEquals(listOf("droiddeck"), attempts) @@ -208,7 +272,7 @@ class ProtonMenuAutoTest { } @Test fun droidDeckProtonIsInstalledWhenMissingUnlessTheUserRemovedIt() { - menu.installer = { tool, test, _ -> attempts.add(if (test) "test" else tool.id); install("${tool.prefix}-11-12"); null } + menu.installer = { tool, _ -> attempts.add(tool.id); install("${tool.prefix}-11-12"); null } ProtonExtras.setDeclined(activity, true) menu.ensureAutoUpdates() assertNull(menu.protonBusyId) @@ -222,11 +286,11 @@ class ProtonMenuAutoTest { menu.removeProton("droiddeck") waitUntil { menu.protonBusyId == null } assertTrue(ProtonExtras.declined(activity)) - menu.installer = { _, _, _ -> "failed" } + menu.installer = { _, _ -> "failed" } menu.installProton("droiddeck") waitUntil { menu.protonBusyId == null } assertTrue(ProtonExtras.declined(activity)) - menu.installer = { tool, _, _ -> install("${tool.prefix}-11-12"); null } + menu.installer = { tool, _ -> install("${tool.prefix}-11-12"); null } menu.installProton("droiddeck") waitUntil { menu.protonBusyId == null } assertFalse(ProtonExtras.declined(activity)) @@ -236,7 +300,7 @@ class ProtonMenuAutoTest { install("DroidDeck-Proton-11-11.1") val launcher = Robolectric.buildActivity(FrontEndActivity::class.java).get() val protons = ReflectionHelpers.getField(launcher, "protons") - protons.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } + protons.installer = { tool, _ -> attempts.add(tool.id); "failed" } Motion.refresh(launcher) LaunchOrigin.mark(Rect(0f, 0f, 100f, 100f), "game") launcher.startActivity(Intent(launcher, SessionActivity::class.java)) diff --git a/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt index 1972a0631..cbb1c52c3 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt @@ -1,7 +1,17 @@ package com.droiddeck.launcher.session import java.io.File +import java.io.RandomAccessFile import java.nio.file.Files +import org.apache.commons.compress.archivers.sevenz.SevenZArchiveEntry +import org.apache.commons.compress.archivers.sevenz.SevenZOutputFile +import org.apache.commons.compress.archivers.zip.ZipArchiveEntry +import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream +import android.app.Activity +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Before +import org.robolectric.Robolectric import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertNull @@ -17,6 +27,75 @@ import org.robolectric.annotation.Config @Config(sdk = [28], manifest = Config.NONE) class ExperimentalProtonsTest { @get:Rule val temp = TemporaryFolder() + private lateinit var activity: Activity + + @Before + fun setup() { + activity = Robolectric.buildActivity(Activity::class.java).setup().get() + } + + @Test + fun fileLabelsDropTheWholeArchiveSuffix() { + assertEquals("Build-12.8-r34", ExperimentalProtons.fileLabel("Build-12.8-r34.tar.xz")) + assertEquals("Build-12.8-r34", ExperimentalProtons.fileLabel("Build-12.8-r34.tar")) + assertEquals("Build-12.8-r34", ExperimentalProtons.fileLabel("Build-12.8-r34.7z")) + assertEquals("Build-12.8-r34", ExperimentalProtons.fileLabel("Build-12.8-r34.tgz")) + assertEquals("Experimental-Build", ExperimentalProtons.dirName("Build", ExperimentalProtons.fileLabel("Build.tar.gz"))) + } + + @Test + fun installedReleasesLeaveTheAvailableRows() { + val rows = listOf("r34", "r35").map { ExperimentalProtons.Release(it, "$it.tar.xz", "https://example.invalid/$it", null, 1L) } + val installed = listOf( + ExperimentalProtons.Installed("Experimental-r34", "r34", "release", "r34"), + ExperimentalProtons.Installed("Experimental-file", "file", "file"), + ) + assertEquals(listOf("r35"), ExperimentalProtons.available(rows, installed).map { it.tag }) + assertEquals(listOf("r34", "r35"), ExperimentalProtons.available(rows, emptyList()).map { it.tag }) + } + + @Test + fun releaseRowsOnlyUsePublishedPrereleaseTarAssets() { + val tool = ProtonExtras.tools.first { it.id == ProtonExtras.OWN } + val releases = JSONArray(""" + [{"tag_name":"stable","prerelease":false,"published_at":"2026-11-10T00:00:00Z","assets":[{"name":"stable-aarch64.tar.gz","browser_download_url":"https://example/stable"}]}, + {"tag_name":"pre","prerelease":true,"published_at":"2026-11-12T00:00:00Z","assets":[{"name":"pre-aarch64.tar.xz","browser_download_url":"https://example/pre"}]}, + {"tag_name":"superseded","prerelease":true,"published_at":"2026-10-25T00:00:00Z","assets":[{"name":"superseded-aarch64.tar.gz","browser_download_url":"https://example/superseded"}]}, + {"tag_name":"sources","prerelease":true,"published_at":"2026-11-13T00:00:00Z","assets":[{"name":"wine-gecko-x86.tar.xz","browser_download_url":"https://example/sources"}]}, + {"tag_name":"draft","draft":true,"prerelease":true,"published_at":"2026-11-14T00:00:00Z","assets":[{"name":"draft-aarch64.tar.gz","browser_download_url":"https://example/draft"}]}, + {"tag_name":"no-tar","prerelease":true,"published_at":"2026-11-15T00:00:00Z","assets":[{"name":"no-tar.sha512sum","browser_download_url":"https://example/sum"}]}] + """.trimIndent()) + assertEquals(listOf("pre"), ProtonExtras.assets(tool, releases, true).map { it.tag }) + } + + @Test + fun markerRoundTripKeepsReleaseTag() { + val dir = File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(activity), "root/.local/share/Steam/compatibilitytools.d/Experimental-pre").apply { mkdirs() } + File(dir, ".droiddeck-experimental.json").writeText(JSONObject().put("label", "Experimental-pre").put("source", "pre").put("releaseTag", "pre").toString()) + assertEquals("pre", ExperimentalProtons.installed(activity).single().releaseTag) + } + + @Test + fun missingReleaseTagsAreAutoRemovedButFileBuildsAreNot() { + val complete = ProtonExtras.ReleaseFetch(JSONArray().put(JSONObject().put("tag_name", "kept").put("prerelease", true)), true) + val partial = ProtonExtras.ReleaseFetch(JSONArray().put(JSONObject().put("tag_name", "gone").put("prerelease", true)), false) + val stable = ProtonExtras.ReleaseFetch(JSONArray().put(JSONObject().put("tag_name", "gone").put("prerelease", false)), false) + assertTrue(ExperimentalProtons.shouldRemove("gone", complete) { true }) + assertFalse(ExperimentalProtons.shouldRemove("gone", complete) { false }) + assertFalse(ExperimentalProtons.shouldRemove("gone", partial) { true }) + assertTrue(ExperimentalProtons.shouldRemove("gone", stable) { false }) + assertFalse(ExperimentalProtons.shouldRemove(null, complete) { true }) + } + + @Test + fun archiveTypeUsesMagicBytes() { + val zip = temp.newFile("wrong-name.bin").apply { writeBytes(byteArrayOf(0x50, 0x4B, 0x03, 0x04)) } + val seven = temp.newFile("seven.data").apply { writeBytes(byteArrayOf(0x37, 0x7A, 0xBC.toByte(), 0xAF.toByte(), 0x27, 0x1C)) } + val tar = temp.newFile("tar.data").apply { RandomAccessFile(this, "rw").use { it.seek(257); it.write("ustar".toByteArray()) } } + assertEquals(ExperimentalProtons.ArchiveType.ZIP, ExperimentalProtons.archiveType(zip)) + assertEquals(ExperimentalProtons.ArchiveType.SEVEN_Z, ExperimentalProtons.archiveType(seven)) + assertEquals(ExperimentalProtons.ArchiveType.TAR, ExperimentalProtons.archiveType(tar)) + } @Test fun namesNeverCollideWithReleasedBuilds() { @@ -74,6 +153,207 @@ class ExperimentalProtonsTest { assertTrue(File(kept, "file").isFile) } + @Test + fun directZipKeepsExecutableModeAndInTreeLinks() { + val archive = temp.newFile("tree.zip") + ZipArchiveOutputStream(archive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("build/proton").apply { unixMode = 0x81ED }) + zip.write("binary".toByteArray()) + zip.closeArchiveEntry() + zip.putArchiveEntry(ZipArchiveEntry("build/link").apply { unixMode = 0xA1FF }) + zip.write("proton".toByteArray()) + zip.closeArchiveEntry() + zip.putArchiveEntry(ZipArchiveEntry("build/files/lib/up").apply { unixMode = 0xA1FF }) + zip.write("../../proton".toByteArray()) + zip.closeArchiveEntry() + } + val unpacked = temp.newFolder("direct") + ExperimentalProtons.extractDirect(archive, unpacked, ExperimentalProtons.ArchiveType.ZIP) + assertTrue(File(unpacked, "build/proton").canExecute()) + assertTrue(Files.isSymbolicLink(File(unpacked, "build/link").toPath())) + assertEquals("proton", Files.readSymbolicLink(File(unpacked, "build/link").toPath()).toString()) + assertEquals("../../proton", Files.readSymbolicLink(File(unpacked, "build/files/lib/up").toPath()).toString()) + assertEquals("binary", File(unpacked, "build/files/lib/up").readText()) + } + + @Test + fun directArchivesFillReadOnlyDirectoriesBeforeLockingThem() { + val archive = temp.newFile("locked.zip") + ZipArchiveOutputStream(archive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("build/files/").apply { unixMode = 0x416D }) + zip.closeArchiveEntry() + zip.putArchiveEntry(ZipArchiveEntry("build/files/data").apply { unixMode = 0x81A4 }) + zip.write("data".toByteArray()) + zip.closeArchiveEntry() + } + val unpacked = temp.newFolder("locked") + ExperimentalProtons.extractDirect(archive, unpacked, ExperimentalProtons.ArchiveType.ZIP) + val directory = File(unpacked, "build/files") + assertEquals("data", File(directory, "data").readText()) + assertFalse(directory.canWrite()) + directory.setWritable(true) + } + + @Test + fun directSevenZipKeepsExecutableModeAndInTreeLinks() { + val archive = temp.newFile("tree.7z") + SevenZOutputFile(archive).use { seven -> + fun add(name: String, mode: Int, text: String) { + val entry = SevenZArchiveEntry().apply { + this.name = name + hasWindowsAttributes = true + windowsAttributes = (mode shl 16) or 0x8000 + } + seven.putArchiveEntry(entry) + seven.write(text.toByteArray()) + seven.closeArchiveEntry() + } + add("build/proton", 0x81ED, "binary") + add("build/files/lib/up", 0xA1FF, "../../proton") + add("build/plain", 0x81A4, "data") + } + val unpacked = temp.newFolder("seven") + ExperimentalProtons.extractDirect(archive, unpacked, ExperimentalProtons.ArchiveType.SEVEN_Z) + assertTrue(File(unpacked, "build/proton").canExecute()) + assertFalse(File(unpacked, "build/plain").canExecute()) + assertEquals("../../proton", Files.readSymbolicLink(File(unpacked, "build/files/lib/up").toPath()).toString()) + } + + @Test + fun directArchivesAllowCurrentDirectoryBeforeAClimb() { + val archive = temp.newFile("dot.zip") + ZipArchiveOutputStream(archive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("build/lib/wine").apply { unixMode = 0x81ED }) + zip.write("binary".toByteArray()) + zip.closeArchiveEntry() + zip.putArchiveEntry(ZipArchiveEntry("build/bin/wine").apply { unixMode = 0xA1FF }) + zip.write("./../lib/wine".toByteArray()) + zip.closeArchiveEntry() + } + val unpacked = temp.newFolder("dot") + ExperimentalProtons.extractDirect(archive, unpacked, ExperimentalProtons.ArchiveType.ZIP) + assertEquals("./../lib/wine", Files.readSymbolicLink(File(unpacked, "build/bin/wine").toPath()).toString()) + assertEquals("binary", File(unpacked, "build/bin/wine").readText()) + } + + @Test + fun directArchivesRejectLinksThatClimbAfterACurrentDirectoryAndAName() { + for (link in listOf("./top/../outside", "./../a/./../..", "top/./../outside")) { + val archive = temp.newFile() + ZipArchiveOutputStream(archive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("build/a/b/out").apply { unixMode = 0xA1FF }) + zip.write(link.toByteArray()) + zip.closeArchiveEntry() + } + val result = runCatching { ExperimentalProtons.extractDirect(archive, temp.newFolder(), ExperimentalProtons.ArchiveType.ZIP) } + assertTrue(link, result.exceptionOrNull() is ExperimentalProtons.UnsafeArchiveException) + } + } + + @Test + fun reconcileKeepsBuildsWhenASessionStartsDuringTheLookup() { + val tools = File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(activity), "root/.local/share/Steam/compatibilitytools.d") + val dirs = listOf("Experimental-gone-a", "Experimental-gone-b").map { name -> + File(tools, name).apply { + mkdirs() + File(this, ".droiddeck-experimental.json").writeText(JSONObject().put("label", name).put("source", name).put("releaseTag", name).toString()) + } + } + val complete = ProtonExtras.ReleaseFetch(JSONArray(), true) + var lookups = 0 + try { + ExperimentalProtons.reconcile(activity, complete) { + lookups++ + SessionState.running = true + true + } + } finally { + SessionState.running = false + } + assertEquals(1, lookups) + assertTrue(dirs.all { it.isDirectory }) + ExperimentalProtons.reconcile(activity, complete) { true } + assertTrue(dirs.none { it.exists() }) + } + + @Test + fun removeWaitsForAStartingSessionAndThenKeepsTheBuild() { + val tools = File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(activity), "root/.local/share/Steam/compatibilitytools.d") + val dir = File(tools, "Experimental-starting").apply { + mkdirs() + File(this, ".droiddeck-experimental.json").writeText(JSONObject().put("label", name).put("source", name).toString()) + File(this, "proton").writeText("build") + } + var removed: Boolean? = null + val removal = Thread { removed = ExperimentalProtons.remove(activity, dir.name) } + try { + synchronized(SessionState.startLock) { + removal.start() + val deadline = System.nanoTime() + 10_000_000_000L + while (removal.state != Thread.State.BLOCKED && System.nanoTime() < deadline) Thread.sleep(5) + assertEquals(Thread.State.BLOCKED, removal.state) + assertTrue(File(dir, "proton").isFile) + SessionState.running = true + } + removal.join(10_000) + assertEquals(false, removed) + assertTrue(File(dir, "proton").isFile) + } finally { + SessionState.running = false + removal.join(10_000) + } + assertTrue(ExperimentalProtons.remove(activity, dir.name)) + assertTrue(!dir.exists()) + assertTrue(File(tools, ".droiddeck-experimental-gone").list().isNullOrEmpty()) + } + + @Test + fun directArchivesRejectLinksThatClimbAfterAName() { + val archive = temp.newFile("climb.zip") + ZipArchiveOutputStream(archive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("build/a/b/top").apply { unixMode = 0xA1FF }) + zip.write("../../..".toByteArray()) + zip.closeArchiveEntry() + zip.putArchiveEntry(ZipArchiveEntry("build/a/b/out").apply { unixMode = 0xA1FF }) + zip.write("top/../outside".toByteArray()) + zip.closeArchiveEntry() + } + val result = runCatching { ExperimentalProtons.extractDirect(archive, temp.newFolder("climb-out"), ExperimentalProtons.ArchiveType.ZIP) } + assertTrue(result.exceptionOrNull() is ExperimentalProtons.UnsafeArchiveException) + } + + @Test + fun directZipRejectsEscapingLinksAndEntries() { + val linkArchive = temp.newFile("link.zip") + ZipArchiveOutputStream(linkArchive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("build/link").apply { unixMode = 0xA1FF }) + zip.write("../../outside".toByteArray()) + zip.closeArchiveEntry() + } + val entryArchive = temp.newFile("entry.zip") + ZipArchiveOutputStream(entryArchive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("../outside")) + zip.write("x".toByteArray()) + zip.closeArchiveEntry() + } + val linkResult = runCatching { ExperimentalProtons.extractDirect(linkArchive, temp.newFolder("link-out"), ExperimentalProtons.ArchiveType.ZIP) } + val entryResult = runCatching { ExperimentalProtons.extractDirect(entryArchive, temp.newFolder("entry-out"), ExperimentalProtons.ArchiveType.ZIP) } + assertTrue(linkResult.exceptionOrNull() is ExperimentalProtons.UnsafeArchiveException) + assertTrue(entryResult.exceptionOrNull() is ExperimentalProtons.UnsafeArchiveException) + } + + @Test + fun staleDownloadCleanupOnlyDeletesItsOwnUnlistedFiles() { + val downloads = File(activity.filesDir, "proton-downloads").apply { mkdirs() } + val stale = File(downloads, "droiddeck-gone-archive.tar.xz").apply { writeText("partial") } + val kept = File(downloads, "droiddeck-kept-archive.tar.xz").apply { writeText("partial") } + val other = File(downloads, "other-archive.tar.xz").apply { writeText("partial") } + ExperimentalProtons.removeStaleDownloads(activity, setOf("kept")) + assertFalse(stale.exists()) + assertTrue(kept.exists()) + assertTrue(other.exists()) + } + @Test fun checksumFileWithoutADigestIsRejected() { assertNull(ExperimentalProtons.checksumIn("not a checksum\n")) diff --git a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt index 15e0280a7..105205a84 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt @@ -30,7 +30,7 @@ class ProtonExtrasTest { .apply { if (digest != null) put("digest", digest) } private fun release(tag: String, vararg assets: JSONObject, prerelease: Boolean = false, draft: Boolean = false) = JSONObject() - .put("tag_name", tag).put("prerelease", prerelease).put("draft", draft) + .put("tag_name", tag).put("prerelease", prerelease).put("draft", draft).put("published_at", "2026-11-12T00:00:00Z") .put("assets", JSONArray().apply { assets.forEach { put(it) } }) private fun droiddeckRelease(ver: String, prerelease: Boolean = false) = release( @@ -48,6 +48,34 @@ class ProtonExtrasTest { File(this, "proton").apply { writeText(""); setExecutable(true) } } + @Test + fun experimentalRowsUseTheReleaseNameAndTagDetail() { + val current = release("DroidDeck-Bionic-12.8-r34", asset("DroidDeck-Bionic-12.8-r34-aarch64.tar.xz"), prerelease = true) + .put("name", "DroidDeck Bionic 12.8 r34") + val selectedAsset = ProtonExtras.assetOf(tool("droiddeck"), current, experimental = true)!! + val selected = ProtonExtras.assets(tool("droiddeck"), JSONArray().put(current), true).single() + assertEquals("DroidDeck-Bionic-12.8-r34-aarch64.tar.xz", selectedAsset.name) + assertEquals("DroidDeck Bionic 12.8 r34", selected.releaseName) + assertEquals("DroidDeck-Bionic-12.8-r34", selected.tag) + } + + @Test + fun experimentalAssetsIgnoreChecksumSidecars() { + val sidecarOnly = release("DroidDeck-Bionic-12.8-r36", asset("DroidDeck-Bionic-12.8-r36-aarch64.tar.xz.sha512sum")) + assertEquals(null, ProtonExtras.assetOf(tool("droiddeck"), sidecarOnly, experimental = true)) + } + + @Test + fun experimentalAssetsSkipOtherArchitectures() { + val foreign = release("DroidDeck-Bionic-12.8-r37", asset("DroidDeck-Bionic-12.8-r37-x86_64.tar.xz"), asset("DroidDeck-Bionic-12.8-r37-amd64.tar.gz"), prerelease = true) + val mixed = release("DroidDeck-Bionic-12.8-r38", asset("DroidDeck-Bionic-12.8-r38-x86_64.tar.xz"), asset("DroidDeck-Bionic-12.8-r38.tar.xz"), prerelease = true) + val named = release("DroidDeck-Bionic-12.8-r39", asset("DroidDeck-Bionic-12.8-r39-aarch64.tar.xz"), asset("DroidDeck-Bionic-12.8-r39-x86_64.tar.xz"), prerelease = true) + assertEquals(null, ProtonExtras.assetOf(tool("droiddeck"), foreign, experimental = true)) + assertEquals("DroidDeck-Bionic-12.8-r38.tar.xz", ProtonExtras.assetOf(tool("droiddeck"), mixed, experimental = true)!!.name) + assertEquals("DroidDeck-Bionic-12.8-r39-aarch64.tar.xz", ProtonExtras.assetOf(tool("droiddeck"), named, experimental = true)!!.name) + assertTrue(ProtonExtras.assets(tool("droiddeck"), JSONArray().put(foreign), true).isEmpty()) + } + @Test fun theThreeSourcesInOrder() { assertEquals(listOf("ge", "cachyos", "droiddeck"), ProtonExtras.tools.map { it.id }) @@ -72,6 +100,14 @@ class ProtonExtrasTest { assertNull(picked.sha256) } + @Test + fun ownExperimentalReleaseUsesItsCurrentBionicTarballShape() { + val current = release("DroidDeck-Bionic-12.8-r34", asset("DroidDeck-Bionic-12.8-r34-aarch64.tar.xz"), asset("DroidDeck-Bionic-12.8-r34-aarch64.sha512sum"), prerelease = true) + val rows = ProtonExtras.assets(tool("droiddeck"), JSONArray().put(current), prerelease = true) + assertEquals(listOf("DroidDeck-Bionic-12.8-r34"), rows.map { it.tag }) + assertTrue(ProtonExtras.assets(tool("droiddeck"), JSONArray().put(release("DroidDeck-Bionic-12.8-r35", asset("DroidDeck-Bionic-12.8-r35-aarch64.sha512sum"), prerelease = true)), true).isEmpty()) + } + @Test fun githubsDigestIsKeptBesideTheSha512File() { val sum = "ab".repeat(32) @@ -83,20 +119,6 @@ class ProtonExtrasTest { assertTrue(picked.sha512!!.endsWith("GE-Proton11-7-aarch64.sha512sum")) } - @Test - fun aTestBuildChoosesACompatibleArchiveWithVerification() { - val release = release( - "DroidDeck-Proton-11-12.9", - asset("DroidDeck-Proton-11-12.9-aarch64.tar.gz"), - asset("DroidDeck-Proton-11-12.9-aarch64.tar.xz", "sha256:" + "ab".repeat(32)), - prerelease = true, - ) - val releases = JSONArray().put(release).put(droiddeckRelease("11-12.8")) - val picked = ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!! - assertEquals("DroidDeck-Proton-11-12.9-aarch64.tar.xz", picked.name) - assertEquals("ab".repeat(32), picked.sha256) - } - @Test fun prereleasesDraftsAndReleasesWithoutAnArm64BuildAreSkipped() { val releases = JSONArray() @@ -274,64 +296,11 @@ class ProtonExtrasTest { assertEquals("DroidDeck-Proton-11-11.4", ProtonExtras.update(context, tool("droiddeck"))) } - @Test - fun theNewestPrereleaseAheadOfTheLatestReleaseIsTheTestBuild() { - val releases = JSONArray() - .put(release("DroidDeck-Bionic-12.8-r25", asset("DroidDeck-Bionic-12.8-r25-aarch64.tar.xz"), prerelease = true)) - .put(droiddeckRelease("11-12.9", prerelease = true)) - .put(droiddeckRelease("11-12.8")) - assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!!.tag) - assertEquals("DroidDeck-Proton-11-12.8", ProtonExtras.pickAsset(tool("droiddeck"), releases)!!.tag) - } - - @Test - fun aPrereleaseOlderThanTheLatestReleaseIsNotOffered() { - val releases = JSONArray() - .put(droiddeckRelease("11-12.9")) - .put(droiddeckRelease("11-12.8", prerelease = true)) - assertNull(ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)) - assertNull(ProtonExtras.pickAsset(tool("droiddeck"), JSONArray().put(droiddeckRelease("11-12.8")), test = true)) - } - - @Test - fun aTestBuildIsOfferedOnlyWhenNotInstalledAndNewer() { - assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.testFor(emptyList(), "DroidDeck-Proton-11-12.9")) - assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.testFor(listOf("DroidDeck-Proton-11-12.8"), "DroidDeck-Proton-11-12.9")) - assertNull(ProtonExtras.testFor(listOf("DroidDeck-Proton-11-12.9"), "DroidDeck-Proton-11-12.9")) - assertNull(ProtonExtras.testFor(listOf("DroidDeck-Proton-11-13.0"), "DroidDeck-Proton-11-12.9")) - assertNull(ProtonExtras.testFor(listOf("DroidDeck-Proton-11-12.8"), null)) - } - - @Test - fun theHighestEligibleTestBuildWinsWhateverTheListOrder() { - val releases = JSONArray() - .put(droiddeckRelease("11-12.7", prerelease = true)) - .put(droiddeckRelease("11-12.9", prerelease = true)) - .put(droiddeckRelease("11-12.8.5", prerelease = true)) - .put(droiddeckRelease("11-12.8")) - assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!!.tag) - } - - @Test - fun noTestBuildWithoutAStableBaseline() { - val releases = JSONArray().put(droiddeckRelease("11-12.9", prerelease = true)) - assertNull(ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)) - } - - @Test - fun aTestBuildWithNoChecksumIsNotOffered() { - val releases = JSONArray() - .put(release("DroidDeck-Proton-11-12.10", asset("DroidDeck-Proton-11-12.10-aarch64.tar.gz"), prerelease = true)) - .put(droiddeckRelease("11-12.9", prerelease = true)) - .put(droiddeckRelease("11-12.8")) - assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!!.tag) - } - @Test fun laterPagesAreReadOnlyUntilAStableBaselineIsFound() { val tool = tool("droiddeck") val pages = mapOf( - 1 to JSONArray().put(droiddeckRelease("11-12.10", prerelease = true)), + 1 to JSONArray().apply { repeat(15) { put(droiddeckRelease("11-12.${10 - it}", prerelease = true)) } }, 2 to JSONArray().put(droiddeckRelease("11-12.8")), 3 to JSONArray().put(droiddeckRelease("11-12.7")), ) @@ -339,7 +308,6 @@ class ProtonExtrasTest { val all = ProtonExtras.releases(tool) { asked += it; pages[it] ?: JSONArray() }!! assertEquals(listOf(1, 2), asked) assertEquals("DroidDeck-Proton-11-12.8", ProtonExtras.pickAsset(tool, all)!!.tag) - assertEquals("DroidDeck-Proton-11-12.10", ProtonExtras.pickAsset(tool, all, test = true)!!.tag) asked.clear() ProtonExtras.releases(tool) { asked += it; pages.getValue(2) } @@ -353,35 +321,20 @@ class ProtonExtrasTest { asked.clear() assertNull(ProtonExtras.releases(tool) { page -> asked += page - if (page == 1) JSONArray().put(droiddeckRelease("11-12.10", prerelease = true)) else null + if (page == 1) JSONArray().apply { repeat(15) { put(droiddeckRelease("11-12.${10 - it}", prerelease = true)) } } else null }) assertEquals(listOf(1, 2), asked) } @Test - fun anIncompleteLookupKeepsTheCachedTestBuildAndACompletedLookupClearsIt() { - val tool = tool("droiddeck") - val cache = JSONObject().put(tool.id, JSONObject().put("tag", "DroidDeck-Proton-11-12.8").put("test", "DroidDeck-Proton-11-12.9")) - ProtonExtras.updateLatest(cache, tool, null, 1L) - assertEquals("DroidDeck-Proton-11-12.9", cache.getJSONObject(tool.id).getString("test")) - ProtonExtras.updateLatest(cache, tool, JSONArray().put(droiddeckRelease("11-12.8")), 1L) - assertFalse(cache.getJSONObject(tool.id).has("test")) - } - - @Test - fun aTestInstallLeavesTheStableEntryAndAStableInstallKeepsTheTestOffer() { - val tool = tool("droiddeck") - val cache = JSONObject().put(tool.id, JSONObject().put("tag", "DroidDeck-Proton-11-12.8").put("test", "DroidDeck-Proton-11-12.9")) - assertFalse(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-12.9", true, 2L)) - assertEquals("DroidDeck-Proton-11-12.8", cache.getJSONObject(tool.id).getString("tag")) - assertEquals("DroidDeck-Proton-11-12.9", cache.getJSONObject(tool.id).getString("test")) - assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.testFor(emptyList(), cache.getJSONObject(tool.id).getString("test"))) - assertFalse(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-12.7", false, 2L)) - assertTrue(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-12.8", false, 2L)) - assertEquals("DroidDeck-Proton-11-12.9", cache.getJSONObject(tool.id).getString("test")) - assertEquals(2L, cache.getJSONObject(tool.id).getLong("at")) - assertTrue(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-13.0", false, 3L)) - assertFalse(cache.getJSONObject(tool.id).has("test")) + fun anOldTestButtonInstallRemainsAUsableInstalledBuild() { + val context = RuntimeEnvironment.getApplication() + val tools = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/compatibilitytools.d") + val installed = installTool(tools, "DroidDeck-Proton 11-12.9") + val releases = File(context.filesDir, "proton-extras.json") + releases.writeText(JSONObject().put(installed.name, "DroidDeck-Proton-11-12.9").toString()) + assertEquals(listOf(installed.name), ProtonExtras.installedAll(context, tool("droiddeck"))) + assertEquals(listOf("DroidDeck-Proton-11-12.9"), ProtonExtras.installedTags(context, tool("droiddeck"))) } @Test @@ -390,4 +343,28 @@ class ProtonExtrasTest { assertEquals("DroidDeck-Proton-11-12.8", ProtonExtras.pickAsset(tool("droiddeck"), releases)!!.tag) assertNull(ProtonExtras.pickAsset(tool("droiddeck"), JSONArray("[null]"))) } + + @Test + fun failedOrPartialReleaseFetchDoesNotPretendMissingBuildsAreGone() { + val tool = tool("droiddeck") + assertNull(ProtonExtras.releasesForRemoval(tool) { null }) + val asked = mutableListOf() + val result = ProtonExtras.releasesForRemoval(tool) { page -> + asked += page + if (page == 1) JSONArray().apply { repeat(15) { put(droiddeckRelease("11-12.${10 - it}", prerelease = true)) } } else null + } + assertNull(result) + assertEquals(listOf(1, 2), asked) + } + + @Test + fun aShortReleasePageCompletesTheRemovalLookup() { + val asked = mutableListOf() + val result = ProtonExtras.releasesForRemoval(tool("droiddeck")) { page -> + asked += page + JSONArray().put(droiddeckRelease("11-12.8", prerelease = true)) + } + assertTrue(result!!.complete) + assertEquals(listOf(1), asked) + } } From cc93ab51c5a7a1090148b4cb24546bb8496e2917 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Thu, 19 Nov 2026 14:31:32 -0500 Subject: [PATCH 18/31] Log the GPU ceiling and mid-session clock hold changes (#2893) * Log the GPU ceiling, steps and mid-session clock hold changes The clock log now records the GPU frequency steps and floor once in its header, probes each limit file as readable or refused, and adds the allowed GPU maximum to every sample in the CPU cur/max(of top) style, so a vendor or thermal cap on the GPU ceiling shows up and changes during a session are visible. Samples are unchanged when no limit file is readable. The limit reading is shared with the device info GPU clock range. Turning the GPU clock hold on or off during a session now logs the same line the session start logs. * Ignore a zero GPU ceiling and log hold changes in order A ceiling file that reads zero is no longer printed as a limit and is listed as refused, matching how the step list is read. The hold state line is logged under the same lock as the state change, so overlapping toggles cannot log out of order. * Find a GPU ceiling that turns readable later and probe step tables as tables A ceiling file that read zero at session start is looked for again on each sample until one is found, and the log notes where it came from. Step and floor sources are probed with the same parser that reads them, so a table with a leading zero is listed as readable. --- .../com/droiddeck/launcher/SessionActivity.kt | 2 +- .../launcher/gpu/ClockLogComponent.kt | 58 +++++++++++----- .../com/droiddeck/launcher/gpu/DeviceInfo.kt | 18 ++--- .../com/droiddeck/launcher/gpu/GpuLimits.kt | 41 ++++++++++++ .../droiddeck/launcher/session/GpuClockPin.kt | 7 +- .../launcher/gpu/ClockLogComponentTest.kt | 66 +++++++++++++++++++ .../launcher/session/GpuClockPinTest.kt | 34 ++++++++++ 7 files changed, 192 insertions(+), 34 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/gpu/GpuLimits.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/GpuClockPinTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 3249d0b3c..618452d02 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1471,7 +1471,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde SessionPrefs.setGpuClockPin(this@SessionActivity, on) gpuClockPin = on Thread { - GpuClockPin.sync(applicationContext) + synchronized(GpuClockPin) { GpuClockPin.sync(applicationContext)?.let { Log.i(TAG, it) } } runOnUiThread { gpuClockPin = gpuClockHeld() } }.start() }, diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/ClockLogComponent.kt b/app/src/main/java/com/droiddeck/launcher/gpu/ClockLogComponent.kt index 6f6827ad0..9368bddcf 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/ClockLogComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/ClockLogComponent.kt @@ -37,22 +37,22 @@ class ClockLogComponent(private val logFile: File) : SessionPart() { ?.sortedBy { it.name.removePrefix("policy").toIntOrNull() ?: 0 } ?: emptyList() val gpuCandidates = gpuSources() val gpu = gpuCandidates.firstOrNull { !it.startsWith("/proc/") && firstNumber(it) != null } + val stepSources = GpuLimits.stepSources() + val maxSources = GpuLimits.maxSources() + val minSources = GpuLimits.minSources() + val steps = GpuLimits.first(stepSources) + var ceiling = ceilingSource(maxSources) val power = app().getSystemService(Context.POWER_SERVICE) as? PowerManager val time = SimpleDateFormat("HH:mm:ss", Locale.US) try { FileWriter(logFile, true).use { w -> w.write("== clocks: ${Build.MANUFACTURER} ${Build.MODEL} (${Build.HARDWARE}), every ${PERIOD_MS / 1000}s\n") w.write("cpu policies: ${policies.joinToString { p -> p.name + " " + (File(p, "related_cpus").readTextOrNull()?.trim() ?: "?") }}\n") - for (source in gpuCandidates) { - val f = File(source) - val state = when { - !f.exists() -> continue - firstNumber(source) != null -> "readable" - else -> "refused" - } - w.write("gpu source $source: $state\n") - } + probeLines("gpu source", gpuCandidates).forEach { w.write(it + "\n") } w.write("gpu clock from: ${gpu ?: "nothing readable"}\n") + (probeLines("gpu limit", stepSources, ::firstStep) + probeLines("gpu limit", maxSources, ::limit) + + probeLines("gpu limit", minSources, ::firstStep)).distinct().forEach { w.write(it + "\n") } + limitLines(steps, ceiling, GpuLimits.first(minSources)).forEach { w.write(it + "\n") } w.flush() while (running && logFile.length() < MAX_BYTES) { val line = StringBuilder(time.format(Date())) @@ -63,7 +63,8 @@ class ClockLogComponent(private val logFile: File) : SessionPart() { line.append(" ${p.name.removePrefix("policy").let { "p$it" }} ${mhz(cur)}/${mhz(max)}") if (hw != null && max != null && max < hw) line.append("(of ${mhz(hw)})") } - gpu?.let { line.append(" | gpu ${mhz(firstNumber(it))} MHz") } + if (ceiling == null) ceiling = ceilingSource(maxSources)?.also { w.write("gpu ceiling from: $it\n") } + line.append(gpuField(gpu, ceiling, steps?.mhz?.last())) if (power != null && Build.VERSION.SDK_INT >= 29) { line.append(" | thermal ${power.currentThermalStatus}") if (Build.VERSION.SDK_INT >= 30) { @@ -109,16 +110,41 @@ class ClockLogComponent(private val logFile: File) : SessionPart() { return list.distinct() } + internal fun probeLines(label: String, sources: List, read: (String) -> Long? = ::firstNumber): List = sources.mapNotNull { source -> + when { + !File(source).exists() -> null + read(source) != null -> "$label $source: readable" + else -> "$label $source: refused" + } + } + + internal fun limitLines(steps: GpuLimits.Found?, ceiling: String?, floor: GpuLimits.Found?): List = listOf( + "gpu steps: " + (steps?.let { "${it.mhz.joinToString(" ")} MHz from ${it.path}" } ?: "nothing readable"), + "gpu ceiling from: " + (ceiling ?: "nothing readable"), + "gpu floor: " + (floor?.let { "${it.mhz.first()} MHz from ${it.path}" } ?: "nothing readable"), + ) + + internal fun gpuField(clock: String?, ceiling: String?, top: Long?): String { + if (clock == null && ceiling == null) return "" + val field = StringBuilder(" | gpu ").append(mhz(clock?.let(::firstNumber))) + ceiling?.let(::limit)?.let { max -> + field.append('/').append(mhz(max)) + if (top != null && GpuLimits.mhz(max) < top) field.append("(of $top)") + } + return field.append(" MHz").toString() + } + private fun File.readTextOrNull(): String? = runCatching { readText() }.getOrNull() private fun firstNumber(path: String): Long? = runCatching { Regex("\\d+").find(File(path).readText())?.value?.toLong() }.getOrNull() - private fun mhz(raw: Long?): String = when { - raw == null -> "?" - raw > 10_000_000 -> (raw / 1_000_000).toString() - raw > 10_000 -> (raw / 1_000).toString() - else -> raw.toString() - } + internal fun limit(path: String): Long? = firstNumber(path)?.takeIf { it > 0 } + + internal fun firstStep(path: String): Long? = GpuLimits.read(path).firstOrNull() + + internal fun ceilingSource(sources: List): String? = sources.firstOrNull { limit(it) != null } + + private fun mhz(raw: Long?): String = raw?.let { GpuLimits.mhz(it).toString() } ?: "?" } } diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/DeviceInfo.kt b/app/src/main/java/com/droiddeck/launcher/gpu/DeviceInfo.kt index bf44d7eec..45a396b65 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/DeviceInfo.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/DeviceInfo.kt @@ -87,20 +87,10 @@ object DeviceInfo { private fun ghz(khz: Long) = String.format(Locale.US, "%.2f GHz", khz / 1e6) private fun gpuRange(): String? { - fun mhz(hz: Long) = "${hz / 1_000_000} MHz" - val kgsl = read("/sys/class/kgsl/kgsl-3d0/gpu_available_frequencies") - ?.split(Regex("\\s+"))?.mapNotNull { it.toLongOrNull() }?.filter { it > 0 }.orEmpty() - if (kgsl.isNotEmpty()) return "${mhz(kgsl.min())}–${mhz(kgsl.max())} (${kgsl.size} steps)" - read("/sys/class/kgsl/kgsl-3d0/max_gpuclk")?.toLongOrNull()?.let { return "up to ${mhz(it)}" } - val node = File("/sys/class/devfreq").listFiles()?.firstOrNull { f -> - val n = f.name.lowercase() - (n.contains("gpu") || n.contains("mali") || n.contains("kgsl-3d")) && listOf("bus", "bw", "memlat").none { n.contains(it) } - } ?: return null - val steps = read("${node.path}/available_frequencies")?.split(Regex("\\s+"))?.mapNotNull { it.toLongOrNull() }?.filter { it > 0 }.orEmpty() - if (steps.isNotEmpty()) return "${mhz(steps.min())}–${mhz(steps.max())} (${steps.size} steps)" - val min = read("${node.path}/min_freq")?.toLongOrNull() - val max = read("${node.path}/max_freq")?.toLongOrNull() ?: return null - return (if (min != null) "${mhz(min)}–" else "up to ") + mhz(max) + GpuLimits.first(GpuLimits.stepSources())?.mhz?.let { return "${it.first()} MHz–${it.last()} MHz (${it.size} steps)" } + val max = GpuLimits.first(GpuLimits.maxSources())?.mhz?.last() ?: return null + val min = GpuLimits.first(GpuLimits.minSources())?.mhz?.first() + return (if (min != null) "$min MHz–" else "up to ") + "$max MHz" } private fun memory(context: Context) = Section("Memory", buildList> { diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/GpuLimits.kt b/app/src/main/java/com/droiddeck/launcher/gpu/GpuLimits.kt new file mode 100644 index 000000000..67eaa2374 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/gpu/GpuLimits.kt @@ -0,0 +1,41 @@ +package com.droiddeck.launcher.gpu + +import java.io.File + +object GpuLimits { + class Found(val path: String, val mhz: List) + + private const val KGSL = "/sys/class/kgsl/kgsl-3d0" + private const val QCOM_GPU = "/sys/kernel/gpu" + + fun stepSources(): List = listOf( + "$KGSL/gpu_available_frequencies", "$KGSL/freq_table_mhz", "$KGSL/devfreq/available_frequencies", "$QCOM_GPU/gpu_freq_table", + ) + devfreq("available_frequencies") + + fun maxSources(): List = listOf( + "$KGSL/max_gpuclk", "$KGSL/max_clock_mhz", "$KGSL/devfreq/max_freq", "$QCOM_GPU/gpu_max_clock", + ) + devfreq("max_freq") + + fun minSources(): List = listOf( + "$KGSL/min_clock_mhz", "$KGSL/devfreq/min_freq", "$QCOM_GPU/gpu_min_clock", + ) + devfreq("min_freq") + + fun first(sources: List): Found? = + sources.firstNotNullOfOrNull { path -> read(path).takeIf { it.isNotEmpty() }?.let { Found(path, it) } } + + fun read(path: String): List = runCatching { + Regex("\\d+").findAll(File(path).readText()).map { mhz(it.value.toLong()) }.filter { it > 0 }.distinct().sorted().toList() + }.getOrDefault(emptyList()) + + fun mhz(raw: Long): Long = when { + raw > 10_000_000 -> raw / 1_000_000 + raw > 10_000 -> raw / 1_000 + else -> raw + } + + private fun devfreq(file: String): List = + File("/sys/class/devfreq").listFiles()?.filter { f -> + val n = f.name.lowercase() + (n.contains("gpu") || n.contains("mali") || n.contains("kgsl-3d")) && listOf("bus", "bw", "memlat").none { n.contains(it) } + }?.sortedBy { it.name }?.map { "${it.path}/$file" }.orEmpty() +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt b/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt index e136df260..e02b3e7bf 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt @@ -46,9 +46,10 @@ object GpuClockPin { } @Synchronized - fun sync(context: Context) { - if (!live) return - if (SessionPrefs.gpuClockPin(context)) hold(context) else if (pinned) clear(context) + fun sync(context: Context): String? { + if (!live) return null + if (!SessionPrefs.gpuClockPin(context) && pinned) clear(context) + return hold(context) } @Synchronized diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/ClockLogComponentTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/ClockLogComponentTest.kt index 1dc1d6b6a..fed4553bf 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/ClockLogComponentTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/ClockLogComponentTest.kt @@ -3,6 +3,8 @@ package com.droiddeck.launcher.gpu import android.content.Intent import android.os.BatteryManager import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull import org.junit.Assert.assertTrue import org.junit.Rule import org.junit.Test @@ -40,4 +42,68 @@ class ClockLogComponentTest { clocks = ClockLogComponent(log).also { it.attach(context); it.stop(); it.start() } assertTrue(log.readText(), log.length() == 0L) } + @Test fun gpuStepsAndCeilingAreParsedAndPrinted() { + val table = tmp.newFile("gpu_available_frequencies").apply { writeText("443000000 350000000 285000000 160000000\n") } + val ceiling = tmp.newFile("max_gpuclk").apply { writeText("285000000\n") } + val floor = tmp.newFile("min_clock_mhz").apply { writeText("160\n") } + val clock = tmp.newFile("gpu_clock").apply { writeText("230\n") } + val steps = GpuLimits.first(listOf(tmp.root.path + "/missing", table.path))!! + assertEquals(listOf(160L, 285L, 350L, 443L), steps.mhz) + assertEquals( + listOf( + "gpu steps: 160 285 350 443 MHz from ${table.path}", + "gpu ceiling from: ${ceiling.path}", + "gpu floor: 160 MHz from ${floor.path}", + ), + ClockLogComponent.limitLines(steps, ceiling.path, GpuLimits.first(listOf(floor.path))), + ) + assertEquals(" | gpu 230/285(of 443) MHz", ClockLogComponent.gpuField(clock.path, ceiling.path, steps.mhz.last())) + ceiling.writeText("443000000\n") + assertEquals(" | gpu 230/443 MHz", ClockLogComponent.gpuField(clock.path, ceiling.path, steps.mhz.last())) + } + + @Test fun aZeroCeilingIsNotALimit() { + val clock = tmp.newFile("gpu_clock").apply { writeText("0\n") } + val zero = tmp.newFile("max_gpuclk").apply { writeText("0\n") } + assertEquals(" | gpu 0 MHz", ClockLogComponent.gpuField(clock.path, zero.path, 443)) + assertEquals(listOf("gpu limit ${zero.path}: refused"), ClockLogComponent.probeLines("gpu limit", listOf(zero.path), ClockLogComponent::limit)) + assertEquals(listOf("gpu source ${clock.path}: readable"), ClockLogComponent.probeLines("gpu source", listOf(clock.path))) + assertNull(ClockLogComponent.ceilingSource(listOf(zero.path))) + zero.writeText("285000000\n") + assertEquals(zero.path, ClockLogComponent.ceilingSource(listOf(zero.path))) + assertEquals(" | gpu 0/285(of 443) MHz", ClockLogComponent.gpuField(clock.path, zero.path, 443)) + } + + @Test fun aStepTableWithALeadingZeroIsReadable() { + val steps = tmp.newFile("freq_table_mhz").apply { writeText("0 160000000 285000000\n") } + assertEquals(listOf(160L, 285L), GpuLimits.first(listOf(steps.path))?.mhz) + assertEquals(listOf("gpu limit ${steps.path}: readable"), ClockLogComponent.probeLines("gpu limit", listOf(steps.path), ClockLogComponent::firstStep)) + } + + @Test fun unreadableOrMissingLimitsLeaveTheSampleUnchanged() { + val clock = tmp.newFile("clock_mhz").apply { writeText("230\n") } + val refused = tmp.newFolder("max_clock_mhz") + val missing = tmp.root.path + "/gpu_max_clock" + assertEquals(" | gpu 230 MHz", ClockLogComponent.gpuField(clock.path, null, null)) + assertEquals(" | gpu 230 MHz", ClockLogComponent.gpuField(clock.path, missing, 443)) + assertEquals(" | gpu 230 MHz", ClockLogComponent.gpuField(clock.path, refused.path, 443)) + assertEquals("", ClockLogComponent.gpuField(null, null, null)) + assertNull(GpuLimits.first(listOf(missing, refused.path))) + assertEquals(listOf("gpu limit ${refused.path}: refused"), ClockLogComponent.probeLines("gpu limit", listOf(missing, refused.path))) + assertEquals( + listOf("gpu steps: nothing readable", "gpu ceiling from: nothing readable", "gpu floor: nothing readable"), + ClockLogComponent.limitLines(null, null, null), + ) + } + + @Test fun aCeilingChangeMidSessionShowsInTheNextSample() { + val clock = tmp.newFile("cur_freq").apply { writeText("443000000\n") } + val ceiling = tmp.newFile("max_freq").apply { writeText("443000000\n") } + val first = ClockLogComponent.gpuField(clock.path, ceiling.path, 443) + ceiling.writeText("285000000\n") + clock.writeText("285000000\n") + val second = ClockLogComponent.gpuField(clock.path, ceiling.path, 443) + assertEquals(" | gpu 443/443 MHz", first) + assertEquals(" | gpu 285/285(of 443) MHz", second) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/GpuClockPinTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GpuClockPinTest.kt new file mode 100644 index 000000000..3311df050 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/GpuClockPinTest.kt @@ -0,0 +1,34 @@ +package com.droiddeck.launcher.session + +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +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 = [28], manifest = Config.NONE) +class GpuClockPinTest { + private val context = RuntimeEnvironment.getApplication() + + @After fun stop() { GpuClockPin.stop(context) } + + @Test fun aToggleOutsideASessionSaysNothing() { + SessionPrefs.setGpuClockPin(context, true) + assertNull(GpuClockPin.sync(context)) + } + + @Test fun aToggleMidSessionReportsTheHoldWithTheStartWording() { + SessionPrefs.setGpuClockPin(context, false) + val started = GpuClockPin.start(context) + assertEquals("gpu clock: governed", started) + SessionPrefs.setGpuClockPin(context, true) + val held = GpuClockPin.sync(context) + assertEquals("gpu clock: no /dev/kgsl-3d0, left governed", held) + SessionPrefs.setGpuClockPin(context, false) + assertEquals(started, GpuClockPin.sync(context)) + } +} From 13a6e0606a7c7f74836e35443937de342fe223bb Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 19 Nov 2026 14:57:11 -0500 Subject: [PATCH 19/31] feat(library): fold not-installed games under one row, link stores' owned games, and fix card sizes and streaming progress (#2894) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(library): fold not-installed games under one row, link a store's owned games, and make card sizes step The Library shows installed games first and folds every owned-but-not-installed game under a "Not installed · N" row that a tap or the A button opens and closes; it replaces the installed/all-owned choice that sat in the Filter menu, which now only appears for Xbox's access filters. Controller focus stops on the row between the two sections and stays on it across a toggle. A store's profile card turns its " · N games" line into the link to those games in the Library, replacing the separate text button. Card sizes pick a column count from the pane width, one column per step, so every Larger/Smaller step changes the grid; before, several steps landed on the same count and only stretched the cards. GOG streams download and install together, and each byte update and each install update used to flip the entry's stage and reset the install count. The install count now survives those swaps and the detail page shows both: "Downloading 9% · Installing 25%", with the download as the fill and the install as a thin bar. The store accounts button uses an accounts icon instead of a second "+", and the Library tab uses a game controller instead of the video library icon. * fix(library): a store with nothing installed folds to its Not installed row instead of an empty-state button With no installed games to show, collapsing used to swap the grid for "No installed games match these filters" and a Browse owned games button. It now leaves only the Not installed row, which reopens the list the same way, by tap or by A. * feat(library): count every owned game in the header and nudge the Not installed arrow The "N games" next to the Library title counts the games folded under Not installed too, so a store with nothing installed reads "316 games" instead of "0 games". The row's arrow hops twice every few seconds toward the way it opens, and at once when the row takes controller focus; it stays still when animations are off. * feat(rail): draw the Library tab as game cases on a shelf Material's video library icon read as a photo or video gallery. * feat(library): the header counts the whole library, whichever store or filter is picked * fix(downloads): keep a streaming install's two bars until the download reaches 100% A download at 99.95% counted as finished, so the install bar disappeared and the fill swapped between download and install progress for the last stretch. * fix(downloads): decide a streaming download is finished from its byte counts A float fraction rounds 99,999,999 of 100,000,000 bytes up to 1. * feat(downloads): show a streaming install as one bar, downloaded behind installed Two bars that moved almost together, under a label with both percentages, read as a glitch. The chip now shows "Installing 61%" with a light fill for what has downloaded and a solid fill for what has installed, like a video's buffer. * feat(downloads): the game page shows one steady bar that only fills up The detail page's chip shows "Installing 62%" from one overall value: the download fills the first 90% and the install the rest, also when they stream together. The fill never steps back across stage changes, keeps one animation key per download, and the chip keeps a minimum width with tabular digits so it does not resize as the number grows. The Downloads tab keeps its per-stage detail. * feat(downloads): a full-size progress button on the game page that opens Downloads The progress chip was a 24 dp pill beside 48 dp buttons. It is now a button the size of Pause and Cancel, filled as the job advances, with a › that opens the Downloads tab and sends the fly-in ball to the rail's Downloads item, by touch or A. The Library card's percent and the bottom-screen download row use the same steady value, so every place shows one bar that only grows. The overall value keeps the install part when the last bytes arrive while the stage still reads Download. --- .../stores/download/DownloadModels.kt | 20 ++ .../launcher/stores/download/DownloadQueue.kt | 9 +- .../launcher/ui/BottomDownloadsPage.kt | 2 +- .../com/droiddeck/launcher/ui/FrontEndRail.kt | 3 +- .../droiddeck/launcher/ui/FrontEndWidgets.kt | 10 +- .../com/droiddeck/launcher/ui/GameDetail.kt | 50 ++++- .../droiddeck/launcher/ui/GameShelfIcon.kt | 17 ++ .../droiddeck/launcher/ui/LibraryAccounts.kt | 6 +- .../com/droiddeck/launcher/ui/LibraryPage.kt | 192 +++++++++++++++--- .../com/droiddeck/launcher/ui/StoresPage.kt | 54 ++++- .../stores/download/DownloadEntryTest.kt | 41 ++++ .../launcher/ui/LibraryColumnsTest.kt | 13 ++ .../launcher/ui/LibraryVisibilityTest.kt | 63 +++--- 13 files changed, 398 insertions(+), 82 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/GameShelfIcon.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/LibraryColumnsTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadModels.kt b/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadModels.kt index 57f07742c..115e0b113 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadModels.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadModels.kt @@ -46,6 +46,26 @@ data class DownloadEntry( stageItemsTotal > 0 -> (stageItems.toFloat() / stageItemsTotal).coerceIn(0f, 1f) else -> -1f } + val downloadFraction: Float get() = if (bytesTotal > 0L) (bytesDone.toDouble() / bytesTotal).toFloat().coerceIn(0f, 1f) else -1f + val installFraction: Float get() = when { + stage != DownloadStage.DOWNLOAD && stage != DownloadStage.INSTALL -> -1f + stageTotal > 0L -> (stageDone.toDouble() / stageTotal).toFloat().coerceIn(0f, 1f) + stageItemsTotal > 0 -> (stageItems.toFloat() / stageItemsTotal).coerceIn(0f, 1f) + else -> -1f + } + val streaming: Boolean get() = state == DownloadState.RUNNING && bytesTotal > 0L && bytesDone < bytesTotal && installFraction >= 0f && + (stage == DownloadStage.INSTALL || (stage == DownloadStage.DOWNLOAD && passed(DownloadStage.INSTALL))) + /** Whole job as one bar: downloading fills the first 90%, installing the rest, also when they run together. */ + val overallFraction: Float get() { + if (state == DownloadState.INSTALLED || stage == DownloadStage.DONE) return 1f + val downloaded = when { + bytesTotal > 0L -> downloadFraction + passed(DownloadStage.DOWNLOAD) -> 1f + else -> 0f + } + val installed = if (stage == DownloadStage.INSTALL || (stage == DownloadStage.DOWNLOAD && passed(DownloadStage.INSTALL))) installFraction.coerceAtLeast(0f) else 0f + return (0.9f * downloaded + 0.1f * installed).coerceIn(0f, 1f) + } val fraction: Float get() = stageFraction.coerceAtLeast(0f) val percent: Int get() = (fraction * 100).toInt() } 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 917b2c0ba..4ceb4278b 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 @@ -45,13 +45,18 @@ object DownloadQueue { val e = item.entry if (e.stage == stage) return item.speedAt = 0L; item.speedBytes = 0L; item.speedEwma = 0.0 - item.entry = e.copy( - stage = stage, stagesPassed = e.stagesPassed or (1 shl e.stage.ordinal), speedBps = 0, etaSeconds = -1, + val passed = e.stagesPassed or (1 shl e.stage.ordinal) + // Streaming installers (GOG) alternate between DOWNLOAD and INSTALL; the install count lives on across the swaps. + val streaming = e.stage in STREAMED && stage in STREAMED && (passed and (1 shl DownloadStage.INSTALL.ordinal)) != 0 + item.entry = if (streaming) e.copy(stage = stage, stagesPassed = passed, speedBps = 0, etaSeconds = -1) + else e.copy( + stage = stage, stagesPassed = passed, speedBps = 0, etaSeconds = -1, stageDone = 0, stageTotal = 0, stageItems = 0, stageItemsTotal = 0, ) } private const val SPEED_WINDOW_MS = 3000.0 + private val STREAMED = setOf(DownloadStage.DOWNLOAD, DownloadStage.INSTALL) private fun stageCount(key: String, done: Long, total: Long, files: Int, filesTotal: Int, bytes: Boolean) { synchronized(lock) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomDownloadsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomDownloadsPage.kt index 7ad576f95..7c33334a2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomDownloadsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomDownloadsPage.kt @@ -100,7 +100,7 @@ fun BottomDownloadsPage() { formatSpeed(e.speedBps), ).filter { it.isNotEmpty() }.joinToString(" · ") } - BottomDownloadRow(e.name, e.store.label, detail, e.stageFraction.takeIf { it >= 0f }) + BottomDownloadRow(e.name, e.store.label, detail, steadyProgress(e)) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt index c35f3d10d..a60c4ee5a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -60,7 +60,6 @@ import androidx.compose.material.icons.outlined.SportsEsports import androidx.compose.material.icons.outlined.Storefront import androidx.compose.material.icons.outlined.SystemUpdate import androidx.compose.material.icons.outlined.Tune -import androidx.compose.material.icons.outlined.VideoLibrary import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -196,7 +195,7 @@ internal fun SideRail( internal fun railLabelIcon(key: String): Pair = when (key) { "steam" -> R.string.rail_steam to Icons.Outlined.SportsEsports - "games" -> R.string.rail_games to Icons.Outlined.VideoLibrary + "games" -> R.string.rail_games to GameShelfIcon "soundtracks" -> R.string.rail_music to SoundtrackIcon "stores" -> R.string.rail_stores to Icons.Outlined.LocalMall "downloads" -> R.string.stores_tab_downloads to Icons.Outlined.Download diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt index 6d360d735..6bc4fd214 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt @@ -27,6 +27,7 @@ import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding @@ -113,8 +114,8 @@ internal fun Actions(content: @Composable () -> Unit) = FlowRow( ) { content() } @Composable -internal fun ActionChip(t: String, ok: Boolean, fraction: Float? = null, key: Any? = null) = - Box(contentAlignment = Alignment.Center, modifier = Modifier.heightIn(min = 44.dp)) { Chip(t, ok, fraction, key) } +internal fun ActionChip(t: String, ok: Boolean, fraction: Float? = null, key: Any? = null, minWidth: androidx.compose.ui.unit.Dp = 0.dp) = + Box(contentAlignment = Alignment.Center, modifier = Modifier.heightIn(min = 44.dp)) { Chip(t, ok, fraction, key, minWidth) } internal val Shape16 = RoundedCornerShape(16.dp) @@ -141,15 +142,16 @@ internal fun BackLink(label: String, compact: Boolean = false, onClick: () -> Un } @Composable -internal fun Chip(t: String, ok: Boolean, fraction: Float? = null, key: Any? = null) { +internal fun Chip(t: String, ok: Boolean, fraction: Float? = null, key: Any? = null, minWidth: androidx.compose.ui.unit.Dp = 0.dp) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val shape = RoundedCornerShape(99.dp) val ink = if (ok) pal.good else colors.onSurfaceVariant - Box(Modifier.clip(shape).background(colors.surfaceVariant).border(1.dp, if (ok) pal.good.copy(alpha = 0.3f) else pal.line, shape)) { + Box(Modifier.widthIn(min = minWidth).clip(shape).background(colors.surfaceVariant).border(1.dp, if (ok) pal.good.copy(alpha = 0.3f) else pal.line, shape), contentAlignment = Alignment.CenterStart) { if (fraction != null) ChipFill(fraction, key, pal.signal.copy(alpha = 0.3f)) Text( t, fontSize = 12.sp, color = ink, maxLines = 1, overflow = TextOverflow.Ellipsis, + style = androidx.compose.ui.text.TextStyle(fontFeatureSettings = "tnum"), modifier = Modifier.padding(horizontal = 9.dp, vertical = 4.dp), ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index 9697fc289..3b93f0652 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -1,5 +1,7 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.interaction.collectIsPressedAsState +import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight import android.widget.Toast import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.LocalIndication @@ -482,7 +484,7 @@ internal fun GameActions( if (installed != null && id != null) { LaunchedEffect(id) { BattleNetInstall.checkUpdate(ctx, installed) } if (download != null) { - ActionChip(downloadLabel(download), ok = false, fraction = download.stageFraction.takeIf { it >= 0f }, key = download.stage) + SteadyDownloadChip(download) if (download.state != DownloadState.PAUSED) SecondaryButton(stringResource(R.string.stores_dl_pause)) { DownloadQueue.pause(download.key) } else SecondaryButton(stringResource(R.string.stores_dl_resume)) { DownloadQueue.resume(ctx, download.key) } } else if (BattleNetInstall.updates[id] == true) { @@ -497,7 +499,7 @@ internal fun GameActions( } } download != null -> { - ActionChip(downloadLabel(download), ok = false, fraction = download.stageFraction.takeIf { it >= 0f }, key = download.stage) + SteadyDownloadChip(download) if (download.state != DownloadState.PAUSED) SecondaryButton(stringResource(R.string.stores_dl_pause), modifier = leadOn) { DownloadQueue.pause(download.key) } else PrimaryButton(stringResource(R.string.stores_dl_resume), main = true, modifier = leadOn) { DownloadQueue.resume(ctx, download.key) } ConfirmButton(stringResource(R.string.stores_dl_cancel), stringResource(R.string.stores_dl_cancel_confirm)) { DownloadQueue.cancel(ctx, download.key) } @@ -1146,3 +1148,47 @@ internal object FolderSizes { }, "folder-size").start() } } + +@Composable +private fun SteadyDownloadChip(download: com.droiddeck.launcher.stores.download.DownloadEntry) { + val progress = steadyProgress(download) + val label = steadyLabel(download, progress) + val show = LocalShowSection.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val shape = if (LocalPillButtons.current) androidx.compose.foundation.shape.CircleShape else Shape12 + val src = remember { androidx.compose.foundation.interaction.MutableInteractionSource() } + val hot = rememberHot(src) + val pressed by src.collectIsPressedAsState() + val scale by androidx.compose.animation.core.animateFloatAsState(if (pressed) 0.955f else if (hot) 1.02f else 1f, Motion.sp(0.5f, androidx.compose.animation.core.Spring.StiffnessMedium), label = "dlScale") + val placed = remember { arrayOfNulls(1) } + val description = stringResource(R.string.stores_tab_downloads) + val open = { + placed[0]?.takeIf { it.isAttached }?.boundsInRoot()?.let { StoresMotion.fly(it) } + show("downloads") + } + Box( + contentAlignment = Alignment.CenterStart, + modifier = Modifier.paneItem("detail-download").testTag("detail-download") + .onGloballyPositioned { placed[0] = it } + .widthIn(min = 200.dp).heightIn(min = 48.dp) + .graphicsLayer { scaleX = scale; scaleY = scale }.clip(shape) + .background(Color.White.copy(alpha = 0.04f)) + .glideBorder(hot, shape, pal.signal, pal.line2) + .hoverable(src) + .clickable(interactionSource = src, indication = androidx.compose.foundation.LocalIndication.current, role = androidx.compose.ui.semantics.Role.Button, onClickLabel = description, onClick = open) + .controllerConfirm(onClick = open), + ) { + ChipFill(progress, download.key, pal.signal.copy(alpha = 0.42f)) + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween, + modifier = Modifier.widthIn(min = 200.dp).padding(start = 16.dp, end = 10.dp), + ) { + Text( + label, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 0.5.sp, color = colors.onBackground, maxLines = 1, + style = androidx.compose.ui.text.TextStyle(fontFeatureSettings = "tnum"), modifier = Modifier.padding(end = 8.dp), + ) + Icon(androidx.compose.material.icons.Icons.AutoMirrored.Filled.KeyboardArrowRight, description, tint = if (hot) colors.onBackground else colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameShelfIcon.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameShelfIcon.kt new file mode 100644 index 000000000..74b92c9be --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameShelfIcon.kt @@ -0,0 +1,17 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.unit.dp + +internal val GameShelfIcon: ImageVector = ImageVector.Builder("GameShelf", 24.dp, 24.dp, 24f, 24f).apply { + for (d in listOf( + "M3,4H7V20H3ZM4.4,5.4V18.6H5.6V5.4Z", + "M8.5,4H12.5V20H8.5ZM9.9,5.4V18.6H11.1V5.4Z", + "M14.2,5.1L18.1,4.2L21.4,19.8L17.5,20.7ZM15.9,6.2L18.6,18.9L19.8,18.6L17.1,5.9Z", + "M2,21H22V22.5H2Z", + )) addPath(addPathNodes(d), fill = SolidColor(Color.Black), pathFillType = PathFillType.EvenOdd) +}.build() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryAccounts.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryAccounts.kt index 2b10c7902..c79337e85 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryAccounts.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryAccounts.kt @@ -19,7 +19,7 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.ManageAccounts import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -66,7 +66,7 @@ internal fun StoreAccountsButton() { placed[0]?.takeIf { it.isAttached }?.boundsInRoot()?.let { at -> Steps.ask(StepAsk( anchor = at, side = StepSide.Left, accent = pal.signal, items = storesWithSignIn().size + 1, pillCorner = 20.dp, maxWidth = 380.dp, - handle = { Icon(Icons.Filled.Add, null, tint = pal.signal, modifier = Modifier.size(20.dp)) }, + handle = { Icon(Icons.Filled.ManageAccounts, null, tint = pal.signal, modifier = Modifier.size(20.dp)) }, ) { StoreAccountsStep(onSignIn = { store, row -> Steps.fold() @@ -92,7 +92,7 @@ internal fun StoreAccountsButton() { .hoverable(src) .clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClickLabel = label, onClick = open) .controllerConfirm(onClick = open), - ) { Icon(Icons.Filled.Add, label, tint = if (hot) colors.onBackground else colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) } + ) { Icon(Icons.Filled.ManageAccounts, label, tint = if (hot) colors.onBackground else colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index 272f42840..b1fd672a6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -41,6 +41,8 @@ import androidx.compose.foundation.selection.selectable import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ExpandLess +import androidx.compose.material.icons.filled.ExpandMore import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.BookmarkBorder import androidx.compose.material.icons.filled.FilterAlt @@ -177,8 +179,9 @@ internal fun librarySources( } internal object LibraryDisplay { + const val DEFAULT_LEVEL = 2 val scales = listOf(0.75f, 0.875f, 1f, 1.2f, 1.45f) - var level by mutableIntStateOf(2) + var level by mutableIntStateOf(DEFAULT_LEVEL) private set var title by mutableStateOf(true) private set @@ -215,6 +218,68 @@ internal object LibraryDisplay { } } +private enum class ToggleAt { NONE, TOP, SPLIT, BOTTOM } + +private const val NOT_INSTALLED_ROW = "library-not-installed" + +@Composable +private fun NotInstalledRow(count: Int, expanded: Boolean, keys: Modifier, onFocus: (Boolean) -> Unit, onToggle: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val shape = RoundedCornerShape(12.dp) + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), + modifier = Modifier.fillMaxWidth().padding(top = 6.dp, bottom = 2.dp).then(keys).paneItem(NOT_INSTALLED_ROW).onFocusChanged { onFocus(it.isFocused) }.testTag(NOT_INSTALLED_ROW) + .heightIn(min = 44.dp).clip(shape) + .background(if (hot) pal.signal.copy(alpha = 0.12f) else Color.Transparent) + .glideBorder(hot, shape, pal.signal, Color.Transparent) + .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onToggle) + .controllerConfirm(onClick = onToggle) + .padding(horizontal = 4.dp, vertical = 8.dp), + ) { + Text( + stringResource(R.string.stores_section_not_installed).uppercase() + " · " + count, + fontSize = 12.sp, fontWeight = FontWeight.Bold, letterSpacing = 1.2.sp, color = if (hot) colors.onBackground else colors.onSurfaceVariant, maxLines = 1, + ) + Box(Modifier.weight(1f).height(1.dp).background(pal.line)) + val hop = remember { androidx.compose.animation.core.Animatable(0f) } + LaunchedEffect(expanded, hot, Motion.scale) { + hop.snapTo(0f) + if (Motion.scale == 0f) return@LaunchedEffect + val toward = if (expanded) -3.5f else 3.5f + kotlinx.coroutines.delay(if (hot) 0L else 1_200L) + while (true) { + repeat(2) { + hop.animateTo(toward, androidx.compose.animation.core.tween(150, easing = androidx.compose.animation.core.FastOutSlowInEasing)) + hop.animateTo(0f, androidx.compose.animation.core.spring(dampingRatio = 0.45f, stiffness = androidx.compose.animation.core.Spring.StiffnessMedium)) + } + kotlinx.coroutines.delay(3_500L) + } + } + Icon( + if (expanded) Icons.Filled.ExpandLess else Icons.Filled.ExpandMore, stringResource(if (expanded) R.string.library_filter_installed else R.string.library_browse_owned), + tint = if (hot) colors.onBackground else colors.onSurfaceVariant, + modifier = Modifier.size(22.dp).graphicsLayer { translationY = hop.value.dp.toPx() }, + ) + } +} + +internal fun libraryColumns(width: Int, base: Int, gap: Int, level: Int): Int = + (((width + gap) / (base + gap)).coerceAtLeast(1) + LibraryDisplay.DEFAULT_LEVEL - level).coerceAtLeast(1) + +private class LevelCells(private val base: androidx.compose.ui.unit.Dp, private val level: Int) : GridCells { + override fun androidx.compose.ui.unit.Density.calculateCrossAxisCellSizes(availableSize: Int, spacing: Int): List { + val count = libraryColumns(availableSize, base.roundToPx(), spacing, level) + val usable = (availableSize - spacing * (count - 1)).coerceAtLeast(0) + return List(count) { usable / count + if (it < usable % count) 1 else 0 } + } + + override fun equals(other: Any?): Boolean = other is LevelCells && other.base == base && other.level == level + override fun hashCode(): Int = 31 * base.hashCode() + level +} + internal object LibraryView { var source by mutableStateOf(LIBRARY_ALL) var query by mutableStateOf("") @@ -305,6 +370,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, } val collectionItems = collectionId?.let { if (source == Store.GAMEJOLT.id) GameJoltCollections.gamesOf(it) else ItchCollections.gamesOf(it) } val pool = if (collectionId == null) all else collectionEntries(all, collectionItems.orEmpty(), Store.byId(source) ?: Store.ITCH) + val libraryTotal = if (soundMode) 0 else all.count { inLibrarySource(LIBRARY_ALL, it, favorites, concealed) } val matching = pool.filter { inLibrarySource(source, it, favorites, concealed) && (q.isEmpty() || it.title.lowercase().contains(q)) && keepsXbox(xboxFilter, it) } @@ -433,7 +499,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val detailScroll = rememberScrollState() var cycled by remember { mutableIntStateOf(0) } var gridFocused by remember { mutableStateOf(false) } - LaunchedEffect(source, sort, listUninstalled) { grid.scrollToItem(0) } + LaunchedEffect(source, sort) { grid.scrollToItem(0) } LaunchedEffect(cycled) { if (cycled == 0 || ff == null || inputMode.inputMode != androidx.compose.ui.input.InputMode.Keyboard) return@LaunchedEffect focusWithinFrames({ gridFocused }) { @@ -449,7 +515,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, wrap = { key, content -> StoreTheme(GameRef.parse(key).let { r -> r.store ?: r.game(s.steamGames)?.source?.let { Store.byId(it) } }) { content() } }, grid = { LibraryGrid( - s, a, grid, visible, split, visible.size, sources, source, sizesPending, syncing, + s, a, grid, visible, split, if (soundMode) visible.size else libraryTotal, sources, source, sizesPending, syncing, showUninstalled = listUninstalled.takeIf { !s.shortcutPicker },onShowUninstalled = setShowUninstalled, hiddenUninstalled = hiddenUninstalled, onSource = { LibraryView.source = it }, @@ -517,12 +583,43 @@ private fun LibraryGrid( ) { val listMode = s.storesView == "list" val capsules = s.storesView == "capsules" - val tileWidth = (if (capsules) CapsuleWidth else if (listMode) CardWidth else LibraryCardWidth) * LibraryDisplay.scales[LibraryDisplay.level] + val baseWidth = if (capsules) CapsuleWidth else LibraryCardWidth + val level = LibraryDisplay.level val focus = LocalFrontFocus.current val scope = rememberCoroutineScope() val density = androidx.compose.ui.platform.LocalDensity.current var columns by remember { mutableIntStateOf(1) } val headerItems = 2 + (if (sizesPending) 1 else 0) + syncing.size + val expanded = showUninstalled == true + val notInstalled = if (expanded) visible.count { !it.installed } else hiddenUninstalled + val toggleAt = when { + showUninstalled == null || soundMode || notInstalled == 0 || (expanded && visible.isEmpty()) -> ToggleAt.NONE + !expanded -> ToggleAt.BOTTOM + split > 0 -> ToggleAt.SPLIT + else -> ToggleAt.TOP + } + val itemIndex: (Int) -> Int = { i -> + headerItems + i + when { + split > 0 -> if (i < split) 1 else 2 + toggleAt == ToggleAt.TOP -> 1 + else -> 0 + } + } + val toggleIndex = when (toggleAt) { + ToggleAt.TOP -> headerItems + ToggleAt.SPLIT -> headerItems + split + 1 + else -> headerItems + visible.size + } + val gapPx = with(density) { 10.dp.toPx() } + val moveFocus: (String, Int, Int, Int) -> Unit = { target, targetIndex, currentIndex, direction -> + val shown = grid.layoutInfo.visibleItemsInfo.any { it.index == targetIndex } + if (focus != null && (!shown || (focus.attached[target] ?: 0) == 0 || + runCatching { focus.items.getValue(target).requestFocus() }.isFailure)) scope.launch { + launch { grid.revealRow(currentIndex, targetIndex, direction, gapPx) } + focusWithinFrames({ focus.last == target }) { focus.items[target] ?: FocusRequester.Default } + } + } + val rowStart: (Int) -> Int? = { i -> if (i < 0) null else if (listMode) i else i - i % columns.coerceAtLeast(1) } val tile: @Composable (LibraryEntry) -> Unit = { e -> val first = e.key == visible.firstOrNull()?.key val navigation = if (focus == null) Modifier else Modifier.onPreviewKeyEvent { event -> @@ -534,21 +631,21 @@ private fun LibraryGrid( } val index = visible.indexOfFirst { it.key == e.key } val next = storeGridNeighbor(index, visible.size, if (listMode) 1 else columns, direction, split) + val toToggle = index >= 0 && when (toggleAt) { + ToggleAt.BOTTOM -> next == null && direction > 0 + ToggleAt.TOP -> next == null && direction < 0 + ToggleAt.SPLIT -> next != null && (index < split) != (next < split) + ToggleAt.NONE -> false + } when { direction == 0 || index < 0 -> false + toToggle -> { + if (key.action == KeyEvent.ACTION_DOWN) moveFocus(NOT_INSTALLED_ROW, toggleIndex, itemIndex(index), direction) + true + } next == null -> direction > 0 && trackHits.isEmpty() else -> { - if (key.action == KeyEvent.ACTION_DOWN) { - val target = "card:${visible[next].key}" - val targetIndex = headerItems + next + if (split == 0) 0 else if (next < split) 1 else 2 - val currentIndex = headerItems + index + if (split == 0) 0 else if (index < split) 1 else 2 - val shown = grid.layoutInfo.visibleItemsInfo.any { it.index == targetIndex } - if (!shown || (focus.attached[target] ?: 0) == 0 || - runCatching { focus.items.getValue(target).requestFocus() }.isFailure) scope.launch { - launch { grid.revealRow(currentIndex, targetIndex, direction, with(density) { 10.dp.toPx() }) } - focusWithinFrames({ focus.last == target }) { focus.items[target] ?: FocusRequester.Default } - } - } + if (key.action == KeyEvent.ACTION_DOWN) moveFocus("card:${visible[next].key}", itemIndex(next), itemIndex(index), direction) true } } @@ -557,12 +654,51 @@ private fun LibraryGrid( val choose = if (picker) ({ a.onSteamGame(e.game!!) }) else null if (listMode) LibraryRow(e, first, navigation, choose, onOpen) else LibraryTile(e, capsules, first, navigation, choose, onOpen, showSource = source == LIBRARY_ALL || source == LIBRARY_FAVORITES || source == LIBRARY_HIDDEN) } + var rowFocused by remember { mutableStateOf(false) } + val toggleRow: @Composable () -> Unit = { + val keys = if (focus == null) Modifier else Modifier.onPreviewKeyEvent { event -> + val key = event.nativeKeyEvent + val direction = when (key.keyCode) { + KeyEvent.KEYCODE_DPAD_DOWN -> 1 + KeyEvent.KEYCODE_DPAD_UP -> -1 + else -> 0 + } + val target = when { + direction > 0 && toggleAt == ToggleAt.TOP -> 0 + direction > 0 && toggleAt == ToggleAt.SPLIT -> split + direction < 0 && toggleAt == ToggleAt.SPLIT -> rowStart(split - 1) + direction < 0 && toggleAt == ToggleAt.BOTTOM -> rowStart(visible.lastIndex) + else -> null + } + when { + direction == 0 -> false + target == null -> direction > 0 && toggleAt == ToggleAt.BOTTOM && trackHits.isEmpty() + else -> { + if (key.action == KeyEvent.ACTION_DOWN) moveFocus("card:${visible[target].key}", itemIndex(target), toggleIndex, direction) + true + } + } + } + NotInstalledRow(notInstalled, expanded, keys, onFocus = { rowFocused = it }) { + rowFocused = false + val landing = if (expanded) headerItems + split else headerItems + visible.size + 1 + onShowUninstalled(!expanded) + if (focus != null && focus.last == NOT_INSTALLED_ROW) scope.launch { + androidx.compose.runtime.withFrameNanos { } + if (grid.layoutInfo.visibleItemsInfo.none { it.key == NOT_INSTALLED_ROW }) grid.scrollToItem((landing - 1).coerceAtLeast(0)) + repeat(30) { + androidx.compose.runtime.withFrameNanos { } + if (rowFocused) return@launch + runCatching { focus.items[NOT_INSTALLED_ROW]?.requestFocus() } + } + } + } + } LazyVerticalGrid( - columns = if (listMode) GridCells.Fixed(1) else GridCells.Adaptive(tileWidth), state = grid, + columns = if (listMode) GridCells.Fixed(1) else remember(baseWidth, level) { LevelCells(baseWidth, level) }, state = grid, modifier = Modifier.fillMaxSize().onFocusChanged { onFocus(it.hasFocus) }.focusGroup().bumpers(onPrevious = { onCycle(-1) }, onNext = { onCycle(1) }).onSizeChanged { val gap = with(density) { 10.dp.roundToPx() } - val minimum = with(density) { (if (listMode) CardWidth * 2 else tileWidth).roundToPx() } - columns = ((it.width + gap) / (minimum + gap)).coerceAtLeast(1) + columns = if (listMode) 1 else libraryColumns(it.width, with(density) { baseWidth.roundToPx() }, gap, level) }, horizontalArrangement = Arrangement.spacedBy(10.dp), verticalArrangement = Arrangement.spacedBy(10.dp), contentPadding = PaddingValues(top = 4.dp, bottom = 16.dp), @@ -587,17 +723,17 @@ private fun LibraryGrid( } } val empty = emptyText - if (visible.isEmpty() && hiddenUninstalled > 0) item(key = "browse-owned", span = { GridItemSpan(maxLineSpan) }) { - Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.fillMaxWidth().padding(vertical = 32.dp)) { - Text(stringResource(R.string.library_no_installed_matches), fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) - SecondaryButton(stringResource(R.string.library_browse_owned), modifier = Modifier.testTag("library-browse-owned")) { onShowUninstalled(true) } - } + if (split == 0) { + if (toggleAt == ToggleAt.TOP) item(key = NOT_INSTALLED_ROW, span = { GridItemSpan(maxLineSpan) }) { toggleRow() } + if (visible.isNotEmpty() || toggleAt == ToggleAt.NONE) libraryGrid(visible, empty, tile) + if (toggleAt == ToggleAt.BOTTOM) item(key = NOT_INSTALLED_ROW, span = { GridItemSpan(maxLineSpan) }) { toggleRow() } } - else if (split == 0) libraryGrid(visible, empty, tile) else { item(key = "installed-label", span = { GridItemSpan(maxLineSpan) }) { SectionLabel(stringResource(R.string.stores_section_installed)) } libraryGrid(visible.take(split), empty, tile) - item(key = "not-installed-label", span = { GridItemSpan(maxLineSpan) }) { SectionLabel(stringResource(R.string.stores_section_not_installed)) } + item(key = NOT_INSTALLED_ROW, span = { GridItemSpan(maxLineSpan) }) { + if (toggleAt == ToggleAt.SPLIT) toggleRow() else SectionLabel(stringResource(R.string.stores_section_not_installed)) + } libraryGrid(visible.drop(split), empty, tile) } if (trackHits.isNotEmpty()) { @@ -683,7 +819,7 @@ private fun LibraryHeader( ) { if (soundMode) HeaderIconButton(stringResource(R.string.soundtracks_saved), Icons.Filled.BookmarkBorder, "collections", onClick = onCollections) DisplayButton() - if (!soundMode && (showUninstalled != null || xbox)) LibraryFilterButton(showUninstalled, onShowUninstalled, xbox) + if (!soundMode && xbox) LibraryFilterButton(null, onShowUninstalled, xbox) if (collections != null) CollectionsButton(collections) SortButton(s, a) ViewButton(s, a) @@ -792,7 +928,7 @@ internal fun libraryTileWidth() = LibraryCardWidth * LibraryDisplay.scales[Libra @Composable private fun LibraryArt(e: LibraryEntry, wide: Any?, tall: Any?, download: DownloadEntry?, hot: Boolean, capsule: Boolean, showSource: Boolean) { val chip = when { - download != null -> "${download.percent}%" + download != null -> "${(steadyProgress(download) * 100).toInt()}%" e.item != null && StoresState.isUnfinished(e.item) -> stringResource(R.string.stores_resume) e.installed && libraryUpdateAvailable(e) -> stringResource(R.string.common_update) else -> null @@ -835,7 +971,7 @@ internal fun ArtCard( ) badge?.invoke(this) if (chip != null) Box(Modifier.align(Alignment.TopEnd).padding(6.dp)) { - StateChip(chip, ChipTone.BUSY, small = true, fraction = download?.stageFraction?.takeIf { it >= 0f }, key = download?.stage) + StateChip(chip, ChipTone.BUSY, small = true, fraction = download?.let { steadyProgress(it) }, key = download?.key) } val showName = LibraryDisplay.title || hot val showDetail = LibraryDisplay.size || hot diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index 440541dda..2a8e8e67a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -92,6 +92,7 @@ import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.Search import androidx.compose.material.icons.automirrored.filled.Login +import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight import androidx.compose.foundation.basicMarquee import androidx.compose.material.icons.filled.Settings import androidx.compose.material.icons.outlined.Download @@ -927,16 +928,13 @@ private fun ProfileStrip(store: Store, owned: Int, loaded: Boolean, s: FrontEndS } Column(Modifier.weight(1f)) { Text(name.ifEmpty { store.label }, fontSize = 15.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) - Text( - if (loaded) store.shortLabel + " · " + androidx.compose.ui.res.pluralStringResource(R.plurals.mode_added_count, owned, owned) else store.label, - fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, - ) - } - Actions { - SmallTextButton(stringResource(R.string.stores_owned_in_library), key = "owned-in-library") { + if (loaded) OwnedLink(store.shortLabel + " · " + androidx.compose.ui.res.pluralStringResource(R.plurals.mode_added_count, owned, owned)) { LibraryView.showOwned(ctx, store) show("games") } + else Text(store.label, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + Actions { SmallTextButton(stringResource(R.string.stores_refresh)) { StoresState.open(ctx, store, force = true) } if (store == Store.XBOX) SmallTextButton(stringResource(R.string.stores_xbox_cloud_settings), key = "xbox-cloud-settings") { ctx.startActivity(android.content.Intent(ctx, com.droiddeck.launcher.stores.xbox.XboxCloudSettingsActivity::class.java)) @@ -949,6 +947,28 @@ private fun ProfileStrip(store: Store, owned: Int, loaded: Boolean, s: FrontEndS } } +@Composable +private fun OwnedLink(label: String, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val shape = RoundedCornerShape(8.dp) + val description = stringResource(R.string.stores_owned_in_library) + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(2.dp), + modifier = Modifier.paneItem("owned-in-library").testTag("owned-in-library").clip(shape) + .background(if (hot) pal.signal.copy(alpha = 0.14f) else Color.Transparent) + .glideBorder(hot, shape, pal.signal, Color.Transparent) + .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClickLabel = description, onClick = onClick) + .controllerConfirm(onClick = onClick) + .padding(start = 2.dp, end = 4.dp, top = 2.dp, bottom = 2.dp), + ) { + Text(label, fontSize = 12.sp, color = if (hot) colors.onBackground else colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + Icon(Icons.AutoMirrored.Filled.KeyboardArrowRight, description, tint = if (hot) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(16.dp)) + } +} + @Composable private fun BattleNetLauncherRow(s: FrontEndState, a: FrontEndActions) { val ctx = LocalContext.current @@ -1385,7 +1405,25 @@ internal fun ProgressBarThin(fraction: Float, paused: Boolean = false, verify: B internal fun downloadLabel(d: com.droiddeck.launcher.stores.download.DownloadEntry): String = when (d.state) { DownloadState.PAUSED -> stringResource(R.string.stores_dl_paused) DownloadState.QUEUED -> stringResource(R.string.stores_dl_queued) - else -> if (d.stageFraction >= 0f) stringResource(R.string.stores_dl_active_percent, activeStageLabel(d), d.percent) else activeStageLabel(d) + else -> when { + d.streaming -> stringResource(R.string.stores_dl_active_percent, stringResource(R.string.stores_stage_installing), (d.installFraction * 100).toInt()) + d.stageFraction >= 0f -> stringResource(R.string.stores_dl_active_percent, activeStageLabel(d), d.percent) + else -> activeStageLabel(d) + } +} + +@Composable +internal fun steadyProgress(d: com.droiddeck.launcher.stores.download.DownloadEntry): Float { + val best = androidx.compose.runtime.remember(d.key) { floatArrayOf(0f) } + best[0] = maxOf(best[0], d.overallFraction) + return best[0] +} + +@Composable +internal fun steadyLabel(d: com.droiddeck.launcher.stores.download.DownloadEntry, progress: Float): String = when (d.state) { + DownloadState.QUEUED -> stringResource(R.string.stores_dl_queued) + DownloadState.PAUSED -> stringResource(R.string.stores_dl_active_percent, stringResource(R.string.stores_dl_paused), (progress * 100).toInt()) + else -> stringResource(R.string.stores_dl_active_percent, stringResource(R.string.stores_stage_installing), (progress * 100).toInt()) } @Composable diff --git a/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadEntryTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadEntryTest.kt index 46b38647c..914089a2c 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadEntryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadEntryTest.kt @@ -24,4 +24,45 @@ class DownloadEntryTest { assertFalse(e.passed(DownloadStage.INSTALL)) assertTrue(e.copy(state = DownloadState.INSTALLED).passed(DownloadStage.INSTALL)) } + + @Test fun streamingInstallKeepsDownloadAndInstallProgressApart() { + val installBit = 1 shl DownloadStage.INSTALL.ordinal + val installing = base.copy(stage = DownloadStage.INSTALL, bytesDone = 10, bytesTotal = 100, stageDone = 25, stageTotal = 100) + assertTrue(installing.streaming) + assertEquals(0.10f, installing.downloadFraction, 0.001f) + assertEquals(0.25f, installing.installFraction, 0.001f) + val backToDownload = installing.copy(stage = DownloadStage.DOWNLOAD, stagesPassed = installBit) + assertTrue(backToDownload.streaming) + assertEquals(0.25f, backToDownload.installFraction, 0.001f) + assertFalse(base.copy(stage = DownloadStage.DOWNLOAD, bytesDone = 10, bytesTotal = 100).streaming) + assertTrue(installing.copy(bytesDone = 99_950, bytesTotal = 100_000).streaming) + assertTrue(installing.copy(bytesDone = 99_999_999, bytesTotal = 100_000_000).streaming) + assertFalse(installing.copy(bytesDone = 100).streaming) + assertFalse(installing.copy(state = DownloadState.PAUSED).streaming) + } + + @Test fun overallProgressOnlyGrowsAcrossSequentialAndStreamingStages() { + val installBit = 1 shl DownloadStage.INSTALL.ordinal + val downloadBit = 1 shl DownloadStage.DOWNLOAD.ordinal + val sequential = listOf( + base.copy(stage = DownloadStage.MANIFEST), + base.copy(stage = DownloadStage.DOWNLOAD, bytesDone = 50, bytesTotal = 100), + base.copy(stage = DownloadStage.DOWNLOAD, bytesDone = 100, bytesTotal = 100), + base.copy(stage = DownloadStage.INSTALL, bytesDone = 100, bytesTotal = 100, stagesPassed = downloadBit, stageDone = 0, stageTotal = 10), + base.copy(stage = DownloadStage.INSTALL, bytesDone = 100, bytesTotal = 100, stagesPassed = downloadBit, stageDone = 10, stageTotal = 10), + base.copy(state = DownloadState.INSTALLED), + ).map { it.overallFraction } + assertEquals(sequential, sequential.sorted()) + assertEquals(1f, sequential.last(), 0f) + val streaming = listOf( + base.copy(stage = DownloadStage.DOWNLOAD, bytesDone = 10, bytesTotal = 100), + base.copy(stage = DownloadStage.INSTALL, bytesDone = 20, bytesTotal = 100, stageDone = 15, stageTotal = 100), + base.copy(stage = DownloadStage.DOWNLOAD, bytesDone = 40, bytesTotal = 100, stageDone = 15, stageTotal = 100, stagesPassed = installBit), + base.copy(stage = DownloadStage.INSTALL, bytesDone = 60, bytesTotal = 100, stageDone = 55, stageTotal = 100, stagesPassed = installBit), + base.copy(stage = DownloadStage.DOWNLOAD, bytesDone = 100, bytesTotal = 100, stageDone = 60, stageTotal = 100, stagesPassed = installBit), + base.copy(stage = DownloadStage.INSTALL, bytesDone = 100, bytesTotal = 100, stageDone = 80, stageTotal = 100, stagesPassed = installBit or downloadBit), + ).map { it.overallFraction } + assertEquals(streaming, streaming.sorted()) + } } + diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryColumnsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryColumnsTest.kt new file mode 100644 index 000000000..3d0340e06 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryColumnsTest.kt @@ -0,0 +1,13 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Test + +class LibraryColumnsTest { + @Test fun everySizeStepChangesTheColumnCountUntilOne() { + val phone = (0..4).map { libraryColumns(width = 1080, base = 450, gap = 30, level = it) } + assertEquals(listOf(4, 3, 2, 1, 1), phone) + val tablet = (0..4).map { libraryColumns(width = 2400, base = 450, gap = 30, level = it) } + assertEquals(listOf(7, 6, 5, 4, 3), tablet) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryVisibilityTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryVisibilityTest.kt index f6085e512..ecefb57d4 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/LibraryVisibilityTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryVisibilityTest.kt @@ -76,52 +76,43 @@ class LibraryVisibilityTest { LibraryView.focusFirst = false } - @Test fun uninstalledGamesAreHiddenUntilSelectedInTheFilterAndTheChoiceSurvivesReopeningLibrary() { + @Test fun uninstalledGamesStayFoldedUnderTheirRowAndTheChoiceSurvivesReopeningLibrary() { show() compose.onNodeWithText("Installed Steam game").assertExists() compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() - chooseVisibility(true) + compose.onNodeWithText("NOT INSTALLED · 2").assertExists() + compose.onNodeWithText("3 games").assertExists() + toggleNotInstalled(true) + compose.onNodeWithText("3 games").assertExists() compose.onNodeWithText("Uninstalled GOG").assertExists() - assertTrue(SessionPrefs.libraryShowUninstalled(ctx)) compose.runOnIdle { generation++; Snapshot.sendApplyNotifications() } compose.mainClock.advanceTimeBy(2_000) compose.onNodeWithText("Uninstalled GOG").assertExists() - chooseVisibility(false) + toggleNotInstalled(false) compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() - assertFalse(SessionPrefs.libraryShowUninstalled(ctx)) } - @Test fun theFilterExpandsBesideSortWithoutChangingTheSelectionOnOpen() { + @Test fun theNotInstalledRowReplacesTheFilterButtonAndSortStillOpens() { show() - val filter = compose.onNodeWithContentDescription("Filter · Installed only") - val sort = compose.onNodeWithContentDescription("Sort") - assertTrue(filter.fetchSemanticsNode().boundsInRoot.right <= sort.fetchSemanticsNode().boundsInRoot.left) - filter.performClick() - compose.mainClock.advanceTimeBy(2_000) - compose.onNodeWithText("Installed only").assertIsDisplayed() - compose.onNodeWithText("All owned games").assertIsDisplayed() - compose.onAllNodesWithText("Filter").assertCountEquals(1) - compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() + compose.onNodeWithContentDescription("Filter · Installed only").assertDoesNotExist() + compose.onNodeWithTag("library-not-installed").assertExists() assertFalse(SessionPrefs.libraryShowUninstalled(ctx)) - compose.runOnIdle { Steps.fold(); Snapshot.sendApplyNotifications() } - compose.mainClock.advanceTimeBy(1_000) - sort.performClick() + compose.onNodeWithContentDescription("Sort").performClick() compose.mainClock.advanceTimeBy(2_000) compose.onAllNodesWithText("Sort").assertCountEquals(1) compose.onNodeWithText("Recently played").assertIsDisplayed() } - @Test fun theXboxAccessChoicesShareTheLibraryFilter() { + @Test fun theXboxFilterOnlyOffersTheXboxAccessChoices() { StoreAccounts.write(ctx, Store.XBOX, JSONObject().put("username", "Library test")) StoresState.accounts[Store.XBOX] = "Library test" StoresState.library[Store.XBOX] = listOf(CatalogItem(Store.XBOX, "owned", "Uninstalled Xbox", null, owned = true)) LibraryView.source = Store.XBOX.id try { show() - compose.onNodeWithContentDescription("Filter · Installed only").performClick() + compose.onNodeWithContentDescription("Filter · All").performClick() compose.mainClock.advanceTimeBy(2_000) - compose.onNodeWithText("Installed only").assertIsDisplayed() - compose.onNodeWithText("All owned games").assertIsDisplayed() + compose.onNodeWithText("Installed only").assertDoesNotExist() compose.onNodeWithText("Game Pass").assertIsDisplayed().performClick() compose.mainClock.advanceTimeBy(1_000) assertEquals(XboxLibraryFilter.GAME_PASS, XboxLibraryFilter.current) @@ -131,14 +122,19 @@ class LibraryVisibilityTest { } } - @Test fun aSearchWithOnlyUninstalledMatchesOffersToRevealThem() { + @Test fun aSearchWithOnlyUninstalledMatchesShowsTheFoldedRowToRevealThem() { LibraryView.query = "Uninstalled GOG" show() compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() - compose.onNodeWithTag("library-browse-owned").performClick() + compose.onNodeWithText("No installed games match these filters", substring = true).assertDoesNotExist() + compose.onNodeWithTag("library-not-installed").performClick() compose.mainClock.advanceTimeBy(1_000) compose.onNodeWithText("Uninstalled GOG").assertExists() assertEquals("Uninstalled GOG", LibraryView.query) + compose.onNodeWithTag("library-not-installed").performClick() + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() + compose.onNodeWithTag("library-not-installed").assertExists() } @Test fun aHiddenStoreRemainsReachableInLibraryInItsConfiguredOrder() { @@ -151,11 +147,19 @@ class LibraryVisibilityTest { assertTrue(steam < epic && epic < gog) compose.onNodeWithTag("library-source-gog").performClick() compose.mainClock.advanceTimeBy(1_000) - compose.onNodeWithTag("library-browse-owned").assertIsDisplayed().performClick() + compose.onNodeWithTag("library-not-installed").assertIsDisplayed().performClick() compose.mainClock.advanceTimeBy(1_000) compose.onNodeWithText("Uninstalled GOG").assertExists() } + @Test fun theHeaderCountsTheWholeLibraryWhicheverStoreIsPicked() { + show() + compose.onNodeWithText("3 games").assertExists() + compose.onNodeWithTag("library-source-gog").performClick() + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("3 games").assertExists() + } + @Test fun theStoresOwnedGamesLinkRevealsOwnedGamesDespiteTheSavedInstalledOnlyView() { assertFalse(SessionPrefs.libraryShowUninstalled(ctx)) LibraryView.showOwned(ctx, Store.GOG) @@ -188,13 +192,8 @@ class LibraryVisibilityTest { compose.mainClock.advanceTimeBy(2_000) } - private fun chooseVisibility(show: Boolean) { - compose.onNodeWithContentDescription("Filter · " + if (SessionPrefs.libraryShowUninstalled(ctx)) "All owned games" else "Installed only") - .performClick() - compose.mainClock.advanceTimeBy(2_000) - assertTrue(Steps.open) - compose.onNodeWithText(if (show) "All owned games" else "Installed only") - .performClick() + private fun toggleNotInstalled(show: Boolean) { + compose.onNodeWithTag("library-not-installed").performClick() compose.mainClock.advanceTimeBy(1_000) assertEquals(show, SessionPrefs.libraryShowUninstalled(ctx)) } From df48a85a710ca0904d98b3c0971c3ecc012fb1e9 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 19 Nov 2026 17:40:55 -0500 Subject: [PATCH 20/31] feat(library): Library chips and toolbar like the Stores tab, a Custom games tab, and one Manage stores sheet (#2897) * feat(stores): one Manage stores sheet for order, visibility and accounts Store order, which stores show, and signing in or out now live in one slide-over, the same one Edit tabs uses, with the same sorter: drag the handle, or Y to grab and the d-pad to move, A to show or hide. - The Library's chip row opens it from a sliders chip at its start, in place of the Store accounts button at the end of the row. The Stores tab's Arrange tabs opens the same sheet instead of rearranging the chip row in place. - Each store row shows its account and one action: Sign in, Sign out, Reconnect when the login expired, or Add key for itch.io. - A switched-off store leaves the Library's chips too; its games stay under All. A shown store that is signed out keeps its chip, and picking it shows the Stores tab's sign-in card in the Library. - The Stores tab, the Library's chips and the sheet share one store order. EditTabsSheet and the new sheet share SideSheet, and the tab and store lists share SortableRows. Sign-in from the Stores tab, the sheet and the Library goes through startStoreSignIn. * feat(library): Library chips match the Stores tab, cards fade in on a store change, and the sheet only arranges The Library's chip row uses the Stores tab's chips, store-colored theme and sliding fill. Switching store fades and lifts the visible cards in, staggered, and still when animations are off. Sign-in now lives on each store's own tab, so Manage stores drops its account buttons and keeps order and show or hide, with each account as a line of text. * feat(library): chips at the top, the chosen chip's toolbar under them, and a Custom games tab The Library drops its title row and game count. The store chips are the top row, and under them the chosen chip's name sits beside search, display, sort, view and the game file actions, as in the Stores tab. The add button that sat in every header becomes a Custom games chip that is always there: empty, it opens on a card that adds a game file or a folder of games; with games in it, its toolbar has the add button. * feat(library): store-colored focus in the Library, an aligned All chip, and sign out from a store's toolbar The Library's grid takes the chosen store's theme, so focus rings and accents use its color as on the Stores tab's pages. All gets a grid mark where the other chips have a dot, so its label lines up, and the Manage stores chip matches the chips' height. A signed-in store's toolbar has an account button that asks before signing out, with the Stores tab's wording. * feat(library): drop the chosen store's name from the toolbar The chip above already names it, so the toolbar starts with search. * fix(library): an empty library keeps its chips, so Custom games and a store's sign-in stay reachable With no games and no store signed in, the Library used to switch to a separate empty page without chips. It now shows the chips and toolbar like any other library, with the empty-library note under All games. * fix(library): no toolbar between the chips and a sign-in or empty Custom games card The search, display, sort and view row has nothing to act on there, so the card sits right under the chips, as it does in the Stores tab, and Down from the chip reaches its button. * fix(library): sign-in and empty Custom games cards fill the space under the chips They were a fixed 300 dp, which left the bottom of the screen empty once the toolbar above them was gone. They now take the grid's height minus the chip row. * fix(library): drop the Installed label and lighten the cards' left fade The Not installed row already divides the two sections, so the Installed label above the first games goes. The dark fade on the left of the store sign-in card and the Steam tab's art wall is lighter, so more of the art shows while the title stays readable. * Library: share the hero wall card and wall fade; icon handle for sign out The Custom games splash is now built from the same card as the store sign-in splash, with a drifting wall of the library's covers instead of a flat gradient and no hint text. The sign-in card and the Steam tab share one wall fade. The sign-out step shows the account icon as its handle, like the other toolbar steps, instead of a truncated label. * Library: sort the Custom games tab in Manage stores; keep search reachable Opened from the Library, the Manage stores sheet lists Custom games among the stores so it can be grabbed and moved like them. Its place is saved as the store it follows, so hiding that store or a new store arriving keeps it where it was. It has no switch: the tab is always there. The Custom games splash no longer replaces the toolbar while a search is active, so a search that matches nothing can still be cleared. * Manage stores: sort Favorites, Steam and Custom games; hide Favorites and Custom games Opened from the Library, the sheet lists the Library's own tabs among the stores. Each one's place is saved as the tab it follows, so hiding a store or a new store arriving leaves it where it was. Favorites and Custom games have a switch; Steam can be moved but not hidden. The sheet takes focus only in controller mode, so opening it by touch no longer switches to controller focus and its ring. Picking up a controller while it is open moves focus into it. Hidden games stay off the Custom games cover wall. * Library: keep an expired store's tab and offer sign-in when nothing is cached An expired account no longer drops its Library tab when it has no cached games: the tab stays and opens on the sign-in card, as on the Stores tab. With cached games it keeps listing them. --- .../launcher/session/SessionPrefs.kt | 19 + .../droiddeck/launcher/ui/FrontEndContent.kt | 10 +- .../droiddeck/launcher/ui/LibraryAccounts.kt | 171 --------- .../com/droiddeck/launcher/ui/LibraryPage.kt | 279 ++++++++++---- .../com/droiddeck/launcher/ui/ManageStores.kt | 358 ++++++++++++++++++ .../launcher/ui/RailSettingsPages.kt | 61 +-- .../com/droiddeck/launcher/ui/SteamHome.kt | 14 +- .../com/droiddeck/launcher/ui/StoresPage.kt | 238 +++--------- .../com/droiddeck/launcher/ui/TabsSettings.kt | 186 ++++----- app/src/main/res/values/strings.xml | 6 + .../launcher/ui/LibraryEntriesTest.kt | 19 + .../launcher/ui/LibraryFavoritesTest.kt | 5 + .../launcher/ui/LibraryVisibilityTest.kt | 48 ++- .../launcher/ui/StoreTabsStateTest.kt | 42 ++ 14 files changed, 860 insertions(+), 596 deletions(-) delete mode 100644 app/src/main/java/com/droiddeck/launcher/ui/LibraryAccounts.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/ManageStores.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/StoreTabsStateTest.kt 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 5c9d0eb17..e7c7f5f2b 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -352,6 +352,25 @@ object SessionPrefs { prefs(context).edit().putString("storesTabOrder", order.joinToString(",")).apply() } + /** + * Where the Library's own tabs (Favorites, Steam, Custom games) sit among the store tabs, as "tab=the tab it follows" pairs in + * strip order ("" follows nothing, i.e. first). Null until arranged. + */ + fun libraryTabPlaces(context: Context): List>? = + prefs(context).getString("libraryTabPlaces", null)?.split(',')?.mapNotNull { pair -> + pair.split('=', limit = 2).takeIf { it.size == 2 && it[0].isNotEmpty() }?.let { it[0] to it[1] } + } + + fun setLibraryTabPlaces(context: Context, places: List>) { + prefs(context).edit().putString("libraryTabPlaces", places.joinToString(",") { "${it.first}=${it.second}" }).apply() + } + + fun libraryTabsHidden(context: Context): Set = idList(prefs(context).getString("libraryTabsHidden", null)).toSet() + + fun setLibraryTabsHidden(context: Context, hidden: Set) { + prefs(context).edit().putString("libraryTabsHidden", hidden.joinToString(",")).apply() + } + fun storesTabHidden(context: Context): Set = idList(prefs(context).getString("storesTabHidden", null)).toSet() fun setStoresTabHidden(context: Context, hidden: Set) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt index 191956c17..c81f19dc5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt @@ -276,11 +276,17 @@ private fun Content( return } if (selected == "stores") { - StoresPage(s, a, modifier) + Box(modifier) { + StoresPage(s, a, Modifier.fillMaxSize()) + ManageStoresSheet() + } return } if (selected == "games" || selected.startsWith("app:") || selected == "soundtracks" || selected.startsWith("sound:")) { - LibraryPage(s, a, selected, onSelect, modifier) + Box(modifier) { + LibraryPage(s, a, selected, onSelect, Modifier.fillMaxSize()) + ManageStoresSheet() + } return } if (selected == "desktop") { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryAccounts.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryAccounts.kt deleted file mode 100644 index c79337e85..000000000 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryAccounts.kt +++ /dev/null @@ -1,171 +0,0 @@ -package com.droiddeck.launcher.ui - -import androidx.compose.foundation.LocalIndication -import androidx.compose.foundation.background -import androidx.compose.foundation.basicMarquee -import androidx.compose.foundation.clickable -import androidx.compose.foundation.hoverable -import androidx.compose.foundation.interaction.MutableInteractionSource -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.heightIn -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.verticalScroll -import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ManageAccounts -import androidx.compose.material3.Icon -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.focus.FocusRequester -import androidx.compose.ui.focus.focusRequester -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.layout.LayoutCoordinates -import androidx.compose.ui.layout.boundsInRoot -import androidx.compose.ui.layout.onGloballyPositioned -import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.platform.testTag -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.semantics.Role -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.style.TextOverflow -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import com.droiddeck.launcher.R -import com.droiddeck.launcher.stores.Store -import com.droiddeck.launcher.stores.StoresState - -@Composable -internal fun StoreAccountsButton() { - val ctx = LocalContext.current - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val placed = remember { arrayOfNulls(1) } - var itchKey by remember { mutableStateOf(false) } - val home = { placed[0]?.takeIf { it.isAttached }?.boundsInRoot() } - if (itchKey) ItchKeyDialog { itchKey = false } - val src = remember { MutableInteractionSource() } - val hot = rememberHot(src) - val label = stringResource(R.string.library_accounts) - val open = { - placed[0]?.takeIf { it.isAttached }?.boundsInRoot()?.let { at -> - Steps.ask(StepAsk( - anchor = at, side = StepSide.Left, accent = pal.signal, items = storesWithSignIn().size + 1, pillCorner = 20.dp, maxWidth = 380.dp, - handle = { Icon(Icons.Filled.ManageAccounts, null, tint = pal.signal, modifier = Modifier.size(20.dp)) }, - ) { - StoreAccountsStep(onSignIn = { store, row -> - Steps.fold() - when { - store == Store.ITCH -> itchKey = true - row == null || Motion.scale == 0f || StoresMotion.signIn != null -> StoresState.signIn(ctx, store) - else -> { - val accent = storePalette(pal, store).signal - StoresMotion.signIn = SignInFlood(store, row, accent, sourceColours(store.id).dot, home = home()) - } - } - }) - }) - } - Unit - } - Box(Modifier.onGloballyPositioned { placed[0] = it }) { - Box( - contentAlignment = Alignment.Center, - modifier = Modifier.paneItem("libchip:accounts").testTag("library-accounts").size(40.dp).clip(CircleShape) - .background(colors.surface) - .glideBorder(hot, CircleShape, pal.signal, pal.line) - .hoverable(src) - .clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClickLabel = label, onClick = open) - .controllerConfirm(onClick = open), - ) { Icon(Icons.Filled.ManageAccounts, label, tint = if (hot) colors.onBackground else colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) } - } -} - -private fun storesWithSignIn(): List = Store.entries.filter { StoresState.backend(it) != null } - -@Composable -private fun StepOutScope.StoreAccountsStep(onSignIn: (Store, androidx.compose.ui.geometry.Rect?) -> Unit) { - val ctx = LocalContext.current - val colors = MaterialTheme.colorScheme - var leaving by remember { mutableStateOf(null) } - LaunchedEffect(leaving) { if (leaving != null) focusSoon { first } } - val out = leaving - if (out == null) { - StepTitle(stringResource(R.string.library_accounts)) - Column(Modifier.fillMaxWidth().heightIn(max = (maxHeight - 72.dp).coerceAtLeast(120.dp)).verticalScroll(rememberScrollState())) { - storesWithSignIn().forEachIndexed { i, store -> - val name = StoresState.accounts[store] - val at = remember { arrayOfNulls(1) } - StoreTheme(store) { - AccountRow( - store, name, - modifier = Modifier.stepItem(1 + i).then(if (i == 0) Modifier.focusRequester(first) else Modifier) - .onGloballyPositioned { at[0] = it }, - enabled = open, - ) { if (name != null) leaving = store else onSignIn(store, at[0]?.takeIf { it.isAttached }?.boundsInRoot()) } - } - } - } - } else { - StepTitle(stringResource(R.string.stores_signout_title, out.label)) - Text(stringResource(R.string.stores_signout_note), fontSize = 13.sp, color = colors.onSurfaceVariant, modifier = Modifier.stepItem(1).padding(start = 4.dp, bottom = 12.dp)) - Row(horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End), modifier = Modifier.fillMaxWidth().stepItem(2)) { - StepChoice(stringResource(R.string.stores_signout_stay), enabled = open, modifier = Modifier.focusRequester(first)) { leaving = null } - StepChoice(stringResource(R.string.stores_signout_go), danger = true, enabled = open) { - Steps.fold() - StoresState.signOut(ctx, out) - } - } - } -} - -@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) -@Composable -private fun AccountRow(store: Store, account: String?, modifier: Modifier, enabled: Boolean, onClick: () -> Unit) { - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val src = remember { MutableInteractionSource() } - val hot = rememberHot(src) - val shape = RoundedCornerShape(20.dp) - val signedIn = account != null - val accent = pal.signal - Row( - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), - modifier = modifier.fillMaxWidth().heightIn(min = 44.dp).clip(shape) - .background(if (hot) accent.copy(alpha = 0.16f) else Color.Transparent) - .glideBorder(hot, shape, accent, Color.Transparent) - .hoverable(src) - .clickable(interactionSource = src, indication = LocalIndication.current, enabled = enabled, role = Role.Button, onClick = onClick) - .controllerConfirm(enabled = enabled, onClick = onClick) - .testTag("account-${store.id}") - .padding(horizontal = 16.dp), - ) { - Box(Modifier.size(10.dp).background(sourceColours(store.id).dot.copy(alpha = if (signedIn) 1f else 0.45f), CircleShape)) - Row(Modifier.weight(1f), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { - Text(store.label, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, softWrap = false) - if (account != null) Text( - account, fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1, softWrap = false, - modifier = Modifier.weight(1f, fill = false).basicMarquee(iterations = Int.MAX_VALUE, initialDelayMillis = 1_200), - ) - } - Text( - stringResource(if (signedIn) R.string.library_account_sign_out else R.string.library_account_sign_in), - fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = if (signedIn) (if (hot) colors.error else colors.onSurfaceVariant) else if (hot) accent else colors.onBackground, maxLines = 1, - ) - } -} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index b1fd672a6..dab63bec1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -41,6 +41,16 @@ import androidx.compose.foundation.selection.selectable import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ManageAccounts +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.border +import androidx.compose.material.icons.outlined.FolderOpen +import androidx.compose.ui.input.InputMode +import androidx.compose.ui.platform.LocalInputModeManager +import androidx.compose.ui.layout.boundsInParent +import androidx.compose.foundation.relocation.bringIntoViewRequester +import androidx.compose.foundation.relocation.BringIntoViewRequester +import androidx.compose.material.icons.filled.Tune import androidx.compose.material.icons.filled.ExpandLess import androidx.compose.material.icons.filled.ExpandMore import androidx.compose.material.icons.filled.Add @@ -167,9 +177,12 @@ internal fun installedFirst(entries: List): List = e internal const val LIBRARY_ALL = "all" internal fun librarySources( entries: List, order: List, always: Set = emptySet(), favorites: Set = emptySet(), - hidden: (LibraryEntry) -> Boolean = { false }, showHidden: Boolean = false, -): List = - (listOf(LIBRARY_FAVORITES, Library.SOURCE_STEAM) + arrangeStoreTabs(order, emptySet()).map { it.store.id } + Library.ADDED + Library.SOURCE_COLLECTION + LIBRARY_HIDDEN) + hidden: (LibraryEntry) -> Boolean = { false }, showHidden: Boolean = false, offStores: Set = emptySet(), + places: List> = DEFAULT_LIBRARY_PLACES, offTabs: Set = emptySet(), +): List { + val tabs = arrangeStoreTabs(order, offStores) + val shown = tabs.filter { it.shown }.map { it.store.id }.toSet() + LIBRARY_OWN_TABS - offTabs + return (placeLibraryTabs(tabs.map { it.store.id }, places).filter { it in shown } + Library.SOURCE_COLLECTION + LIBRARY_HIDDEN) .filter { source -> when (source) { LIBRARY_HIDDEN -> showHidden @@ -177,6 +190,7 @@ internal fun librarySources( else -> source in always || entries.any { it.source == source && !hidden(it) } } } +} internal object LibraryDisplay { const val DEFAULT_LEVEL = 2 @@ -345,10 +359,18 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, } val itchSignedIn = owned.containsKey(Store.ITCH) val gameJoltSignedIn = owned.containsKey(Store.GAMEJOLT) + remember { StoreTabsState.load(ctx) } + val storeTabs = StoreTabsState.tabs + val signInChips = if (!stores || !StoresState.accountsLoaded) emptySet() else storeTabs + .filter { it.shown && StoresState.backend(it.store) != null && storeAccount(it.store) != StoreAccount.SIGNED_IN } + .map { it.store.id }.toSet() val sources = librarySources( - all, SessionPrefs.storesTabOrder(ctx), - listOfNotNull(Store.ITCH.id.takeIf { itchSignedIn && !soundMode }, Store.GAMEJOLT.id.takeIf { gameJoltSignedIn && !soundMode }).toSet(), + all, storeTabs.map { it.store.id }, + listOfNotNull(Store.ITCH.id.takeIf { itchSignedIn && !soundMode }, Store.GAMEJOLT.id.takeIf { gameJoltSignedIn && !soundMode }, Library.ADDED.takeIf { stores }).toSet() + signInChips, favorites, concealed, LibraryDisplay.hidden && !soundMode, + offStores = if (soundMode) emptySet() else storeTabs.filterNot { it.shown }.map { it.store.id }.toSet(), + places = if (soundMode) DEFAULT_LIBRARY_PLACES else StoreTabsState.libraryPlaces, + offTabs = if (soundMode) emptySet() else StoreTabsState.libraryHidden, ) val source = LibraryView.source.takeIf { it == LIBRARY_ALL || it in sources } ?: LIBRARY_ALL val q = LibraryView.query.trim().lowercase() @@ -370,7 +392,6 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, } val collectionItems = collectionId?.let { if (source == Store.GAMEJOLT.id) GameJoltCollections.gamesOf(it) else ItchCollections.gamesOf(it) } val pool = if (collectionId == null) all else collectionEntries(all, collectionItems.orEmpty(), Store.byId(source) ?: Store.ITCH) - val libraryTotal = if (soundMode) 0 else all.count { inLibrarySource(LIBRARY_ALL, it, favorites, concealed) } val matching = pool.filter { inLibrarySource(source, it, favorites, concealed) && (q.isEmpty() || it.title.lowercase().contains(q)) && keepsXbox(xboxFilter, it) } @@ -491,7 +512,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, kotlinx.coroutines.delay(Motion.ms(240).toLong()) focusWithinFrames({ ff.last?.startsWith("card:") == true }) { if (ff.firstTileAttached > 0) ff.firstTile else FocusRequester.Default } } - if (!soundMode && all.isEmpty() && open == null && !itchSignedIn && !gameJoltSignedIn) { + if (!soundMode && s.shortcutPicker && all.isEmpty() && open == null && !itchSignedIn && !gameJoltSignedIn) { LibraryEmpty(s, a, modifier) return } @@ -514,8 +535,8 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, bleedHorizontal = if (narrow) 14.dp else 22.dp, bleedTop = if (narrow) 10.dp else 14.dp, wrap = { key, content -> StoreTheme(GameRef.parse(key).let { r -> r.store ?: r.game(s.steamGames)?.source?.let { Store.byId(it) } }) { content() } }, grid = { - LibraryGrid( - s, a, grid, visible, split, if (soundMode) visible.size else libraryTotal, sources, source, sizesPending, syncing, + StoreTheme(Store.byId(source)) { LibraryGrid( + s, a, grid, visible, split, visible.size, sources, source, sizesPending, syncing, showUninstalled = listUninstalled.takeIf { !s.shortcutPicker },onShowUninstalled = setShowUninstalled, hiddenUninstalled = hiddenUninstalled, onSource = { LibraryView.source = it }, @@ -528,15 +549,19 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, searchCleared = open != null, onFocus = { gridFocused = it }, soundMode = soundMode, + wallArt = { wallTiles(all.filterNot(concealed).mapNotNull { entryArt(it, tall = true) }) }, emptyText = when { soundMode && all.isEmpty() -> R.string.soundtracks_empty + !soundMode && all.isEmpty() && source == LIBRARY_ALL -> R.string.games_empty soundMode && source == Library.SOURCE_COLLECTION && q.isEmpty() -> R.string.soundtracks_collections_empty else -> R.string.stores_nothing_matches }, onAddSoundtrack = { addingSoundtrack = true }, onCollections = { savedDialog = true }, trackHits = shownHits, onPlayHit = playHit, - ) + // An expired account keeps showing its cached games; with none cached it asks to sign in again, like a signed-out store. + signInStore = Store.byId(source)?.takeIf { st -> st.id in signInChips && (storeAccount(st) != StoreAccount.EXPIRED || all.none { it.source == st.id }) }, + ) } }, ) { key -> if (soundMode || (!s.soundtracksEnabled && s.soundtracks.any { GameRef.key(it) == key })) SoundtrackDetail(key, s, a, lead, backLabel, onBack = back) @@ -558,7 +583,7 @@ private fun LibraryEmpty(s: FrontEndState, a: FrontEndActions, modifier: Modifie if (s.steamGamesX64) ClientTag() if (!s.shortcutPicker) { AddGameButton { GamesDialogState.adding = true } - StoreAccountsButton() + ManageStoresChip() } } } @@ -580,6 +605,7 @@ private fun LibraryGrid( onSource: (String) -> Unit, onCycle: (Int) -> Unit, onOpen: (String) -> Unit, onFocus: (Boolean) -> Unit, searchCleared: Boolean, soundMode: Boolean = false, emptyText: Int = R.string.stores_nothing_matches, onAddSoundtrack: () -> Unit = {}, onCollections: () -> Unit = {}, trackHits: List = emptyList(), onPlayHit: (SoundtrackIndex.Hit) -> Unit = {}, + signInStore: Store? = null, wallArt: () -> List = { emptyList() }, ) { val listMode = s.storesView == "list" val capsules = s.storesView == "capsules" @@ -589,7 +615,12 @@ private fun LibraryGrid( val scope = rememberCoroutineScope() val density = androidx.compose.ui.platform.LocalDensity.current var columns by remember { mutableIntStateOf(1) } - val headerItems = 2 + (if (sizesPending) 1 else 0) + syncing.size + var gridH by remember { mutableIntStateOf(0) } + var chipsH by remember { mutableIntStateOf(0) } + // A search that matches nothing keeps the toolbar, so the search can still be cleared. + val customEmpty = !soundMode && source == Library.ADDED && visible.isEmpty() && hiddenUninstalled == 0 && LibraryView.query.isBlank() + val splash = !soundMode && (signInStore != null || customEmpty) + val headerItems = (if (splash) 1 else 2) + (if (sizesPending) 1 else 0) + syncing.size val expanded = showUninstalled == true val notInstalled = if (expanded) visible.count { !it.installed } else hiddenUninstalled val toggleAt = when { @@ -600,14 +631,14 @@ private fun LibraryGrid( } val itemIndex: (Int) -> Int = { i -> headerItems + i + when { - split > 0 -> if (i < split) 1 else 2 + split > 0 -> if (i < split) 0 else 1 toggleAt == ToggleAt.TOP -> 1 else -> 0 } } val toggleIndex = when (toggleAt) { ToggleAt.TOP -> headerItems - ToggleAt.SPLIT -> headerItems + split + 1 + ToggleAt.SPLIT -> headerItems + split else -> headerItems + visible.size } val gapPx = with(density) { 10.dp.toPx() } @@ -620,6 +651,7 @@ private fun LibraryGrid( } } val rowStart: (Int) -> Int? = { i -> if (i < 0) null else if (listMode) i else i - i % columns.coerceAtLeast(1) } + val switchedAt = remember(source) { android.os.SystemClock.uptimeMillis() } val tile: @Composable (LibraryEntry) -> Unit = { e -> val first = e.key == visible.firstOrNull()?.key val navigation = if (focus == null) Modifier else Modifier.onPreviewKeyEvent { event -> @@ -652,7 +684,17 @@ private fun LibraryGrid( } val picker = s.shortcutPicker && e.game != null val choose = if (picker) ({ a.onSteamGame(e.game!!) }) else null - if (listMode) LibraryRow(e, first, navigation, choose, onOpen) else LibraryTile(e, capsules, first, navigation, choose, onOpen, showSource = source == LIBRARY_ALL || source == LIBRARY_FAVORITES || source == LIBRARY_HIDDEN) + val enter = remember(source) { + androidx.compose.animation.core.Animatable(if (Motion.scale == 0f || android.os.SystemClock.uptimeMillis() - switchedAt > 600) 1f else 0f) + } + LaunchedEffect(source) { + if (enter.value >= 1f) return@LaunchedEffect + kotlinx.coroutines.delay(Motion.ms(minOf(visible.indexOfFirst { it.key == e.key }.coerceAtLeast(0), 11) * 28).toLong()) + enter.animateTo(1f, Motion.tw(320)) + } + Box(Modifier.graphicsLayer { alpha = enter.value; translationY = (1f - enter.value) * 18.dp.toPx() }) { + if (listMode) LibraryRow(e, first, navigation, choose, onOpen) else LibraryTile(e, capsules, first, navigation, choose, onOpen, showSource = source == LIBRARY_ALL || source == LIBRARY_FAVORITES || source == LIBRARY_HIDDEN) + } } var rowFocused by remember { mutableStateOf(false) } val toggleRow: @Composable () -> Unit = { @@ -681,7 +723,7 @@ private fun LibraryGrid( } NotInstalledRow(notInstalled, expanded, keys, onFocus = { rowFocused = it }) { rowFocused = false - val landing = if (expanded) headerItems + split else headerItems + visible.size + 1 + val landing = if (expanded) headerItems + split else headerItems + visible.size onShowUninstalled(!expanded) if (focus != null && focus.last == NOT_INSTALLED_ROW) scope.launch { androidx.compose.runtime.withFrameNanos { } @@ -699,16 +741,20 @@ private fun LibraryGrid( modifier = Modifier.fillMaxSize().onFocusChanged { onFocus(it.hasFocus) }.focusGroup().bumpers(onPrevious = { onCycle(-1) }, onNext = { onCycle(1) }).onSizeChanged { val gap = with(density) { 10.dp.roundToPx() } columns = if (listMode) 1 else libraryColumns(it.width, with(density) { baseWidth.roundToPx() }, gap, level) + gridH = it.height }, horizontalArrangement = Arrangement.spacedBy(10.dp), verticalArrangement = Arrangement.spacedBy(10.dp), contentPadding = PaddingValues(top = 4.dp, bottom = 16.dp), ) { - item(key = "header", span = { GridItemSpan(maxLineSpan) }) { - Rise(0) { LibraryHeader(s, a, total, searchCleared, source == Store.XBOX.id, showUninstalled, onShowUninstalled, collections = Store.byId(source)?.takeIf { it == Store.ITCH || it == Store.GAMEJOLT }, soundMode = soundMode, onAddSoundtrack = onAddSoundtrack, onCollections = onCollections) } + val header: @Composable () -> Unit = { + LibraryHeader(s, a, if (soundMode) total else visible.size + hiddenUninstalled, searchCleared, source == Store.XBOX.id, showUninstalled, onShowUninstalled, collections = Store.byId(source)?.takeIf { it == Store.ITCH || it == Store.GAMEJOLT }, soundMode = soundMode, onAddSoundtrack = onAddSoundtrack, onCollections = onCollections, source = source) } - item(key = "filters", span = { GridItemSpan(maxLineSpan) }) { - Rise(1) { LibraryFilters(sources, source, onSource, accounts = !soundMode && !s.shortcutPicker) } + val filters: @Composable () -> Unit = { LibraryFilters(sources, source, onSource, manage = !soundMode && !s.shortcutPicker) } + item(key = if (soundMode) "header" else "filters", span = { GridItemSpan(maxLineSpan) }) { + Box(Modifier.onSizeChanged { chipsH = it.height }) { Rise(0) { if (soundMode) header() else filters() } } } + val splashHeight = with(density) { (gridH - chipsH).toDp() - 28.dp }.coerceAtLeast(300.dp) + if (!splash) item(key = if (soundMode) "filters" else "header", span = { GridItemSpan(maxLineSpan) }) { Rise(1) { if (soundMode) filters() else header() } } for ((store, line) in syncing) item(key = "sync-${store.id}", span = { GridItemSpan(maxLineSpan) }) { Column(verticalArrangement = Arrangement.spacedBy(4.dp), modifier = Modifier.fillMaxWidth()) { Text(store.shortLabel + " · " + line, fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) @@ -723,13 +769,19 @@ private fun LibraryGrid( } } val empty = emptyText - if (split == 0) { + if (customEmpty) item(key = "custom-empty", span = { GridItemSpan(maxLineSpan) }) { + val art = remember { wallArt() } + Box(Modifier.padding(top = 4.dp, bottom = 16.dp)) { CustomGamesCard(splashHeight, art) } + } + else if (signInStore != null) item(key = "sign-in:${signInStore.id}", span = { GridItemSpan(maxLineSpan) }) { + StoreTheme(signInStore) { Box(Modifier.padding(top = 4.dp, bottom = 16.dp)) { SignInCard(signInStore, splashHeight) } } + } + else if (split == 0) { if (toggleAt == ToggleAt.TOP) item(key = NOT_INSTALLED_ROW, span = { GridItemSpan(maxLineSpan) }) { toggleRow() } if (visible.isNotEmpty() || toggleAt == ToggleAt.NONE) libraryGrid(visible, empty, tile) if (toggleAt == ToggleAt.BOTTOM) item(key = NOT_INSTALLED_ROW, span = { GridItemSpan(maxLineSpan) }) { toggleRow() } } else { - item(key = "installed-label", span = { GridItemSpan(maxLineSpan) }) { SectionLabel(stringResource(R.string.stores_section_installed)) } libraryGrid(visible.take(split), empty, tile) item(key = NOT_INSTALLED_ROW, span = { GridItemSpan(maxLineSpan) }) { if (toggleAt == ToggleAt.SPLIT) toggleRow() else SectionLabel(stringResource(R.string.stores_section_not_installed)) @@ -800,22 +852,23 @@ private fun LazyGridScope.libraryGrid(entries: List, empty: Int, t private fun LibraryHeader( s: FrontEndState, a: FrontEndActions, total: Int, searchCleared: Boolean, xbox: Boolean, showUninstalled: Boolean?, onShowUninstalled: (Boolean) -> Unit, collections: Store?, - soundMode: Boolean = false, onAddSoundtrack: () -> Unit = {}, onCollections: () -> Unit = {}, + soundMode: Boolean = false, onAddSoundtrack: () -> Unit = {}, onCollections: () -> Unit = {}, source: String = LIBRARY_ALL, ) { val colors = MaterialTheme.colorScheme val narrow = LocalNarrowPane.current - val heading = stringResource(if (soundMode) R.string.rail_soundtracks else R.string.rail_games) + val heading = if (soundMode) stringResource(R.string.rail_soundtracks) else sourceTitle(source) + val soundLead: (@Composable () -> Unit)? = if (!soundMode) { -> if (s.steamGamesX64 && !narrow) ClientTag() } else { -> + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(start = 2.dp, end = 4.dp)) { + Text(heading, fontSize = if (narrow) 20.sp else 24.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1) + Text(total.toString(), fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1) + if (s.steamGamesX64 && !narrow) ClientTag() + } + } ModeHeader( heading, LibraryView.query, { LibraryView.query = it }, placeholder = stringResource(if (soundMode) R.string.soundtracks_search else R.string.stores_search_library), clearSearchFocus = searchCleared, inlineWhenStacked = true, - lead = { - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(start = 2.dp, end = 4.dp)) { - Text(heading, fontSize = if (narrow) 20.sp else 24.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1) - Text(if (soundMode) total.toString() else pluralStringResource(R.plurals.mode_added_count, total, total), fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1) - if (s.steamGamesX64 && !narrow) ClientTag() - } - }, + lead = soundLead, ) { if (soundMode) HeaderIconButton(stringResource(R.string.soundtracks_saved), Icons.Filled.BookmarkBorder, "collections", onClick = onCollections) DisplayButton() @@ -824,63 +877,143 @@ private fun LibraryHeader( SortButton(s, a) ViewButton(s, a) if (!soundMode) GameFileFolderActions(s, a) - if (!s.shortcutPicker) AddGameButton { if (soundMode) onAddSoundtrack() else GamesDialogState.adding = true } + Store.byId(source)?.takeIf { !soundMode && StoresState.isSignedIn(it) }?.let { StoreAccountButton(it) } + if (!s.shortcutPicker && (soundMode || (source == Library.ADDED && total > 0))) AddGameButton { if (soundMode) onAddSoundtrack() else GamesDialogState.adding = true } } if (s.steamGamesX64 && narrow) Box(Modifier.padding(top = 4.dp)) { ClientTag() } } +@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) @Composable -private fun LibraryFilters(sources: List, source: String, onSource: (String) -> Unit, accounts: Boolean) { - val chips = sources.size >= 2 || sources.singleOrNull() == LIBRARY_HIDDEN - if (!chips && !accounts) return - Row( - horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.fillMaxWidth().padding(top = 4.dp, bottom = 2.dp).horizontalScroll(rememberScrollState()), - ) { - if (chips) SourceFilterChip(LIBRARY_ALL, stringResource(R.string.stores_tab_all), source == LIBRARY_ALL, dot = null) { onSource(LIBRARY_ALL) } - if (chips) for (src in sources) { - val store = Store.byId(src) - val dot = when { - store != null -> sourceColours(src).dot.copy(alpha = if (StoresState.isSignedIn(store) && StoresState.expired[store] != true) 1f else 0.35f) - src == LIBRARY_FAVORITES -> FavoritesColours.dot - src == LIBRARY_HIDDEN -> Color(0xFF9AA0A6) - src == Library.SOURCE_STEAM || src == Library.ADDED || src == Library.SOURCE_COLLECTION -> sourceColours(src).dot - else -> null +private fun LibraryFilters(sources: List, source: String, onSource: (String) -> Unit, manage: Boolean) { + val chips = (manage && sources.isNotEmpty()) || sources.size >= 2 || sources.singleOrNull() == LIBRARY_HIDDEN + if (!chips && !manage) return + val pal = LocalPalette.current + val keys = if (chips) listOf(LIBRARY_ALL) + sources else emptyList() + var focused by remember { mutableStateOf(null) } + val highlighted = focused?.takeIf { it in keys } ?: source + val bounds = remember { androidx.compose.runtime.mutableStateMapOf() } + val inputMode = LocalInputModeManager.current.inputMode + val fillShown = inputMode != InputMode.Keyboard + val scroll = rememberScrollState() + StoreTheme(Store.byId(highlighted)) { + val tint = androidx.compose.animation.animateColorAsState(sourceDot(highlighted) ?: LocalPalette.current.signal, Motion.tw(160), label = "libChipTint") + Row( + horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth().padding(top = 4.dp, bottom = 2.dp), + ) { + if (manage) ManageStoresChip() + Box(Modifier.weight(1f).edgeFade(scroll).horizontalScroll(scroll)) { + Row(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.focusGroup()) { + for (id in keys) { + val store = Store.byId(id) + val dot = sourceDot(id) + val label = when (id) { + LIBRARY_ALL -> stringResource(R.string.stores_tab_all) + Library.ADDED -> stringResource(R.string.library_custom_games) + LIBRARY_FAVORITES -> stringResource(R.string.soundtracks_favorites) + LIBRARY_HIDDEN -> stringResource(R.string.apps_filter_hidden) + else -> store?.shortLabel ?: sourceLabel(id) + } + androidx.compose.runtime.key(id) { + val reveal = remember { BringIntoViewRequester() } + LaunchedEffect(source) { if (source == id) reveal.bringIntoView() } + StoreChip( + label = label, on = source == id, under = fillShown && highlighted == id, key = id, mark = dot ?: pal.signal, + modifier = Modifier.bringIntoViewRequester(reveal).testTag("library-source-$id") + .onGloballyPositioned { bounds[id] = it.boundsInParent() }, + lead = { + if (dot != null) Box(Modifier.size(9.dp).background(dot, CircleShape)) + else Icon(Icons.Filled.GridView, null, modifier = Modifier.size(14.dp)) + }, + onFocused = { focused = it }, + paneKey = "libchip:$id", + ) { onSource(id) } + } + } + } + if (highlighted in keys) ChipGlide(keys.indexOf(highlighted), bounds[highlighted], tint, visible = fillShown) } - SourceFilterChip( - src, - when (src) { - Library.ADDED -> stringResource(R.string.library_filter_added) - LIBRARY_FAVORITES -> stringResource(R.string.soundtracks_favorites) - LIBRARY_HIDDEN -> stringResource(R.string.apps_filter_hidden) - else -> store?.shortLabel ?: sourceLabel(src) - }, - source == src, dot, - ) { onSource(src) } } - if (accounts) StoreAccountsButton() } } @Composable -private fun SourceFilterChip(key: String, label: String, on: Boolean, dot: Color?, onClick: () -> Unit) { +private fun sourceTitle(src: String): String = when (src) { + LIBRARY_ALL -> stringResource(R.string.library_all_games) + Library.ADDED -> stringResource(R.string.library_custom_games) + LIBRARY_FAVORITES -> stringResource(R.string.soundtracks_favorites) + LIBRARY_HIDDEN -> stringResource(R.string.apps_filter_hidden) + else -> Store.byId(src)?.label ?: sourceLabel(src) +} + +@Composable +private fun StoreAccountButton(store: Store) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val name = StoresState.accounts[store] ?: store.label + val label = stringResource(R.string.stores_signout_named, name) + val title = stringResource(R.string.stores_signout_title, store.label) + val note = stringResource(R.string.stores_signout_note) + val stay = stringResource(R.string.stores_signout_stay) + val go = stringResource(R.string.stores_signout_go) + var at by remember { mutableStateOf(null) } + Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) { + HeaderIconButton(label, Icons.Filled.ManageAccounts, "library-account") { + val from = at ?: run { StoresState.signOut(ctx, store); return@HeaderIconButton } + Steps.ask(StepAsk( + anchor = from, side = StepSide.Left, accent = colors.error, pillCorner = 8.dp, items = 3, + handle = { Icon(Icons.Filled.ManageAccounts, null, tint = colors.error, modifier = Modifier.size(18.dp)) }, + ) { + StepTitle(title) + Text(note, fontSize = 13.sp, color = colors.onSurfaceVariant, modifier = Modifier.stepItem(1).padding(start = 4.dp, bottom = 12.dp)) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End), modifier = Modifier.fillMaxWidth().stepItem(2)) { + StepChoice(stay, enabled = open, modifier = Modifier.focusRequester(first)) { Steps.fold() } + StepChoice(go, danger = true, enabled = open) { Steps.fold(); StoresState.signOut(ctx, store) } + } + }) + } + } +} + +@Composable +private fun CustomGamesCard(height: androidx.compose.ui.unit.Dp, art: List) { + HeroWallCard(stringResource(R.string.library_custom_games), art, sourceColours(Library.ADDED), height, Modifier.testTag("library-custom-empty")) { + PrimaryButton(stringResource(R.string.games_add), main = true, large = true, icon = Icons.Filled.Add, modifier = Modifier.testTag("library-custom-add")) { + GamesDialogState.adding = true + } + } +} + +private fun sourceDot(src: String): Color? { + val store = Store.byId(src) + return when { + store != null -> sourceColours(src).dot.copy(alpha = if (StoresState.isSignedIn(store) && StoresState.expired[store] != true) 1f else 0.35f) + src == LIBRARY_FAVORITES -> FavoritesColours.dot + src == LIBRARY_HIDDEN -> Color(0xFF9AA0A6) + src == Library.SOURCE_STEAM || src == Library.ADDED || src == Library.SOURCE_COLLECTION -> sourceColours(src).dot + else -> null + } +} + +@Composable +internal fun ManageStoresChip() { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val src = remember { MutableInteractionSource() } val hot = rememberHot(src) - val shape = RoundedCornerShape(99.dp) - Row( - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(7.dp), - modifier = Modifier.paneItem("libchip:$key").testTag("library-source-$key").heightIn(min = 40.dp).clip(shape) - .background(if (on) pal.signal.copy(alpha = 0.16f) else colors.surface) - .glideBorder(hot, shape, pal.signal, if (on) pal.signal else pal.line) - .hoverable(src).selectable(selected = on, interactionSource = src, indication = LocalIndication.current, role = Role.Tab, onClick = onClick) - .controllerConfirm(onClick = onClick) - .padding(horizontal = 14.dp, vertical = 8.dp), - ) { - if (dot != null) Box(Modifier.size(9.dp).background(dot, CircleShape)) - Text(label, fontSize = 13.sp, fontWeight = FontWeight.Bold, color = if (on || hot) colors.onBackground else colors.onSurfaceVariant, maxLines = 1) - } + val back = remember { FocusRequester() } + val label = stringResource(R.string.library_manage_stores) + val open = { ManageStores.returnTo = back; ManageStores.custom = true; ManageStores.open = true } + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.paneItem("libchip:manage").focusRequester(back).testTag("library-manage-stores").size(44.dp).clip(CircleShape) + .background(colors.surface) + .glideBorder(hot, CircleShape, pal.signal, pal.line) + .hoverable(src) + .clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClickLabel = label, onClick = open) + .controllerConfirm(onClick = open), + ) { Icon(Icons.Filled.Tune, label, tint = if (hot) colors.onBackground else colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) } } private fun entryArt(e: LibraryEntry, tall: Boolean): Any? { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ManageStores.kt b/app/src/main/java/com/droiddeck/launcher/ui/ManageStores.kt new file mode 100644 index 000000000..c56ac4a43 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/ManageStores.kt @@ -0,0 +1,358 @@ +package com.droiddeck.launcher.ui + +import androidx.activity.compose.BackHandler +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.slideInHorizontally +import androidx.compose.animation.slideOutHorizontally +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.focusGroup +import androidx.compose.foundation.focusable +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.filled.DragHandle +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusProperties +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.geometry.Rect +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.layout.boundsInRoot +import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.compose.ui.zIndex +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreTab +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.arrangeStoreTabs + +internal object StoreTabsState { + var tabs by mutableStateOf>(emptyList()) + private set + var libraryPlaces by mutableStateOf(DEFAULT_LIBRARY_PLACES) + private set + var libraryHidden by mutableStateOf>(emptySet()) + private set + + fun load(context: android.content.Context) { + SessionPrefs.settleStoresTabOrder(context, Store.entries.map { it.id }) + tabs = arrangeStoreTabs(SessionPrefs.storesTabOrder(context), SessionPrefs.storesTabHidden(context)) + libraryPlaces = SessionPrefs.libraryTabPlaces(context) ?: DEFAULT_LIBRARY_PLACES + libraryHidden = SessionPrefs.libraryTabsHidden(context) + } + + /** [ids] may hold the Library's own tabs among the stores; each one's place is kept as the tab it follows. */ + fun reorder(context: android.content.Context, ids: List) { + if (ids.any { it in LIBRARY_OWN_TABS }) { + val places = libraryPlacesOf(ids) + libraryPlaces = places + SessionPrefs.setLibraryTabPlaces(context, places) + } + val byId = tabs.associateBy { it.store.id } + val order = ids.mapNotNull { byId[it] } + if (order.map { it.store } != tabs.map { it.store }) { + tabs = order + save(context, arranged = true) + } + } + + // The Stores tab needs at least one shown store to open on. + fun setShown(context: android.content.Context, store: Store, show: Boolean): Boolean { + if (!show && tabs.count { it.shown } <= 1) return false + tabs = tabs.map { if (it.store == store) it.copy(shown = show) else it } + save(context, arranged = false) + return true + } + + fun setLibraryShown(context: android.content.Context, id: String, show: Boolean) { + libraryHidden = if (show) libraryHidden - id else libraryHidden + id + SessionPrefs.setLibraryTabsHidden(context, libraryHidden) + } + + private fun save(context: android.content.Context, arranged: Boolean) = + SessionPrefs.saveStoresTabs(context, tabs.map { it.store.id }, tabs.filterNot { it.shown }.map { it.store.id }.toSet(), arranged) +} + +/** The Library tabs that are not stores but sort among them in Manage stores. Only Favorites and Custom games can be hidden. */ +internal val LIBRARY_OWN_TABS = listOf(LIBRARY_FAVORITES, Library.SOURCE_STEAM, Library.ADDED) +internal val LIBRARY_HIDEABLE_TABS = setOf(LIBRARY_FAVORITES, Library.ADDED) + +/** Favorites, then Steam, ahead of the stores; Custom games after them (null: the end). */ +internal val DEFAULT_LIBRARY_PLACES: List> = + listOf(LIBRARY_FAVORITES to "", Library.SOURCE_STEAM to LIBRARY_FAVORITES, Library.ADDED to null) + +/** + * Puts the Library's own tabs into a store tab order. Each goes after the tab it follows ("" for first; null or a tab that is gone + * for last), in [places] order, so a place may name a tab placed before it. A tab [places] misses keeps its default place. + */ +internal fun placeLibraryTabs(stores: List, places: List>): List { + var out = stores.filterNot { it in LIBRARY_OWN_TABS } + for ((id, after) in places.filter { it.first in LIBRARY_OWN_TABS } + DEFAULT_LIBRARY_PLACES) { + if (id in out) continue + val at = when { + after == "" -> 0 + after != null && after in out -> out.indexOf(after) + 1 + else -> out.size + } + out = out.take(at) + id + out.drop(at) + } + return out +} + +/** The places that rebuild [order] with [placeLibraryTabs]. */ +internal fun libraryPlacesOf(order: List): List> = + order.mapIndexedNotNull { i, id -> if (id in LIBRARY_OWN_TABS) id to (order.getOrNull(i - 1) ?: "") else null } + +internal object ManageStores { + var open by mutableStateOf(false) + /** Opened from the Library, which also lists the Custom games tab. */ + var custom by mutableStateOf(false) + var returnTo: FocusRequester? = null +} + +internal enum class StoreAccount { SIGNED_IN, SIGNED_OUT, EXPIRED, NEEDS_KEY } + +internal fun storeAccount(store: Store): StoreAccount = when { + StoresState.isSignedIn(store) && StoresState.expired[store] == true -> StoreAccount.EXPIRED + StoresState.isSignedIn(store) -> StoreAccount.SIGNED_IN + store == Store.ITCH -> StoreAccount.NEEDS_KEY + else -> StoreAccount.SIGNED_OUT +} + +internal fun startStoreSignIn(context: android.content.Context, store: Store, at: Rect?, start: Color, onItchKey: () -> Unit) { + when { + store == Store.ITCH -> onItchKey() + at == null || Motion.scale == 0f || StoresMotion.signIn != null -> StoresState.signIn(context, store) + else -> StoresMotion.signIn = SignInFlood(store, at, start, sourceColours(store.id).dot) + } +} + +@OptIn(androidx.compose.ui.ExperimentalComposeUiApi::class) +@Composable +internal fun SideSheet(open: Boolean, onClose: () -> Unit, returnFocus: FocusRequester?, tag: String, content: @Composable ColumnScope.() -> Unit) { + val pal = LocalPalette.current + BackHandler(enabled = open) { onClose() } + var wasOpen by remember { mutableStateOf(false) } + val closeInput = androidx.compose.ui.platform.LocalInputModeManager.current + LaunchedEffect(open) { + if (open) wasOpen = true + else if (wasOpen && returnFocus != null && closeInput.inputMode == androidx.compose.ui.input.InputMode.Keyboard) focusSoon { returnFocus } + } + Box(Modifier.fillMaxSize()) { + AnimatedVisibility(open, enter = fadeIn(), exit = fadeOut()) { + Box( + Modifier.fillMaxSize().background(Color.Black.copy(alpha = 0.45f)) + .focusProperties { canFocus = false } + .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null) { onClose() }, + ) + } + BoxWithConstraints(Modifier.fillMaxSize(), contentAlignment = Alignment.CenterEnd) { + val width = minOf(560.dp, maxWidth * 0.92f) + AnimatedVisibility(open, enter = slideInHorizontally { it } + fadeIn(), exit = slideOutHorizontally { it } + fadeOut()) { + val inside = remember { FocusRequester() } + var holds by remember { mutableStateOf(false) } + val pad = androidx.compose.ui.platform.LocalInputModeManager.current.inputMode == androidx.compose.ui.input.InputMode.Keyboard + // Focus (and its ring) only matters to a controller: opened by touch the sheet waits until one is picked up. + LaunchedEffect(pad) { + if (!pad) return@LaunchedEffect + repeat(60) { + androidx.compose.runtime.withFrameNanos { } + if (holds || !open) return@LaunchedEffect + runCatching { inside.requestFocus() } + } + } + Column( + Modifier.width(width).fillMaxHeight() + .onFocusChanged { holds = it.hasFocus } + .focusRequester(inside) + .focusProperties { exit = { if (open) FocusRequester.Cancel else FocusRequester.Default } } + .focusGroup() + .background(MaterialTheme.colorScheme.background) + .border(1.dp, pal.line).padding(horizontal = 18.dp, vertical = 16.dp).testTag(tag), + content = content, + ) + } + } + } +} + +private val STORE_ROW = 60.dp +private val STORE_HANDLE = 44.dp + +@Composable +internal fun ManageStoresSheet() { + val ctx = LocalContext.current + LaunchedEffect(ManageStores.open) { if (ManageStores.open) StoreTabsState.load(ctx) } + SideSheet(ManageStores.open, onClose = { ManageStores.open = false }, returnFocus = ManageStores.returnTo, tag = "manage-stores-sheet") { + PageHeader(stringResource(R.string.library_manage_stores)) { + Spacer(Modifier.weight(1f)) + SmallIconButton(Icons.Filled.Close, stringResource(R.string.common_close), tint = MaterialTheme.colorScheme.onSurfaceVariant) { + ManageStores.open = false + } + } + Column(Modifier.weight(1f).verticalScroll(rememberScrollState())) { + SortableRows( + rows = { + val ids = StoreTabsState.tabs.map { it.store.id } + if (ManageStores.custom) placeLibraryTabs(ids, StoreTabsState.libraryPlaces) else ids + }, + commit = { StoreTabsState.reorder(ctx, it) }, + movable = { true }, + rowHeight = STORE_ROW, handleWidth = STORE_HANDLE, + onActivate = { id -> + if (id in LIBRARY_HIDEABLE_TABS) { + StoreTabsState.setLibraryShown(ctx, id, id in StoreTabsState.libraryHidden) + return@SortableRows + } + val tab = StoreTabsState.tabs.firstOrNull { it.store.id == id } ?: return@SortableRows + StoreTabsState.setShown(ctx, tab.store, !tab.shown) + }, + ) { id, held, offset, hint, modifier, onFocus -> + val tab = StoreTabsState.tabs.firstOrNull { it.store.id == id } + if (id in LIBRARY_OWN_TABS) LibraryTabSortRow(id, held, offset, hint, modifier, onFocus) + else if (tab != null) StoreSortRow(tab, held, offset, hint, modifier, onFocus) + } + } + } +} + +@Composable +private fun StoreSortRow( + tab: StoreTab, held: Boolean, offset: Float, hint: String?, modifier: Modifier, onFocus: (Boolean) -> Unit, +) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val store = tab.store + val account = storeAccount(store) + val name = StoresState.accounts[store] + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val note = when (account) { + StoreAccount.SIGNED_IN -> name ?: "" + StoreAccount.SIGNED_OUT -> stringResource(R.string.store_account_signed_out) + StoreAccount.EXPIRED -> stringResource(R.string.store_account_expired) + StoreAccount.NEEDS_KEY -> stringResource(R.string.store_account_api_key) + } + SortRowFrame(held, offset, modifier.testTag("store-row-${store.id}"), hot, src, onFocus) { + Box(contentAlignment = Alignment.Center, modifier = Modifier.size(width = STORE_HANDLE, height = STORE_ROW).testTag("store-handle-${store.id}")) { + Icon(Icons.Filled.DragHandle, null, tint = if (held) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) + } + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.weight(1f).alpha(if (tab.shown) 1f else 0.5f)) { + Box(Modifier.size(10.dp).background(sourceColours(store.id).dot.copy(alpha = if (account == StoreAccount.SIGNED_IN) 1f else 0.4f), CircleShape)) + Column(verticalArrangement = Arrangement.spacedBy(1.dp)) { + Text(store.label, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + if (note.isNotEmpty()) Text( + note, fontSize = 12.sp, maxLines = 1, overflow = TextOverflow.Ellipsis, + color = if (account == StoreAccount.EXPIRED) colors.error else colors.onSurfaceVariant, + ) + } + } + if (hint != null) KeyHint("Y", hint) + ToggleSwitch( + tab.shown, true, store.label, + Modifier.testTag("store-shown-${store.id}").focusProperties { canFocus = false }, + ) { StoreTabsState.setShown(ctx, store, it) } + } +} + +@Composable +private fun SortRowFrame( + held: Boolean, offset: Float, modifier: Modifier, hot: Boolean, src: MutableInteractionSource, onFocus: (Boolean) -> Unit, + content: @Composable androidx.compose.foundation.layout.RowScope.() -> Unit, +) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Column( + modifier.fillMaxWidth().height(STORE_ROW) + .zIndex(if (held) 1f else 0f) + .graphicsLayer { translationY = offset } + .background(if (held) colors.surfaceVariant else colors.surface) + .glideBorder(hot, Shape12, pal.signal) + .onFocusChanged { onFocus(it.isFocused) } + .hoverable(src) + .focusable(interactionSource = src), + ) { + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.fillMaxWidth().weight(1f).padding(end = 10.dp), + content = content, + ) + Box(Modifier.fillMaxWidth().height(1.dp).background(if (held) Color.Transparent else pal.line)) + } +} + +@Composable +private fun LibraryTabSortRow(id: String, held: Boolean, offset: Float, hint: String?, modifier: Modifier, onFocus: (Boolean) -> Unit) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val hideable = id in LIBRARY_HIDEABLE_TABS + val shown = id !in StoreTabsState.libraryHidden + val label = when (id) { + LIBRARY_FAVORITES -> stringResource(R.string.soundtracks_favorites) + Library.ADDED -> stringResource(R.string.library_custom_games) + else -> stringResource(R.string.source_steam) + } + val dot = if (id == LIBRARY_FAVORITES) FavoritesColours.dot else sourceColours(id).dot + SortRowFrame(held, offset, modifier.testTag("store-row-$id"), hot, src, onFocus) { + Box(contentAlignment = Alignment.Center, modifier = Modifier.size(width = STORE_HANDLE, height = STORE_ROW).testTag("store-handle-$id")) { + Icon(Icons.Filled.DragHandle, null, tint = if (held) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) + } + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.weight(1f).alpha(if (shown) 1f else 0.5f)) { + Box(Modifier.size(10.dp).background(dot, CircleShape)) + Text(label, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + if (hint != null) KeyHint("Y", hint) + if (hideable) ToggleSwitch( + shown, true, label, + Modifier.testTag("store-shown-$id").focusProperties { canFocus = false }, + ) { StoreTabsState.setLibraryShown(ctx, id, it) } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/RailSettingsPages.kt b/app/src/main/java/com/droiddeck/launcher/ui/RailSettingsPages.kt index debc0f86b..d25f72365 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/RailSettingsPages.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/RailSettingsPages.kt @@ -105,62 +105,19 @@ private fun ResetTabsRow() { } } } -@OptIn(androidx.compose.ui.ExperimentalComposeUiApi::class) @Composable internal fun EditTabsSheet(s: FrontEndState, a: FrontEndActions) { - val pal = LocalPalette.current - BackHandler(enabled = MoreTabs.editing) { MoreTabs.editing = false } androidx.compose.runtime.DisposableEffect(Unit) { onDispose { MoreTabs.editing = false } } - var wasOpen by remember { mutableStateOf(false) } - val closeInput = androidx.compose.ui.platform.LocalInputModeManager.current - LaunchedEffect(MoreTabs.editing) { - if (MoreTabs.editing) wasOpen = true - else if (wasOpen && closeInput.inputMode == androidx.compose.ui.input.InputMode.Keyboard) focusSoon { MoreTabs.button } - } - Box(Modifier.fillMaxSize()) { - AnimatedVisibility(MoreTabs.editing, enter = fadeIn(), exit = fadeOut()) { - Box( - Modifier.fillMaxSize().background(Color.Black.copy(alpha = 0.45f)) - .focusProperties { canFocus = false } - .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null) { MoreTabs.editing = false }, - ) - } - BoxWithConstraints(Modifier.fillMaxSize(), contentAlignment = Alignment.CenterEnd) { - val width = minOf(560.dp, maxWidth * 0.92f) - AnimatedVisibility(MoreTabs.editing, enter = slideInHorizontally { it } + fadeIn(), exit = slideOutHorizontally { it } + fadeOut()) { - val inside = remember { FocusRequester() } - var holds by remember { mutableStateOf(false) } - val openInput = androidx.compose.ui.platform.LocalInputModeManager.current - // The launcher only takes focus in controller mode, so opening by touch switches to it like startup does. - LaunchedEffect(Unit) { - repeat(60) { - androidx.compose.runtime.withFrameNanos { } - if (holds || !MoreTabs.editing) return@LaunchedEffect - if (openInput.inputMode != androidx.compose.ui.input.InputMode.Keyboard) openInput.requestInputMode(androidx.compose.ui.input.InputMode.Keyboard) - runCatching { inside.requestFocus() } - } - } - Column( - Modifier.width(width).fillMaxHeight() - .onFocusChanged { holds = it.hasFocus } - .focusRequester(inside) - .focusProperties { exit = { if (MoreTabs.editing) FocusRequester.Cancel else FocusRequester.Default } } - .focusGroup() - .background(MaterialTheme.colorScheme.background) - .border(1.dp, pal.line).padding(horizontal = 18.dp, vertical = 16.dp).testTag("edit-tabs-sheet"), - ) { - PageHeader(stringResource(R.string.more_edit_tabs)) { - Spacer(Modifier.weight(1f)) - SmallIconButton(Icons.Filled.Close, stringResource(R.string.common_close), tint = MaterialTheme.colorScheme.onSurfaceVariant) { - MoreTabs.editing = false - } - } - Column(Modifier.weight(1f).verticalScroll(rememberScrollState())) { - TabsSettingsGroup(rememberMenuHost(), s, a) - if (!NavTabs.isDefault()) ResetTabsRow() - } - } + SideSheet(MoreTabs.editing, onClose = { MoreTabs.editing = false }, returnFocus = MoreTabs.button, tag = "edit-tabs-sheet") { + PageHeader(stringResource(R.string.more_edit_tabs)) { + Spacer(Modifier.weight(1f)) + SmallIconButton(Icons.Filled.Close, stringResource(R.string.common_close), tint = MaterialTheme.colorScheme.onSurfaceVariant) { + MoreTabs.editing = false } } + Column(Modifier.weight(1f).verticalScroll(rememberScrollState())) { + TabsSettingsGroup(rememberMenuHost(), s, a) + if (!NavTabs.isDefault()) ResetTabsRow() + } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt index 7f2d0cb0c..20dd2c280 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt @@ -186,19 +186,19 @@ internal fun Modifier.overhang(by: androidx.compose.ui.unit.Dp = 4.dp): Modifier } @Composable -internal fun WallFade() { +internal fun WallFade(modifier: Modifier = Modifier.fillMaxSize().overhang()) { val colors = MaterialTheme.colorScheme Box( - Modifier.fillMaxSize().overhang().background( + modifier.background( Brush.horizontalGradient( - 0f to colors.background.copy(alpha = 0.97f), - 0.34f to colors.background.copy(alpha = 0.86f), - 0.68f to colors.background.copy(alpha = 0.25f), - 1f to colors.background.copy(alpha = 0.1f), + 0f to colors.background.copy(alpha = 0.86f), + 0.34f to colors.background.copy(alpha = 0.6f), + 0.68f to colors.background.copy(alpha = 0.14f), + 1f to colors.background.copy(alpha = 0.04f), ), ), ) - Box(Modifier.fillMaxSize().overhang().background(Brush.verticalGradient(0.55f to Color.Transparent, 1f to colors.background.copy(alpha = 0.9f)))) + Box(modifier.background(Brush.verticalGradient(0.6f to Color.Transparent, 1f to colors.background.copy(alpha = 0.75f)))) } @Composable diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index 2a8e8e67a..edea48ea7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -154,41 +154,10 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier val focusManager = LocalFocusManager.current val narrow = LocalNarrowPane.current val padH = if (narrow) 14.dp else 22.dp - val tabs = remember { - androidx.compose.runtime.mutableStateListOf().apply { - SessionPrefs.settleStoresTabOrder(ctx, Store.entries.map { it.id }) - addAll(arrangeStoreTabs(SessionPrefs.storesTabOrder(ctx), SessionPrefs.storesTabHidden(ctx))) - } - } + remember { StoreTabsState.load(ctx) } + val tabs = StoreTabsState.tabs var chip by rememberSaveable { mutableStateOf(tabs.firstOrNull { it.shown }?.store?.id ?: Store.GOG.id) } - var arranging by remember { mutableStateOf(false) } val shownStores = tabs.filter { it.shown }.map { it.store } - fun commitTabs(markCustomized: Boolean = false) { - SessionPrefs.saveStoresTabs(ctx, tabs.map { it.store.id }, tabs.filterNot { it.shown }.map { it.store.id }.toSet(), markCustomized) - } - fun shiftTab(store: Store, delta: Int) { - val from = tabs.indexOfFirst { it.store == store } - val to = from + delta - if (from < 0 || to !in tabs.indices) return - tabs.add(to, tabs.removeAt(from)) - commitTabs(markCustomized = true) - } - fun moveTab(store: Store, to: Int) { - val from = tabs.indexOfFirst { it.store == store } - if (from < 0) return - val target = to.coerceIn(0, tabs.lastIndex) - if (target == from) return - tabs.add(target, tabs.removeAt(from)) - commitTabs(markCustomized = true) - } - fun toggleTab(store: Store) { - val i = tabs.indexOfFirst { it.store == store } - if (i < 0) return - val show = !tabs[i].shown - if (!show && tabs.count { it.shown } <= 1) return - tabs[i] = tabs[i].copy(shown = show) - commitTabs() - } LaunchedEffect(tabs.map { it.store to it.shown }, chip) { val picked = Store.byId(chip) ?: return@LaunchedEffect if (tabs.none { it.store == picked && it.shown }) chip = tabs.firstOrNull { it.shown }?.store?.id ?: chip @@ -262,18 +231,8 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier if (chip != st.id) pickChip(st.id) else move("first") } BackHandler(enabled = openGame != null) { closeGame() } - BackHandler(enabled = arranging) { arranging = false } var contentFocused by remember { mutableStateOf(false) } - BackHandler(enabled = contentFocused && openGame == null && !arranging) { move("item:storechip:$chip") } - LaunchedEffect(arranging) { - val focus = ff ?: return@LaunchedEffect - if (!arranging || inputMode.inputMode != androidx.compose.ui.input.InputMode.Keyboard) return@LaunchedEffect - repeat(45) { - androidx.compose.runtime.withFrameNanos { } - val req = tabs.firstOrNull()?.let { focus.items["storechip:${it.store.id}"] } ?: return@repeat - if (runCatching { req.requestFocus() }.isSuccess) return@LaunchedEffect - } - } + BackHandler(enabled = contentFocused && openGame == null) { move("item:storechip:$chip") } val scroll = rememberScrollState() val detailScroll = rememberScrollState() LaunchedEffect(chip) { scroll.scrollTo(0); grid.scrollToItem(0) } @@ -317,28 +276,16 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier Box(modifier.onGloballyPositioned { hostAt = it.positionInRoot() }) { Column( modifier = Modifier.fillMaxSize().padding(horizontal = padH).padding(top = if (narrow) 10.dp else 14.dp) - .then(if (openGame != null && !arranging) Modifier else Modifier.bumpers( - onPrevious = { - val picked = Store.byId(focusedChip) - if (arranging) { if (picked != null) shiftTab(picked, -1) } else cycleStore(-1) - }, - onNext = { - val picked = Store.byId(focusedChip) - if (arranging) { if (picked != null) shiftTab(picked, 1) } else cycleStore(1) - }, - )), + .then(if (openGame != null) Modifier else Modifier.bumpers(onPrevious = { cycleStore(-1) }, onNext = { cycleStore(1) })), ) { Box(Modifier.fillMaxWidth().padding(bottom = 8.dp)) { StoreTheme(Store.byId(focusedChip ?: chip)) { Rise(0) { StoreChips( - chip, focusedChip, tabs, arranging, + chip, focusedChip, tabs, onStore = { st -> openModes(st) }, onFocusChip = { focusedChip = it }, - onArrangeDone = { arranging = false }, - onMoveTab = { st, to -> moveTab(st, to) }, - onToggleTab = { toggleTab(it) }, - onSettings = { at -> if (at != null) StoresMotion.ask(storesSettingsStep(at, liveState, a, pal.signal) { arranging = true }) }, + onSettings = { at -> if (at != null) StoresMotion.ask(storesSettingsStep(at, liveState, a, pal.signal) { ManageStores.custom = false; ManageStores.open = true }) }, ) } } @@ -493,13 +440,6 @@ internal fun SignInFloodLayer(hostAt: Offset) { } -private class ChipDrag { - var store by mutableStateOf(null) - var from by mutableIntStateOf(-1) - var target by mutableIntStateOf(-1) - var x by mutableFloatStateOf(0f) -} - @Composable private fun StoreDot(store: Store, signedIn: Boolean) { val c = sourceColours(store.id) @@ -511,106 +451,30 @@ private fun StoreDot(store: Store, signedIn: Boolean) { ) } -@Composable -private fun RowScope.ArrangeStoreChip( - tab: StoreTab, index: Int, last: Int, gapPx: Float, drag: ChipDrag, - onFocusChip: (String?) -> Unit, onMoveTab: (Store, Int) -> Unit, onToggleTab: (Store) -> Unit, -) { - val store = tab.store - val box = remember(store) { mutableFloatStateOf(0f) } - val pitch = box.floatValue + gapPx - val held = drag.store == store - val lift by animateFloatAsState(if (held) 1f else 0f, Motion.sp(0.7f, Spring.StiffnessMediumLow), label = "chipLift") - val shift by animateFloatAsState( - when { - drag.store == null || held -> 0f - drag.from < index && drag.target >= index -> -pitch - drag.from > index && drag.target <= index -> pitch - else -> 0f - }, - Motion.sp(0.6f, Spring.StiffnessMediumLow), label = "chipShift", - ) - val pill = remember { RoundedCornerShape(99.dp) } - val signedIn = StoresState.isSignedIn(store) && StoresState.expired[store] != true - fun reset() { - drag.store = null - drag.from = -1 - drag.target = -1 - drag.x = 0f - } - fun commit() { - val from = drag.from - val to = drag.target - reset() - if (from >= 0 && to >= 0 && to != from) onMoveTab(store, to) - } - StoreChip( - label = store.shortLabel, on = false, under = false, key = store.id, mark = sourceColours(store.id).dot, lift = lift, - modifier = Modifier.weight(1f) - .zIndex(if (held) 2f else 0f) - .onSizeChanged { box.floatValue = it.width.toFloat() } - .graphicsLayer { - translationX = if (held) drag.x else shift - shadowElevation = 14.dp.toPx() * lift - shape = pill - clip = false - } - .pointerInput(store, index) { - detectDragGestures( - onDragStart = { - drag.store = store - drag.from = index - drag.target = index - drag.x = 0f - }, - onDragEnd = { commit() }, - onDragCancel = { reset() }, - ) { change, amount -> - change.consume() - val step = box.floatValue + gapPx - if (step <= 0f) return@detectDragGestures - drag.x = (drag.x + amount.x).coerceIn(-drag.from * step, (last - drag.from) * step) - drag.target = (drag.from + (drag.x / step).roundToInt()).coerceIn(0, last) - } - } - .alpha(if (tab.shown) 1f else 0.32f), - lead = { StoreDot(store, signedIn) }, - onFocused = onFocusChip, - ) { onToggleTab(store) } -} - @OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) @Composable private fun StoreChips( - selected: String, focused: String?, tabs: List, arranging: Boolean, + selected: String, focused: String?, tabs: List, onStore: (Store) -> Unit, onSettings: (Rect?) -> Unit, onFocusChip: (String?) -> Unit, - onArrangeDone: () -> Unit, onMoveTab: (Store, Int) -> Unit, onToggleTab: (Store) -> Unit, ) { val pal = LocalPalette.current val keys = tabs.filter { it.shown }.map { it.store.id } val bounds = remember { androidx.compose.runtime.mutableStateMapOf() } val highlighted = focused ?: selected val inputMode = androidx.compose.ui.platform.LocalInputModeManager.current.inputMode - val fillShown = inputMode != androidx.compose.ui.input.InputMode.Keyboard && !arranging + val fillShown = inputMode != androidx.compose.ui.input.InputMode.Keyboard val tint = androidx.compose.animation.animateColorAsState( Store.byId(highlighted)?.let { sourceColours(it.id).dot } ?: pal.signal, Motion.tw(160), label = "chipTint", ) val gap = 8.dp - val gapPx = with(androidx.compose.ui.platform.LocalDensity.current) { gap.toPx() } - val drag = remember { ChipDrag() } val tabScroll = rememberScrollState() Box(Modifier.fillMaxWidth()) { Row(horizontalArrangement = Arrangement.spacedBy(gap), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) { - Box(Modifier.weight(1f).then(if (arranging) Modifier else Modifier.edgeFade(tabScroll).horizontalScroll(tabScroll))) { - Row(horizontalArrangement = Arrangement.spacedBy(gap), verticalAlignment = Alignment.CenterVertically, - modifier = (if (arranging) Modifier.fillMaxWidth() else Modifier).focusGroup(), - ) { + Box(Modifier.weight(1f).edgeFade(tabScroll).horizontalScroll(tabScroll)) { + Row(horizontalArrangement = Arrangement.spacedBy(gap), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.focusGroup()) { for (tab in tabs) { val store = tab.store - if (arranging) { - val index = tabs.indexOfFirst { it.store == store } - key(store) { ArrangeStoreChip(tab, index, tabs.lastIndex, gapPx, drag, onFocusChip, onMoveTab, onToggleTab) } - } else if (tab.shown) { + if (tab.shown) { val signedIn = StoresState.isSignedIn(store) && StoresState.expired[store] != true key(store) { val reveal = remember { BringIntoViewRequester() } @@ -628,23 +492,19 @@ private fun StoreChips( } ChipGlide(keys.indexOf(highlighted), bounds[highlighted], tint, visible = fillShown) } - if (arranging) { - IconChip(Icons.Filled.Check, stringResource(R.string.stores_tabs_arrange_done)) { onArrangeDone() } - } else { - var cogAt by remember { mutableStateOf(null) } - Box(Modifier.onGloballyPositioned { cogAt = it.boundsInRoot() }) { - IconChip(Icons.Filled.Settings, stringResource(R.string.stores_settings)) { onSettings(cogAt) } - } + var cogAt by remember { mutableStateOf(null) } + Box(Modifier.onGloballyPositioned { cogAt = it.boundsInRoot() }) { + IconChip(Icons.Filled.Settings, stringResource(R.string.stores_settings)) { onSettings(cogAt) } } } } } @Composable -private fun StoreChip( +internal fun StoreChip( label: String?, on: Boolean, under: Boolean, key: String, mark: Color, modifier: Modifier, lead: @Composable () -> Unit, trail: (@Composable () -> Unit)? = null, description: String? = null, lift: Float = 0f, - onFocused: (String?) -> Unit = {}, onClick: () -> Unit, + onFocused: (String?) -> Unit = {}, paneKey: String = "storechip:$key", onClick: () -> Unit, ) { val inputMode = androidx.compose.ui.platform.LocalInputModeManager.current val colors = MaterialTheme.colorScheme @@ -663,7 +523,7 @@ private fun StoreChip( } Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally), - modifier = modifier.paneItem("storechip:$key") + modifier = modifier.paneItem(paneKey) .onFocusChanged { f -> if (f.isFocused && inputMode.inputMode == androidx.compose.ui.input.InputMode.Keyboard) onFocused(key) else if (!f.isFocused) onFocused(null) @@ -711,56 +571,59 @@ internal fun CountPill(count: Int) { @Composable -private fun SignInCard(store: Store, height: Dp) { +internal fun SignInCard(store: Store, height: Dp) { val ctx = LocalContext.current - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val narrow = LocalNarrowPane.current - val c = sourceColours(store.id) LaunchedEffect(store) { StoresState.preview(ctx, store) } val art = remember(StoresState.shelves[store]) { val shelves = StoresState.shelves[store] - val urls = (shelves?.art?.takeIf { it.isNotEmpty() } - ?: shelves?.all.orEmpty().filter { !it.mature && !it.owned }.mapNotNull { it.tallImageUrl ?: it.imageUrl }).distinct().take(48) - when { - urls.size >= 8 -> urls - urls.size >= 4 -> urls + urls.drop(urls.size / 2) + urls.take(urls.size / 2) - else -> emptyList() - } + wallTiles( + shelves?.art?.takeIf { it.isNotEmpty() } + ?: shelves?.all.orEmpty().filter { !it.mature && !it.owned }.mapNotNull { it.tallImageUrl ?: it.imageUrl }, + ) } + HeroWallCard(store.label, art, sourceColours(store.id), height) { SignInButton(store, large = true) } +} + +/** Repeats a short cover list so the wall has enough tiles to drift; too few covers leave it to the blank capsules. */ +internal fun wallTiles(urls: List): List { + val u = urls.distinct().take(48) + return when { + u.size >= 8 -> u + u.size >= 4 -> u + u.drop(u.size / 2) + u.take(u.size / 2) + else -> emptyList() + } +} + +/** Full-height splash used where a tab has nothing to list yet: a drifting cover wall, the shared wall fade, a title and one action. */ +@Composable +internal fun HeroWallCard(title: String, art: List, c: SourceColours, height: Dp, modifier: Modifier = Modifier, action: @Composable () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val narrow = LocalNarrowPane.current val shape = RoundedCornerShape(20.dp) val blank = WallCapsule(Brush.linearGradient(listOf(c.fill, colors.background)), edge = c.dot.copy(alpha = 0.22f)) val ground = SolidColor(c.fill) - Box(Modifier.fillMaxWidth().heightIn(min = height.coerceAtLeast(0.dp)).clip(shape).background(colors.background).border(1.dp, pal.line, shape)) { - androidx.compose.animation.Crossfade(art, animationSpec = Motion.tw(600), label = "signInWall", modifier = Modifier.matchParentSize()) { tiles -> + Box(modifier.fillMaxWidth().heightIn(min = height.coerceAtLeast(0.dp)).clip(shape).background(colors.background).border(1.dp, pal.line, shape)) { + androidx.compose.animation.Crossfade(art, animationSpec = Motion.tw(600), label = "heroWall", modifier = Modifier.matchParentSize()) { tiles -> TiltedWall(tiles.size, if (tiles.isEmpty()) 75_000 else 50_000) { i -> if (tiles.isEmpty()) blank else WallCapsule(ground, tiles[i]) } } - Box( - Modifier.matchParentSize().background( - Brush.horizontalGradient( - 0f to colors.background.copy(alpha = 0.97f), 0.45f to colors.background.copy(alpha = 0.9f), - 0.78f to colors.background.copy(alpha = 0.35f), 1f to colors.background.copy(alpha = 0.15f), - ), - ), - ) - Box(Modifier.matchParentSize().background(Brush.verticalGradient(0.5f to Color.Transparent, 1f to colors.background.copy(alpha = 0.92f)))) + WallFade(Modifier.matchParentSize()) Box( Modifier.matchParentSize().drawBehind { drawRect(Brush.radialGradient(listOf(c.dot.copy(alpha = 0.22f), Color.Transparent), center = Offset(size.width * 0.16f, size.height * 0.9f), radius = size.height * 0.75f)) }, ) Column( - verticalArrangement = Arrangement.spacedBy(10.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), modifier = Modifier.align(Alignment.BottomStart).padding(start = if (narrow) 20.dp else 40.dp, bottom = if (narrow) 20.dp else 36.dp, end = 20.dp), ) { Rise(2) { Text( - store.label, fontSize = if (narrow) 30.sp else 42.sp, lineHeight = if (narrow) 34.sp else 46.sp, + title, fontSize = if (narrow) 30.sp else 42.sp, lineHeight = if (narrow) 34.sp else 46.sp, fontWeight = FontWeight.Black, color = colors.onBackground, ) } - Spacer(Modifier.height(6.dp)) - Rise(3) { SignInButton(store, large = true) } + Rise(3) { action() } } } } @@ -774,12 +637,7 @@ private fun SignInButton(store: Store, large: Boolean = false) { if (askKey) ItchKeyDialog { askKey = false } Box(Modifier.onGloballyPositioned { placed[0] = it }) { PrimaryButton(stringResource(R.string.stores_signin), main = true, large = large, icon = if (large) Icons.AutoMirrored.Filled.Login else null) { - if (store == Store.ITCH) askKey = true - else { - val at = placed[0]?.takeIf { it.isAttached }?.boundsInRoot() - if (at == null || Motion.scale == 0f || StoresMotion.signIn != null) StoresState.signIn(ctx, store) - else StoresMotion.signIn = SignInFlood(store, at, colors.primary, sourceColours(store.id).dot) - } + startStoreSignIn(ctx, store, placed[0]?.takeIf { it.isAttached }?.boundsInRoot(), colors.primary) { askKey = true } } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt index 6d4605785..efe8a808b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt @@ -81,7 +81,6 @@ internal fun TabsSettingsGroup(host: MenuHost, s: FrontEndState, a: FrontEndActi androidx.compose.runtime.withFrameNanos { } reveal.bringIntoView() } - val pad = LocalInputModeManager.current.inputMode == InputMode.Keyboard val state by rememberUpdatedState(s) val rows = { val keys = NavTabs.listed(state) @@ -95,98 +94,113 @@ internal fun TabsSettingsGroup(host: MenuHost, s: FrontEndState, a: FrontEndActi NavTabs.setHidden(ctx, key, !show) } + Box(Modifier.bringIntoViewRequester(reveal)) { + SettingsGroup(stringResource(R.string.setup_group_tabs)) { + SortableRows( + rows = rows, commit = commit, movable = { it != MORE_LINE }, rowHeight = TAB_ROW, handleWidth = TAB_HANDLE, + onActivate = { tab -> if (NavTabs.hideable(tab)) setShown(tab, NavTabs.place(state, tab) == TabPlace.HIDDEN) }, + ) { tab, held, offset, hint, modifier, onFocus -> + if (tab == MORE_LINE) MoreLine() + else TabRow( + tab, NavTabs.place(s, tab) != TabPlace.HIDDEN, NavTabs.hideable(tab), held, offset, hint, modifier, onFocus, + ) { host.open = null; setShown(tab, it) } + } + } + } +} + +@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) +@Composable +internal fun SortableRows( + rows: () -> List, + commit: (List) -> Unit, + movable: (String) -> Boolean, + rowHeight: androidx.compose.ui.unit.Dp, + handleWidth: androidx.compose.ui.unit.Dp, + onActivate: (String) -> Unit, + row: @Composable (key: String, held: Boolean, offset: Float, hint: String?, modifier: Modifier, onFocus: (Boolean) -> Unit) -> Unit, +) { + val pad = LocalInputModeManager.current.inputMode == InputMode.Keyboard var dragging by remember { mutableStateOf(null) } var dragOffset by remember { mutableFloatStateOf(0f) } var grabbed by remember { mutableStateOf(null) } var before by remember { mutableStateOf>(emptyList()) } var focused by remember { mutableStateOf(null) } - val rowPx = with(LocalDensity.current) { TAB_ROW.toPx() } - val handlePx = with(LocalDensity.current) { TAB_HANDLE.toPx() } + val rowPx = with(LocalDensity.current) { rowHeight.toPx() } + val handlePx = with(LocalDensity.current) { handleWidth.toPx() } val list = rows() - - Box(Modifier.bringIntoViewRequester(reveal)) { - SettingsGroup(stringResource(R.string.setup_group_tabs)) { - Column( - Modifier.fillMaxWidth().pointerInput(Unit) { - awaitEachGesture { - val down = awaitFirstDown(requireUnconsumed = false) - val start = (down.position.y / rowPx).toInt() - val key = rows().getOrNull(start) - if (key == null || key == MORE_LINE || down.position.x > handlePx || grabbed != null) return@awaitEachGesture - down.consume() - dragging = key - dragOffset = 0f - while (true) { - val change = awaitPointerEvent(PointerEventPass.Initial).changes.firstOrNull { it.id == down.id } ?: break - change.consume() - if (!change.pressed) break - val travel = change.position.y - down.position.y - val current = rows() - val target = (start + (travel / rowPx).roundToInt()).coerceIn(0, current.lastIndex) - var at = current.indexOf(key) - var next = current - while (target != at) { - next = moveTabRow(next, key, if (target > at) 1 else -1) ?: break - at = next.indexOf(key) + Column( + Modifier.fillMaxWidth().pointerInput(Unit) { + awaitEachGesture { + val down = awaitFirstDown(requireUnconsumed = false) + val start = (down.position.y / rowPx).toInt() + val key = rows().getOrNull(start) + if (key == null || !movable(key) || down.position.x > handlePx || grabbed != null) return@awaitEachGesture + down.consume() + dragging = key + dragOffset = 0f + while (true) { + val change = awaitPointerEvent(PointerEventPass.Initial).changes.firstOrNull { it.id == down.id } ?: break + change.consume() + if (!change.pressed) break + val travel = change.position.y - down.position.y + val current = rows() + val target = (start + (travel / rowPx).roundToInt()).coerceIn(0, current.lastIndex) + var at = current.indexOf(key) + var next = current + while (target != at) { + next = moveTabRow(next, key, if (target > at) 1 else -1) ?: break + at = next.indexOf(key) + } + if (next !== current) commit(next) + dragOffset = travel - (at - start) * rowPx + } + dragging = null + dragOffset = 0f + } + }, + ) { + list.forEachIndexed { index, item -> + key(item) { + if (!movable(item)) row(item, false, 0f, null, Modifier) {} + else { + val bring = remember { BringIntoViewRequester() } + LaunchedEffect(index, grabbed) { if (grabbed == item) bring.bringIntoView() } + row( + item, item == dragging || item == grabbed, if (item == dragging) dragOffset else 0f, + if (pad && focused == item) stringResource(if (grabbed == item) R.string.hud_hint_drop else R.string.hud_hint_grab) else null, + Modifier.bringIntoViewRequester(bring).onPreviewKeyEvent { event -> + val e = event.nativeKeyEvent + val down = e.action == KeyEvent.ACTION_DOWN + val first = down && e.repeatCount == 0 + val mine = grabbed == item + when (e.keyCode) { + KeyEvent.KEYCODE_BUTTON_Y -> { + if (first) { + if (mine) grabbed = null + else if (grabbed == null) { before = rows(); grabbed = item } + } + true + } + KeyEvent.KEYCODE_DPAD_UP, KeyEvent.KEYCODE_DPAD_DOWN -> { + if (mine && down) moveTabRow(rows(), item, if (e.keyCode == KeyEvent.KEYCODE_DPAD_UP) -1 else 1)?.let(commit) + mine + } + KeyEvent.KEYCODE_DPAD_LEFT, KeyEvent.KEYCODE_DPAD_RIGHT -> mine + KeyEvent.KEYCODE_BUTTON_B, KeyEvent.KEYCODE_BACK -> { + if (mine && first) { commit(before); grabbed = null } + mine + } + KeyEvent.KEYCODE_BUTTON_A, KeyEvent.KEYCODE_ENTER, KeyEvent.KEYCODE_SPACE -> { + if (first) { + if (mine) grabbed = null else onActivate(item) + } + true + } + else -> false } - if (next !== current) commit(next) - dragOffset = travel - (at - start) * rowPx - } - dragging = null - dragOffset = 0f - } - }, - ) { - list.forEachIndexed { index, tab -> - key(tab) { - if (tab == MORE_LINE) { - MoreLine() - } else { - val shown = NavTabs.place(s, tab) != TabPlace.HIDDEN - val held = tab == dragging || tab == grabbed - val bring = remember { BringIntoViewRequester() } - LaunchedEffect(index, grabbed) { if (grabbed == tab) bring.bringIntoView() } - TabRow( - tab, shown, NavTabs.hideable(tab), held, - offset = if (tab == dragging) dragOffset else 0f, - hint = if (pad && focused == tab) stringResource(if (grabbed == tab) R.string.hud_hint_drop else R.string.hud_hint_grab) else null, - modifier = Modifier.bringIntoViewRequester(bring) - .onPreviewKeyEvent { event -> - val e = event.nativeKeyEvent - val down = e.action == KeyEvent.ACTION_DOWN - val first = down && e.repeatCount == 0 - val mine = grabbed == tab - when (e.keyCode) { - KeyEvent.KEYCODE_BUTTON_Y -> { - if (first) { - if (mine) grabbed = null - else if (grabbed == null) { before = rows(); grabbed = tab } - } - true - } - KeyEvent.KEYCODE_DPAD_UP, KeyEvent.KEYCODE_DPAD_DOWN -> { - if (mine && down) moveTabRow(rows(), tab, if (e.keyCode == KeyEvent.KEYCODE_DPAD_UP) -1 else 1)?.let(commit) - mine - } - KeyEvent.KEYCODE_DPAD_LEFT, KeyEvent.KEYCODE_DPAD_RIGHT -> mine - KeyEvent.KEYCODE_BUTTON_B, KeyEvent.KEYCODE_BACK -> { - if (mine && first) { commit(before); grabbed = null } - mine - } - KeyEvent.KEYCODE_BUTTON_A, KeyEvent.KEYCODE_ENTER, KeyEvent.KEYCODE_SPACE -> { - if (first) { - if (mine) grabbed = null - else if (NavTabs.hideable(tab)) setShown(tab, !shown) - } - true - } - else -> false - } - }, - onFocus = { if (it) focused = tab else if (focused == tab) { focused = null; if (grabbed == tab) grabbed = null } }, - ) { host.open = null; setShown(tab, it) } - } - } + }, + ) { if (it) focused = item else if (focused == item) { focused = null; if (grabbed == item) grabbed = null } } } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 965ab2322..4ee7cd776 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4316,6 +4316,12 @@ Store accounts Sign in Sign out + Manage stores + All games + Custom games + Not signed in + Login expired + Uses an API key Reset Reset tabs Steam, Desktop, Library, Downloads, Settings and Updates on the bar, the rest under More. diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt index 7674ab242..772578ea3 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt @@ -82,6 +82,25 @@ class LibraryEntriesTest { assertEquals(listOf("steam", "xbox", "epic", "gog", "added"), librarySources(entries, listOf("xbox", "epic", "gog"))) } + @Test fun theLibrarysOwnTabsSitAfterTheTabTheyFollow() { + val entries = listOf("added", "gog", "steam", "epic", "xbox").map { LibraryEntry(it, it, it, null, null, true) } + val order = listOf("xbox", "epic", "gog") + assertEquals(listOf("steam", "xbox", "added", "epic", "gog"), librarySources(entries, order, places = listOf("added" to "xbox"))) + assertEquals(listOf("added", "steam", "xbox", "epic", "gog"), librarySources(entries, order, places = listOf("added" to "", "favorites" to "added", "steam" to "favorites"))) + assertEquals(listOf("xbox", "epic", "steam", "gog", "added"), librarySources(entries, order, places = listOf("favorites" to "epic", "steam" to "favorites", "added" to "nope"))) + } + + @Test fun hidingTheTabALibraryTabFollowsKeepsItInPlace() { + val entries = listOf("added", "gog", "epic", "xbox").map { LibraryEntry(it, it, it, null, null, true) } + assertEquals(listOf("xbox", "added", "gog"), librarySources(entries, listOf("xbox", "epic", "gog"), places = listOf("added" to "epic"), offStores = setOf("epic"))) + } + + @Test fun placesRoundTripThroughTheirOrder() { + val order = listOf("epic", "steam", "favorites", "gog", "xbox", "added") + assertEquals(order, placeLibraryTabs(listOf("epic", "gog", "xbox"), libraryPlacesOf(order))) + assertEquals(listOf("favorites", "steam", "epic", "gog", "added"), placeLibraryTabs(listOf("epic", "gog"), emptyList())) + } + @Test fun librarySourcesIgnoreUnknownAndDuplicateOrderEntriesAndAppendNewStores() { val entries = listOf("epic", "gog", "battlenet").map { LibraryEntry(it, it, it, null, null, false) } assertEquals(listOf("epic", "gog", "battlenet"), librarySources(entries, listOf("missing", "epic", "epic", "amazon"))) diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryFavoritesTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryFavoritesTest.kt index 699ca0372..c2ce77dbf 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/LibraryFavoritesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryFavoritesTest.kt @@ -50,4 +50,9 @@ class LibraryFavoritesTest { assertEquals(listOf(LIBRARY_FAVORITES, "steam", "gog"), librarySources(entries, listOf("gog"), favorites = setOf("gog:123"))) assertEquals(listOf("steam", "gog"), librarySources(entries, listOf("gog"), favorites = setOf("gog:999"))) } + + @Test fun aHiddenFavoritesTabStaysHiddenWithHeartedGames() { + val entries = listOf(steam(440, "Team Fortress 2"), owned("123", "Witcher")) + assertEquals(listOf("steam", "gog"), librarySources(entries, listOf("gog"), favorites = setOf("gog:123"), offTabs = setOf(LIBRARY_FAVORITES))) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryVisibilityTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryVisibilityTest.kt index ecefb57d4..2630a3314 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/LibraryVisibilityTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryVisibilityTest.kt @@ -81,9 +81,7 @@ class LibraryVisibilityTest { compose.onNodeWithText("Installed Steam game").assertExists() compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() compose.onNodeWithText("NOT INSTALLED · 2").assertExists() - compose.onNodeWithText("3 games").assertExists() toggleNotInstalled(true) - compose.onNodeWithText("3 games").assertExists() compose.onNodeWithText("Uninstalled GOG").assertExists() compose.runOnIdle { generation++; Snapshot.sendApplyNotifications() } compose.mainClock.advanceTimeBy(2_000) @@ -137,27 +135,47 @@ class LibraryVisibilityTest { compose.onNodeWithTag("library-not-installed").assertExists() } - @Test fun aHiddenStoreRemainsReachableInLibraryInItsConfiguredOrder() { + @Test fun aSwitchedOffStoreLeavesTheChipsButItsGamesStayUnderAll() { SessionPrefs.setStoresTabOrder(ctx, listOf("epic", "gog")) SessionPrefs.setStoresTabHidden(ctx, setOf("gog")) show() val steam = compose.onNodeWithTag("library-source-steam").fetchSemanticsNode().boundsInRoot.left val epic = compose.onNodeWithTag("library-source-epic").fetchSemanticsNode().boundsInRoot.left - val gog = compose.onNodeWithTag("library-source-gog").fetchSemanticsNode().boundsInRoot.left - assertTrue(steam < epic && epic < gog) - compose.onNodeWithTag("library-source-gog").performClick() - compose.mainClock.advanceTimeBy(1_000) - compose.onNodeWithTag("library-not-installed").assertIsDisplayed().performClick() + assertTrue(steam < epic) + compose.onNodeWithTag("library-source-gog").assertDoesNotExist() + compose.onNodeWithTag("library-not-installed").performClick() compose.mainClock.advanceTimeBy(1_000) compose.onNodeWithText("Uninstalled GOG").assertExists() } - @Test fun theHeaderCountsTheWholeLibraryWhicheverStoreIsPicked() { - show() - compose.onNodeWithText("3 games").assertExists() - compose.onNodeWithTag("library-source-gog").performClick() + @Test fun anEmptyLibraryStillShowsItsChipsSoCustomGamesAndSignInAreReachable() { + for (store in listOf(Store.GOG, Store.EPIC)) StoreAccounts.clear(ctx, store) + StoresState.library.clear() + StoresState.accounts.clear() + compose.mainClock.autoAdvance = false + compose.setContent { + DroidDeckTheme { + CompositionLocalProvider(LocalFrontFocus provides FrontFocus()) { + FocusGlideHost { Box(Modifier.fillMaxSize()) { + LibraryPage(state(emptyList()), actions(), "games", {}, Modifier.fillMaxSize()) + } } + } + } + } + compose.mainClock.advanceTimeBy(2_000) + compose.onNodeWithTag("library-source-added").performClick() compose.mainClock.advanceTimeBy(1_000) - compose.onNodeWithText("3 games").assertExists() + compose.onNodeWithTag("library-custom-empty").assertExists() + } + + @Test fun theCustomGamesTabIsAlwaysThereAndOffersToAddWhenEmpty() { + show() + compose.onNodeWithTag("library-source-added").performClick() + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithTag("library-custom-empty").assertExists() + compose.onNodeWithTag("library-custom-add").performClick() + assertTrue(GamesDialogState.adding) + GamesDialogState.adding = false } @Test fun theStoresOwnedGamesLinkRevealsOwnedGamesDespiteTheSavedInstalledOnlyView() { @@ -198,11 +216,11 @@ class LibraryVisibilityTest { assertEquals(show, SessionPrefs.libraryShowUninstalled(ctx)) } - private fun state() = FrontEndState( + private fun state(games: List = listOf(Library.SteamGame(440, "Installed Steam game", null, "internal"))) = FrontEndState( installed = "r9", ready = true, available = null, busy = false, stage = "", percent = -1, desktopInstalled = true, offlineAccount = null, offline = false, frameGenLabel = "", romsDir = null, logsEnabled = false, - steamGames = listOf(Library.SteamGame(440, "Installed Steam game", null, "internal")), + steamGames = games, emulators = emptyList(), running = null, ) diff --git a/app/src/test/java/com/droiddeck/launcher/ui/StoreTabsStateTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/StoreTabsStateTest.kt new file mode 100644 index 000000000..e159f5185 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/StoreTabsStateTest.kt @@ -0,0 +1,42 @@ +package com.droiddeck.launcher.ui + +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.stores.Store +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], application = android.app.Application::class) +class StoreTabsStateTest { + private val ctx get() = RuntimeEnvironment.getApplication() + + @Before fun clear() { + ctx.getSharedPreferences("session", 0).edit().clear().commit() + StoreTabsState.load(ctx) + } + + @Test fun aReorderIsSavedForTheStoresTabAndTheLibrary() { + val ids = StoreTabsState.tabs.map { it.store.id } + val moved = listOf(ids[1], ids[0]) + ids.drop(2) + StoreTabsState.reorder(ctx, moved) + assertEquals(moved, StoreTabsState.tabs.map { it.store.id }) + StoreTabsState.load(ctx) + assertEquals(moved, StoreTabsState.tabs.map { it.store.id }) + } + + @Test fun hidingIsSavedButTheLastShownStoreStays() { + assertTrue(StoreTabsState.setShown(ctx, Store.GOG, false)) + assertTrue(Store.GOG.id in SessionPrefs.storesTabHidden(ctx)) + for (tab in StoreTabsState.tabs.filter { it.shown }.dropLast(1)) StoreTabsState.setShown(ctx, tab.store, false) + val last = StoreTabsState.tabs.single { it.shown }.store + assertFalse(StoreTabsState.setShown(ctx, last, false)) + assertTrue(StoreTabsState.tabs.single { it.store == last }.shown) + } +} From d4af37937a068a52fa91d732ca96cf0ef4d6268e Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 19 Nov 2026 19:12:10 -0500 Subject: [PATCH 21/31] feat(ui): Steam Deck menu icons, and Compose previews rendered to PNGs (#2900) * Rail and second-screen icons in the Steam Deck menu's style Solid icons throughout the rail, and Steam's glyphs where Steam has the same place: Library is the four-square grid, Stores the price tag, Downloads the download arrow, Settings the gear. On the second screen, Screenshots uses Steam's Media picture and Chat its Friends people. * Compose previews of the launcher and the in-game menu, rendered to PNGs Debug-only previews of the launcher on each tab and the in-game menu's pages, built from the production composables with sample state and no-op actions, at the Duo's handheld size and in portrait. PreviewRenderTest draws each with Robolectric's native graphics into app/build/preview-renders/, so a UI change can be looked at without a device, and fails on a preview that throws or draws nothing. docs/compose-previews.md says how to run and extend them. * Preview renders wait for store accounts before drawing A preview case can name what the render test waits for. The Library and Stores cases wait for store accounts, which load on a background thread, so their PNGs never catch the loading state. * Preview renders step the paused clock while waiting for a case to be ready --- app/build.gradle | 2 + .../droiddeck/launcher/ui/LauncherPreviews.kt | 47 +++++++++++ .../droiddeck/launcher/ui/PreviewSupport.kt | 83 +++++++++++++++++++ .../com/droiddeck/launcher/ui/BottomPages.kt | 16 ++-- .../com/droiddeck/launcher/ui/FrontEndRail.kt | 53 ++++++------ .../droiddeck/launcher/ui/GameShelfIcon.kt | 17 ---- .../launcher/ui/PreviewRenderTest.kt | 63 ++++++++++++++ docs/compose-previews.md | 36 ++++++++ 8 files changed, 266 insertions(+), 51 deletions(-) create mode 100644 app/src/debug/java/com/droiddeck/launcher/ui/LauncherPreviews.kt create mode 100644 app/src/debug/java/com/droiddeck/launcher/ui/PreviewSupport.kt delete mode 100644 app/src/main/java/com/droiddeck/launcher/ui/GameShelfIcon.kt create mode 100644 app/src/testDebug/java/com/droiddeck/launcher/ui/PreviewRenderTest.kt create mode 100644 docs/compose-previews.md diff --git a/app/build.gradle b/app/build.gradle index cb5b882ec..c271f963b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -388,6 +388,8 @@ dependencies { implementation 'androidx.compose.material3:material3' implementation 'androidx.compose.ui:ui-tooling-preview' debugImplementation 'androidx.compose.ui:ui-tooling' + // Declares the ComponentActivity that createComposeRule launches, for PreviewRenderTest. + debugImplementation 'androidx.compose.ui:ui-test-manifest' implementation 'androidx.activity:activity-compose:1.8.2' implementation 'androidx.compose.material:material-icons-extended' implementation 'io.coil-kt:coil-compose:2.6.0' diff --git a/app/src/debug/java/com/droiddeck/launcher/ui/LauncherPreviews.kt b/app/src/debug/java/com/droiddeck/launcher/ui/LauncherPreviews.kt new file mode 100644 index 000000000..12c245122 --- /dev/null +++ b/app/src/debug/java/com/droiddeck/launcher/ui/LauncherPreviews.kt @@ -0,0 +1,47 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.runtime.Composable + +/** The launcher as a whole: rail and page, opened on each tab through FrontEndState.navigate. */ +@Composable +private fun Launcher(tab: String, games: List = sampleGames, ready: Boolean = true) = + PreviewHost { FrontEndScreen(sampleState(games = games, navigate = tab, ready = ready), sampleActions) } + +@DroidDeckPreviews @Composable private fun SteamTabPreview() = Launcher("steam") +@DroidDeckPreviews @Composable private fun LibraryPreview() = Launcher("games") +@DroidDeckPreviews @Composable private fun LibraryEmptyPreview() = Launcher("games", games = emptyList()) +@DroidDeckPreviews @Composable private fun StoresPreview() = Launcher("stores") +@DroidDeckPreviews @Composable private fun DownloadsPreview() = Launcher("downloads") +@DroidDeckPreviews @Composable private fun SettingsPreview() = Launcher("setup") +@DroidDeckPreviews @Composable private fun RuntimeMissingPreview() = Launcher("setup", ready = false) + +/** The in-game menu on one page, as a session shows it. */ +@Composable +private fun SessionMenu(page: SessionDrawerPage, steam: Boolean = true, desktop: Boolean = false) = PreviewHost { + SessionDrawer(true, page, controllerActive = true, onPageChange = {}, a = sampleDrawerActions(steam, desktop)) +} + +@DroidDeckPreviews @Composable private fun SessionMenuControllerPreview() = SessionMenu(SessionDrawerPage.CONTROLLER) +@DroidDeckPreviews @Composable private fun SessionMenuDisplayPreview() = SessionMenu(SessionDrawerPage.DISPLAY) +@DroidDeckPreviews @Composable private fun SessionMenuHudPreview() = SessionMenu(SessionDrawerPage.HUD) +@DroidDeckPreviews @Composable private fun SessionMenuSessionPreview() = SessionMenu(SessionDrawerPage.SESSION) +@DroidDeckPreviews @Composable private fun SessionMenuDesktopPreview() = SessionMenu(SessionDrawerPage.CONTROLLER, steam = false, desktop = true) + +/** The Library and Stores tabs read store accounts, which load on a background thread. */ +private val storesLoaded = { com.droiddeck.launcher.stores.StoresState.accountsLoaded } + +/** Every preview above, for the render test. Add a case when adding a preview. */ +internal val previewCases: List = listOf( + PreviewCase("steam-tab") { Launcher("steam") }, + PreviewCase("library", storesLoaded) { Launcher("games") }, + PreviewCase("library-empty", storesLoaded) { Launcher("games", games = emptyList()) }, + PreviewCase("stores", storesLoaded) { Launcher("stores") }, + PreviewCase("downloads") { Launcher("downloads") }, + PreviewCase("settings") { Launcher("setup") }, + PreviewCase("runtime-missing") { Launcher("setup", ready = false) }, + PreviewCase("session-menu-controller") { SessionMenu(SessionDrawerPage.CONTROLLER) }, + PreviewCase("session-menu-display") { SessionMenu(SessionDrawerPage.DISPLAY) }, + PreviewCase("session-menu-hud") { SessionMenu(SessionDrawerPage.HUD) }, + PreviewCase("session-menu-session") { SessionMenu(SessionDrawerPage.SESSION) }, + PreviewCase("session-menu-desktop") { SessionMenu(SessionDrawerPage.CONTROLLER, steam = false, desktop = true) }, +) diff --git a/app/src/debug/java/com/droiddeck/launcher/ui/PreviewSupport.kt b/app/src/debug/java/com/droiddeck/launcher/ui/PreviewSupport.kt new file mode 100644 index 000000000..4e8ae8094 --- /dev/null +++ b/app/src/debug/java/com/droiddeck/launcher/ui/PreviewSupport.kt @@ -0,0 +1,83 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.gpu.FrameGen +import com.droiddeck.launcher.gpu.Lossless +import com.droiddeck.launcher.input.SecondScreenMode +import com.droiddeck.launcher.session.SessionPrefs + +/** + * Debug-only support for Compose previews: the production theme around a screen, and sample state and no-op actions so + * production composables render without a device, a runtime or a network. See docs/compose-previews.md. + */ + +/** The sizes the previews come in. The Duo's top screen is 1920x1080 at xhdpi, i.e. 960x540 dp. */ +@Preview(name = "Handheld", widthDp = 960, heightDp = 540, device = "spec:width=960dp,height=540dp,dpi=320,orientation=landscape") +@Preview(name = "Portrait", widthDp = 540, heightDp = 960, device = "spec:width=540dp,height=960dp,dpi=320") +internal annotation class DroidDeckPreviews + +@Composable +internal fun PreviewHost(content: @Composable () -> Unit) { + DroidDeckTheme { + Box(Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background)) { content() } + } +} + +/** + * A case the render test draws: a name for its PNG and the preview's content. [ready] is what the test waits for before + * drawing, for a screen that loads something off the main thread first. + */ +internal class PreviewCase(val name: String, val ready: () -> Boolean = { true }, val content: @Composable () -> Unit) { + override fun toString() = name +} + +internal val sampleGames: List = listOf( + "Portal 2" to 620, "Hades" to 1145360, "Celeste" to 504230, "Stardew Valley" to 413150, "Hollow Knight" to 367520, + "Balatro" to 2379780, "Dead Cells" to 588650, "Terraria" to 105600, "Vampire Survivors" to 1794680, "Slay the Spire" to 646570, +).mapIndexed { i, (name, appId) -> + Library.SteamGame(appId, name, art = null, library = "steam", lastPlayed = 1_700_000_000_000L - i * 86_400_000L) +} + +internal fun sampleState( + games: List = sampleGames, + navigate: String? = null, + ready: Boolean = true, +): FrontEndState = FrontEndState( + installed = "ubuntu-r1", ready = ready, available = "ubuntu-r1", busy = false, stage = "", percent = 0, + desktopInstalled = true, offlineAccount = null, offline = false, frameGenLabel = "Off", romsDir = null, logsEnabled = true, + steamGames = games, emulators = emptyList(), running = null, navigate = navigate, +) + +internal val sampleActions: FrontEndActions = FrontEndActions( + onPlay = {}, onPlayDesktopUi = {}, onSteamGame = {}, onDesktop = {}, onEmulator = {}, onRom = {}, onResume = {}, + onSteamSettings = {}, onDesktopSettings = {}, onInstallPackage = {}, onRemovePackage = {}, onRuntime = {}, + onFrameGenPick = {}, onImportLossless = {}, onProtons = {}, onComponents = {}, onPerformance = {}, onRoms = {}, + onFiles = {}, onLogs = {}, onOffline = {}, + onWirelessAdbPair = { _, _, _, _ -> }, onWirelessAdbApply = { _, _, _, _ -> }, onSetPhantomProcessLimit = { _, _ -> }, +) + +/** The in-game menu's actions with settled sample values; its switches do nothing. */ +internal fun sampleDrawerActions(steam: Boolean = true, desktop: Boolean = false): DrawerActions = DrawerActions( + steam = steam, desktop = desktop, title = if (!steam && !desktop) "Hades" else null, + isHomeApp = false, androidApps = emptyList(), + hudOn = true, onHud = {}, + frameGen = FrameGen.Mode.OFF, onFrameGenPick = {}, + lossless = Lossless.State.NONE, + oscMode = SessionPrefs.OSC_AUTO, onOsc = {}, + suspendPolicy = SessionPrefs.SUSPEND_MANUAL, onSuspendPolicy = {}, + backActionsInverted = false, onBackActionsInverted = {}, + touchMode = SessionPrefs.TOUCH_AUTO, onTouch = {}, touchAuto = "Auto (direct)", + fexPreset = "", onFexPreset = {}, + secondScreenMode = SecondScreenMode.NONE, onSecondScreenMode = {}, + secondScreenDisplays = emptyList(), selectedSecondScreenDisplay = -1, onSecondScreenDisplay = {}, + onImportLossless = {}, onKeyboard = {}, onHardwareKeyboard = {}, + onSteamMenu = if (steam) ({}) else null, onQam = if (steam) ({}) else null, + onLaunchAndroidApp = { _, _ -> }, onBackground = {}, onShareLogs = {}, onStop = {}, onClose = {}, +) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomPages.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomPages.kt index 2d2e401fa..b51aec8bf 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomPages.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomPages.kt @@ -7,10 +7,10 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Download -import androidx.compose.material.icons.outlined.Forum -import androidx.compose.material.icons.outlined.Speed -import androidx.compose.material.icons.outlined.PhotoLibrary +import androidx.compose.material.icons.filled.Speed +import androidx.compose.material.icons.filled.Download +import androidx.compose.material.icons.filled.Image +import androidx.compose.material.icons.filled.People import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -32,10 +32,10 @@ class BottomPageActions( internal const val BOTTOM_PAGE_TELEMETRY = "telemetry" fun sessionBottomPages(actions: BottomPageActions): List = listOf( - BottomPage(BOTTOM_PAGE_TELEMETRY, R.string.bottom_page_telemetry, Icons.Outlined.Speed) { BottomTelemetryPage(actions.fps, actions.runningGame) }, - BottomPage("downloads", R.string.bottom_page_downloads, Icons.Outlined.Download) { BottomDownloadsPage() }, - BottomPage("screenshots", R.string.bottom_page_screenshots, Icons.Outlined.PhotoLibrary) { BottomScreenshotsPage(actions.takeScreenshot) }, - BottomPage("chat", R.string.bottom_page_chat, Icons.Outlined.Forum) { BottomChatPage() }, + BottomPage(BOTTOM_PAGE_TELEMETRY, R.string.bottom_page_telemetry, Icons.Filled.Speed) { BottomTelemetryPage(actions.fps, actions.runningGame) }, + BottomPage("downloads", R.string.bottom_page_downloads, Icons.Filled.Download) { BottomDownloadsPage() }, + BottomPage("screenshots", R.string.bottom_page_screenshots, Icons.Filled.Image) { BottomScreenshotsPage(actions.takeScreenshot) }, + BottomPage("chat", R.string.bottom_page_chat, Icons.Filled.People) { BottomChatPage() }, ) @Composable diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt index a60c4ee5a..5503ef22a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -46,20 +46,20 @@ import androidx.compose.foundation.relocation.BringIntoViewRequester import androidx.compose.foundation.relocation.bringIntoViewRequester import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Apps -import androidx.compose.material.icons.outlined.Download -import androidx.compose.material.icons.outlined.SdStorage -import androidx.compose.material.icons.outlined.Sync -import androidx.compose.material.icons.outlined.Terminal -import androidx.compose.material.icons.outlined.DesktopWindows -import androidx.compose.material.icons.outlined.Layers -import androidx.compose.material.icons.outlined.LocalMall -import androidx.compose.material.icons.outlined.MoreHoriz +import androidx.compose.material.icons.filled.SportsEsports +import androidx.compose.material.icons.filled.GridView +import androidx.compose.material.icons.filled.LocalOffer +import androidx.compose.material.icons.filled.Download +import androidx.compose.material.icons.filled.DesktopWindows +import androidx.compose.material.icons.filled.Layers +import androidx.compose.material.icons.filled.Terminal +import androidx.compose.material.icons.filled.Apps +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material.icons.filled.SdStorage +import androidx.compose.material.icons.filled.Sync +import androidx.compose.material.icons.filled.MoreHoriz +import androidx.compose.material.icons.filled.SystemUpdate import androidx.compose.material.icons.automirrored.outlined.ArrowBack -import androidx.compose.material.icons.outlined.SportsEsports -import androidx.compose.material.icons.outlined.Storefront -import androidx.compose.material.icons.outlined.SystemUpdate -import androidx.compose.material.icons.outlined.Tune import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -193,21 +193,22 @@ internal fun SideRail( } } +// Solid icons in the Steam Deck menu's style; where Steam has the same place (Library, Store, Downloads, Settings) its glyph is used. internal fun railLabelIcon(key: String): Pair = when (key) { - "steam" -> R.string.rail_steam to Icons.Outlined.SportsEsports - "games" -> R.string.rail_games to GameShelfIcon + "steam" -> R.string.rail_steam to Icons.Filled.SportsEsports + "games" -> R.string.rail_games to Icons.Filled.GridView "soundtracks" -> R.string.rail_music to SoundtrackIcon - "stores" -> R.string.rail_stores to Icons.Outlined.LocalMall - "downloads" -> R.string.stores_tab_downloads to Icons.Outlined.Download - "desktop" -> R.string.rail_desktop to Icons.Outlined.DesktopWindows - "components" -> R.string.rail_components to Icons.Outlined.Layers - "agent" -> R.string.rail_agent to Icons.Outlined.Terminal - "android-apps" -> R.string.rail_apps to Icons.Outlined.Apps - "setup" -> R.string.rail_setup to Icons.Outlined.Tune - "storage" -> R.string.rail_storage to Icons.Outlined.SdStorage - "sync" -> R.string.rail_sync to Icons.Outlined.Sync - NavTabs.MORE -> R.string.rail_more to Icons.Outlined.MoreHoriz - else -> R.string.rail_updates to Icons.Outlined.SystemUpdate + "stores" -> R.string.rail_stores to Icons.Filled.LocalOffer + "downloads" -> R.string.stores_tab_downloads to Icons.Filled.Download + "desktop" -> R.string.rail_desktop to Icons.Filled.DesktopWindows + "components" -> R.string.rail_components to Icons.Filled.Layers + "agent" -> R.string.rail_agent to Icons.Filled.Terminal + "android-apps" -> R.string.rail_apps to Icons.Filled.Apps + "setup" -> R.string.rail_setup to Icons.Filled.Settings + "storage" -> R.string.rail_storage to Icons.Filled.SdStorage + "sync" -> R.string.rail_sync to Icons.Filled.Sync + NavTabs.MORE -> R.string.rail_more to Icons.Filled.MoreHoriz + else -> R.string.rail_updates to Icons.Filled.SystemUpdate } internal fun setupNeedsAttention(s: FrontEndState): Boolean = !s.ready || (s.available != null && s.available != s.installed) || diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameShelfIcon.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameShelfIcon.kt deleted file mode 100644 index 74b92c9be..000000000 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameShelfIcon.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.droiddeck.launcher.ui - -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.PathFillType -import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.addPathNodes -import androidx.compose.ui.unit.dp - -internal val GameShelfIcon: ImageVector = ImageVector.Builder("GameShelf", 24.dp, 24.dp, 24f, 24f).apply { - for (d in listOf( - "M3,4H7V20H3ZM4.4,5.4V18.6H5.6V5.4Z", - "M8.5,4H12.5V20H8.5ZM9.9,5.4V18.6H11.1V5.4Z", - "M14.2,5.1L18.1,4.2L21.4,19.8L17.5,20.7ZM15.9,6.2L18.6,18.9L19.8,18.6L17.1,5.9Z", - "M2,21H22V22.5H2Z", - )) addPath(addPathNodes(d), fill = SolidColor(Color.Black), pathFillType = PathFillType.EvenOdd) -}.build() diff --git a/app/src/testDebug/java/com/droiddeck/launcher/ui/PreviewRenderTest.kt b/app/src/testDebug/java/com/droiddeck/launcher/ui/PreviewRenderTest.kt new file mode 100644 index 000000000..f84e55526 --- /dev/null +++ b/app/src/testDebug/java/com/droiddeck/launcher/ui/PreviewRenderTest.kt @@ -0,0 +1,63 @@ +package com.droiddeck.launcher.ui + +import android.app.Application +import android.graphics.Bitmap +import android.graphics.Canvas +import android.view.inspector.WindowInspector +import androidx.compose.ui.test.junit4.createComposeRule +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.ParameterizedRobolectricTestRunner +import org.robolectric.ParameterizedRobolectricTestRunner.Parameters +import org.robolectric.annotation.Config +import org.robolectric.annotation.GraphicsMode +import java.io.File + +/** + * Draws every preview case with Robolectric's native graphics and saves it as a PNG under app/build/preview-renders/, + * so UI changes can be looked at without a device. Fails on a preview that throws or draws a single flat colour. + */ +@RunWith(ParameterizedRobolectricTestRunner::class) +@Config(sdk = [34], application = Application::class, qualifiers = "w960dp-h540dp-land-xhdpi") +@GraphicsMode(GraphicsMode.Mode.NATIVE) +internal class PreviewRenderTest(private val case: PreviewCase) { + @get:Rule val compose = createComposeRule() + + @Test fun handheld() = render("handheld") + + @Test @Config(qualifiers = "w540dp-h960dp-port-xhdpi") + fun portrait() = render("portrait") + + private fun render(size: String) { + compose.mainClock.autoAdvance = false + compose.setContent { case.content() } + // The clock is paused, so step it while waiting: navigation and the loads that make a case ready run in frames. + compose.waitUntil(timeoutMillis = 15_000) { compose.mainClock.advanceTimeByFrame(); case.ready() } + // Entrance animations settle well within this. + compose.mainClock.advanceTimeBy(2_000) + compose.waitForIdle() + compose.runOnIdle { save(size) } + } + + private fun save(size: String) { + // A dialog has its own window; the last one is on top. + val view = WindowInspector.getGlobalWindowViews().last() + assertTrue("${case.name}: empty bounds", view.width > 0 && view.height > 0) + val image = Bitmap.createBitmap(view.width, view.height, Bitmap.Config.ARGB_8888) + view.draw(Canvas(image)) + val pixels = IntArray(image.width * image.height) + image.getPixels(pixels, 0, image.width, 0, 0, image.width, image.height) + assertTrue("${case.name}: drew one flat colour", pixels.any { it != pixels.first() }) + val out = File("build/preview-renders/$size/${case.name}.png") + out.parentFile?.mkdirs() + out.outputStream().use { image.compress(Bitmap.CompressFormat.PNG, 100, it) } + image.recycle() + } + + companion object { + @JvmStatic @Parameters(name = "{0}") + fun cases(): List> = previewCases.map { arrayOf(it) } + } +} diff --git a/docs/compose-previews.md b/docs/compose-previews.md new file mode 100644 index 000000000..1aa505956 --- /dev/null +++ b/docs/compose-previews.md @@ -0,0 +1,36 @@ +# Compose previews + +Previews show production composables with sample data, without a device, the Linux runtime or a network. Use them in two +ways: + +- **Android Studio:** select the `debug` build variant and open `app/src/debug/java/com/droiddeck/launcher/ui/LauncherPreviews.kt` + in Split or Design view. +- **Rendered to PNG files**, with no Studio or device needed (also how an agent can look at a UI change): + + ```sh + ./gradlew -PskipRust=true :app:testDebugUnitTest --tests '*PreviewRenderTest' + ``` + + Each preview is drawn with Robolectric's native graphics at handheld (960x540 dp at xhdpi, the Duo's top screen, + 1920x1080 px) and portrait (540x960 dp) sizes, into `app/build/preview-renders/{handheld,portrait}/.png`. The test + fails if a preview throws, or draws a single flat colour. + +## Files + +| File | What | +| --- | --- | +| `app/src/debug/.../ui/PreviewSupport.kt` | `PreviewHost` (the production theme), `@DroidDeckPreviews` (the two sizes), sample `FrontEndState`, no-op `FrontEndActions` and `DrawerActions`, sample games | +| `app/src/debug/.../ui/LauncherPreviews.kt` | The previews, and `previewCases`, the list the render test draws | +| `app/src/testDebug/.../ui/PreviewRenderTest.kt` | The render test | + +Previews cover the launcher on each tab (Steam, Library, Library with no games, Stores, Downloads, Settings, Settings with +no runtime) and the in-game menu's pages (Controller, Display, HUD, Session, and the Desktop menu). + +## Adding one + +Write the preview in `LauncherPreviews.kt` (or a new file beside it) with `@DroidDeckPreviews`, wrapping the content in +`PreviewHost`. Add a `PreviewCase` to `previewCases` so it is rendered and checked too. The launcher opens on a tab via +`sampleState(navigate = "")`. + +Everything here is in the debug source sets, so none of it ships in release builds. Sample art is left out, so cards use +their fallback gradients. Previews check layout and look; they do not exercise launching, input or the runtime. From fc9ad2447dee320cbfb8a6d7066250cad36192ff Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 19 Nov 2026 21:12:50 -0500 Subject: [PATCH 22/31] fix(agent): the setup install repairs broken package dependencies instead of stopping (#2901) * fix(agent): the setup install repairs broken package dependencies instead of stopping * fix(agent): retry the package refresh and fetch missing archives during the setup install --- .../main/java/com/droiddeck/launcher/agent/AgentSetup.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt index e917e3660..df90f6f86 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt @@ -141,8 +141,11 @@ object AgentSetup { Step.CONNECTION -> return Step.INSTALL -> { listOf("sh", "-c", "set -e; export DEBIAN_FRONTEND=noninteractive; " + - "dpkg --configure -a; apt-get update || echo 'Some package sources could not be refreshed; continuing'; apt-get -f install -y; " + - "apt-get install -y --no-install-recommends git gh adb curl ca-certificates python3; ${harness.install}") + "apt() { apt-get -o Acquire::Retries=5 -o Acquire::http::Timeout=30 \"\$@\"; }; " + + "dpkg --configure -a || echo 'Some packages are not configured yet; repairing dependencies'; " + + "for i in 1 2 3; do apt update -q && break; echo 'Some package sources could not be refreshed; retrying'; sleep 3; done; " + + "apt -f install -y --fix-missing; " + + "apt install -y --fix-missing --no-install-recommends git gh adb curl ca-certificates python3; ${harness.install}") } Step.SIGN_IN -> harness.signIn Step.GITHUB -> listOf("dd-gh-login") From 00557703da4219566bdf8ffbae7bdd2461dfcbf0 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 19 Nov 2026 21:26:31 -0500 Subject: [PATCH 23/31] feat(dev): preview states for the Library and the in-game menu (#2899) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Developer tools: preview states for the Library and the in-game menu Settings › Developer gets a Preview states group (shown with developer tools on): - Library: nothing installed, signed out of every store, or sample games in every store (each store's storefront games passed off as owned, a few as installed). A pill on the Library says which preview is on and ends it. Nothing is installed, removed or signed out, and the preview is never saved, so a restart always turns it off. - In-game menu: opens the session menu over the launcher for Steam, Desktop or a game, without starting a session. Its switches change only the preview. LB/RB switch pages and B or Back closes it, as in a session. * Preview states: Back closes the menu preview; signed-out preview covers expired stores The launcher's exit gesture no longer takes Back while the in-game menu preview is open, so Back closes the preview. The signed-out Library preview shows the sign-in card for an expired store with cached games too. * Developer tools: a UI zoo sheet for previews; previews are read-only The Developer tab keeps one UI zoo row instead of the preview pickers. It opens a side sheet listing the in-game menu (Steam, Desktop, game) and the Library states; nothing shows until one is picked, and picking one closes the sheet. A Library preview switches to the Library on All games. While a Library preview is on, opening a game shows a short note instead of its page, which would act on the real install behind the preview. Size sorting uses the size a card shows, so a real install shown as not installed sorts by its catalog size. * Developer tools: preview shortcuts, a Library toolbar button for preview states An opt-in Preview shortcuts switch (off by default) puts a flask button in the Library's toolbar that picks the real library or a preview state in place, so a state is a tap away while using the launcher normally. The UI zoo stays the catalog of every preview. * Preview states: no real sign-in or sign-out from a Library preview The toolbar's sign-out button is hidden while a Library preview is on, and the sign-in card's button only says previews are read-only, so a preview never signs a real account in or out. --- .../launcher/session/SessionPrefs.kt | 6 + .../com/droiddeck/launcher/ui/DevPreview.kt | 268 ++++++++++++++++++ .../droiddeck/launcher/ui/FrontEndContent.kt | 1 + .../droiddeck/launcher/ui/FrontEndScreen.kt | 10 +- .../droiddeck/launcher/ui/FrontEndSetup.kt | 9 + .../com/droiddeck/launcher/ui/LibraryPage.kt | 51 +++- .../java/com/droiddeck/launcher/ui/NavTabs.kt | 1 + .../com/droiddeck/launcher/ui/StoresPage.kt | 10 +- app/src/main/res/values/strings.xml | 18 ++ 9 files changed, 354 insertions(+), 20 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/DevPreview.kt 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 e7c7f5f2b..a0208ec72 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -280,6 +280,12 @@ object SessionPrefs { prefs(context).edit().putBoolean("developerTools", on).apply() } + fun previewShortcuts(context: Context): Boolean = prefs(context).getBoolean("previewShortcuts", false) + + fun setPreviewShortcuts(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("previewShortcuts", on).apply() + } + fun fpsLimitKey(mode: String?, game: String?): String? = when (mode) { SessionService.MODE_RUN -> game?.trim()?.takeIf(com.droiddeck.launcher.frontend.GameLaunchLink::validId)?.let { "fpsLimit.game.$it" } SessionService.MODE_DESKTOP -> "fpsLimit.desktop" diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DevPreview.kt b/app/src/main/java/com/droiddeck/launcher/ui/DevPreview.kt new file mode 100644 index 000000000..c13faceff --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/DevPreview.kt @@ -0,0 +1,268 @@ +package com.droiddeck.launcher.ui + +import androidx.activity.compose.BackHandler +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.outlined.Science +import androidx.compose.material.icons.outlined.Visibility +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.layout.boundsInRoot +import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.input.key.KeyEventType +import androidx.compose.ui.input.key.onKeyEvent +import androidx.compose.ui.input.key.onPreviewKeyEvent +import androidx.compose.ui.input.key.type +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.gpu.FrameGen +import com.droiddeck.launcher.gpu.Lossless +import com.droiddeck.launcher.input.SecondScreenDisplay +import com.droiddeck.launcher.input.SecondScreenMode +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoresState + +/** What the Library pretends while a developer previews it. Nothing here is saved: a restart always comes back to [OFF]. */ +internal enum class LibraryPreview { OFF, NOTHING_INSTALLED, SIGNED_OUT, SAMPLE } + +internal enum class DrawerPreview { STEAM, DESKTOP, GAME } + +/** Developer tools' preview states: screens that are otherwise hard to reach, shown without changing anything real. */ +internal object DevPreview { + var library by mutableStateOf(LibraryPreview.OFF) + var drawer by mutableStateOf(null) + /** The UI zoo sheet: where previews are picked, one at a time, only when asked for. */ + var zoo by mutableStateOf(false) + /** Opt-in: a preview button where its state lives (the Library's toolbar), for switching states without the zoo. */ + var shortcuts by mutableStateOf(false) + + fun setShortcuts(context: android.content.Context, on: Boolean) { + shortcuts = on + SessionPrefs.setPreviewShortcuts(context, on) + } + + /** Set when a Library preview is picked, so the launcher switches to the Library to show it. */ + var openLibrary by mutableStateOf(false) +} + +/** How many of each store's sample games look installed. */ +private const val SAMPLE_INSTALLED = 3 + +/** A store's storefront games, passed off as owned, for the sample library. Empty until the store's shelves have loaded. */ +internal fun sampleOwned(store: Store): List = + StoresState.shelves[store]?.all.orEmpty().filter { !it.mature }.distinctBy { it.id }.take(24).map { it.copy(owned = true) } + +internal fun sampleInstalled(owned: Map>): Set = + owned.values.flatMap { items -> items.take(SAMPLE_INSTALLED).map { it.key } }.toSet() + +/** The pill a previewed Library shows, so the fake state is never mistaken for the real one. */ +@Composable +internal fun LibraryPreviewPill(modifier: Modifier = Modifier) { + val preview = DevPreview.library + if (preview == LibraryPreview.OFF) return + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val label = stringResource( + when (preview) { + LibraryPreview.NOTHING_INSTALLED -> R.string.dev_preview_library_nothing_installed + LibraryPreview.SIGNED_OUT -> R.string.dev_preview_library_signed_out + else -> R.string.dev_preview_library_sample + }, + ) + val end = stringResource(R.string.dev_preview_end) + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), + modifier = modifier.background(colors.surface, CircleShape).border(1.dp, pal.signal, CircleShape) + .clickable(role = Role.Button, onClickLabel = end) { DevPreview.library = LibraryPreview.OFF } + .padding(start = 14.dp, end = 10.dp, top = 8.dp, bottom = 8.dp).testTag("dev-preview-end"), + ) { + Icon(Icons.Outlined.Visibility, null, tint = pal.signal, modifier = Modifier.size(18.dp)) + Text(stringResource(R.string.dev_preview_banner, label), fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground) + Icon(Icons.Filled.Close, end, tint = colors.onSurfaceVariant, modifier = Modifier.size(18.dp)) + } +} + +/** + * The in-game menu over the launcher, for looking at without starting a session. Its switches change only this preview: nothing + * is saved and no session is told. Back or Close ends it. + */ +@Composable +internal fun SessionDrawerPreview(secondScreens: List) { + val mode = DevPreview.drawer ?: return + val ctx = LocalContext.current + val close = { DevPreview.drawer = null } + var page by remember { mutableStateOf(SessionDrawerPage.CONTROLLER) } + // A session's activity routes these keys to its menu; the launcher has no such routing, so the preview does it. + var layerOpen by remember { mutableStateOf(false) } + var backRequests by remember { mutableStateOf(0) } + val back = { if (layerOpen) backRequests++ else close() } + BackHandler { back() } + var hud by remember { mutableStateOf(SessionPrefs.hudEnabled(ctx)) } + var touch by remember { mutableStateOf(SessionPrefs.touchMode(ctx)) } + var osc by remember { mutableStateOf(SessionPrefs.oscMode(ctx)) } + var fex by remember { mutableStateOf(SessionPrefs.fexPreset(ctx)) } + var inverted by remember { mutableStateOf(SessionPrefs.backActionsInverted(ctx)) } + var suspend by remember { mutableStateOf(SessionPrefs.SUSPEND_MANUAL) } + var frameGen by remember { mutableStateOf(FrameGen.Mode.OFF) } + var second by remember { mutableStateOf(SecondScreenMode.NONE) } + var fps by remember { mutableStateOf(0) } + val steam = mode == DrawerPreview.STEAM + val actions = DrawerActions( + steam = steam, + desktop = mode == DrawerPreview.DESKTOP, + title = if (mode == DrawerPreview.GAME) stringResource(R.string.session_title_game) else null, + isHomeApp = false, + androidApps = emptyList(), + hudOn = hud, onHud = { hud = it }, + frameGen = frameGen, onFrameGenPick = { frameGen = it }, + lossless = Lossless.State.NONE, + oscMode = osc, onOsc = { osc = it }, + suspendPolicy = suspend, onSuspendPolicy = { suspend = it }, + backActionsInverted = inverted, onBackActionsInverted = { inverted = it }, + touchMode = touch, onTouch = { touch = it }, + touchAuto = stringResource(R.string.session_touch_auto_direct), + fexPreset = fex, onFexPreset = { fex = it }, + fpsLimit = fps, onFpsLimit = { fps = it }, + secondScreenMode = second, onSecondScreenMode = { second = it }, + secondScreenDisplays = secondScreens, + selectedSecondScreenDisplay = secondScreens.firstOrNull()?.id ?: -1, + onSecondScreenDisplay = {}, + onImportLossless = {}, + onKeyboard = {}, onHardwareKeyboard = {}, + onSteamMenu = if (steam) ({}) else null, + onQam = if (steam) ({}) else null, + onLaunchAndroidApp = { _, _ -> }, + onBackground = close, + onShareLogs = {}, + onStop = close, + onClose = close, + ) + Box( + Modifier.fillMaxSize().testTag("dev-preview-drawer") + .onPreviewKeyEvent { e -> + val code = e.nativeKeyEvent.keyCode + if (code != android.view.KeyEvent.KEYCODE_BUTTON_L1 && code != android.view.KeyEvent.KEYCODE_BUTTON_R1) return@onPreviewKeyEvent false + if (e.type == KeyEventType.KeyDown && e.nativeKeyEvent.repeatCount == 0) { + page = sessionDrawerPages(secondScreens.isNotEmpty()).step(page, if (code == android.view.KeyEvent.KEYCODE_BUTTON_R1) 1 else -1) + } + true + } + .onKeyEvent { e -> + if (e.nativeKeyEvent.keyCode != android.view.KeyEvent.KEYCODE_BUTTON_B) return@onKeyEvent false + if (e.type == KeyEventType.KeyDown && e.nativeKeyEvent.repeatCount == 0) back() + true + } + .background(Brush.linearGradient(listOf(Color(0xFF1B2A3A), Color(0xFF0B0F14), Color(0xFF2A1B2E)))), + ) { + Text( + stringResource(R.string.dev_preview_drawer_backdrop), fontSize = 13.sp, color = Color.White.copy(alpha = 0.5f), + modifier = Modifier.align(Alignment.BottomStart).padding(24.dp), + ) + SessionDrawer( + true, page, controllerActive = true, onPageChange = { page = it }, a = actions, + backRequest = backRequests, onLayerChange = { layerOpen = it }, + ) + } +} + +/** Developer tools' UI zoo: a sheet listing the previews. Nothing shows until one is picked, and picking one closes the sheet. */ +@Composable +internal fun UiZooSheet() { + val close = { DevPreview.zoo = false } + SideSheet(DevPreview.zoo, onClose = close, returnFocus = null, tag = "ui-zoo-sheet") { + PageHeader(stringResource(R.string.dev_ui_zoo)) { + androidx.compose.foundation.layout.Spacer(Modifier.weight(1f)) + SmallIconButton(Icons.Filled.Close, stringResource(R.string.common_close), tint = MaterialTheme.colorScheme.onSurfaceVariant) { close() } + } + androidx.compose.foundation.layout.Column(Modifier.weight(1f).verticalScroll(rememberScrollState())) { + val show = stringResource(R.string.dev_ui_zoo_show) + SettingsGroup(stringResource(R.string.dev_preview_drawer)) { + for ((mode, label) in listOf( + DrawerPreview.STEAM to R.string.source_steam, + DrawerPreview.DESKTOP to R.string.rail_desktop, + DrawerPreview.GAME to R.string.session_title_game, + )) ActionRow(stringResource(label), null, show, onClick = { close(); DevPreview.drawer = mode }, modifier = Modifier.testTag("zoo-drawer-${mode.name.lowercase()}")) + } + SettingsGroup(stringResource(R.string.dev_preview_library)) { + for ((mode, label) in listOf( + LibraryPreview.NOTHING_INSTALLED to R.string.dev_preview_library_nothing_installed, + LibraryPreview.SIGNED_OUT to R.string.dev_preview_library_signed_out, + LibraryPreview.SAMPLE to R.string.dev_preview_library_sample, + )) ActionRow( + stringResource(label), null, show, + onClick = { close(); DevPreview.library = mode; DevPreview.openLibrary = true }, + modifier = Modifier.testTag("zoo-library-${mode.name.lowercase()}"), + ) + } + Text( + stringResource(R.string.dev_ui_zoo_note), fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(horizontal = 14.dp, vertical = 8.dp), + ) + } + } +} + +/** The Library toolbar's preview button, shown only with preview shortcuts on: picks the Library state in place. */ +@Composable +internal fun LibraryPreviewButton() { + val pal = LocalPalette.current + val title = stringResource(R.string.dev_preview_library) + var at by remember { mutableStateOf(null) } + val states = listOf( + LibraryPreview.OFF to R.string.dev_preview_real, + LibraryPreview.NOTHING_INSTALLED to R.string.dev_preview_library_nothing_installed, + LibraryPreview.SIGNED_OUT to R.string.dev_preview_library_signed_out, + LibraryPreview.SAMPLE to R.string.dev_preview_library_sample, + ) + Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) { + HeaderIconButton(stringResource(R.string.dev_preview_shortcut), Icons.Outlined.Science, "library-preview") { + val from = at ?: return@HeaderIconButton + Steps.ask(StepAsk( + anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = states.size, + handle = { Icon(Icons.Outlined.Science, null, tint = pal.signal, modifier = Modifier.size(18.dp)) }, + ) { + StepTitle(title) + StepList { + states.forEachIndexed { i, (state, label) -> + StepChoice( + stringResource(label), selected = DevPreview.library == state, enabled = open, + modifier = Modifier.fillMaxWidth().stepItem(i).let { if (i == 0) it.focusRequester(first) else it }, + ) { DevPreview.library = state; Steps.fold() } + } + } + }) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt index c81f19dc5..adf55c4b1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt @@ -285,6 +285,7 @@ private fun Content( if (selected == "games" || selected.startsWith("app:") || selected == "soundtracks" || selected.startsWith("sound:")) { Box(modifier) { LibraryPage(s, a, selected, onSelect, Modifier.fillMaxSize()) + if (selected == "games") LibraryPreviewPill(Modifier.align(androidx.compose.ui.Alignment.BottomCenter).padding(bottom = 20.dp)) ManageStoresSheet() } return diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index ef414c4eb..2267bef93 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -650,6 +650,12 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com LaunchedEffect(SetupTabs.openSection) { if (SetupTabs.openSection != null && (railSelection != "setup" || s.pageKey != null)) showRailPage("setup", true) } + LaunchedEffect(DevPreview.openLibrary) { + if (!DevPreview.openLibrary) return@LaunchedEffect + DevPreview.openLibrary = false + LibraryView.source = LIBRARY_ALL + showRailPage("games", true) + } val onRailFocus: (String) -> Unit = { key -> if (key != railSelection) showRailPage(key, false) } @@ -806,6 +812,8 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com com.droiddeck.launcher.stores.StoresState.itchPicking?.let { item -> StoreTheme(item.store) { ItchBuildPicker(item) { com.droiddeck.launcher.stores.StoresState.itchPicking = null } } } com.droiddeck.launcher.stores.StoresState.gameJoltPicking?.let { item -> StoreTheme(item.store) { GameJoltBuildPicker(item) { com.droiddeck.launcher.stores.StoresState.gameJoltPicking = null } } } StepsLayer(screenAt) + UiZooSheet() + SessionDrawerPreview(s.secondScreenDisplays) appToChooseDisplay?.let { app -> val secondaryDisplay = s.secondScreenDisplays.firstOrNull() @@ -876,7 +884,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com (selected.startsWith("emu:") || selected.startsWith("rom:") || selected.startsWith("user:") || selected == "store")) val exitArmed = !processSettingsPageVisible && !hasBackTarget LaunchedEffect(exitArmed, selected) { ExitGesture.reset() } - BackHandler(enabled = exitArmed) { + BackHandler(enabled = exitArmed && DevPreview.drawer == null) { when (ExitGesture.back()) { 2 -> android.widget.Toast.makeText(ctx, R.string.exit_hint_back, android.widget.Toast.LENGTH_SHORT).show() 3 -> { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 8815ea43a..b7976c89d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -59,6 +59,7 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.testTag import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource @@ -595,6 +596,14 @@ internal fun SetupPanel( ToggleRow(host, "developer-tools", stringResource(R.string.dev_tools_title), stringResource(R.string.dev_tools_hint), DeveloperTools.on) { DeveloperTools.set(devContext, it) } + if (DeveloperTools.on) ActionRow( + stringResource(R.string.dev_ui_zoo), stringResource(R.string.dev_ui_zoo_hint), stringResource(R.string.dev_ui_zoo_open), + onClick = { DevPreview.zoo = true }, modifier = Modifier.testTag("dev-ui-zoo"), + ) + if (DeveloperTools.on) ToggleRow( + host, "preview-shortcuts", stringResource(R.string.dev_preview_shortcuts), stringResource(R.string.dev_preview_shortcuts_hint), + DevPreview.shortcuts, + ) { DevPreview.setShortcuts(devContext, it) } } SettingsGroup(stringResource(R.string.dev_group_logs)) { ToggleRow(host, "logs", stringResource(R.string.setup_logs), stringResource(R.string.setup_logs_hint), s.logsEnabled) { a.onLogs() } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index dab63bec1..ea8d3317f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -326,20 +326,33 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val favorites = if (soundMode) emptySet() else LibraryFavorites.keys val concealed: (LibraryEntry) -> Boolean = { !soundMode && LibraryHidden.isHidden(it) } val stores = !s.shortcutPicker && !soundMode - val signedIn = Store.entries.filter { StoresState.isSignedIn(it) } - LaunchedEffect(stores, signedIn) { if (stores) signedIn.forEach { StoresState.loadLibrary(ctx, it) } } - val owned = if (stores) signedIn.associateWith { StoresState.library[it].orEmpty() } else emptyMap() - val installedStore = StoresState.installed.map { it.key }.toSet() - val syncing = if (stores) signedIn.mapNotNull { st -> StoresState.status[st]?.let { st to it } } else emptyList() + val preview = if (stores) DevPreview.library else LibraryPreview.OFF + val signedIn = when (preview) { + LibraryPreview.SAMPLE -> Store.entries.filter { StoresState.backend(it) != null } + LibraryPreview.SIGNED_OUT -> emptyList() + else -> Store.entries.filter { StoresState.isSignedIn(it) } + } + LaunchedEffect(stores, signedIn, preview) { + if (stores) signedIn.forEach { if (preview == LibraryPreview.SAMPLE) StoresState.preview(ctx, it) else StoresState.loadLibrary(ctx, it) } + } + val owned = when { + !stores -> emptyMap() + preview == LibraryPreview.SAMPLE -> signedIn.associateWith { sampleOwned(it) } + else -> signedIn.associateWith { StoresState.library[it].orEmpty() } + } + val reallyInstalled = StoresState.installed.map { it.key }.toSet() + val installedStore = reallyInstalled + if (preview == LibraryPreview.SAMPLE) sampleInstalled(owned) else emptySet() + val syncing = if (stores && preview == LibraryPreview.OFF) signedIn.mapNotNull { st -> StoresState.status[st]?.let { st to it } } else emptyList() val cloudRows = rememberXboxCloudRows(s) remember { SoundtrackCollections.load(ctx) } val savedSnapshot = SoundtrackCollections.snapshot val favoritesLabel = stringResource(R.string.soundtracks_favorites) - val all = remember(soundMode, s.steamGames, s.soundtracks, s.soundtracksEnabled, cloudRows, owned, installedStore, savedSnapshot, favoritesLabel) { + val all = remember(soundMode, s.steamGames, s.soundtracks, s.soundtracksEnabled, cloudRows, owned, installedStore, savedSnapshot, favoritesLabel, preview) { if (soundMode) s.soundtracks.map { LibraryEntry("sound:${it.appId}", it.source, it.name, it, null, true) } + (if (s.soundtracks.isEmpty() && savedSnapshot.favorites.isEmpty() && savedSnapshot.collections.isEmpty()) emptyList() else SoundtrackCollections.games(ctx, favoritesLabel, skipEmptyFavorites = true)) .map { LibraryEntry("sound:${it.appId}", it.source, it.name, it, null, true) } else libraryEntries(s.steamGames + cloudRows + if (s.soundtracksEnabled) emptyList() else s.soundtracks.filter { it.library != Library.ADDED }, owned, installedStore) + .let { rows -> if (preview == LibraryPreview.NOTHING_INSTALLED) rows.map { LibraryEntry(it.key, it.source, it.title, it.game, it.item, false) } else rows } } var addingSoundtrack by remember { mutableStateOf(false) } LaunchedEffect(Unit) { XboxLibraryFilter.load(ctx) } @@ -361,8 +374,8 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val gameJoltSignedIn = owned.containsKey(Store.GAMEJOLT) remember { StoreTabsState.load(ctx) } val storeTabs = StoreTabsState.tabs - val signInChips = if (!stores || !StoresState.accountsLoaded) emptySet() else storeTabs - .filter { it.shown && StoresState.backend(it.store) != null && storeAccount(it.store) != StoreAccount.SIGNED_IN } + val signInChips = if (!stores || !StoresState.accountsLoaded || preview == LibraryPreview.SAMPLE) emptySet() else storeTabs + .filter { it.shown && StoresState.backend(it.store) != null && (preview == LibraryPreview.SIGNED_OUT || storeAccount(it.store) != StoreAccount.SIGNED_IN) } .map { it.store.id }.toSet() val sources = librarySources( all, storeTabs.map { it.store.id }, @@ -429,7 +442,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, fun sizeOf(e: LibraryEntry): Long? { val key = e.storeKey return when { - key != null && key in installedStore -> StoreSizes.onDisk[key] + key != null && e.installed && key in installedStore -> StoreSizes.onDisk[key] e.game?.gameFiles != null -> FolderSizes.known[e.game.gameFiles.path] e.item != null -> StoreSizes.size(e.item).takeIf { it > 0 } else -> 0L @@ -450,7 +463,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, var sizesWaited by remember(sizeSort) { mutableStateOf(false) } LaunchedEffect(sizeSort) { if (sizeSort) { kotlinx.coroutines.delay(8_000); sizesWaited = true } } fun sizeComing(e: LibraryEntry): Boolean = when { - e.storeKey != null && e.storeKey in installedStore -> true + e.storeKey != null && e.storeKey in installedStore -> e.storeKey in reallyInstalled // a sample install has no size to wait for e.game?.gameFiles != null -> true e.item != null -> StoreSizes.coming(e.item) else -> false @@ -545,7 +558,11 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, LibraryView.source = ids[(ids.indexOf(source).coerceAtLeast(0) + step + ids.size) % ids.size] cycled++ }, - onOpen = { focusManager.clearFocus(force = true); onSelect(it) }, + onOpen = { + // A preview is read-only: a game's page would act on the real install behind the pretend one. + if (preview != LibraryPreview.OFF) android.widget.Toast.makeText(ctx, R.string.dev_preview_read_only, android.widget.Toast.LENGTH_SHORT).show() + else { focusManager.clearFocus(force = true); onSelect(it) } + }, searchCleared = open != null, onFocus = { gridFocused = it }, soundMode = soundMode, @@ -560,7 +577,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, onCollections = { savedDialog = true }, trackHits = shownHits, onPlayHit = playHit, // An expired account keeps showing its cached games; with none cached it asks to sign in again, like a signed-out store. - signInStore = Store.byId(source)?.takeIf { st -> st.id in signInChips && (storeAccount(st) != StoreAccount.EXPIRED || all.none { it.source == st.id }) }, + signInStore = Store.byId(source)?.takeIf { st -> st.id in signInChips && (preview == LibraryPreview.SIGNED_OUT || storeAccount(st) != StoreAccount.EXPIRED || all.none { it.source == st.id }) }, ) } }, ) { key -> @@ -774,7 +791,7 @@ private fun LibraryGrid( Box(Modifier.padding(top = 4.dp, bottom = 16.dp)) { CustomGamesCard(splashHeight, art) } } else if (signInStore != null) item(key = "sign-in:${signInStore.id}", span = { GridItemSpan(maxLineSpan) }) { - StoreTheme(signInStore) { Box(Modifier.padding(top = 4.dp, bottom = 16.dp)) { SignInCard(signInStore, splashHeight) } } + StoreTheme(signInStore) { Box(Modifier.padding(top = 4.dp, bottom = 16.dp)) { SignInCard(signInStore, splashHeight, inert = DevPreview.library != LibraryPreview.OFF) } } } else if (split == 0) { if (toggleAt == ToggleAt.TOP) item(key = NOT_INSTALLED_ROW, span = { GridItemSpan(maxLineSpan) }) { toggleRow() } @@ -871,13 +888,15 @@ private fun LibraryHeader( lead = soundLead, ) { if (soundMode) HeaderIconButton(stringResource(R.string.soundtracks_saved), Icons.Filled.BookmarkBorder, "collections", onClick = onCollections) + if (!soundMode && DeveloperTools.on && DevPreview.shortcuts) LibraryPreviewButton() DisplayButton() if (!soundMode && xbox) LibraryFilterButton(null, onShowUninstalled, xbox) if (collections != null) CollectionsButton(collections) SortButton(s, a) ViewButton(s, a) if (!soundMode) GameFileFolderActions(s, a) - Store.byId(source)?.takeIf { !soundMode && StoresState.isSignedIn(it) }?.let { StoreAccountButton(it) } + // No sign-out in a preview: it would sign the real account out. + Store.byId(source)?.takeIf { !soundMode && DevPreview.library == LibraryPreview.OFF && StoresState.isSignedIn(it) }?.let { StoreAccountButton(it) } if (!s.shortcutPicker && (soundMode || (source == Library.ADDED && total > 0))) AddGameButton { if (soundMode) onAddSoundtrack() else GamesDialogState.adding = true } } if (s.steamGamesX64 && narrow) Box(Modifier.padding(top = 4.dp)) { ClientTag() } @@ -988,7 +1007,9 @@ private fun CustomGamesCard(height: androidx.compose.ui.unit.Dp, art: List) private fun sourceDot(src: String): Color? { val store = Store.byId(src) return when { - store != null -> sourceColours(src).dot.copy(alpha = if (StoresState.isSignedIn(store) && StoresState.expired[store] != true) 1f else 0.35f) + store != null -> sourceColours(src).dot.copy( + alpha = if (DevPreview.library == LibraryPreview.SAMPLE || (DevPreview.library != LibraryPreview.SIGNED_OUT && StoresState.isSignedIn(store) && StoresState.expired[store] != true)) 1f else 0.35f, + ) src == LIBRARY_FAVORITES -> FavoritesColours.dot src == LIBRARY_HIDDEN -> Color(0xFF9AA0A6) src == Library.SOURCE_STEAM || src == Library.ADDED || src == Library.SOURCE_COLLECTION -> sourceColours(src).dot diff --git a/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt b/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt index f7f4319d2..1a674da7f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt @@ -15,6 +15,7 @@ internal object DeveloperTools { fun load(context: Context) { on = SessionPrefs.developerTools(context) + DevPreview.shortcuts = SessionPrefs.previewShortcuts(context) } fun set(context: Context, enabled: Boolean) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index edea48ea7..580b8ebc5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -571,7 +571,8 @@ internal fun CountPill(count: Int) { @Composable -internal fun SignInCard(store: Store, height: Dp) { +/** [inert]: shown in a Library preview, where signing in would act on the real account; the button only says so. */ +internal fun SignInCard(store: Store, height: Dp, inert: Boolean = false) { val ctx = LocalContext.current LaunchedEffect(store) { StoresState.preview(ctx, store) } val art = remember(StoresState.shelves[store]) { @@ -581,7 +582,7 @@ internal fun SignInCard(store: Store, height: Dp) { ?: shelves?.all.orEmpty().filter { !it.mature && !it.owned }.mapNotNull { it.tallImageUrl ?: it.imageUrl }, ) } - HeroWallCard(store.label, art, sourceColours(store.id), height) { SignInButton(store, large = true) } + HeroWallCard(store.label, art, sourceColours(store.id), height) { SignInButton(store, large = true, inert = inert) } } /** Repeats a short cover list so the wall has enough tiles to drift; too few covers leave it to the blank capsules. */ @@ -629,7 +630,7 @@ internal fun HeroWallCard(title: String, art: List, c: SourceColours, heigh } @Composable -private fun SignInButton(store: Store, large: Boolean = false) { +private fun SignInButton(store: Store, large: Boolean = false, inert: Boolean = false) { val ctx = LocalContext.current val colors = MaterialTheme.colorScheme val placed = remember { arrayOfNulls(1) } @@ -637,7 +638,8 @@ private fun SignInButton(store: Store, large: Boolean = false) { if (askKey) ItchKeyDialog { askKey = false } Box(Modifier.onGloballyPositioned { placed[0] = it }) { PrimaryButton(stringResource(R.string.stores_signin), main = true, large = large, icon = if (large) Icons.AutoMirrored.Filled.Login else null) { - startStoreSignIn(ctx, store, placed[0]?.takeIf { it.isAttached }?.boundsInRoot(), colors.primary) { askKey = true } + if (inert) android.widget.Toast.makeText(ctx, R.string.dev_preview_read_only, android.widget.Toast.LENGTH_SHORT).show() + else startStoreSignIn(ctx, store, placed[0]?.takeIf { it.isAttached }?.boundsInRoot(), colors.primary) { askKey = true } } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4ee7cd776..4187e13cd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4288,6 +4288,24 @@ Steam or Desktop options (swipe up) Steam quick menu (•••) Logs + UI zoo + Screens that are hard to reach, shown only when you pick one + Open + Show + Previews change nothing real: nothing is installed, removed or signed out, and the menu\'s switches save nothing. A Library preview stays until you end it from its pill or restart. + Library + Nothing installed + Signed out of every store + Sample games in every store + Preview: %1$s + End preview + Real library + Preview a state + Preview shortcuts + Adds a preview button where a state lives, such as the Library\'s toolbar, to switch states in place + Previews are read-only. End the preview to open games. + In-game menu + In-game menu preview · Back to close Tabs Storage Syncthing From 45c31a480afd156cb63648ac5025dfb8769b57be Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 19 Nov 2026 21:27:49 -0500 Subject: [PATCH 24/31] Default WINESTEAMNOEXEC=0 for Black Ops II (#2892) --- tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env | 6 ++++++ tools/tests/test_game_environment.py | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 5dd574abd..b4b574a0a 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -194,6 +194,12 @@ def protonfixes_off(game): return {"PROTONFIXES_DISABLE": "1"}, [], "umu-protonfixes off (its ALSA audio and VC++ installer steps fail here)" +@fix +def black_ops_ii_steam_exec(game): + if game.app_id in ("202970", "202990", "212910") or game.stem in ("t6sp", "t6mp", "t6zm"): + return {"WINESTEAMNOEXEC": "0"}, [], "Black Ops II: Steam exec handling on (the game does not start without it)" + + @fix def little_nightmares_threads(game): if game.stem == "littlenightmares": diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 898bd3a22..41f05beb8 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -1615,6 +1615,14 @@ class GameEnvironmentTest(unittest.TestCase): self.assertTrue(notes) self.assertEqual(MODULE["engine_fixes"]("/game/Game/DarkSoulsII.exe", []), ({}, [], [])) + def test_black_ops_ii_starts_with_steam_exec_handling(self): + for exe in ("/game/Call of Duty Black Ops II/t6zm.exe", "/game/Call of Duty Black Ops II/t6mp.exe", "/game/Call of Duty Black Ops II/t6sp.exe"): + env, extra, notes = MODULE["engine_fixes"](exe, []) + self.assertEqual((env, extra), ({"WINESTEAMNOEXEC": "0"}, [])) + self.assertTrue(notes) + self.assertEqual(MODULE["engine_fixes"]("/game/Game/Other.exe", [], "202990")[0], {"WINESTEAMNOEXEC": "0"}) + self.assertEqual(MODULE["engine_fixes"]("/game/Game/Other.exe", []), ({}, [], [])) + def test_little_nightmares_keeps_its_render_thread(self): env, extra, notes = MODULE["engine_fixes"]("/game/Little Nightmares/Atlas/Binaries/Win64/LittleNightmares.exe", []) self.assertEqual((env, extra), ({"PROTONFIXES_DISABLE": "1"}, [])) From dc9d1b81cc3b6f9e4e9edb98d07e0c19b2b0da9e Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 19 Nov 2026 22:41:04 -0500 Subject: [PATCH 25/31] feat(frontend): launch from every frontend file format and store, with per-store game files (#2872) --- .../droiddeck/launcher/FrontEndActivity.kt | 20 +++-- .../droiddeck/launcher/frontend/GameFiles.kt | 71 ++++++++++++--- .../launcher/frontend/GameLaunchIntent.kt | 18 ++-- .../launcher/frontend/GameRequest.kt | 78 ++++++++++++++++ app/src/main/res/values/strings.xml | 1 + .../launcher/frontend/GameFilesTest.kt | 70 +++++++++++++-- .../launcher/frontend/GameLaunchIntentTest.kt | 38 +++++--- .../launcher/frontend/GameRequestTest.kt | 62 +++++++++++++ docs/frontend-integration.md | 88 +++++++++++++++++++ docs/testing/game-launcher-shortcuts.md | 6 +- 10 files changed, 399 insertions(+), 53 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/frontend/GameRequest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/frontend/GameRequestTest.kt create mode 100644 docs/frontend-integration.md diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index c15996d8f..d286cce1f 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -875,7 +875,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet runCatching { com.droiddeck.launcher.frontend.AutoComponents.restoreMissing(this) }.onFailure { Log.w(TAG, "components: restore failed", it) } }, "components-restore").start() } - private var pendingGameLink: String? = null + private var pendingGameLink: com.droiddeck.launcher.frontend.GameRequest? = null private var gameLinkReading = false private var gameLinkTried = false private var gameSyncFolder by mutableStateOf(null) @@ -947,12 +947,12 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet com.droiddeck.launcher.ui.DualScreenPanel.hide(taskId) val copy = Intent(request) Thread({ - val id = GameLaunchIntent.read(this, copy) + val game = GameLaunchIntent.read(this, copy) ui.post { if (intent === request && !isDestroyed) { gameLinkReading = false - pendingGameLink = id - if (id == null) { + pendingGameLink = game + if (game == null) { syncDualPanel() android.widget.Toast.makeText(this, R.string.game_link_invalid, android.widget.Toast.LENGTH_LONG).show() } else { @@ -1202,16 +1202,16 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet private fun handleGameLink(games: List, scanned: Boolean = true) { if (!lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.RESUMED)) return - val id = pendingGameLink ?: return - if (!scanned && games.none { it.gameIdString == id }) return + val request = pendingGameLink ?: return + val game = request.find(games, byTitle = scanned) + if (!scanned && game == null) return gameLinkTried = true ui.postDelayed({ if (!isDestroyed && lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.RESUMED)) syncDualPanel() }, LINK_PANEL_MS) - val game = games.firstOrNull { it.gameIdString == id } val link = intent fun consume() { - if (intent !== link || pendingGameLink != id) return + if (intent !== link || pendingGameLink !== request) return pendingGameLink = null link.data = null link.action = Intent.ACTION_MAIN @@ -1220,7 +1220,9 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet if (game == null) { consume() syncDualPanel() - android.widget.Toast.makeText(this, R.string.game_link_missing, android.widget.Toast.LENGTH_LONG).show() + android.widget.Toast.makeText(this, + if (request.program != null) R.string.game_link_program_unknown else R.string.game_link_missing, + android.widget.Toast.LENGTH_LONG).show() } else launchGame(game, returnHome = true, onSettled = ::consume) } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/GameFiles.kt b/app/src/main/java/com/droiddeck/launcher/frontend/GameFiles.kt index 63b5f6b4d..3ab892892 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/GameFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/GameFiles.kt @@ -2,6 +2,9 @@ package com.droiddeck.launcher.frontend import android.content.Context import android.content.Intent +import android.net.Uri +import android.provider.DocumentsContract +import android.provider.OpenableColumns import android.util.AtomicFile import com.droiddeck.launcher.R import androidx.core.util.readText @@ -13,27 +16,65 @@ import java.io.InputStream object GameFiles { const val EXTENSION = "steam" - private const val MAX_BYTES = 128 + private const val MAX_BYTES = 4096 private const val MAX_NAME_BYTES = 200 private const val INVENTORY = ".droiddeck-sync.json" private const val FORMAT = "droiddeck-game-files-v1" - fun readIntent(context: Context, request: Intent): String? = runCatching { + fun readIntent(context: Context, request: Intent): GameRequest? = runCatching { if (request.action != Intent.ACTION_VIEW) return null val uri = request.data ?: return null - GameLaunchLink.parse(uri.toString())?.let { return it } + GameRequest.link(uri.toString())?.let { return GameRequest(it) } + val name = displayName(context, uri) + val extension = name?.substringAfterLast('.', "").orEmpty() + if (extension.lowercase(java.util.Locale.ROOT) in GameRequest.PROGRAMS) { + val program = localFile(context, uri)?.takeIf { it.isFile } ?: return null + return GameRequest(title = name?.substringBeforeLast('.'), program = program.canonicalFile) + } val stream = when (uri.scheme) { - "content" -> context.contentResolver.openInputStream(uri) - "file" -> { - if (!uri.authority.isNullOrEmpty() || uri.query != null || uri.fragment != null) return null - File(uri.path ?: return null).inputStream() - } - null -> File(uri.toString()).takeIf { it.isAbsolute }?.inputStream() + "content" -> runCatching { context.contentResolver.openInputStream(uri) }.getOrNull() + ?: localFile(context, uri)?.takeIf { it.isFile }?.inputStream() + "file", null -> localFile(context, uri)?.inputStream() else -> null } ?: return null - stream.use(::read) + val id = stream.use(::read) ?: return null + GameRequest(id, GameRequest.sourceOf(extension), name?.substringBeforeLast('.')) }.getOrNull() + private fun displayName(context: Context, uri: Uri): String? = when (uri.scheme) { + "content" -> runCatching { + context.contentResolver.query(uri, arrayOf(OpenableColumns.DISPLAY_NAME), null, null, null)?.use { c -> + if (c.moveToFirst()) c.getString(0) else null + } + }.getOrNull() ?: uri.lastPathSegment?.substringAfterLast('/')?.substringAfterLast(':') + "file" -> uri.path?.let { File(it).name } + null -> File(uri.toString()).name + else -> null + }?.takeIf { it.isNotEmpty() } + + private fun localFile(context: Context, uri: Uri): File? = when (uri.scheme) { + "file" -> { + if (!uri.authority.isNullOrEmpty() || uri.query != null || uri.fragment != null) null + else uri.path?.let(::File) + } + null -> File(uri.toString()).takeIf { it.isAbsolute } + "content" -> storageDocument(context, uri) ?: uri.pathSegments.let { parts -> + (0..1).asSequence().map { File("/" + parts.drop(it).joinToString("/")) }.firstOrNull { it.isFile } + } + else -> null + } + + // Frontends pass SAF document URIs or FileProvider URIs whose path mirrors shared storage. + private fun storageDocument(context: Context, uri: Uri): File? { + if (uri.authority != "com.android.externalstorage.documents" || !DocumentsContract.isDocumentUri(context, uri)) return null + val id = DocumentsContract.getDocumentId(uri) + val volume = id.substringBefore(':') + val path = id.substringAfter(':', "") + val root = if (volume.equals("primary", ignoreCase = true)) android.os.Environment.getExternalStorageDirectory() + else File("/storage", volume) + return File(root, path) + } + fun read(stream: InputStream): String? { val bytes = ByteArray(MAX_BYTES + 1) var count = 0 @@ -44,8 +85,7 @@ object GameFiles { count += n } if (count > MAX_BYTES) return null - val text = String(bytes, 0, count, Charsets.UTF_8).trim() - return text.takeIf(GameLaunchLink::validId) + return GameRequest.parse(String(bytes, 0, count, Charsets.UTF_8)) } fun filename(game: Library.SteamGame, disambiguate: Boolean = false): String { @@ -61,7 +101,7 @@ object GameFiles { } val title = String(points, 0, end).trimEnd { it.isWhitespace() || it == '.' }.ifBlank { "Game" } val suffix = if (disambiguate) " (${game.gameIdString})" else "" - return "$title$suffix.$EXTENSION" + return "$title$suffix.${GameRequest.extension(game)}" } private fun contents(id: String): String { @@ -130,7 +170,7 @@ object GameFiles { } for (name in previous.keys()) { val id = previous.getString(name) - if (!next.has(name) && name.endsWith(".$EXTENSION") && GameLaunchLink.validId(id)) { + if (!next.has(name) && ours(name) && GameLaunchLink.validId(id)) { val file = child(context, folder, name) if (matches(file, contents(id))) { val retained = exports.any { java.nio.file.Files.isSameFile(it.toPath(), file.toPath()) } @@ -141,6 +181,9 @@ object GameFiles { if (previous.toString() != next.toString()) write(inventory, JSONObject().put("format", FORMAT).put("games", next).toString()) } + private fun ours(name: String) = name.substringAfterLast('.', "").lowercase(java.util.Locale.ROOT) + .let { it == EXTENSION || it in GameRequest.extensions } + private fun inventoryOwns(context: Context, folder: File, record: JSONObject, file: File, id: String): Boolean { if (record.optString(file.name) == id) return true if (!file.exists()) return false diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/GameLaunchIntent.kt b/app/src/main/java/com/droiddeck/launcher/frontend/GameLaunchIntent.kt index 6f71475cf..3e5d4ae0d 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/GameLaunchIntent.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/GameLaunchIntent.kt @@ -11,22 +11,26 @@ object GameLaunchIntent { fun accepts(action: String?): Boolean = action == Intent.ACTION_VIEW || action == ACTION || action == GAMENATIVE_ACTION - fun read(context: Context, intent: Intent): String? = when (intent.action) { + fun read(context: Context, intent: Intent): GameRequest? = when (intent.action) { Intent.ACTION_VIEW -> GameFiles.readIntent(context, intent) - ACTION, GAMENATIVE_ACTION -> readId(intent) + ACTION, GAMENATIVE_ACTION -> readExtras(intent) else -> null } @Suppress("DEPRECATION") - internal fun readId(intent: Intent): String? = runCatching { + internal fun readExtras(intent: Intent): GameRequest? = runCatching { if (intent.action != ACTION && intent.action != GAMENATIVE_ACTION) return null - val source = intent.extras?.get(EXTRA_GAME_SOURCE) - if (source != null && (source !is String || !source.equals("STEAM", ignoreCase = true))) return null + val source = when (val value = intent.extras?.get(EXTRA_GAME_SOURCE)) { + null -> Library.SOURCE_STEAM + is String -> GameRequest.sourceNamed(value) ?: return null + else -> return null + } val id = when (val value = intent.extras?.get(EXTRA_APP_ID)) { is Int -> value.takeIf { it > 0 }?.toString() + is Long -> value.takeIf { it != 0L }?.let(java.lang.Long::toUnsignedString) is String -> value.takeIf(GameLaunchLink::validId) else -> null - } - id + } ?: return null + GameRequest(id, source) }.getOrNull() } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/GameRequest.kt b/app/src/main/java/com/droiddeck/launcher/frontend/GameRequest.kt new file mode 100644 index 000000000..a6baf2d70 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/GameRequest.kt @@ -0,0 +1,78 @@ +package com.droiddeck.launcher.frontend + +import com.droiddeck.launcher.stores.Store +import java.io.File +import java.util.Locale + +class GameRequest( + val id: String? = null, + val source: String = Library.SOURCE_STEAM, + val title: String? = null, + val program: File? = null, +) { + fun find(games: List, byTitle: Boolean = true): Library.SteamGame? { + program?.let { return owner(games, it) } + val exact = id?.let { id -> games.firstOrNull { it.gameIdString == id } } + if (source == Library.SOURCE_STEAM) return exact ?: games.firstOrNull { it.appId > 0 && it.appId.toString() == id } + exact?.takeIf { it.source == source }?.let { return it } + id?.let { id -> games.firstOrNull { it.source == source && it.storeId == id } }?.let { return it } + if (!byTitle) return null + val key = title?.let(::titleKey)?.takeIf { it.isNotEmpty() } ?: return null + return games.firstOrNull { it.source == source && titleKey(it.name) == key } + } + + private fun owner(games: List, program: File): Library.SteamGame? { + val path = program.path + return games.mapNotNull { game -> + val folder = game.gameFiles ?: return@mapNotNull null + val dir = folder.absolutePath.takeIf { inside(path, it) } + ?: runCatching { folder.canonicalPath }.getOrNull()?.takeIf { inside(path, it) } + dir?.let { game to it.length } + }.maxByOrNull { it.second }?.first + } + + companion object { + val PROGRAMS = setOf("exe", "bat") + private const val CUSTOM_GAME = "CUSTOM_GAME" + private const val CUSTOM_EXTENSION = "pcgame" + private val DAIJISHOU = setOf("# Daijishou Player Template", "# DST") + private val daijishouId = Regex("""(?i)\[steamappid]\s*([0-9]+)""") + private val steamLink = Regex("steam://rungameid/([1-9][0-9]{0,19})") + + val extensions: Set = Store.entries.map { it.id }.toSet() + CUSTOM_EXTENSION + + fun extension(game: Library.SteamGame): String = Store.byId(game.source)?.id ?: GameFiles.EXTENSION + + fun sourceNamed(value: String): String? = when { + value.equals(Library.SOURCE_STEAM, ignoreCase = true) -> Library.SOURCE_STEAM + value.equals(CUSTOM_GAME, ignoreCase = true) -> Library.ADDED + else -> Store.entries.firstOrNull { it.name.equals(value, ignoreCase = true) }?.id + } + + fun sourceOf(extension: String): String = when (val ext = extension.lowercase(Locale.ROOT)) { + CUSTOM_EXTENSION -> Library.ADDED + else -> Store.byId(ext)?.id ?: Library.SOURCE_STEAM + } + + fun link(text: String): String? = text.takeIf(GameLaunchLink::validId) + ?: GameLaunchLink.parse(text) + ?: steamLink.matchEntire(text)?.groupValues?.get(1)?.takeIf(GameLaunchLink::validId) + + fun parse(text: String): String? { + link(text.trim())?.let { return it } + val lines = text.lines().map { it.trim() }.filter { it.isNotEmpty() } + val header = lines.firstOrNull() ?: return null + return when { + DAIJISHOU.any { header.equals(it, ignoreCase = true) } -> lines.firstNotNullOfOrNull { daijishouId.matchEntire(it) } + ?.groupValues?.get(1)?.takeIf(GameLaunchLink::validId) + header.equals("[InternetShortcut]", ignoreCase = true) -> lines.firstOrNull { it.startsWith("URL=", ignoreCase = true) } + ?.substring(4)?.trim()?.takeIf { !GameLaunchLink.validId(it) }?.let(::link) + else -> null + } + } + + internal fun titleKey(name: String): String = name.lowercase(Locale.ROOT).filter { it.isLetterOrDigit() } + + private fun inside(path: String, dir: String) = path.startsWith(dir.trimEnd(File.separatorChar) + File.separator) + } +} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4187e13cd..2fcff59c4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1774,6 +1774,7 @@ This launcher cannot add shortcuts. Use Copy launch link instead. Invalid game launch link. This game is no longer in your DroidDeck library. + Add this game to DroidDeck first, then start it from your frontend. Stop the current session before launching a Steam game. Could not send the game to Steam. Try launching it again. %1$s is a UWP app. This runtime has no Windows app-model host to start it. diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/GameFilesTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/GameFilesTest.kt index bcae5c8fe..b5f58de79 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/GameFilesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/GameFilesTest.kt @@ -33,27 +33,64 @@ class GameFilesTest { assertEquals("18446744073709551615", file.readText()) val context = RuntimeEnvironment.getApplication() listOf(Uri.fromFile(file), Uri.parse(file.path)).forEach { uri -> - assertEquals("18446744073709551615", GameFiles.readIntent(context, Intent(Intent.ACTION_VIEW, uri))) + assertEquals("18446744073709551615", GameFiles.readIntent(context, Intent(Intent.ACTION_VIEW, uri))?.id) } val provider = LaunchFileProvider(file) provider.attachInfo(context, android.content.pm.ProviderInfo().apply { authority = "frontend" }) ShadowContentResolver.registerProviderInternal("frontend", provider) val uri = Uri.parse("content://frontend/document/opaque%3A42") - assertEquals("18446744073709551615", GameFiles.readIntent(context, Intent(Intent.ACTION_VIEW, uri))) + assertEquals("18446744073709551615", GameFiles.readIntent(context, Intent(Intent.ACTION_VIEW, uri))?.id) + } + + @Test fun readsIdsFromEveryFrontendFileFormat() { + listOf("8400\n", "steam://rungameid/8400", "droiddeck://game/8400", + "# Daijishou Player Template\n[steamappid] 8400\n", "# DST\n[steamappid] 8400\n", + "[InternetShortcut]\r\nIconIndex=0\r\nURL=steam://rungameid/8400\r\nIconFile=C:\\steam.ico\r\n").forEach { value -> + assertEquals(value, "8400", GameFiles.read(ByteArrayInputStream(value.toByteArray()))) + } } @Test fun rejectsCommandsMalformedIdsLargeFilesAndUnsupportedIntents() { - listOf("", "0", "01", "-1", "18446744073709551616", "steam://rungameid/8400", - "8400\n8401", "droiddeck://game/8400", "droiddeck://game/8400?command=quit", "x".repeat(129)).forEach { value -> + listOf("", "0", "01", "-1", "18446744073709551616", "steam://rungameid/8400?x=1", "steam://run/8400", + "8400\n8401", "droiddeck://game/8400?command=quit", "x".repeat(4097), + "[InternetShortcut]\nURL=https://example.com/8400", "[InternetShortcut]\nURL=8400", + "# Daijishou Player Template\n[epicappid] 8400").forEach { value -> assertNull(value, GameFiles.read(ByteArrayInputStream(value.toByteArray()))) } - assertEquals("8400", GameFiles.read(ByteArrayInputStream("8400\n".toByteArray()))) val context = RuntimeEnvironment.getApplication() assertNull(GameFiles.readIntent(context, Intent(Intent.ACTION_SEND, Uri.parse("droiddeck://game/8400")))) assertNull(GameFiles.readIntent(context, Intent(Intent.ACTION_VIEW, Uri.parse("https://example.com/8400.steam")))) assertNull(GameFiles.readIntent(context, Intent(Intent.ACTION_VIEW, Uri.parse("file://remote/game.steam")))) assertNull(GameFiles.readIntent(context, Intent(Intent.ACTION_VIEW, Uri.fromFile(File(tmp.root, "missing.steam"))))) - assertEquals("8400", GameFiles.readIntent(context, Intent(Intent.ACTION_VIEW, Uri.parse("droiddeck://game/8400")))) + assertEquals("8400", GameFiles.readIntent(context, Intent(Intent.ACTION_VIEW, Uri.parse("droiddeck://game/8400")))?.id) + assertEquals("8400", GameFiles.readIntent(context, Intent(Intent.ACTION_VIEW, Uri.parse("8400")))?.id) + assertEquals("8400", GameFiles.readIntent(context, Intent(Intent.ACTION_VIEW, Uri.parse("steam://rungameid/8400")))?.id) + } + + @Test fun storeFilesCarryTheirSourceAndTitle() { + val context = RuntimeEnvironment.getApplication() + val epic = File(tmp.root, "Hades II.epic").apply { writeText("17") } + val request = GameFiles.readIntent(context, Intent(Intent.ACTION_VIEW, Uri.fromFile(epic)))!! + assertEquals("epic", request.source) + assertEquals("Hades II", request.title) + val daijishou = File(tmp.root, "Portal.steamappid").apply { writeText("# Daijishou Player Template\n[steamappid] 400\n") } + val steam = GameFiles.readIntent(context, Intent(Intent.ACTION_VIEW, Uri.fromFile(daijishou)))!! + assertEquals(Library.SOURCE_STEAM, steam.source) + assertEquals("400", steam.id) + } + + @Test fun programFilesArriveAsPathsNotContents() { + val context = RuntimeEnvironment.getApplication() + val exe = File(tmp.newFolder("Game"), "Game.exe").apply { writeBytes(byteArrayOf(0x4d, 0x5a)) } + val request = GameFiles.readIntent(context, Intent(Intent.ACTION_VIEW, Uri.fromFile(exe)))!! + assertEquals(exe.canonicalFile, request.program) + assertNull(request.id) + val provider = LaunchFileProvider(exe) + provider.attachInfo(context, android.content.pm.ProviderInfo().apply { authority = "frontend.files" }) + ShadowContentResolver.registerProviderInternal("frontend.files", provider) + val shared = Uri.parse("content://frontend.files/root" + exe.canonicalPath) + assertEquals(exe.canonicalFile, GameFiles.readIntent(context, Intent(Intent.ACTION_VIEW, shared))?.program) + assertNull(GameFiles.readIntent(context, Intent(Intent.ACTION_VIEW, Uri.fromFile(File(exe.parentFile, "Missing.exe"))))) } @Test fun exportsGameIconBeforeCapsuleAndPreservesCustomArtwork() { @@ -185,13 +222,32 @@ class GameFilesTest { val file = GameFiles.export(app, folder, game("620", "Portal 2")) assertEquals("Portal 2.steam", file.name) assertEquals("620", file.readText()) - assertEquals("620", GameFiles.readIntent(RuntimeEnvironment.getApplication(), Intent(Intent.ACTION_VIEW, Uri.fromFile(file)))) + assertEquals("620", GameFiles.readIntent(RuntimeEnvironment.getApplication(), Intent(Intent.ACTION_VIEW, Uri.fromFile(file)))?.id) val added = Library.SteamGame(1, "Added Game", null, Library.ADDED, -1L) val addedFile = GameFiles.export(app, folder, added) assertEquals("Added Game.steam", addedFile.name) assertEquals("18446744073709551615", addedFile.readText()) } + @Test fun storeGamesExportUnderTheirStoreExtensionAndLaunchBack() { + val folder = tmp.newFolder() + val forza = Library.SteamGame(1, "Forza Horizon 5", null, Library.ADDED, -7L, source = "xbox", storeId = "9NKX70BBCDRN") + val steam = File(folder, "Forza Horizon 5.steam").apply { writeText(forza.gameIdString) } + File(folder, ".droiddeck-sync.json").writeText( + """{"format":"droiddeck-game-files-v1","games":{"Forza Horizon 5.steam":"${forza.gameIdString}"}}""") + GameFiles.sync(app, folder, listOf(forza)) + val file = File(folder, "Forza Horizon 5.xbox") + assertEquals(forza.gameIdString, file.readText()) + assertFalse(steam.exists()) + val request = GameFiles.readIntent(RuntimeEnvironment.getApplication(), Intent(Intent.ACTION_VIEW, Uri.fromFile(file)))!! + assertEquals("xbox", request.source) + assertSame(forza, request.find(listOf(game("620", "Portal 2"), forza))) + listOf("ubisoft", "ea", "rockstar", "battlenet", "itch", "gamejolt", "epic", "gog", "amazon").forEach { store -> + val game = Library.SteamGame(1, "Game", null, Library.ADDED, -8L, source = store) + assertEquals("Game.$store", GameFiles.filename(game)) + } + } + @Test fun steamSyncDisambiguatesTitlesAndPreservesEditedAndForeignFiles() { val folder = tmp.newFolder() val first = game("620", "A/B") diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/GameLaunchIntentTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/GameLaunchIntentTest.kt index 002085daf..63b6807c0 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/GameLaunchIntentTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/GameLaunchIntentTest.kt @@ -14,29 +14,41 @@ class GameLaunchIntentTest { @Test fun acceptsNativeAndExplicitlyRetargetedGameNativeProfiles() { listOf(GameLaunchIntent.ACTION, "app.gamenative.LAUNCH_GAME").forEach { action -> val request = Intent(action).putExtra("app_id", 620).putExtra("game_source", "STEAM") - assertEquals("620", GameLaunchIntent.read(RuntimeEnvironment.getApplication(), request)) - assertEquals("8400", GameLaunchIntent.readId(Intent(action).putExtra("app_id", "8400"))) - assertEquals("620", GameLaunchIntent.readId(request.putExtra("game_source", "steam"))) + assertEquals("620", GameLaunchIntent.read(RuntimeEnvironment.getApplication(), request)?.id) + assertEquals("8400", GameLaunchIntent.readExtras(Intent(action).putExtra("app_id", "8400"))?.id) + assertEquals("620", GameLaunchIntent.readExtras(request.putExtra("game_source", "steam"))?.id) } } - @Test fun stringIdsPreserveUnsignedShortcutIds() { + @Test fun longAndStringIdsPreserveUnsignedShortcutIds() { listOf("2147483648", "18446744073709551615").forEach { id -> - assertEquals(id, GameLaunchIntent.readId(Intent(GameLaunchIntent.ACTION).putExtra("app_id", id))) + assertEquals(id, GameLaunchIntent.readExtras(Intent(GameLaunchIntent.ACTION).putExtra("app_id", id))?.id) + } + assertEquals("620", GameLaunchIntent.readExtras(Intent(GameLaunchIntent.ACTION).putExtra("app_id", 620L))?.id) + assertEquals("18446744073709551615", GameLaunchIntent.readExtras(Intent(GameLaunchIntent.ACTION).putExtra("app_id", -1L))?.id) + } + + @Test fun storeSourcesComeThroughForLibraryMatching() { + mapOf("EPIC" to "epic", "gog" to "gog", "AMAZON" to "amazon", "XBOX" to "xbox", "UBISOFT" to "ubisoft", + "EA" to "ea", "ROCKSTAR" to "rockstar", "BATTLENET" to "battlenet", "ITCH" to "itch", "GAMEJOLT" to "gamejolt", + "CUSTOM_GAME" to Library.ADDED).forEach { (name, source) -> + val request = GameLaunchIntent.readExtras(Intent(GameLaunchIntent.ACTION).putExtra("app_id", 1207658924).putExtra("game_source", name)) + assertEquals(name, source, request?.source) + assertEquals("1207658924", request?.id) } } @Test fun rejectsUnsupportedSourcesTypesAndIdsWithoutFallingBackToData() { listOf("", "0", "01", "+1", "-1", "18446744073709551616", "620\n", "steam://rungameid/620").forEach { id -> - assertNull(id, GameLaunchIntent.readId(Intent(GameLaunchIntent.ACTION).putExtra("app_id", id))) + assertNull(id, GameLaunchIntent.readExtras(Intent(GameLaunchIntent.ACTION).putExtra("app_id", id))) } - listOf("EPIC", "GOG", "CUSTOM_GAME", "", "STEAM ").forEach { source -> - assertNull(GameLaunchIntent.readId(Intent(GameLaunchIntent.ACTION).putExtra("app_id", 620).putExtra("game_source", source))) + listOf("STADIA", "", "STEAM ", "added").forEach { source -> + assertNull(GameLaunchIntent.readExtras(Intent(GameLaunchIntent.ACTION).putExtra("app_id", 620).putExtra("game_source", source))) } - assertNull(GameLaunchIntent.readId(Intent(GameLaunchIntent.ACTION).putExtra("app_id", 620L))) - assertNull(GameLaunchIntent.readId(Intent(GameLaunchIntent.ACTION).putExtra("app_id", -1))) - assertNull(GameLaunchIntent.readId(Intent(GameLaunchIntent.ACTION).putExtra("app_id", 620).putExtra("game_source", 1))) - assertNull(GameLaunchIntent.readId(Intent(Intent.ACTION_MAIN).putExtra("app_id", 620))) + assertNull(GameLaunchIntent.readExtras(Intent(GameLaunchIntent.ACTION).putExtra("app_id", 0L))) + assertNull(GameLaunchIntent.readExtras(Intent(GameLaunchIntent.ACTION).putExtra("app_id", -1))) + assertNull(GameLaunchIntent.readExtras(Intent(GameLaunchIntent.ACTION).putExtra("app_id", 620).putExtra("game_source", 1))) + assertNull(GameLaunchIntent.readExtras(Intent(Intent.ACTION_MAIN).putExtra("app_id", 620))) assertNull(GameLaunchIntent.read(RuntimeEnvironment.getApplication(), Intent(GameLaunchIntent.ACTION, android.net.Uri.parse("droiddeck://game/620")))) } @@ -44,7 +56,7 @@ class GameLaunchIntentTest { @Test fun deepLinksStillAcceptUnsignedShortcutIds() { val context = RuntimeEnvironment.getApplication() assertEquals("18446744073709551615", GameLaunchIntent.read(context, - Intent(Intent.ACTION_VIEW, android.net.Uri.parse("droiddeck://game/18446744073709551615")))) + Intent(Intent.ACTION_VIEW, android.net.Uri.parse("droiddeck://game/18446744073709551615")))?.id) assertFalse(GameLaunchIntent.accepts(Intent.ACTION_SEND)) assertTrue(GameLaunchIntent.accepts(GameLaunchIntent.ACTION)) } diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/GameRequestTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/GameRequestTest.kt new file mode 100644 index 000000000..d7a50728c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/GameRequestTest.kt @@ -0,0 +1,62 @@ +package com.droiddeck.launcher.frontend + +import org.junit.Assert.* +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File + +class GameRequestTest { + @get:Rule val tmp = TemporaryFolder() + + private fun game(id: Long, name: String, source: String = Library.SOURCE_STEAM, storeId: String? = null, files: File? = null, + library: String = "internal", appId: Int = id.toInt()) = + Library.SteamGame(appId, name, null, library, id, gameFiles = files, source = source, storeId = storeId) + + @Test fun steamIdsMatchTheGameIdOrAnAddedGamesSteamAppId() { + val portal = game(400, "Portal") + val added = game(-1L, "Celeste", library = Library.ADDED, source = Library.ADDED, appId = 504230) + val games = listOf(portal, added) + assertSame(portal, GameRequest("400").find(games)) + assertSame(added, GameRequest("18446744073709551615").find(games)) + assertSame(added, GameRequest("504230").find(games)) + assertNull(GameRequest("401").find(games)) + } + + @Test fun titleMatchingWaitsForTheFullScan() { + val cached = game(-2L, "Example", source = "gog", storeId = "111") + assertNull(GameRequest("222", "gog", "Example").find(listOf(cached), byTitle = false)) + assertSame(cached, GameRequest("222", "gog", "Example").find(listOf(cached))) + assertSame(cached, GameRequest("111", "gog", "Other").find(listOf(cached), byTitle = false)) + } + + @Test fun gogMatchesItsProductIdThenTitle() { + val witcher = game(-2L, "The Witcher 3: Wild Hunt", source = "gog", storeId = "1207664663") + val games = listOf(game(292030, "The Witcher 3: Wild Hunt"), witcher) + assertSame(witcher, GameRequest("1207664663", "gog").find(games)) + assertSame(witcher, GameRequest("5", "gog", "The Witcher 3 Wild Hunt").find(games)) + } + + @Test fun storesWithAppLocalIdsMatchByTitleWithinTheirStore() { + val hades = game(-3L, "Hades II", source = "epic", storeId = "Ixion") + val custom = game(-4L, "Cave Story+", library = Library.ADDED, source = Library.ADDED) + val games = listOf(game(1145350, "Hades II"), hades, custom) + assertSame(hades, GameRequest("17", "epic", "hades ii").find(games)) + assertSame(custom, GameRequest("9", Library.ADDED, "Cave Story").find(games)) + assertNull(GameRequest("17", "epic").find(games)) + assertNull(GameRequest("17", "amazon", "Hades II").find(games)) + } + + @Test fun programsStartTheDeepestGameThatOwnsThem() { + val root = tmp.newFolder("Games") + val suite = File(root, "Suite").apply { mkdirs() } + val inner = File(suite, "Episode 2").apply { mkdirs() } + val outer = game(-5L, "Suite", files = suite) + val episode = game(-6L, "Episode 2", files = inner) + val games = listOf(outer, episode) + assertSame(episode, GameRequest(program = File(inner, "bin/game.exe")).find(games)) + assertSame(outer, GameRequest(program = File(suite, "launcher.exe")).find(games)) + assertNull(GameRequest(program = File(root, "Other/other.exe")).find(games)) + assertNull(GameRequest(program = File(root, "Suite2/game.exe")).find(games)) + } +} diff --git a/docs/frontend-integration.md b/docs/frontend-integration.md new file mode 100644 index 000000000..d60a4cbbf --- /dev/null +++ b/docs/frontend-integration.md @@ -0,0 +1,88 @@ +# Launching DroidDeck games from a frontend + +Frontends such as ES-DE, Daijisho, Cocoon, Beacon and iiSU can start any game in the DroidDeck library. DroidDeck can be the default player for a whole Windows or PC platform folder: it reads every file format listed below and starts the matching library game. + +## Launch target + +Send an explicit intent to `com.droiddeck.launcher/com.droiddeck.launcher.FrontEndActivity`. This activity is never disabled. `.MainActivity` is a launcher-icon alias and is disabled when the user picks the light icon, so do not target it. + +The release variants use other package names but the same activity class and action: + +| Build | Package | +| --- | --- | +| Standard | `com.droiddeck.launcher` | +| PUBG | `com.tencent.ig` | +| AnTuTu | `com.antutu.benchmark.full` | +| Ludashi | `com.ludashi.benchmark` | + +An intent that names only the action `com.droiddeck.launcher.LAUNCH_GAME`, without a package, reaches whichever build is installed. + +## Intents + +**Action with extras**, the same shape other PC game apps use: + +```sh +am start -n com.droiddeck.launcher/.FrontEndActivity \ + -a com.droiddeck.launcher.LAUNCH_GAME --es app_id 620 --es game_source STEAM +``` + +- `app_id`: an int, long or decimal string. DroidDeck ids for added and store games are unsigned 64-bit, so send them with `--es`, not `--ei`. `--el` only accepts the signed 64-bit form, so an id above 9223372036854775807 such as `18446744073709551615` must be sent as `-1`, or better with `--es`. +- `game_source` (optional, default `STEAM`): `STEAM`, `EPIC`, `GOG`, `AMAZON`, `XBOX`, `UBISOFT`, `EA`, `ROCKSTAR`, `BATTLENET`, `ITCH`, `GAMEJOLT` or `CUSTOM_GAME`. + +**View a link or a file**: + +```sh +am start -n com.droiddeck.launcher/.FrontEndActivity -a android.intent.action.VIEW -d 'droiddeck://game/620' +am start -n com.droiddeck.launcher/.FrontEndActivity -a android.intent.action.VIEW -d '' +``` + +The data can be `droiddeck://game/`, `steam://rungameid/`, a bare id, or a `file://`, `content://` or absolute path to one of the files below. + +## Game files + +**Frontend files** (the sync button at the top of the Games page) keeps a chosen folder filled with one file per installed game, named after the game, holding only its DroidDeck id. Steam and added games use `.steam`; store games use the store's own extension. + +| Extension | Games | +| --- | --- | +| `.steam` | Steam games and games added from a folder | +| `.epic` `.gog` `.amazon` | Epic, GOG and Amazon games | +| `.xbox` `.ubisoft` `.ea` `.rockstar` `.battlenet` `.itch` `.gamejolt` | Xbox, Ubisoft, EA, Rockstar, Battle.net, itch.io and Game Jolt games | + +DroidDeck also reads files written by other apps: + +- A bare id in any of the extensions above, plus `.pcgame` and `.droiddeck`. For `.epic`, `.gog`, `.amazon` and `.pcgame`, an id DroidDeck does not know falls back to the store's product id (GOG) and then to the game's title from the file name. +- Daijisho player templates (`.steamappid`) with a `[steamappid] ` line. +- Windows Internet Shortcuts (`.url`) whose `URL=` is `steam://rungameid/`. +- `.exe` and `.bat` files. DroidDeck starts the library game whose folder holds the program. A program that belongs to no library game is not run; add its folder in DroidDeck first. + +## Frontend examples + +**ES-DE** (`ES-DE/custom_systems/es_find_rules.xml`): + +```xml + + + com.droiddeck.launcher/com.droiddeck.launcher.FrontEndActivity + + +``` + +and in `es_systems.xml` for the `steam` or `windows` system: + +```xml +%EMULATOR_DROIDDECK% %ACTION%=android.intent.action.VIEW %DATA%=%ROMSAF% +``` + +`%ROMPROVIDER%` works as well. DroidDeck reads the file through the URI, or through the shared-storage path behind it when the URI grants no access. + +**Daijisho** player: + +```text +-n com.droiddeck.launcher/.FrontEndActivity -a android.intent.action.VIEW -d {file.uri} +``` + +**Frontends that inject the file's contents** can send `-a com.droiddeck.launcher.LAUNCH_GAME --es app_id ` or `-a android.intent.action.VIEW -d `. + +## What happens on launch + +DroidDeck matches the request against a fresh library scan and starts the game the same way its own Play button does, through Steam or without Steam as the game is set up. A cold launch boots the session straight into the game. A warm launch hands the game to the running Steam session. When the game exits, DroidDeck returns to the frontend that started it. diff --git a/docs/testing/game-launcher-shortcuts.md b/docs/testing/game-launcher-shortcuts.md index f806f2a8f..833386d9e 100644 --- a/docs/testing/game-launcher-shortcuts.md +++ b/docs/testing/game-launcher-shortcuts.md @@ -6,21 +6,21 @@ DroidDeck exposes installed Steam titles and AddedGames through a canonical laun droiddeck://game/ ``` -The ID is the value accepted by `steam://rungameid/`, including an AddedGames shortcut ID that occupies the unsigned 64-bit range. The app accepts only the exact URI form and only after a fresh library scan finds that game. The deep link does not accept paths, Steam URLs, extra parameters, leading zeroes, or IDs outside the unsigned 64-bit range. Frontends that scan files can instead pass a file or content URI for an exported `.droiddeck` launch file. +The ID is the value accepted by `steam://rungameid/`, including an AddedGames shortcut ID that occupies the unsigned 64-bit range. The app accepts only the exact URI form and only after a fresh library scan finds that game. The deep link does not accept paths, Steam URLs, extra parameters, leading zeroes, or IDs outside the unsigned 64-bit range. Frontends that scan files can instead pass a file or content URI for an exported game file. See [Launching DroidDeck games from a frontend](../frontend-integration.md) for every accepted intent and file format. Each game page's **Shortcut** menu offers **Add to home screen** through Android's pinned-shortcut request and **Copy launch link**. When a launcher invokes `ACTION_CREATE_SHORTCUT`, DroidDeck opens the Games page and returns Android's standard shortcut result after the user chooses a game. With the debug app installed, exercise link routing with an installed game ID from the current library: ```sh -adb shell am start -n com.droiddeck.launcher/.MainActivity \ +adb shell am start -n com.droiddeck.launcher/.FrontEndActivity \ -a android.intent.action.VIEW -d 'droiddeck://game/620' ``` Open the standard shortcut picker with: ```sh -adb shell am start -n com.droiddeck.launcher/.MainActivity \ +adb shell am start -n com.droiddeck.launcher/.FrontEndActivity \ -a android.intent.action.CREATE_SHORTCUT ``` From 4e81030fb8d79b5a926d7fa91a5fb83c2b1f301b Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Fri, 20 Nov 2026 00:00:27 -0500 Subject: [PATCH 26/31] fix: source builds start a session again on storage without hard links (#2908) --- .github/workflows/build.yml | 10 +++++++--- tools/packs/proot/release.env | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08cb6341b..3816c1a52 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -619,14 +619,18 @@ jobs: export NDK="$ANDROID_HOME/ndk/$NDK_VERSION" tools/syncthing/build.sh app/src/main/jniLibs/arm64-v8a - - name: Note when the proot pack pin is behind this build + - name: Check the proot pack pin against this build run: | set -euo pipefail # shellcheck disable=SC1091 source tools/packs/proot/release.env sha=$(sha256sum app/build/packs/proot.tar.zst | cut -d' ' -f1) - if [ "$sha" != "$PROOT_PACK_SHA256" ]; then - echo "::warning::built proot pack $sha does not match tools/packs/proot/release.env ($PROOT_PACK_SHA256). This build publishes the pack it just built. Source builds keep downloading the pinned pack until release.env is updated." + size=$(stat -c %s app/build/packs/proot.tar.zst) + if [ "$sha" != "$PROOT_PACK_SHA256" ] || [ "$size" != "$PROOT_PACK_SIZE" ]; then + level=warning + if [ "$GITHUB_EVENT_NAME" = pull_request ]; then level=error; fi + echo "::$level::built proot pack $sha ($size bytes) does not match tools/packs/proot/release.env ($PROOT_PACK_SHA256, $PROOT_PACK_SIZE bytes). Source builds download the pinned pack, so set PROOT_PACK_SHA256=$sha and PROOT_PACK_SIZE=$size in tools/packs/proot/release.env." + if [ "$level" = error ]; then exit 1; fi fi - name: Check out MaliBridge diff --git a/tools/packs/proot/release.env b/tools/packs/proot/release.env index 6d88f886a..95343609f 100644 --- a/tools/packs/proot/release.env +++ b/tools/packs/proot/release.env @@ -1,2 +1,2 @@ -PROOT_PACK_SHA256=5a2b7284e6357f88a14a790abd54e61effbe5f202c63b6aaba9b974c559649c3 -PROOT_PACK_SIZE=96643 +PROOT_PACK_SHA256=7800e188363f2b99485e8b9e4f68ea77eb65b088ca66b9e508a3a0938acea394 +PROOT_PACK_SIZE=99536 From 5051fc8b32f67ab4ac7a0f99dd963d8c4856f79e Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 20 Nov 2026 00:18:50 -0500 Subject: [PATCH 27/31] fix(session): the bottom screen takes touch again while a game runs (#2910) * fix(session): the bottom screen takes touch again while a game runs Since #2763, a transparent KeepTopActivity covers every other display while a session is on top. Its window is NOT_TOUCHABLE, but Android gives a translucent activity alone in its task an ActivityRecordInputSink that eats every touch on that display (ENABLE_TOUCH_OPAQUE_ACTIVITIES, on for this target SDK). With the dual-screen panel closed, the bottom screen's launcher, Cocoon or any other app could not be touched until the session ended, and the guard stayed over it after Home/PiP as well. - The guard now takes touches itself: a touch removes it from that display. - It comes back when the session is top-resumed again, or after 5 s if the session kept the top spot (the user touched the bottom screen once and stayed in the game). - Stopping or entering PiP removes the guards; PiP keeps the session at adj 50 with or without them, so they protected nothing there. A/B on a Retroid Pocket Duo (Android 16, Cocoon as bottom home): the guard is on top in every state it was on top on main, except the 5 s after a bottom touch and PiP. Under lmkd pressure (kills down to adj 50, bottom home killed 14-31 times per run) neither build lost the top spot. * test(session): A/B tool for the keep-top guard on rooted dual screens, with Duo findings * test(session): the guard A/B tool stops on a failed session start and cleans up an interrupted pressure run --- .../com/droiddeck/launcher/SessionActivity.kt | 32 +- .../launcher/session/KeepTopActivity.kt | 41 +- docs/development/memory-guard-ab.md | 90 ++++ tools/memory_guard_ab.py | 389 ++++++++++++++++++ tools/tests/test_memory_guard_ab.py | 106 +++++ 5 files changed, 650 insertions(+), 8 deletions(-) create mode 100644 docs/development/memory-guard-ab.md create mode 100755 tools/memory_guard_ab.py create mode 100644 tools/tests/test_memory_guard_ab.py diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 618452d02..b50175f60 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -5615,6 +5615,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde override fun onPictureInPictureModeChanged(inPip: Boolean, newConfig: android.content.res.Configuration) { super.onPictureInPictureModeChanged(inPip, newConfig) + if (inPip) { + uiHandler.removeCallbacks(guardWhenRunning) + uiHandler.removeCallbacks(rearmAfterYield) + com.droiddeck.launcher.session.KeepTopActivity.stepAside() + } if (::pip.isInitialized) pip.changed(inPip) if (!inPip && surfaceW > 0) resizeOutputForWindow(surfaceW, surfaceH) applyUnfoldedControls() @@ -5657,6 +5662,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde override fun onStop() { if (lightPause.stopped()) departureCleanup() + uiHandler.removeCallbacks(guardWhenRunning) + uiHandler.removeCallbacks(rearmAfterYield) + com.droiddeck.launcher.session.KeepTopActivity.stepAside() if (runtimeRemovalBlocked) { super.onStop(); return } started = false if (::hud.isInitialized) hud.setBackgrounded(true) @@ -5700,6 +5708,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde override fun onResume() { super.onResume() + com.droiddeck.launcher.session.KeepTopActivity.onYield = onGuardYield uiHandler.removeCallbacks(lightPauseCheck) when (lightPause.resumed(com.droiddeck.launcher.session.KeepTopActivity.bounces)) { com.droiddeck.launcher.session.LightPause.Resume.LIGHT -> return @@ -5783,6 +5792,19 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } } + // A touch that removed a guard while the session kept the top spot did not move focus to that + // display, so the guard comes back unless the user carries on there. + private val rearmAfterYield = Runnable { + if (topResumed && !isFinishing) { + com.droiddeck.launcher.session.KeepTopActivity.rearm() + guardOtherDisplays() + } + } + private val onGuardYield: () -> Unit = { + uiHandler.removeCallbacks(rearmAfterYield) + uiHandler.postDelayed(rearmAfterYield, com.droiddeck.launcher.session.KeepTopActivity.YIELD_GRACE_MS) + } + // RUNNING_LOW and RUNNING_CRITICAL are not delivered from API 34, so the guard also goes up // as soon as a running session is on top. override fun onTrimMemory(level: Int) { @@ -5796,13 +5818,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde super.onTopResumedActivityChanged(isTopResumedActivity) topResumed = isTopResumedActivity uiHandler.removeCallbacks(guardWhenRunning) - if (isTopResumedActivity) uiHandler.post(guardWhenRunning) + uiHandler.removeCallbacks(rearmAfterYield) + if (isTopResumedActivity) { + com.droiddeck.launcher.session.KeepTopActivity.rearm() + uiHandler.post(guardWhenRunning) + } else if (com.droiddeck.launcher.session.TopUnderPressure.shouldReclaim( android.os.SystemClock.elapsedRealtime(), memoryPressureAt, SessionState.running, isFinishing)) guardOtherDisplays() } private fun guardOtherDisplays() { - if (!SessionState.running || isFinishing) return + if (!SessionState.running || isFinishing || isInPictureInPictureMode) return val wasResumed = lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.RESUMED) val bounced = com.droiddeck.launcher.session.KeepTopActivity.guardOtherDisplays(this, display?.displayId ?: android.view.Display.DEFAULT_DISPLAY) if (com.droiddeck.launcher.session.KeepTopActivity.hasPendingStarts()) { @@ -6483,6 +6509,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde override fun onDestroy() { uiHandler.removeCallbacks(guardWhenRunning) + uiHandler.removeCallbacks(rearmAfterYield) + if (com.droiddeck.launcher.session.KeepTopActivity.onYield === onGuardYield) com.droiddeck.launcher.session.KeepTopActivity.onYield = null com.droiddeck.launcher.session.KeepTopActivity.release() synchronized(frameGenGlobalLock) { frameGenActivityActive = false diff --git a/app/src/main/java/com/droiddeck/launcher/session/KeepTopActivity.kt b/app/src/main/java/com/droiddeck/launcher/session/KeepTopActivity.kt index 849c0aafc..109f6d282 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/KeepTopActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/KeepTopActivity.kt @@ -9,11 +9,15 @@ import android.os.Bundle import android.os.SystemClock import android.util.Log import android.view.Display +import android.view.MotionEvent import android.view.WindowManager -// While a session runs, sits invisibly on top of every other display until it ends, so -// that display's home launcher is not its top activity. lmkd kills the launcher first; restarted as a -// top activity it takes focus from the session, which then drops to adj 50 and is killed next. +// While a session is on screen, sits invisibly on top of every other display, so that display's +// home launcher is not its top activity. lmkd kills the launcher first; restarted as a top activity +// it takes focus from the session, which then drops to adj 50 and is killed next. +// Android gives a translucent activity alone in its task an input sink that eats every touch on the +// display whatever its window flags say, so a touch makes the guard leave that display until the +// session is back on top. class KeepTopActivity : Activity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -27,13 +31,28 @@ class KeepTopActivity : Activity() { finishAndRemoveTask() return } - window.addFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) + window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) val id = display?.displayId ?: Display.INVALID_DISPLAY starting.remove(id) + if (id in yielded) { + finishAndRemoveTask() + return + } guards[id]?.takeIf { it !== this && !it.isFinishing }?.finishAndRemoveTask() guards[id] = this } + override fun dispatchTouchEvent(event: MotionEvent): Boolean { + if (event.actionMasked == MotionEvent.ACTION_DOWN && !isFinishing) { + val id = display?.displayId ?: Display.INVALID_DISPLAY + yielded.add(id) + Log.i(TAG, "display $id touched, leaving it to the app below") + finishAndRemoveTask() + onYield?.invoke() + } + return true + } + override fun onDestroy() { guards.values.remove(this) super.onDestroy() @@ -49,13 +68,18 @@ class KeepTopActivity : Activity() { private val guards = HashMap() private const val START_TIMEOUT_MS = 2_000L private val starting = HashMap() + private val yielded = HashSet() + const val YIELD_GRACE_MS = 5_000L + var onYield: (() -> Unit)? = null + + fun rearm() = yielded.clear() fun guardOtherDisplays(context: Context, sessionDisplay: Int): Boolean { val displays = context.getSystemService(DisplayManager::class.java)?.displays ?: return false var started = false for (display in displays) { val id = display.displayId - if (id == sessionDisplay || display.state != Display.STATE_ON || guards[id]?.isFinishing == false || + if (id == sessionDisplay || id in yielded || display.state != Display.STATE_ON || guards[id]?.isFinishing == false || starting[id]?.let { SystemClock.elapsedRealtime() - it < START_TIMEOUT_MS } == true) continue runCatching { launch(context, id, bounce = false) @@ -73,13 +97,18 @@ class KeepTopActivity : Activity() { const val RETRY_MS = START_TIMEOUT_MS + 250 - fun release() { + fun stepAside() { generation++ guards.values.toList().forEach { it.finishAndRemoveTask() } guards.clear() starting.clear() } + fun release() { + stepAside() + yielded.clear() + } + private fun launch(context: Context, displayId: Int, bounce: Boolean) { val intent = Intent(context, KeepTopActivity::class.java) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK or Intent.FLAG_ACTIVITY_NO_ANIMATION) diff --git a/docs/development/memory-guard-ab.md b/docs/development/memory-guard-ab.md new file mode 100644 index 000000000..4ac8d1a21 --- /dev/null +++ b/docs/development/memory-guard-ab.md @@ -0,0 +1,90 @@ +# Keep-top guard A/B on dual screens + +`KeepTopActivity` (#2763) covers every other display while a session is on top, so that +display's home is not its top activity. On the Thor, lmkd kills the bottom home under memory +pressure, Android relaunches it to the front (`wm_task_to_front`), the session loses the top +spot, drops to adj 50 and is killed in lmkd's next pass. + +Android gives a translucent activity that is alone in its task an `ActivityRecordInputSink` +that consumes every touch inside the task bounds, whatever the window's flags say +(`ENABLE_TOUCH_OPAQUE_ACTIVITIES`, on for DroidDeck's target SDK; see +`services/core/java/com/android/server/wm/ActivityRecordInputSink.java`). The guard's +`FLAG_NOT_TOUCHABLE` therefore did nothing: with the dual-screen panel closed, the bottom +screen took no touch until the session ended, and the guard also stayed over it after Home. + +The guard now takes touches itself. A touch removes it from that display. It comes back when +the session is top-resumed again, or after 5 s if the session kept the top spot (one touch on +the bottom screen, then back to the game). Stopping or entering PiP removes the guards. + +## Tool + +`tools/memory_guard_ab.py` drives a rooted dual-screen device over adb (`su` required) with a +build that has the debugging tools: + +```sh +python3 tools/memory_guard_ab.py --label main --apk main.apk states +python3 tools/memory_guard_ab.py --label fix --apk fix.apk states +python3 tools/memory_guard_ab.py --label fix pressure --stop-mb 650 --hold 30 --runs 3 +python3 tools/memory_guard_ab.py --label fix summarize ~/.cache/droiddeck-memory-guard-ab/fix-stop650-1-events.txt +``` + +Results are JSON lines in `~/.cache/droiddeck-memory-guard-ab/