diff --git a/app/src/main/java/com/droiddeck/launcher/ComponentsMenu.kt b/app/src/main/java/com/droiddeck/launcher/ComponentsMenu.kt index cbd7603708..db1d3eda5d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ComponentsMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ComponentsMenu.kt @@ -5,8 +5,11 @@ import android.util.Log import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue +import com.droiddeck.launcher.session.ComponentUpdater +import com.droiddeck.launcher.session.ComponentUpdates import com.droiddeck.launcher.session.ComponentsManager import com.droiddeck.launcher.session.ProtonDefault +import com.droiddeck.launcher.session.SessionPrefs internal class ComponentsMenu(private val activity: android.app.Activity, private val ui: Handler) { var compSnapshot by mutableStateOf(null) @@ -20,6 +23,10 @@ internal class ComponentsMenu(private val activity: android.app.Activity, privat get() = downloads private set(value) { downloads = value } val compDownloadRevision: Long get() = downloadRevision + var compModes by mutableStateOf>(emptyMap()) + var compAuto by mutableStateOf>>(emptyMap()) + var compAutoHeld by mutableStateOf>(emptySet()) + var compAutoChecking by mutableStateOf(false) private var shownDefault: String? = null fun refreshComponents(snapshotFirst: Boolean = false) { @@ -29,7 +36,14 @@ internal class ComponentsMenu(private val activity: android.app.Activity, privat val snap = runCatching { ComponentsManager.snapshot(activity) }.onFailure { Log.w(TAG, "components", it) }.getOrNull() val cat = runCatching { ComponentsManager.catalog(activity, false) }.getOrNull() val chosen = snap?.let { s -> runCatching { ProtonDefault.selectedId(activity, s.protons.map { it.proton }) }.getOrNull() } + runCatching { ComponentUpdater.settle(activity) } + val modes = ComponentsManager.COMPONENTS.associateWith { SessionPrefs.componentMode(activity, it) } + val auto = ComponentsManager.COMPONENTS.associateWith { runCatching { ComponentUpdater.status(activity, it) }.getOrDefault(emptyList()) } + val held = if (runCatching { ComponentsManager.hardwareDxvk(activity) }.getOrDefault(false)) setOf("dxvk") else emptySet() ui.post { + compModes = modes + compAuto = auto + compAutoHeld = held compSnapshot = snap ?: ComponentsManager.Snapshot(emptyList(), emptyList()) if (cat != null && cat.fetchedAt > 0) { compCatalog = cat.items; compCatalogAt = cat.fetchedAt } if (chosen != null && chosen != shownDefault) { @@ -42,6 +56,35 @@ internal class ComponentsMenu(private val activity: android.app.Activity, privat }, "components").start() } + fun chooseComponentMode(comp: String, mode: String) { + SessionPrefs.setComponentMode(activity, comp, mode) + compModes = compModes + (comp to mode) + if (mode != ComponentUpdates.AUTO) return + checkComponentUpdates(force = true) + } + + private var checkAgain: Boolean? = null + + fun checkComponentUpdates(force: Boolean) { + if (compAutoChecking) { + checkAgain = force || checkAgain == true + return + } + compAutoChecking = true + Thread({ + val notes = runCatching { ComponentUpdater.ensure(activity, force) }.onFailure { Log.w(TAG, "component updates", it) }.getOrDefault(emptyList()) + ui.post { + compAutoChecking = false + checkAgain?.let { again -> + checkAgain = null + checkComponentUpdates(again) + } + if (notes.isNotEmpty()) android.widget.Toast.makeText(activity, notes.joinToString("\n"), android.widget.Toast.LENGTH_LONG).show() + refreshComponents() + } + }, "component-updates").start() + } + fun chooseProton(id: String) { val proton = compSnapshot?.protons?.firstOrNull { it.proton.id == id }?.proton ?: return compProton = id diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 919d02cabd..13a96efc15 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -40,6 +40,8 @@ import com.droiddeck.launcher.ui.PackageRow import com.droiddeck.launcher.ui.exposeTestTags import com.droiddeck.launcher.session.OfflineMode import com.droiddeck.launcher.session.ProtonExtras +import com.droiddeck.launcher.session.ComponentUpdater +import com.droiddeck.launcher.session.ComponentUpdates import com.droiddeck.launcher.session.ComponentsManager import com.droiddeck.launcher.ui.ComponentsPage import com.droiddeck.launcher.session.GameSaves @@ -94,7 +96,11 @@ class FrontEndActivity : ComponentActivity() { private val components = ComponentsMenu(this, ui) private val decky = DeckyMenu(this, ui) private val updates = UpdatesMenu(this, ui) - private val protons = ProtonMenu(this, ui) { !busy && flood == null && compatLaunch == null && pkgStage == null && components.compBusy == null } + private val protons = ProtonMenu( + this, ui, + idle = { !busy && flood == null && compatLaunch == null && pkgStage == null && components.compBusy == null }, + onInstalled = { if (!OfflineMode.enabled(this)) components.checkComponentUpdates(force = false) }, + ) private var installed by mutableStateOf(null) private var flood by mutableStateOf(null) @@ -1880,6 +1886,13 @@ class FrontEndActivity : ComponentActivity() { if (applied.isNotEmpty()) ui.post { android.widget.Toast.makeText(this, getString(R.string.main_applied, applied.joinToString(", ")), android.widget.Toast.LENGTH_LONG).show() } + if (!OfflineMode.enabled(this)) { + val updated = runCatching { ComponentUpdater.ensure(this, force = false) } + .onFailure { android.util.Log.w("ComponentUpdater", "automatic component updates", it) }.getOrDefault(emptyList()) + if (updated.isNotEmpty()) ui.post { + android.widget.Toast.makeText(this, updated.joinToString("\n"), android.widget.Toast.LENGTH_LONG).show() + } + } ui.post { componentsQueueBusy = false if (showComponents) components.refreshComponents() @@ -2153,7 +2166,15 @@ class FrontEndActivity : ComponentActivity() { onDeletePackage = { file -> components.componentAction(getString(R.string.comp_busy_deleting)) { ComponentsManager.deletePackage(this, file) } }, onDeleteOriginal = { version -> components.compProton?.let { pid -> components.componentAction(getString(R.string.comp_busy_deleting)) { ComponentsManager.deleteOriginal(this, pid, components.compComp, version) } } }, onDownload = { components.downloadComponent(it) }, - onRefresh = { components.refreshComponentCatalog() }, + onRefresh = { + components.refreshComponentCatalog() + if (components.compModes.values.any { it == ComponentUpdates.AUTO }) components.checkComponentUpdates(force = true) + }, + compModes = components.compModes, + compAuto = components.compAuto, + compAutoHeld = components.compAutoHeld, + compAutoChecking = components.compAutoChecking, + onCompMode = { comp, mode -> components.chooseComponentMode(comp, mode) }, onImport = { pickComponent.launch(InAppFilePicker.buildIntent(this, WCP_EXT, getString(R.string.comp_pick_wcp))) }, onBack = { if (!com.droiddeck.launcher.ui.Hops.back { showComponents = false }) showComponents = false }, games = steamGames, @@ -2982,6 +3003,7 @@ class FrontEndActivity : ComponentActivity() { private fun removeRuntime() { if (runtimeChangesBlocked()) return val removal = LinuxRuntimeInstaller.beginUninstall(this) ?: return + com.droiddeck.launcher.runtime.RuntimeAutoUpdate.seed(this) ready = false com.droiddeck.launcher.runtime.RuntimeInstallService.keepRemovalAlive(this) followRuntimeOperation { removal.run(it) } @@ -3008,6 +3030,7 @@ class FrontEndActivity : ComponentActivity() { android.widget.Toast.makeText(this, it, android.widget.Toast.LENGTH_LONG).show() } refresh() + if (ok == true && LinuxRuntime.isInstalled(this)) protons.checkUpdates() } }, "runtime-operation").start() } @@ -3015,9 +3038,12 @@ class FrontEndActivity : ComponentActivity() { private fun autoUpdateRuntime() { val release = available?.takeIf { catalogFresh } ?: return if (!lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.RESUMED) || runtimeChangesBlocked() || removalPending) return - if (release.version == installed || installed == null) return + if (installed != null) com.droiddeck.launcher.runtime.RuntimeAutoUpdate.seed(this) + if (release.version == installed) return + if (installed == null && (OfflineMode.enabled(this) || !com.droiddeck.launcher.core.DeviceSupport.canDraw(this) || + !com.droiddeck.launcher.frontend.AutoComponents.online(this) || com.droiddeck.launcher.frontend.AutoComponents.unfavourable(this))) return if (com.droiddeck.launcher.runtime.RuntimeAutoUpdate.claim(this, installed, release.version)) { - Log.i(TAG, "runtime: updating $installed to ${release.version} by itself") + Log.i(TAG, "runtime: installing ${release.version} over ${installed ?: "nothing"} by itself") install(release) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt index 5251b50da3..c8fe30c9e1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt @@ -18,6 +18,7 @@ import com.droiddeck.launcher.runtime.LinuxRuntimeInstaller internal class ProtonMenu( private val activity: android.app.Activity, private val ui: Handler, + private val onInstalled: () -> Unit = {}, private val idle: () -> Boolean = { true }, ) { private object Operation { @@ -61,6 +62,7 @@ internal class ProtonMenu( if (automatic) Log.w("ProtonMenu", "auto-update ${tool.id}: $problem") else android.widget.Toast.makeText(activity, problem, android.widget.Toast.LENGTH_LONG).show() } + if (problem == null) onInstalled() if (automatic) ensureAutoUpdates() } }, "install-proton-$id").start() diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdate.kt b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdate.kt index 5bb53bbc0e..880f447bee 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdate.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdate.kt @@ -8,8 +8,10 @@ object RuntimeAutoUpdate { const val MAX_ATTEMPTS = 3 const val RETRY_MS = 10 * 60_000L - fun due(installed: String?, release: String?, attempts: Int, lastAt: Long = 0L, now: Long = lastAt + RETRY_MS): Boolean = - installed != null && !release.isNullOrEmpty() && release != installed && attempts < MAX_ATTEMPTS && + private const val SEEDED = "seeded" + + fun due(installed: String?, release: String?, attempts: Int, lastAt: Long = 0L, now: Long = lastAt + RETRY_MS, first: Boolean = false): Boolean = + (installed != null || first) && !release.isNullOrEmpty() && release != installed && attempts < MAX_ATTEMPTS && (attempts == 0 || now - lastAt !in 0 until RETRY_MS) fun key(appVersion: Int, release: String) = "$appVersion:$release" @@ -20,11 +22,17 @@ object RuntimeAutoUpdate { val key = key(BuildConfig.VERSION_CODE, release) synchronized(this) { val attempts = prefs.getInt(key, 0) - if (!due(installed, release, attempts, prefs.getLong("$key@at", 0L), now)) return false + val first = installed == null && !prefs.getBoolean(SEEDED, false) + if (!due(installed, release, attempts, prefs.getLong("$key@at", 0L), now, first)) return false val edit = prefs.edit() - prefs.all.keys.filterNot { it.startsWith("${BuildConfig.VERSION_CODE}:") }.forEach { edit.remove(it) } + prefs.all.keys.filterNot { it.startsWith("${BuildConfig.VERSION_CODE}:") || it == SEEDED }.forEach { edit.remove(it) } edit.putInt(key, attempts + 1).putLong("$key@at", now).apply() return true } } + + fun seed(context: Context) { + val prefs = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE) + if (!prefs.getBoolean(SEEDED, false)) prefs.edit().putBoolean(SEEDED, true).apply() + } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdater.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdater.kt new file mode 100644 index 0000000000..e428ede2a0 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdater.kt @@ -0,0 +1,312 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import android.util.AtomicFile +import android.util.Log +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.AutoComponents +import org.json.JSONArray +import org.json.JSONObject +import java.io.File + +object ComponentUpdater { + private const val TAG = "ComponentUpdater" + private const val CHECK_EVERY_MS = 3_600_000L + private const val BOOTED_KEPT = 200 + private val lock = Any() + private val io = Any() + + data class Status(val line: String, val current: String, val previous: String, val protons: List, val note: String) + + private fun file(context: Context) = File(File(context.filesDir, "components").apply { mkdirs() }, "updates.json") + + private fun load(context: Context): JSONObject = synchronized(io) { + runCatching { JSONObject(String(AtomicFile(file(context)).readFully(), Charsets.UTF_8)) }.getOrDefault(JSONObject()) + } + + private fun save(context: Context, state: JSONObject) { + synchronized(io) { + val atomic = AtomicFile(file(context)) + val output = runCatching { atomic.startWrite() }.onFailure { Log.w(TAG, "could not save", it) }.getOrNull() ?: return + try { + output.write(state.toString(1).toByteArray(Charsets.UTF_8)) + atomic.finishWrite(output) + } catch (error: Exception) { + atomic.failWrite(output) + Log.w(TAG, "could not save", error) + } + } + } + + private fun Map>.fileOf(p: ComponentsManager.Proton, comp: String): String? = + this[p.id]?.get(comp)?.takeIf { it.protonVersion == p.version }?.file + + private class Target(val comp: String, val p: ComponentsManager.Proton, val line: ComponentUpdates.Line, val ls: JSONObject) { + val key: String get() = line.key + } + + private fun JSONObject.obj(key: String): JSONObject = optJSONObject(key) ?: JSONObject().also { put(key, it) } + + private fun JSONArray?.strings(): Set = this?.let { a -> (0 until a.length()).map { a.optString(it) }.toSet() } ?: emptySet() + + private fun JSONObject.strings(key: String): Set = optJSONArray(key).strings() + + private fun JSONObject?.ints(): Map = this?.keys()?.asSequence()?.associateWith { optInt(it) } ?: emptyMap() + + private fun JSONObject?.texts(): Map = this?.keys()?.asSequence()?.associateWith { optString(it) } ?: emptyMap() + + fun settle(context: Context) { + val owned = load(context).optJSONObject("lines")?.let { lines -> lines.keys().asSequence().flatMap { lines.optJSONObject(it).strings("owned") }.toSet() } ?: emptySet() + val choices = ComponentsManager.activeChoices(context).values.flatMap { it.entries } + for (comp in ComponentsManager.COMPONENTS) { + if (SessionPrefs.componentModeChosen(context, comp)) continue + val manual = choices.any { (c, choice) -> c == comp && !choice.auto && choice.file !in owned && !choice.file.startsWith("original ") } + SessionPrefs.setComponentMode(context, comp, if (manual) ComponentUpdates.MANUAL else ComponentUpdates.AUTO) + } + } + + private fun managed(context: Context, comp: String): Boolean = + SessionPrefs.componentMode(context, comp) == ComponentUpdates.AUTO && !(comp == "dxvk" && ComponentsManager.hardwareDxvk(context)) + + private fun logLines(context: Context): Sequence { + val dir = ComponentsManager.steamLogs(context) + return sequenceOf("console_log.previous.txt", "console_log.txt").map { File(dir, it) }.filter { it.isFile } + .flatMap { f -> runCatching { f.readLines() }.getOrDefault(emptyList()).asSequence() } + } + + private val STAMP = Regex("""^\[(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d)]""") + + private fun latestStamp(context: Context): String = + logLines(context).mapNotNull { STAMP.find(it)?.groupValues?.get(1) }.maxOrNull() ?: "0" + + private fun lineOf(context: Context, state: JSONObject, p: ComponentsManager.Proton, comp: String): ComponentUpdates.Line? { + if (!ComponentsManager.supports(p, comp)) return null + if (comp == "fex") return ComponentUpdates.line("fex", false) + val key = "${p.id}|${p.version}" + val flavors = state.obj("flavors").obj(key) + val arm64ec = if (flavors.has(comp)) flavors.optBoolean(comp) else ComponentsManager.arm64ec(context, p, comp)?.also { flavors.put(comp, it) } + return arm64ec?.let { ComponentUpdates.line(comp, it) } + } + + fun ensure(context: Context, force: Boolean): List = synchronized(lock) { + if (SessionState.running) return emptyList() + settle(context) + val state = load(context) + val notes = ArrayList() + val protons = runCatching { ComponentsManager.protons(context) }.getOrDefault(emptyList()) + judge(context, state, protons, notes) + val due = force || System.currentTimeMillis() - state.optLong("checkedAt") >= CHECK_EVERY_MS + val wanted = ComponentsManager.COMPONENTS.filter { managed(context, it) } + if (wanted.isEmpty() || protons.isEmpty()) { + save(context, state) + return notes + } + try { + dropRemoved(state, protons) + val checked = due && check(context, state, protons, wanted, force, notes) + apply(context, state, protons, wanted, notes) + prune(context, state) + if (checked) state.put("checkedAt", System.currentTimeMillis()) + } finally { + save(context, state) + } + notes + } + + private fun check( + context: Context, state: JSONObject, protons: List, wanted: List, force: Boolean, notes: MutableList, + ): Boolean { + if (!AutoComponents.isOnline(context)) { + state.put("note", context.getString(R.string.comp_auto_waits_network)) + return false + } + val catalog = runCatching { ComponentsManager.catalog(context, true).items } + .onFailure { Log.w(TAG, "catalog", it) }.getOrDefault(emptyList()) + if (catalog.none { it.release == ComponentsManager.DD_NIGHTLY }) { + state.put("note", context.getString(R.string.comp_auto_check_failed)) + return false + } + val holdBack = !force && AutoComponents.constrained(context) + val lines = state.obj("lines") + var complete = true + state.remove("note") + for (comp in wanted) for (p in protons) { + val line = lineOf(context, state, p, comp) ?: continue + val ls = lines.obj(line.key) + if (rollingBack(ls)) { + complete = false + continue + } + val target = ComponentUpdates.pick(catalog, line, ls.strings("bad")) + if (target == null || ls.optString("current") == target.file) continue + val stored = ComponentsManager.isStored(context, target.file) + if (!stored) { + if (holdBack) { + state.put("note", context.getString(R.string.comp_auto_waits_unmetered)) + complete = false + continue + } + val got = runCatching { ComponentsManager.download(context, target) {} } + if (got.isFailure) { + Log.w(TAG, "download ${target.file}", got.exceptionOrNull()) + state.put("note", context.getString(R.string.comp_auto_check_failed)) + complete = false + continue + } + } + val stocks = protons.filter { lineOf(context, state, it, comp)?.key == line.key }.map { ComponentsManager.arm64x(context, it, comp) } + if (ComponentUpdates.needsArm64x(line, stocks) && !ComponentsManager.packageArm64x(context, target.file, comp)) { + Log.w(TAG, "${target.file} is not ARM64X like ${p.name}'s own ${line.key}; skipped") + ls.put("bad", JSONArray(ls.strings("bad") + target.file)) + if (!stored) runCatching { ComponentsManager.deletePackage(context, target.file) } + continue + } + ls.put("previous", ls.optString("current").ifEmpty { ComponentUpdates.ORIGINAL }) + .put("current", target.file).put("since", latestStamp(context)).put("failed", JSONObject()) + if (!stored) ls.put("owned", JSONArray(ls.strings("owned") + target.file)) + ls.remove("note") + notes += context.getString(R.string.comp_auto_updated, ComponentsManager.LABEL[comp], target.file.removeSuffix(".wcp")) + } + return complete + } + + private fun apply(context: Context, state: JSONObject, protons: List, wanted: List, notes: MutableList) { + val lines = state.obj("lines") + val targets = wanted.flatMap { comp -> + protons.mapNotNull { p -> lineOf(context, state, p, comp)?.let { line -> lines.optJSONObject(line.key)?.let { Target(comp, p, line, it) } } } + } + val choices = ComponentsManager.activeChoices(context) + for (t in targets) { + val from = t.ls.optJSONObject("restore")?.optString(t.p.id).orEmpty() + val current = t.ls.optString("current") + if (from.isNotEmpty()) { + if (choices.fileOf(t.p, t.comp) == from) runCatching { ComponentsManager.restore(context, t.p.id, t.comp, ComponentsManager.safeName(t.p.version)) } + .onFailure { Log.w(TAG, "restore ${t.p.name} ${t.key}", it) } + } else if (current.isNotEmpty() && choices.fileOf(t.p, t.comp) != current) { + if (ComponentUpdates.needsArm64x(t.line, listOf(ComponentsManager.arm64x(context, t.p, t.comp))) && + !ComponentsManager.packageArm64x(context, current, t.comp)) continue + runCatching { ComponentsManager.swap(context, t.p.id, current) }.onFailure { Log.w(TAG, "${t.p.name} ${t.key}", it) } + } + } + val after = ComponentsManager.activeChoices(context) + val unfinished = HashSet() + for (t in targets) { + val restore = t.ls.optJSONObject("restore") + val from = restore?.optString(t.p.id).orEmpty() + val current = t.ls.optString("current") + if (from.isNotEmpty()) { + if (after.fileOf(t.p, t.comp) == from) unfinished += t.key else restore?.remove(t.p.id) + } else if (current.isNotEmpty() && after.fileOf(t.p, t.comp) != current) { + unfinished += t.key + } + } + for (key in lines.keys().asSequence().toList()) { + val ls = lines.optJSONObject(key) ?: continue + val pending = ls.optString("pendingNote") + if (pending.isEmpty() || key in unfinished || (ls.optJSONObject("restore")?.length() ?: 0) > 0) continue + ls.remove("pendingNote") + ls.put("note", pending) + notes += pending + } + } + + internal fun dropRemoved(state: JSONObject, protons: List) { + val installed = protons.mapTo(HashSet()) { it.id } + val lines = state.optJSONObject("lines") ?: return + for (key in lines.keys().asSequence().toList()) { + val restore = lines.optJSONObject(key)?.optJSONObject("restore") ?: continue + for (id in restore.keys().asSequence().toList()) if (id !in installed) restore.remove(id) + } + } + + internal fun rollingBack(ls: JSONObject): Boolean = + (ls.optJSONObject("restore")?.length() ?: 0) > 0 || ls.optString("pendingNote").isNotEmpty() + + private fun judge(context: Context, state: JSONObject, protons: List, notes: MutableList) { + val mark = state.optString("logMark") + val runs = ComponentUpdates.launches(logLines(context), mark) + if (runs.isEmpty()) return + state.put("logMark", runs.maxOf { it.start }) + val byTool = protons.associateBy { it.dir.name } + val lines = state.obj("lines") + for (comp in ComponentsManager.COMPONENTS) { + val onLine = HashMap>() + for (run in runs) { + val p = byTool[run.tool] ?: continue + if (ComponentsManager.gameComponents(context, run.app).containsKey(comp)) continue + val line = lineOf(context, state, p, comp) ?: continue + onLine.getOrPut(line.key) { ArrayList() } += run + } + for ((key, list) in onLine) { + val ls = lines.obj(key) + val verdict = ComponentUpdates.judge(ComponentUpdates.Trial( + ls.optString("current"), ls.optString("previous"), ls.optString("since"), + ls.optJSONObject("booted").texts(), ls.optJSONObject("failed").ints(), + ), list) + ls.put("booted", JSONObject(verdict.booted.entries.toList().takeLast(BOOTED_KEPT).associate { it.key to it.value } as Map<*, *>)) + ls.put("failed", JSONObject(verdict.failed as Map<*, *>)) + if (verdict.rollBack && managed(context, comp)) rollBack(context, state, protons, comp, key, notes) + } + } + } + + private fun rollBack(context: Context, state: JSONObject, protons: List, comp: String, key: String, notes: MutableList) { + val ls = state.obj("lines").obj(key) + val bad = ls.optString("current") + val back = ls.optString("previous") + val choices = ComponentsManager.activeChoices(context) + val targets = protons.filter { lineOf(context, state, it, comp)?.key == key && choices.fileOf(it, comp) == bad } + for (p in targets) { + runCatching { + if (back == ComponentUpdates.ORIGINAL) ComponentsManager.restore(context, p.id, comp, ComponentsManager.safeName(p.version)) + else ComponentsManager.swap(context, p.id, back) + }.onFailure { Log.w(TAG, "roll back ${p.name} $key", it) } + } + val after = ComponentsManager.activeChoices(context) + val unfinished = targets.filter { after.fileOf(it, comp) == bad } + ls.put("bad", JSONArray(ls.strings("bad") + bad)).put("current", back).put("previous", ComponentUpdates.ORIGINAL) + .put("since", latestStamp(context)).put("failed", JSONObject()) + if (back == ComponentUpdates.ORIGINAL) ls.obj("restore").let { restore -> unfinished.forEach { restore.put(it.id, bad) } } + val label = ComponentsManager.LABEL[comp] + val shown = back.ifEmpty { context.getString(R.string.comp_tag_original) }.removeSuffix(".wcp") + val note = context.getString(R.string.comp_auto_rolled_back, label, bad.removeSuffix(".wcp"), shown) + Log.w(TAG, note) + if (unfinished.isNotEmpty()) { + ls.put("pendingNote", note) + return + } + ls.remove("pendingNote") + ls.put("note", note) + notes += note + prune(context, state) + } + + private fun prune(context: Context, state: JSONObject) { + val lines = state.obj("lines") + val selected = ComponentsManager.selectedPackages(context) + val keep = lines.keys().asSequence().flatMap { k -> + val ls = lines.optJSONObject(k) ?: return@flatMap emptySequence() + ComponentUpdates.keep(ls.optString("current"), ls.optString("previous"), selected).asSequence() + }.toSet() + for (k in lines.keys().asSequence().toList()) { + val ls = lines.optJSONObject(k) ?: continue + val owned = ls.strings("owned") + val gone = owned.filter { it !in keep && runCatching { ComponentsManager.deletePackage(context, it) }.isSuccess } + ls.put("owned", JSONArray(owned - gone.toSet())) + } + } + + fun status(context: Context, comp: String): List { + val state = load(context) + val lines = state.optJSONObject("lines") ?: JSONObject() + val protons = runCatching { ComponentsManager.protons(context) }.getOrDefault(emptyList()) + val byLine = protons.groupBy { lineOf(context, state, it, comp)?.key } + return ComponentUpdates.LINES.filter { it.comp == comp }.mapNotNull { line -> + val on = byLine[line.key].orEmpty() + val ls = lines.optJSONObject(line.key) + if (on.isEmpty() && ls == null) return@mapNotNull null + val note = ls?.optString("note").orEmpty().ifEmpty { state.optString("note") } + Status(line.key, ls?.optString("current").orEmpty(), ls?.optString("previous").orEmpty(), on.map { it.name }, note) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdates.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdates.kt new file mode 100644 index 0000000000..7acf29a4ec --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdates.kt @@ -0,0 +1,127 @@ +package com.droiddeck.launcher.session + +import java.nio.ByteBuffer +import java.nio.ByteOrder +import java.text.SimpleDateFormat +import java.util.Locale + +object ComponentUpdates { + const val AUTO = "auto" + const val MANUAL = "manual" + const val ORIGINAL = "" + const val BOOT_SECONDS = 30L + const val BOOTED_SECONDS = 60L + const val FAILED_BOOTS_BEFORE_ROLLBACK = 2 + + data class Line(val key: String, val comp: String, val prefix: String) + + val LINES = listOf( + Line("dxvk", "dxvk", "DD-dxvk-"), + Line("dxvk-arm64ec", "dxvk", "DD-dxvk-arm64ec-"), + Line("vkd3d", "vkd3d", "DD-vkd3d-proton-"), + Line("vkd3d-arm64ec", "vkd3d", "DD-vkd3d-proton-arm64ec-"), + Line("fex", "fex", "DD-FEXCore-"), + ) + + fun line(comp: String, arm64ec: Boolean): Line = LINES.first { + it.comp == comp && (comp == "fex" || it.key.endsWith("-arm64ec") == arm64ec) + } + + fun pick(items: List, line: Line, bad: Set): ComponentsManager.CatalogItem? { + val newestBad = bad.filter { belongs(it, line) }.maxWithOrNull { a, b -> ProtonExtras.compareVersions(a, b) } + return items.filter { it.release == ComponentsManager.DD_NIGHTLY && it.comp == line.comp && belongs(it.file, line) } + .filter { newestBad == null || ProtonExtras.compareVersions(it.file, newestBad) > 0 } + .maxWithOrNull { a, b -> ProtonExtras.compareVersions(a.file, b.file) } + } + + fun belongs(file: String, line: Line): Boolean = + file.startsWith(line.prefix) && file.removePrefix(line.prefix).firstOrNull()?.isDigit() == true + + fun arm64ec(pe: ByteArray): Boolean? = runCatching { + val b = ByteBuffer.wrap(pe).order(ByteOrder.LITTLE_ENDIAN) + val header = b.getInt(0x3c) + if (b.getInt(header) != 0x4550) return null + val sections = b.getShort(header + 6).toInt() and 0xffff + val optionalSize = b.getShort(header + 20).toInt() and 0xffff + val optional = header + 24 + if ((b.getShort(optional).toInt() and 0xffff) != 0x20b) return false + val loadConfigRva = b.getInt(optional + 112 + 10 * 8) + if (loadConfigRva == 0) return false + val table = optional + optionalSize + var offset = -1 + for (i in 0 until sections) { + val s = table + i * 40 + val size = b.getInt(s + 8) + val va = b.getInt(s + 12) + if (loadConfigRva >= va && loadConfigRva < va + maxOf(size, 1)) offset = b.getInt(s + 20) + loadConfigRva - va + } + if (offset < 0) return null + b.getInt(offset) >= 0xC8 + 8 && b.getLong(offset + 0xC8) != 0L + }.getOrNull() + + fun arm64x(pe: ByteArray): Boolean = runCatching { + val b = ByteBuffer.wrap(pe).order(ByteOrder.LITTLE_ENDIAN) + val header = b.getInt(0x3c) + b.getInt(header) == 0x4550 && (b.getShort(header + 4).toInt() and 0xffff) == 0xaa64 && arm64ec(pe) == true + }.getOrDefault(false) + + fun needsArm64x(line: Line, stocks: List): Boolean = + line.key.endsWith("-arm64ec") && stocks.any { it != false } + + data class Launch(val app: String, val tool: String, val start: String, val seconds: Long) + + private val PROCESS = Regex("""^\[(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d)] Game process (added|removed)\s*: AppID (\d+)(?: "(.*))?""") + private val TOOL = Regex("""compatibilitytools\.d/([^/'"]+)['"]?/|steamapps/common/([^/'"]+)['"]?/proton""") + + fun launches(log: Sequence, after: String): List { + val format = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US) + val open = HashMap>() + val out = ArrayList() + for (line in log) { + val m = PROCESS.find(line) ?: continue + val (time, what, app) = m.destructured + if (time <= after) continue + if (what == "added") { + val tool = TOOL.find(m.groupValues[4])?.let { t -> t.groupValues[1].ifEmpty { t.groupValues[2] } } ?: continue + open[app] = time to tool + } else { + val (start, tool) = open.remove(app) ?: continue + val seconds = runCatching { (format.parse(time)!!.time - format.parse(start)!!.time) / 1000 }.getOrNull() ?: continue + out += Launch(app, tool, start, seconds) + } + } + return out + } + + data class Trial( + val current: String, + val previous: String, + val since: String, + val booted: Map, + val failed: Map, + ) + + data class Verdict(val booted: Map, val failed: Map, val rollBack: Boolean) + + fun judge(trial: Trial, runs: List): Verdict { + val booted = trial.booted.toMutableMap() + val failed = trial.failed.toMutableMap() + var rollBack = false + for (run in runs) { + val build = if (trial.since.isNotEmpty() && run.start > trial.since) trial.current else trial.previous + if (run.seconds >= BOOTED_SECONDS) { + booted[run.app] = build + if (build == trial.current) failed.remove(run.app) + } else if (run.seconds < BOOT_SECONDS && build == trial.current && trial.current != trial.previous && + booted[run.app] == trial.previous) { + val n = (failed[run.app] ?: 0) + 1 + failed[run.app] = n + if (n >= FAILED_BOOTS_BEFORE_ROLLBACK) rollBack = true + } + } + return Verdict(booted, failed, rollBack) + } + + fun keep(current: String, previous: String, selected: Set): Set = + (setOf(current, previous) + selected) - ORIGINAL +} 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 df5db5eb64..edc68aea3d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -84,6 +84,7 @@ object ComponentsManager { private fun root(context: Context) = LinuxRuntime.rootDir(context) private fun steam(context: Context) = File(root(context), "root/.local/share/Steam") + fun steamLogs(context: Context) = File(steam(context), "logs") private fun host(context: Context, guest: String) = File(root(context), guest.removePrefix("/")) private fun dataDir(context: Context) = File(context.filesDir, "components").apply { mkdirs() } private fun packagesDir(context: Context) = File(dataDir(context), "packages").apply { mkdirs() } @@ -1031,6 +1032,78 @@ object ComponentsManager { ForcedPackage(setOf(GpuInfo.Family.A6XX), "dxvk", "dxvk-2.7.1-linux.wcp", "Dxvk-Linux"), ) + private val ARM64EC_PROBE = mapOf("dxvk" to "d3d11.dll", "vkd3d" to "d3d12.dll") + + fun arm64ec(context: Context, p: Proton, comp: String): Boolean? = stockProbe(context, p, comp)?.let(ComponentUpdates::arm64ec) + + fun arm64x(context: Context, p: Proton, comp: String): Boolean? = stockProbe(context, p, comp)?.let(ComponentUpdates::arm64x) + + fun packageArm64x(context: Context, file: String, comp: String): Boolean { + val rel = "${COMP_DIR[comp] ?: return false}/aarch64-windows/${ARM64EC_PROBE.getValue(comp)}" + val f = File(packagesDir(context), safeName(file)).takeIf { it.isFile } ?: return false + return runCatching { readWcpEntry(f, rel) }.getOrNull()?.let(ComponentUpdates::arm64x) == true + } + + private fun readWcpEntry(f: File, rel: String): ByteArray? = readWcp(f) { tar -> + var found: ByteArray? = null + while (found == null) { + val e = tar.nextTarEntry ?: break + if (!e.isDirectory && normalize(e.name) == rel) found = tar.readBytes() + } + found + } + + private fun stockProbe(context: Context, p: Proton, comp: String): ByteArray? { + val rel = "${COMP_DIR[comp] ?: return null}/aarch64-windows/${ARM64EC_PROBE.getValue(comp)}" + val original = synchronized(lock) { + val swapped = loadState(context).optJSONObject("active")?.optJSONObject(p.id)?.optJSONObject(comp) + ?.let { liveSelection("active", it, p) } == true + if (!swapped) return File(p.dir, rel).takeIf { it.isFile }?.let { runCatching { it.readBytes() }.getOrNull() } + originalFile(context, p, comp).takeIf { it.isFile } ?: return null + } + return runCatching { readWcpEntry(original, rel) }.getOrNull() + } + + fun supports(p: Proton, comp: String): Boolean = + if (comp == "fex") File(p.dir, FEX_FILES.first()).isFile else File(p.dir, "${COMP_DIR.getValue(comp)}/aarch64-windows").isDirectory + + fun hardwareDxvk(context: Context): Boolean = + runtimeManaged(context, "dxvk") || FORCED_PACKAGES.any { it.comp == "dxvk" && it.matches(GpuInfo.detect()) } || + (com.droiddeck.launcher.core.DeviceSupport.vkBridge(context) && !SessionPrefs.bridgeProtonDxvk(context) && + bridgeDxvk(AppVulkan.detect(context)) != null) + + data class Choice(val file: String, val auto: Boolean, val protonVersion: String) + + fun activeChoices(context: Context): Map> = synchronized(lock) { + val active = loadState(context).optJSONObject("active") ?: return emptyMap() + active.keys().asSequence().toList().associateWith { pid -> + val comps = active.optJSONObject(pid) ?: JSONObject() + comps.keys().asSequence().toList().mapNotNull { c -> + comps.optJSONObject(c)?.let { c to Choice(it.optString("file"), it.optBoolean("auto"), it.optString("protonVersion")) } + }.toMap() + } + } + + fun selectedPackages(context: Context): Set = synchronized(lock) { + val state = loadState(context) + buildSet { + for (key in listOf("active", "queued")) { + val byProton = state.optJSONObject(key) ?: continue + for (pid in byProton.keys()) { + val comps = byProton.optJSONObject(pid) ?: continue + for (c in comps.keys()) comps.optJSONObject(c)?.optString("file")?.takeIf(String::isNotEmpty)?.let(::add) + } + } + val profiles = state.optJSONObject("profiles") + profiles?.keys()?.forEach { scope -> + val profile = profiles.optJSONObject(scope) ?: return@forEach + for (c in COMPONENTS) profile.optString(c).takeIf(String::isNotEmpty)?.let(::add) + } + } + } + + fun isStored(context: Context, file: String): Boolean = File(packagesDir(context), safeName(file)).isFile + internal fun forcedPackageWanted(activeFile: String?, protonVersionMatches: Boolean): Boolean = activeFile.isNullOrEmpty() || !protonVersionMatches 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 9c314ade25..2abf094c0f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -508,6 +508,17 @@ object SessionPrefs { prefs(context).edit().putString("gpuDriverMode", mode).apply() } + fun componentMode(context: Context, comp: String): String = + prefs(context).getString("componentMode.$comp", ComponentUpdates.AUTO) + ?.takeIf { it == ComponentUpdates.AUTO || it == ComponentUpdates.MANUAL } ?: ComponentUpdates.AUTO + + fun componentModeChosen(context: Context, comp: String): Boolean = prefs(context).contains("componentMode.$comp") + + fun setComponentMode(context: Context, comp: String, mode: String) { + require(mode == ComponentUpdates.AUTO || mode == ComponentUpdates.MANUAL) + prefs(context).edit().putString("componentMode.$comp", mode).commit() + } + fun settleGpuDriverMode(context: Context) { val p = prefs(context) if (p.contains("gpuDriverMode")) return 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 f315c1e1a6..df74d80544 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -30,7 +30,7 @@ object SettingsReset { ) internal val SESSION_PREFIXES = listOf( - "resolutionCap.", "displayResolution.", "customRes.", "hdr.", "fpsLimit.", "performanceMode.", "suspendPolicy.", + "resolutionCap.", "displayResolution.", "customRes.", "hdr.", "fpsLimit.", "performanceMode.", "suspendPolicy.", "componentMode.", ) private val STEAM_TOUCH_KEYS = listOf("feedback", "autoFade", "gyro", "shake") 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 43f613486d..3746a32dee 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt @@ -81,6 +81,8 @@ 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.session.ComponentUpdater +import com.droiddeck.launcher.session.ComponentUpdates import com.droiddeck.launcher.session.ComponentsManager import com.droiddeck.launcher.session.ComponentsManager.CatalogItem import com.droiddeck.launcher.session.ComponentsManager.Snapshot @@ -163,6 +165,11 @@ fun ComponentsPage( protons: ProtonsState = ProtonsState(), protonActions: ProtonsActions = ProtonsActions(), protonOptions: @Composable () -> Unit = {}, + compModes: Map = emptyMap(), + compAuto: Map> = emptyMap(), + compAutoHeld: Set = emptySet(), + compAutoChecking: Boolean = false, + onCompMode: (String, String) -> Unit = { _, _ -> }, ) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current @@ -521,6 +528,8 @@ fun ComponentsPage( else -> stringResource(R.string.comp_nightlies_count, availableRows(l, catalog, snapshot).size) } } + val moded: (String) -> Boolean = { it in compModes && it !in compAutoHeld && !ComponentsManager.runtimeManaged(it, gpu.systemPowerVr) } + val automatic: (String) -> Boolean = { moded(it) && compModes[it] == ComponentUpdates.AUTO } val installedRows: @Composable ColumnScope.(String, Boolean) -> Unit = { l, right -> when (l) { PROTON_TAB -> { @@ -535,7 +544,7 @@ fun ComponentsPage( (if (swaps > 0) stringResource(R.string.comp_swapped, v.proton.version, swaps) else stringResource(R.string.comp_all_original, v.proton.version)) .let { if (v.inUseByGame) stringResource(R.string.comp_game_running_suffix, it) else it }, v.proton.id == view?.proton?.id, removable = removable, - modifier = (if (i == 0) Modifier.focusRequester(firstRow) else Modifier).trackRow(key, rowsAt), + 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) { @@ -555,7 +564,7 @@ fun ComponentsPage( val key = "row:$l:${item.file ?: item.protonVersion}" ChoiceLine( item.name, item.detail, item.selected, item.removable, tag = item.tag, enabled = !managedDxvk, - modifier = (if (i == 0 && !managedDxvk) Modifier.focusRequester(firstRow) else Modifier).trackRow(key, rowsAt), + modifier = (if (i == 0 && !managedDxvk && !moded(l)) Modifier.focusRequester(firstRow) else Modifier).trackRow(key, rowsAt), onSelect = { if (managedDxvk || item.selected || p == null) return@ChoiceLine val waits = if (view.inUseByGame) ctx.getString(R.string.comp_waits_long) else ctx.getString(R.string.comp_applies_long) @@ -680,15 +689,31 @@ fun ComponentsPage( label = "layerRows", ) { k -> body(k) } } - if (single) { - slide { k -> RowGroup(installedTitle(k)) { installedRows(k, false) } } - Spacer(Modifier.height(12.dp)) - slide { k -> RowGroup(availableTitle(k)) { availableRows(k) } } - } else Row(horizontalArrangement = Arrangement.spacedBy(14.dp), verticalAlignment = Alignment.Top) { - Column(Modifier.weight(1f)) { slide { k -> RowGroup(installedTitle(k)) { installedRows(k, false) } } } - Column(Modifier.weight(1f)) { slide { k -> RowGroup(availableTitle(k)) { availableRows(k) } } } + if (moded(l)) slide { k -> + if (moded(k)) Column(verticalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.padding(bottom = 14.dp)) { + PanelHeading(stringResource(R.string.comp_mode_title)) + ModeChoices( + listOf( + Triple(ComponentUpdates.AUTO, R.string.common_auto, R.string.comp_mode_auto_detail), + Triple(ComponentUpdates.MANUAL, R.string.drivers_manual, R.string.comp_mode_manual_detail), + ), + if (automatic(k)) ComponentUpdates.AUTO else ComponentUpdates.MANUAL, single, firstRow, + onPick = { onCompMode(k, it) }, + ) + if (automatic(k)) AutoComponentBody(ComponentsManager.LABEL[k] ?: k, compAuto[k].orEmpty(), compAutoChecking) + } + } + if (!automatic(l)) { + if (single) { + slide { k -> RowGroup(installedTitle(k)) { installedRows(k, false) } } + Spacer(Modifier.height(12.dp)) + slide { k -> RowGroup(availableTitle(k)) { availableRows(k) } } + } else Row(horizontalArrangement = Arrangement.spacedBy(14.dp), verticalAlignment = Alignment.Top) { + Column(Modifier.weight(1f)) { slide { k -> RowGroup(installedTitle(k)) { installedRows(k, false) } } } + Column(Modifier.weight(1f)) { slide { k -> RowGroup(availableTitle(k)) { availableRows(k) } } } + } + Box(Modifier.padding(top = 14.dp)) { slide { k -> actions(k) } } } - Box(Modifier.padding(top = 14.dp)) { slide { k -> actions(k) } } if (l == "fex") { SettingsGroup(stringResource(R.string.fex_preset_title)) { SettingsRow(stringResource(R.string.fex_preset_title), null) { @@ -1078,6 +1103,25 @@ private fun RowGroup(title: String, content: @Composable ColumnScope.() -> Unit) } } +@Composable +private fun AutoComponentBody(label: String, lines: List, checking: Boolean) { + val colors = MaterialTheme.colorScheme + Column(verticalArrangement = Arrangement.spacedBy(10.dp)) { + PanelTitle(stringResource(R.string.comp_auto_title, label), stringResource(R.string.comp_auto_hint)) + if (lines.isEmpty()) EmptyLine(stringResource(R.string.comp_auto_none)) + for (line in lines) { + val previous = line.previous.removeSuffix(".wcp").ifEmpty { stringResource(R.string.comp_tag_original) } + val fallback = if (line.current.isEmpty()) null else stringResource(R.string.comp_auto_fallback, previous) + PanelRow( + line.current.removeSuffix(".wcp").ifEmpty { stringResource(if (checking) R.string.comp_auto_checking else R.string.comp_tag_original) }, + listOfNotNull(line.protons.joinToString(", ").ifEmpty { null }, fallback).joinToString(" · "), + selected = true, onClick = null, + ) + } + lines.map { it.note }.filter { it.isNotEmpty() }.distinct().forEach { Text(it, fontSize = 13.sp, color = colors.onSurfaceVariant) } + } +} + @Composable private fun EmptyLine(text: String) { Text(text, fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(horizontal = 14.dp, vertical = 12.dp)) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt index f0df5a2209..823c065aa6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt @@ -250,18 +250,8 @@ internal fun GpuDriversBody( Triple(GPU_MODE_PAIR, R.string.gpu_mode_pair, R.string.gpu_mode_pair_detail), Triple(GPU_MODE_MIX, R.string.gpu_mode_mix, R.string.gpu_mode_mix_detail), ) - val choice: @Composable (Int, Modifier) -> Unit = { i, mod -> - val (id, title, detail) = modes[i] - PanelRow( - stringResource(title), stringResource(detail), gpu.mode == id, - modifier = mod.then(if (gpu.mode == id) Modifier.focusRequester(first) else Modifier) - .then(if (i == 0) Modifier.onGloballyPositioned { placed[1] = it }.onFocusChanged { if (it.isFocused) revealCard() } else Modifier), - onClick = { if (gpu.mode != id) actions.onMode(id) }, - ) - } - if (single) Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { modes.indices.forEach { choice(it, Modifier) } } - else Row(horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Min)) { - modes.indices.forEach { choice(it, Modifier.weight(1f).fillMaxHeight()) } + ModeChoices(modes, gpu.mode, single, first, onPick = actions.onMode) { i -> + if (i == 0) Modifier.onGloballyPositioned { placed[1] = it }.onFocusChanged { if (it.isFocused) revealCard() } else Modifier } when (gpu.mode) { GPU_MODE_AUTO -> AutoBody(gpu, actions) @@ -439,12 +429,35 @@ internal const val SLOT_DISPLAY = "panel" internal const val SLOT_RUNTIME = "rt" @Composable -private fun PanelHeading(text: String) { +internal fun ModeChoices( + modes: List>, + selected: String, + single: Boolean, + first: FocusRequester, + onPick: (String) -> Unit, + extra: (Int) -> Modifier = { Modifier }, +) { + val choice: @Composable (Int, Modifier) -> Unit = { i, mod -> + val (id, title, detail) = modes[i] + PanelRow( + stringResource(title), stringResource(detail), selected == id, + modifier = mod.then(if (selected == id) Modifier.focusRequester(first) else Modifier).then(extra(i)), + onClick = { if (selected != id) onPick(id) }, + ) + } + if (single) Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { modes.indices.forEach { choice(it, Modifier) } } + else Row(horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Min)) { + modes.indices.forEach { choice(it, Modifier.weight(1f).fillMaxHeight()) } + } +} + +@Composable +internal fun PanelHeading(text: String) { Text(text.uppercase(), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.5.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) } @Composable -private fun PanelTitle(title: String, hint: String) { +internal fun PanelTitle(title: String, hint: String) { Column(verticalArrangement = Arrangement.spacedBy(3.dp), modifier = Modifier.padding(top = 4.dp)) { Text(title, fontSize = 18.sp, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground) Text(hint, fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) @@ -461,7 +474,7 @@ private fun Pill(text: String, fill: Color, ink: Color) { } @Composable -private fun PanelRow( +internal fun PanelRow( title: String, detail: String, selected: Boolean, diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 5b1426b750..c552295915 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -564,6 +564,19 @@ قيد الاستخدام جديد مخزّن + كيفية اختيار الإصدارات + أحدث إصدار من DroidDeck، محدّث دائمًا + اختر الإصدارات وثبّتها بنفسك + يُبقي Auto ‏%1$s محدّثًا + تُثبَّت الإصدارات الجديدة في الخلفية. إذا أُغلقت لعبة كانت تعمل خلال ثوانٍ مرتين، يعود Auto إلى الإصدار الذي كان يعمل. + الاحتياطي: %1$s + جارٍ البحث عن إصدارات… + لا يستخدمه أي Proton مثبّت + تنتظر تحديثات Auto اتصالًا. + تعذّر البحث عن إصدارات جديدة. + تنتظر الإصدارات الجديدة اتصالًا غير محدود، وإيقاف توفير البطارية، وجهازًا غير ساخن. + تم تحديث %1$s إلى %2$s. + أغلق %1$s %2$s لعبة خلال ثوانٍ مرتين، لذا عاد Auto إلى %3$s. الأداء أنوية CPU وإصلاحات الجلسة واسم المضيف. يُطبَّق في الجلسة التالية. أنوية عميل Steam 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 4b54a8daa2..32d66b003d 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -558,6 +558,19 @@ En uso Nuevo Guardado + Cómo se eligen las versiones + Versión más reciente de DroidDeck, siempre al día + Elige e instala las versiones tú mismo + Auto mantiene %1$s al día + Las nuevas versiones se instalan en segundo plano. Si un juego que funcionaba se cierra en segundos dos veces, Auto vuelve a la versión que funcionaba. + Respaldo: %1$s + Buscando versiones… + Ningún Proton instalado lo usa + Las actualizaciones Auto esperan una conexión. + No se pudieron buscar nuevas versiones. + Las nuevas versiones esperan una conexión sin límite de datos, el ahorro de batería desactivado y el dispositivo frío. + %1$s actualizado a %2$s. + %1$s %2$s cerró un juego en segundos dos veces, así que Auto volvió a %3$s. Rendimiento Núcleos de CPU, correcciones de sesión y nombre del host. Se aplica en la próxima sesión. Núcleos del cliente de Steam diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index f3cadc899b..5c961b0336 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -556,6 +556,19 @@ В употреба Ново Запазено + Как се избират версиите + Най-новата версия на DroidDeck, винаги актуална + Избирайте и инсталирайте версии сами + Auto поддържа %1$s актуален + Новите версии се инсталират във фонов режим. Ако игра, която е работила, се затвори до секунди два пъти, Auto се връща към работещата версия. + Резервна: %1$s + Търсене на версии… + Нито един инсталиран Proton не го използва + Актуализациите Auto чакат връзка. + Новите версии не можаха да бъдат проверени. + Новите версии чакат неотчитана връзка, изключен режим за пестене на батерията и охладено устройство. + %1$s е обновен до %2$s. + %1$s %2$s два пъти затвори игра до секунди, затова Auto се върна към %3$s. Производителност CPU ядра, корекции на сесията и името на хоста. Прилага се от следващата сесия. Ядра за клиента на Steam diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index c6e35ae37a..5eb8849f47 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -560,6 +560,19 @@ Používá se Nové Uloženo + Jak se vybírají sestavení + Nejnovější sestavení DroidDeck, stále aktuální + Vyberte a instalujte sestavení sami + Auto udržuje %1$s aktuální + Nová sestavení se instalují na pozadí. Pokud se hra, která dřív fungovala, dvakrát zavře během pár sekund, Auto se vrátí k funkčnímu sestavení. + Záložní: %1$s + Hledání sestavení… + Žádný nainstalovaný Proton to nepoužívá + Aktualizace Auto čekají na připojení. + Nová sestavení nelze zkontrolovat. + Nová sestavení čekají na neměřené připojení, vypnutou úsporu baterie a nepřehřáté zařízení. + %1$s aktualizováno na %2$s. + %1$s %2$s dvakrát zavřelo hru během pár sekund, proto se Auto vrátilo k %3$s. Výkon Jádra CPU, opravy relace a název hostitele. Použije se od příští relace. Jádra pro klienta Steam diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index e93dd58db8..2048de93e7 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -556,6 +556,19 @@ I brug Ny Gemt + Sådan vælges builds + Nyeste DroidDeck-build, altid opdateret + Vælg og installer builds selv + Auto holder %1$s opdateret + Nye builds installeres i baggrunden. Hvis et spil, der virkede før, lukker inden for sekunder to gange, går Auto tilbage til det build, der virkede. + Reserve: %1$s + Søger efter builds… + Ingen installeret Proton bruger dette + Auto-opdateringer venter på en forbindelse. + Kunne ikke søge efter nye builds. + Nye builds venter på en ubegrænset forbindelse, slået batterisparer fra og en kølig enhed. + %1$s opdateret til %2$s. + %1$s %2$s lukkede et spil inden for sekunder to gange, så Auto gik tilbage til %3$s. Ydelse CPU-kerner, sessionsrettelser og værtsnavn. Gælder fra næste session. Steam-klientens kerner diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e00048becf..ae04fc0d9c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -556,6 +556,19 @@ In Verwendung Neu Gespeichert + Wie Builds gewählt werden + Neuester DroidDeck-Build, stets aktuell + Builds selbst auswählen und installieren + Auto hält %1$s aktuell + Neue Builds werden im Hintergrund installiert. Schließt sich ein Spiel, das vorher lief, zweimal nach wenigen Sekunden, kehrt Auto zum funktionierenden Build zurück. + Ausweich-Build: %1$s + Suche nach Builds… + Kein installiertes Proton nutzt dies + Auto-Updates warten auf eine Verbindung. + Neue Builds konnten nicht geprüft werden. + Neue Builds warten auf eine nicht getaktete Verbindung, ausgeschalteten Energiesparmodus und ein kühles Gerät. + %1$s auf %2$s aktualisiert. + %1$s %2$s hat ein Spiel zweimal nach wenigen Sekunden beendet, daher ist Auto zu %3$s zurückgekehrt. Leistung CPU-Kerne, Sitzungskorrekturen und der Hostname. Gilt ab der nächsten Sitzung. Steam-Client-Kerne diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 8c1f1f43ff..8d7be5031f 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -556,6 +556,19 @@ Σε χρήση Νέο Αποθηκευμένο + Πώς επιλέγονται οι εκδόσεις + Νεότερη έκδοση DroidDeck, πάντα ενημερωμένη + Επιλέξτε και εγκαταστήστε εκδόσεις μόνοι σας + Το Auto κρατά το %1$s ενημερωμένο + Οι νέες εκδόσεις εγκαθίστανται στο παρασκήνιο. Αν ένα παιχνίδι που λειτουργούσε κλείσει μέσα σε δευτερόλεπτα δύο φορές, το Auto επιστρέφει στην έκδοση που λειτουργούσε. + Εφεδρική: %1$s + Αναζήτηση εκδόσεων… + Κανένα εγκατεστημένο Proton δεν το χρησιμοποιεί + Οι ενημερώσεις Auto περιμένουν σύνδεση. + Δεν ήταν δυνατός ο έλεγχος για νέες εκδόσεις. + Οι νέες εκδόσεις περιμένουν σύνδεση χωρίς όριο δεδομένων, απενεργοποιημένη εξοικονόμηση μπαταρίας και δροσερή συσκευή. + Το %1$s ενημερώθηκε σε %2$s. + Το %1$s %2$s έκλεισε ένα παιχνίδι μέσα σε δευτερόλεπτα δύο φορές, οπότε το Auto επέστρεψε στο %3$s. Απόδοση Πυρήνες CPU, διορθώσεις συνεδρίας και το όνομα κεντρικού υπολογιστή. Εφαρμόζεται στην επόμενη συνεδρία. Πυρήνες πελάτη Steam diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 52be78eafb..3ac7f5a9cf 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -558,6 +558,19 @@ En uso Nuevo Guardado + Cómo se eligen las versiones + Versión más reciente de DroidDeck, siempre al día + Elige e instala las versiones tú mismo + Auto mantiene %1$s al día + Las nuevas versiones se instalan en segundo plano. Si un juego que funcionaba se cierra en segundos dos veces, Auto vuelve a la versión que funcionaba. + Respaldo: %1$s + Buscando versiones… + Ningún Proton instalado lo usa + Las actualizaciones Auto esperan una conexión. + No se pudieron buscar nuevas versiones. + Las nuevas versiones esperan una conexión sin límite de datos, el ahorro de batería desactivado y el dispositivo frío. + %1$s actualizado a %2$s. + %1$s %2$s cerró un juego en segundos dos veces, así que Auto volvió a %3$s. Rendimiento Núcleos de CPU, correcciones de sesión y nombre del host. Se aplica en la próxima sesión. Núcleos del cliente de Steam diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index a413c8d9ac..c2a8c24cc6 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -556,6 +556,19 @@ Käytössä Uusi Tallennettu + Miten versiot valitaan + Uusin DroidDeck-versio, aina ajan tasalla + Valitse ja asenna versiot itse + Auto pitää %1$s ajan tasalla + Uudet versiot asentuvat taustalla. Jos aiemmin toiminut peli sulkeutuu sekunneissa kahdesti, Auto palaa toimineeseen versioon. + Varaversio: %1$s + Haetaan versioita… + Mikään asennettu Proton ei käytä tätä + Auto-päivitykset odottavat yhteyttä. + Uusia versioita ei voitu tarkistaa. + Uudet versiot odottavat rajoittamatonta yhteyttä, virransäästön poistoa ja viileää laitetta. + %1$s päivitetty versioon %2$s. + %1$s %2$s sulki pelin sekunneissa kahdesti, joten Auto palasi versioon %3$s. Suorituskyky CPU-ytimet, istunnon korjaukset ja isäntänimi. Tulee voimaan seuraavassa istunnossa. Steam-asiakasohjelman ytimet diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5009c3e5a6..1b8ff67fbe 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -558,6 +558,19 @@ Utilisé Nouveau Enregistré + Choix des versions + Dernière version DroidDeck, toujours à jour + Choisir et installer les versions vous-même + Auto garde %1$s à jour + Les nouvelles versions s\'installent en arrière-plan. Si un jeu qui fonctionnait se ferme deux fois en quelques secondes, Auto revient à la version qui fonctionnait. + Secours : %1$s + Recherche de versions… + Aucun Proton installé ne l\'utilise + Les mises à jour Auto attendent une connexion. + Impossible de vérifier les nouvelles versions. + Les nouvelles versions attendent une connexion non limitée, l\'économiseur de batterie désactivé et un appareil frais. + %1$s mis à jour vers %2$s. + %1$s %2$s a fermé un jeu en quelques secondes deux fois, Auto est donc revenu à %3$s. Performance Cœurs CPU, correctifs de session et nom d\'hôte. Prendra effet à la prochaine session. Cœurs du client Steam diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index edf039eeba..3bae590a2d 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -556,6 +556,19 @@ उपयोग में नया सेव है + बिल्ड कैसे चुने जाते हैं + सबसे नया DroidDeck बिल्ड, हमेशा अपडेट + बिल्ड खुद चुनें और इंस्टॉल करें + Auto %1$s को अपडेट रखता है + नए बिल्ड बैकग्राउंड में इंस्टॉल होते हैं। अगर पहले चलने वाला गेम दो बार कुछ सेकंड में बंद हो जाए, तो Auto काम करने वाले बिल्ड पर लौट जाता है। + फ़ॉलबैक: %1$s + बिल्ड खोजे जा रहे हैं… + कोई इंस्टॉल Proton इसका उपयोग नहीं करता + Auto अपडेट कनेक्शन का इंतज़ार कर रहे हैं। + नए बिल्ड नहीं जाँचे जा सके। + नए बिल्ड बिना सीमा वाले कनेक्शन, बंद बैटरी सेवर और ठंडे डिवाइस का इंतज़ार करते हैं। + %1$s को %2$s पर अपडेट किया गया। + %1$s %2$s ने दो बार कुछ सेकंड में गेम बंद कर दिया, इसलिए Auto %3$s पर लौट गया। परफ़ॉर्मेंस CPU कोर, सेशन फ़िक्स और होस्ट नाम। अगले सेशन से लागू होता है। Steam क्लाइंट कोर diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 0ac1a8beca..3d560663ad 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -556,6 +556,19 @@ Használatban Új Tárolva + Hogyan választódnak a buildek + Legújabb DroidDeck build, mindig naprakész + Buildek kiválasztása és telepítése saját kézzel + Az Auto naprakészen tartja: %1$s + Az új buildek a háttérben települnek. Ha egy korábban működő játék kétszer is másodperceken belül bezárul, az Auto visszaáll a működő buildre. + Tartalék: %1$s + Buildek keresése… + Egyik telepített Proton sem használja + Az Auto frissítések kapcsolatra várnak. + Nem sikerült új buildeket keresni. + Az új buildek nem forgalomkorlátos kapcsolatra, kikapcsolt energiatakarékos módra és hűvös eszközre várnak. + %1$s frissítve: %2$s. + %1$s %2$s kétszer is másodperceken belül bezárt egy játékot, ezért az Auto visszaállt erre: %3$s. Teljesítmény CPU-magok, munkamenet-javítások és a hosztnév. A következő munkamenettől érvényes. Steam-kliens magok diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index a2db31f53e..f7b605249a 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -554,6 +554,19 @@ Digunakan Baru Tersimpan + Cara build dipilih + Build DroidDeck terbaru, selalu mutakhir + Pilih dan pasang build sendiri + Auto menjaga %1$s tetap mutakhir + Build baru dipasang di latar belakang. Jika game yang sebelumnya berjalan tertutup dalam hitungan detik dua kali, Auto kembali ke build yang berfungsi. + Cadangan: %1$s + Mencari build… + Tidak ada Proton terpasang yang memakainya + Pembaruan Auto menunggu koneksi. + Tidak dapat memeriksa build baru. + Build baru menunggu koneksi tanpa kuota, penghemat baterai mati, dan perangkat yang dingin. + %1$s diperbarui ke %2$s. + %1$s %2$s menutup game dalam hitungan detik dua kali, jadi Auto kembali ke %3$s. Performa Core CPU, perbaikan sesi, dan nama host. Berlaku pada sesi berikutnya. Core klien Steam diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d3d5045a05..0aa5bccc70 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -558,6 +558,19 @@ In uso Nuovo Salvato + Come vengono scelte le build + Build DroidDeck più recente, sempre aggiornata + Scegli e installa tu le build + Auto mantiene aggiornato %1$s + Le nuove build si installano in background. Se un gioco che funzionava si chiude in pochi secondi per due volte, Auto torna alla build che funzionava. + Riserva: %1$s + Ricerca build… + Nessun Proton installato lo usa + Gli aggiornamenti Auto attendono una connessione. + Impossibile cercare nuove build. + Le nuove build attendono una connessione non a consumo, il risparmio batteria disattivato e un dispositivo fresco. + %1$s aggiornato a %2$s. + %1$s %2$s ha chiuso un gioco in pochi secondi per due volte, quindi Auto è tornato a %3$s. Prestazioni Core della CPU, correzioni della sessione e nome host. Si applica dalla prossima sessione. Core del client Steam diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 7c959249fa..ba0c4cb1a0 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -554,6 +554,19 @@ 使用中 新規 保存済み + ビルドの選び方 + 最新の DroidDeck ビルドを常に維持 + ビルドを自分で選んでインストール + Auto が %1$s を最新に保ちます + 新しいビルドはバックグラウンドでインストールされます。以前動いていたゲームが数秒で 2 回終了した場合、Auto は動作していたビルドに戻します。 + 予備: %1$s + ビルドを確認中… + これを使うインストール済み Proton はありません + Auto 更新は接続を待っています。 + 新しいビルドを確認できませんでした。 + 新しいビルドは従量制でない接続、バッテリーセーバーのオフ、端末が熱くない状態を待ちます。 + %1$s を %2$s に更新しました。 + %1$s %2$s でゲームが数秒で 2 回終了したため、Auto は %3$s に戻しました。 パフォーマンス CPUコア、セッション修正、ホスト名。次回のセッションで有効になります。 Steamクライアントコア diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 3ecd46598f..b3a368777a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -554,6 +554,19 @@ 사용 중 신규 저장됨 + 빌드 선택 방식 + 최신 DroidDeck 빌드, 항상 최신 유지 + 빌드를 직접 선택하고 설치 + Auto가 %1$s을(를) 최신으로 유지합니다 + 새 빌드는 백그라운드에서 설치됩니다. 이전에 실행되던 게임이 몇 초 만에 두 번 종료되면 Auto가 작동하던 빌드로 되돌립니다. + 대체: %1$s + 빌드 확인 중… + 이를 사용하는 설치된 Proton이 없습니다 + Auto 업데이트가 연결을 기다리는 중입니다. + 새 빌드를 확인할 수 없습니다. + 새 빌드는 데이터 무제한 연결, 배터리 세이버 꺼짐, 기기가 뜨겁지 않은 상태를 기다립니다. + %1$s을(를) %2$s(으)로 업데이트했습니다. + %1$s %2$s(으)로 게임이 몇 초 만에 두 번 종료되어 Auto가 %3$s(으)로 되돌렸습니다. 성능 CPU 코어, 세션 수정 및 호스트 이름. 다음 세션에 적용됩니다. Steam 클라이언트 코어 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 12666f1644..15512b395b 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -554,6 +554,19 @@ Digunakan Baharu Disimpan + Cara binaan dipilih + Binaan DroidDeck terbaharu, sentiasa terkini + Pilih dan pasang binaan sendiri + Auto memastikan %1$s sentiasa terkini + Binaan baharu dipasang di latar belakang. Jika permainan yang pernah berjalan tertutup dalam beberapa saat dua kali, Auto kembali ke binaan yang berfungsi. + Sandaran: %1$s + Mencari binaan… + Tiada Proton terpasang yang menggunakannya + Kemas kini Auto menunggu sambungan. + Tidak dapat menyemak binaan baharu. + Binaan baharu menunggu sambungan tanpa meter, penjimat bateri dimatikan dan peranti yang sejuk. + %1$s dikemas kini ke %2$s. + %1$s %2$s menutup permainan dalam beberapa saat dua kali, jadi Auto kembali ke %3$s. Prestasi Teras CPU, pembaikan sesi dan nama hos. Berkuat kuasa pada sesi seterusnya. Teras klien Steam diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 191e8e54b5..ab859f0e15 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -556,6 +556,19 @@ I bruk Ny Lagret + Slik velges bygg + Nyeste DroidDeck-bygg, alltid oppdatert + Velg og installer bygg selv + Auto holder %1$s oppdatert + Nye bygg installeres i bakgrunnen. Hvis et spill som fungerte før lukkes innen sekunder to ganger, går Auto tilbake til bygget som fungerte. + Reserve: %1$s + Ser etter bygg… + Ingen installert Proton bruker dette + Auto-oppdateringer venter på en tilkobling. + Kunne ikke se etter nye bygg. + Nye bygg venter på en ubegrenset tilkobling, avslått batterisparing og en kjølig enhet. + %1$s oppdatert til %2$s. + %1$s %2$s lukket et spill innen sekunder to ganger, så Auto gikk tilbake til %3$s. Ytelse CPU-kjerner, sesjonsfikser og vertsnavnet. Gjelder fra neste sesjon. Steam-klientens kjerner diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 47b574eb88..ea4e0eb572 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -556,6 +556,19 @@ In gebruik Nieuw Bewaard + Hoe builds worden gekozen + Nieuwste DroidDeck-build, altijd actueel + Kies en installeer builds zelf + Auto houdt %1$s actueel + Nieuwe builds worden op de achtergrond geïnstalleerd. Sluit een game die eerder werkte twee keer binnen enkele seconden, dan gaat Auto terug naar de build die werkte. + Terugval: %1$s + Zoeken naar builds… + Geen geïnstalleerde Proton gebruikt dit + Auto-updates wachten op een verbinding. + Kon niet op nieuwe builds controleren. + Nieuwe builds wachten op een onbeperkte verbinding, batterijbesparing uit en een koel apparaat. + %1$s bijgewerkt naar %2$s. + %1$s %2$s sloot een game twee keer binnen enkele seconden, dus Auto ging terug naar %3$s. Prestaties CPU-cores, sessiefixes en de hostnaam. Geldt vanaf de volgende sessie. Cores voor de Steam-client diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 8982560cb1..52a42187a6 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -560,6 +560,19 @@ W użyciu Nowy Zapisany + Jak wybierane są wersje + Najnowsza wersja DroidDeck, zawsze aktualna + Wybieraj i instaluj wersje samodzielnie + Auto utrzymuje %1$s w aktualności + Nowe wersje instalują się w tle. Jeśli gra, która działała, dwa razy zamknie się po kilku sekundach, Auto wróci do działającej wersji. + Zapasowa: %1$s + Szukanie wersji… + Żaden zainstalowany Proton tego nie używa + Aktualizacje Auto czekają na połączenie. + Nie udało się sprawdzić nowych wersji. + Nowe wersje czekają na połączenie bez limitu, wyłączone oszczędzanie baterii i chłodne urządzenie. + %1$s zaktualizowano do %2$s. + %1$s %2$s dwa razy zamknął grę po kilku sekundach, więc Auto wróciło do %3$s. Wydajność Rdzenie CPU, poprawki sesji i nazwa hosta. Działa od następnej sesji. Rdzenie klienta Steam diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 38ab08a785..668919b906 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -558,6 +558,19 @@ Em utilização Novo Guardado + Como as versões são escolhidas + Versão mais recente do DroidDeck, sempre atualizada + Escolha e instale as versões manualmente + Auto mantém %1$s atualizado + As novas versões são instaladas em segundo plano. Se um jogo que funcionava fechar em segundos duas vezes, Auto volta à versão que funcionava. + Reserva: %1$s + A procurar versões… + Nenhum Proton instalado usa isto + As atualizações Auto aguardam uma ligação. + Não foi possível procurar novas versões. + As novas versões aguardam uma ligação não limitada, a poupança de bateria desligada e o dispositivo fresco. + %1$s atualizado para %2$s. + %1$s %2$s fechou um jogo em segundos duas vezes, por isso Auto voltou a %3$s. Desempenho Núcleos da CPU, correções da sessão e nome do anfitrião. Aplica-se na próxima sessão. Núcleos do cliente Steam diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 7b5faee1fd..2fbd7414c9 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -558,6 +558,19 @@ Em uso Novo Armazenado + Como as versões são escolhidas + Versão mais recente do DroidDeck, sempre atualizada + Escolha e instale as versões você mesmo + Auto mantém %1$s atualizado + Novas versões são instaladas em segundo plano. Se um jogo que funcionava fechar em segundos duas vezes, Auto volta para a versão que funcionava. + Reserva: %1$s + Procurando versões… + Nenhum Proton instalado usa isto + As atualizações Auto aguardam uma conexão. + Não foi possível procurar novas versões. + Novas versões aguardam uma conexão não limitada, a economia de bateria desligada e o aparelho frio. + %1$s atualizado para %2$s. + %1$s %2$s fechou um jogo em segundos duas vezes, então Auto voltou para %3$s. Desempenho Núcleos da CPU, correções da sessão e o nome do host. Vale a partir da próxima sessão. Núcleos do cliente Steam diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 747948cc26..69751c27cb 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -558,6 +558,19 @@ În uz Nou Salvat + Cum se aleg versiunile + Cea mai nouă versiune DroidDeck, mereu actualizată + Alege și instalează singur versiunile + Auto menține %1$s actualizat + Versiunile noi se instalează în fundal. Dacă un joc care mergea se închide în câteva secunde de două ori, Auto revine la versiunea care funcționa. + Rezervă: %1$s + Se caută versiuni… + Niciun Proton instalat nu folosește asta + Actualizările Auto așteaptă o conexiune. + Nu s-au putut căuta versiuni noi. + Versiunile noi așteaptă o conexiune fără limită de date, economisirea bateriei oprită și un dispozitiv răcit. + %1$s actualizat la %2$s. + %1$s %2$s a închis un joc în câteva secunde de două ori, așa că Auto a revenit la %3$s. Performanță Nuclee CPU, remedieri de sesiune și numele hostului. Se aplică la sesiunea următoare. Nuclee pentru clientul Steam diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 65220e106a..b8198adfcc 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -579,6 +579,19 @@ Используется Новый Сохранено + Как выбираются сборки + Новейшая сборка DroidDeck, всегда актуальна + Выбирайте и устанавливайте сборки сами + Auto поддерживает %1$s в актуальном состоянии + Новые сборки ставятся в фоне. Если игра, которая раньше работала, дважды закроется за несколько секунд, Auto вернётся к рабочей сборке. + Запасная: %1$s + Поиск сборок… + Ни один установленный Proton это не использует + Обновления Auto ждут подключения. + Не удалось проверить новые сборки. + Новые сборки ждут безлимитного подключения, выключенной экономии заряда и остывшего устройства. + %1$s обновлён до %2$s. + %1$s %2$s дважды закрыл игру за несколько секунд, поэтому Auto вернулся к %3$s. Производительность Ядра CPU, исправления сессии и имя хоста. Вступит в силу в следующей сессии. Ядра клиента Steam diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index f2c4b11c2b..0fcfbcb0f8 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -556,6 +556,19 @@ I bruk Ny Sparad + Hur byggen väljs + Senaste DroidDeck-bygget, alltid aktuellt + Välj och installera byggen själv + Auto håller %1$s aktuellt + Nya byggen installeras i bakgrunden. Om ett spel som fungerade stängs inom sekunder två gånger går Auto tillbaka till bygget som fungerade. + Reserv: %1$s + Söker efter byggen… + Ingen installerad Proton använder detta + Auto-uppdateringar väntar på en anslutning. + Kunde inte söka efter nya byggen. + Nya byggen väntar på en obegränsad anslutning, avstängt batterisparläge och en sval enhet. + %1$s uppdaterat till %2$s. + %1$s %2$s stängde ett spel inom sekunder två gånger, så Auto gick tillbaka till %3$s. Prestanda CPU-kärnor, sessionsfixar och värdnamnet. Gäller från nästa session. Steam-klientens kärnor diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index f05a5158e0..c1b88770b2 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -554,6 +554,19 @@ ใช้งานอยู่ ใหม่ บันทึกไว้ + วิธีเลือกบิลด์ + บิลด์ DroidDeck ล่าสุด อัปเดตอยู่เสมอ + เลือกและติดตั้งบิลด์เอง + Auto ทำให้ %1$s เป็นปัจจุบัน + บิลด์ใหม่จะติดตั้งในเบื้องหลัง หากเกมที่เคยเล่นได้ปิดลงภายในไม่กี่วินาทีสองครั้ง Auto จะกลับไปใช้บิลด์ที่ใช้งานได้ + สำรอง: %1$s + กำลังค้นหาบิลด์… + ไม่มี Proton ที่ติดตั้งใช้สิ่งนี้ + การอัปเดต Auto กำลังรอการเชื่อมต่อ + ตรวจหาบิลด์ใหม่ไม่ได้ + บิลด์ใหม่จะรอการเชื่อมต่อที่ไม่จำกัดปริมาณ ปิดโหมดประหยัดแบตเตอรี่ และอุปกรณ์ที่ไม่ร้อน + อัปเดต %1$s เป็น %2$s แล้ว + %1$s %2$s ทำให้เกมปิดภายในไม่กี่วินาทีสองครั้ง Auto จึงกลับไปใช้ %3$s ประสิทธิภาพ คอร์ CPU การแก้ไขเซสชัน และชื่อโฮสต์ จะมีผลในเซสชันถัดไป คอร์สำหรับไคลเอนต์ Steam diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 9e95d2f134..30708430fd 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -556,6 +556,19 @@ Kullanımda Yeni Saklandı + Sürümler nasıl seçilir + En yeni DroidDeck sürümü, hep güncel + Sürümleri kendin seç ve yükle + Auto %1$s bileşenini güncel tutar + Yeni sürümler arka planda yüklenir. Önceden çalışan bir oyun iki kez saniyeler içinde kapanırsa Auto çalışan sürüme geri döner. + Yedek: %1$s + Sürümler aranıyor… + Yüklü hiçbir Proton bunu kullanmıyor + Auto güncellemeleri bağlantı bekliyor. + Yeni sürümler denetlenemedi. + Yeni sürümler sınırsız bir bağlantı, kapalı pil tasarrufu ve serin bir cihaz bekler. + %1$s, %2$s sürümüne güncellendi. + %1$s %2$s bir oyunu iki kez saniyeler içinde kapattı, bu yüzden Auto %3$s sürümüne döndü. Performans CPU çekirdekleri, oturum düzeltmeleri ve ana bilgisayar adı. Sonraki oturumda uygulanır. Steam istemcisi çekirdekleri diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 2a82143256..dad9d6c46a 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -560,6 +560,19 @@ Використовується Нове Збережено + Як вибираються збірки + Найновіша збірка DroidDeck, завжди актуальна + Вибирайте та встановлюйте збірки самостійно + Auto підтримує %1$s в актуальному стані + Нові збірки встановлюються у фоні. Якщо гра, яка раніше працювала, двічі закриється за кілька секунд, Auto повернеться до робочої збірки. + Запасна: %1$s + Пошук збірок… + Жоден встановлений Proton цього не використовує + Оновлення Auto чекають на з’єднання. + Не вдалося перевірити нові збірки. + Нові збірки чекають на безлімітне з’єднання, вимкнену економію заряду та охолоджений пристрій. + %1$s оновлено до %2$s. + %1$s %2$s двічі закрив гру за кілька секунд, тому Auto повернувся до %3$s. Продуктивність Ядра CPU, виправлення сеансу та ім’я хоста. Застосовується в наступному сеансі. Ядра клієнта Steam diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 8a4f6cc4c5..8b1b6c93c5 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -554,6 +554,19 @@ Đang dùng Mới Đã lưu + Cách chọn bản dựng + Bản dựng DroidDeck mới nhất, luôn cập nhật + Tự chọn và cài bản dựng + Auto giữ %1$s luôn cập nhật + Bản dựng mới được cài ở nền. Nếu một trò chơi từng chạy được bị đóng sau vài giây hai lần, Auto quay lại bản dựng đã chạy được. + Dự phòng: %1$s + Đang tìm bản dựng… + Không Proton nào đã cài dùng thành phần này + Cập nhật Auto đang chờ kết nối. + Không thể kiểm tra bản dựng mới. + Bản dựng mới chờ kết nối không đo lưu lượng, tắt tiết kiệm pin và thiết bị đủ mát. + Đã cập nhật %1$s lên %2$s. + %1$s %2$s làm trò chơi đóng sau vài giây hai lần, nên Auto đã quay lại %3$s. Hiệu năng Lõi CPU, các bản sửa phiên và tên máy chủ. Áp dụng từ phiên sau. Lõi client Steam diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d2b7610f8a..2e480621bb 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -554,6 +554,19 @@ 使用中 新 已存储 + 版本的选择方式 + 最新 DroidDeck 版本,始终保持更新 + 自行选择并安装版本 + Auto 会让 %1$s 保持最新 + 新版本会在后台安装。如果之前能运行的游戏两次在几秒内关闭,Auto 会退回到之前可用的版本。 + 备用:%1$s + 正在检查版本… + 没有已安装的 Proton 使用它 + Auto 更新正在等待网络连接。 + 无法检查新版本。 + 新版本将等待不按流量计费的网络、关闭省电模式且设备不过热时下载。 + %1$s 已更新到 %2$s。 + %1$s %2$s 两次在几秒内关闭了游戏,因此 Auto 已退回到 %3$s。 性能 CPU 核心、会话修复和主机名。将在下次会话生效。 Steam 客户端核心 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 7b176d7c14..30f10dfa3b 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -554,6 +554,19 @@ 使用中 新 已儲存 + 版本的選擇方式 + 最新 DroidDeck 版本,持續保持更新 + 自行選擇並安裝版本 + Auto 會令 %1$s 保持最新 + 新版本會在背景安裝。如果之前能執行的遊戲兩次在幾秒內關閉,Auto 會退回到之前可用的版本。 + 備用:%1$s + 正在檢查版本… + 沒有已安裝的 Proton 使用它 + Auto 更新正在等待網絡連線。 + 無法檢查新版本。 + 新版本將等待非按流量收費的網絡、關閉省電模式且裝置不過熱時下載。 + %1$s 已更新至 %2$s。 + %1$s %2$s 兩次在幾秒內關閉了遊戲,因此 Auto 已退回到 %3$s。 效能 CPU 核心、會話修正和主機名稱。下次會話生效。 Steam 用戶端核心 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index d32c71feb4..20bab6679c 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -554,6 +554,19 @@ 使用中 新 已儲存 + 版本的選擇方式 + 最新 DroidDeck 版本,持續保持更新 + 自行選擇並安裝版本 + Auto 會讓 %1$s 保持最新 + 新版本會在背景安裝。如果先前能執行的遊戲兩次在幾秒內關閉,Auto 會退回到先前可用的版本。 + 備用:%1$s + 正在檢查版本… + 沒有已安裝的 Proton 使用它 + Auto 更新正在等待網路連線。 + 無法檢查新版本。 + 新版本將等待非計量網路、關閉省電模式且裝置不過熱時下載。 + %1$s 已更新至 %2$s。 + %1$s %2$s 兩次在幾秒內關閉了遊戲,因此 Auto 已退回到 %3$s。 效能 CPU 核心、工作階段修復和主機名稱。下次工作階段生效。 Steam 用戶端核心 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c1bcfd576c..936935e11e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -604,6 +604,19 @@ In use New Stored + How builds are chosen + Newest DroidDeck build, kept current + Pick and install builds yourself + Auto keeps %1$s current + New builds install in the background. If a game that ran before closes within seconds twice, Auto goes back to the build that worked. + Fallback: %1$s + Checking for builds… + No installed Proton uses this + Auto updates wait for a connection. + Couldn\'t check for new builds. + New builds wait for an unmetered connection, battery saver off and a cool device. + %1$s updated to %2$s. + %1$s %2$s closed a game within seconds twice, so Auto went back to %3$s. Performance CPU cores, session fixes and the host name. Applies next session. Steam client cores diff --git a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt index 9f79a6efad..7aff486917 100644 --- a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt @@ -134,6 +134,19 @@ class ProtonMenuAutoTest { assertEquals(listOf("droiddeck"), attempts) } + @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.installProton("droiddeck") + waitUntil { watched.protonBusyId == null && checks == 1 } + assertEquals(1, checks) + watched.installer = { _, _ -> "failed" } + watched.installProton("ge") + waitUntil { watched.protonBusyId == null } + assertEquals(1, checks) + } + @Test fun aFailedUpdateDoesNotLoopOrBlockOtherInstalledFamilies() { val ge = install("GE-Proton11-11") install("DroidDeck-Proton-11-11.1") diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdateTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdateTest.kt index 8357f9694c..e47ec934ac 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdateTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdateTest.kt @@ -17,8 +17,23 @@ class RuntimeAutoUpdateTest { assertTrue(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", "ubuntu-r1-rc2")) } - @Test fun noRuntimeOrTheSameOneIsLeftAlone() { + @Test fun aFirstLaunchInstallsTheRuntimeByItself() { + assertTrue(RuntimeAutoUpdate.claim(context, null, "ubuntu-r1-rc2")) + } + + @Test fun aRuntimeTheUserRemovedIsNotPutBack() { + RuntimeAutoUpdate.seed(context) assertFalse(RuntimeAutoUpdate.claim(context, null, "ubuntu-r1-rc2")) + assertTrue(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", "ubuntu-r1-rc2")) + } + + @Test fun aFailingFirstInstallStopsTryingAfterAFewLaunches() { + repeat(RuntimeAutoUpdate.MAX_ATTEMPTS) { assertTrue(RuntimeAutoUpdate.claim(context, null, "ubuntu-r1-rc2", it * RuntimeAutoUpdate.RETRY_MS)) } + assertFalse(RuntimeAutoUpdate.claim(context, null, "ubuntu-r1-rc2", 10 * RuntimeAutoUpdate.RETRY_MS)) + } + + @Test fun theSameOrNoReleaseIsLeftAlone() { + assertFalse(RuntimeAutoUpdate.claim(context, null, null)) assertFalse(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc2", "ubuntu-r1-rc2")) assertFalse(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", null)) assertFalse(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", "")) diff --git a/app/src/test/java/com/droiddeck/launcher/session/ComponentUpdatesTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ComponentUpdatesTest.kt new file mode 100644 index 0000000000..4711ad3162 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/ComponentUpdatesTest.kt @@ -0,0 +1,243 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import android.content.Context +import androidx.test.core.app.ApplicationProvider +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import java.io.File +import java.nio.ByteBuffer +import java.nio.ByteOrder +import java.nio.file.Files + +@RunWith(RobolectricTestRunner::class) +class ComponentUpdatesTest { + private fun item(file: String, comp: String, release: String = ComponentsManager.DD_NIGHTLY) = + ComponentsManager.CatalogItem(file, comp, release, "https://github.com/Droid-Deck/DroidDeck-Components/releases/download/x/$file", 1, "sha256:" + "0".repeat(64)) + + private val catalog = listOf( + item("DD-dxvk-3.1.1+188-nightly.wcp", "dxvk"), + item("DD-dxvk-3.1.1+190-nightly.wcp", "dxvk"), + item("DD-dxvk-arm64ec-3.1.1+188-nightly.wcp", "dxvk"), + item("DD-dxvk-gplasync-3.1.1+190-nightly.wcp", "dxvk"), + item("dxvk-3.1.1-linux.wcp", "dxvk", "Dxvk-Linux"), + item("DD-vkd3d-proton-3.1+30-nightly.wcp", "vkd3d"), + item("DD-vkd3d-proton-arm64ec-3.1+30-nightly.wcp", "vkd3d"), + item("DD-FEXCore-2611+3-nightly.wcp", "fex"), + ) + + @Test fun eachLineFollowsOnlyItsOwnPublishedFlavour() { + assertEquals("DD-dxvk-3.1.1+190-nightly.wcp", ComponentUpdates.pick(catalog, ComponentUpdates.line("dxvk", false), emptySet())?.file) + assertEquals("DD-dxvk-arm64ec-3.1.1+188-nightly.wcp", ComponentUpdates.pick(catalog, ComponentUpdates.line("dxvk", true), emptySet())?.file) + assertEquals("DD-vkd3d-proton-arm64ec-3.1+30-nightly.wcp", ComponentUpdates.pick(catalog, ComponentUpdates.line("vkd3d", true), emptySet())?.file) + assertEquals("DD-vkd3d-proton-3.1+30-nightly.wcp", ComponentUpdates.pick(catalog, ComponentUpdates.line("vkd3d", false), emptySet())?.file) + assertEquals("DD-FEXCore-2611+3-nightly.wcp", ComponentUpdates.pick(catalog, ComponentUpdates.line("fex", true), emptySet())?.file) + assertEquals("fex", ComponentUpdates.line("fex", false).key) + } + + @Test fun aBadBuildIsSkippedAndNothingElseIsPickedInItsPlace() { + val plain = ComponentUpdates.line("dxvk", false) + assertNull(ComponentUpdates.pick(catalog, plain, setOf("DD-dxvk-3.1.1+190-nightly.wcp"))) + assertEquals("DD-dxvk-3.1.1+190-nightly.wcp", ComponentUpdates.pick(catalog, plain, setOf("DD-dxvk-3.1.1+188-nightly.wcp"))?.file) + assertEquals("DD-dxvk-3.1.1+190-nightly.wcp", ComponentUpdates.pick(catalog, plain, setOf("DD-vkd3d-proton-3.1+40-nightly.wcp"))?.file) + assertNull(ComponentUpdates.pick(catalog, ComponentUpdates.line("fex", false), setOf("DD-FEXCore-2611+3-nightly.wcp"))) + assertNull(ComponentUpdates.pick(catalog.filter { it.release != ComponentsManager.DD_NIGHTLY }, plain, emptySet())) + } + + private fun pe(machine: Int, pe32plus: Boolean, hybrid: Boolean?): ByteArray { + val b = ByteBuffer.allocate(0x800).order(ByteOrder.LITTLE_ENDIAN) + b.put(0, 'M'.code.toByte()).put(1, 'Z'.code.toByte()).putInt(0x3c, 0x80) + b.putInt(0x80, 0x4550).putShort(0x84, machine.toShort()).putShort(0x86, 1) + val optional = 0x98 + val optionalSize = if (pe32plus) 240 else 224 + b.putShort(0x94, optionalSize.toShort()) + b.putShort(optional, if (pe32plus) 0x20b.toShort() else 0x10b.toShort()) + val section = optional + optionalSize + b.putInt(section + 8, 0x1000).putInt(section + 12, 0x1000).putInt(section + 20, 0x400) + if (hybrid != null && pe32plus) { + b.putInt(optional + 112 + 10 * 8, 0x1100) + b.putInt(0x500, 0x140) + if (hybrid) b.putLong(0x500 + 0xC8, 0x180001000L) + } + return b.array() + } + + @Test fun arm64ecAndArm64xImagesAreToldApartFromPlainX64ByTheirHybridMetadata() { + assertEquals(true, ComponentUpdates.arm64ec(pe(0xaa64, true, true))) + assertEquals(true, ComponentUpdates.arm64ec(pe(0x8664, true, true))) + assertEquals(false, ComponentUpdates.arm64ec(pe(0x8664, true, false))) + assertEquals(false, ComponentUpdates.arm64ec(pe(0x8664, true, null))) + assertEquals(false, ComponentUpdates.arm64ec(pe(0x14c, false, null))) + assertNull(ComponentUpdates.arm64ec(ByteArray(16))) + } + + @Test fun onlyAHybridArm64ImageCountsAsArm64x() { + assertTrue(ComponentUpdates.arm64x(pe(0xaa64, true, true))) + assertFalse(ComponentUpdates.arm64x(pe(0x8664, true, true))) + assertFalse(ComponentUpdates.arm64x(pe(0xaa64, true, false))) + assertFalse(ComponentUpdates.arm64x(ByteArray(16))) + } + + @Test fun anArm64ecLineNeedsArm64xUnlessTheProtonsOwnBuildIsKnownNotToBe() { + val ec = ComponentUpdates.line("dxvk", true) + assertTrue(ComponentUpdates.needsArm64x(ec, listOf(true))) + assertTrue(ComponentUpdates.needsArm64x(ec, listOf(null))) + assertFalse(ComponentUpdates.needsArm64x(ec, listOf(false))) + assertTrue(ComponentUpdates.needsArm64x(ec, listOf(false, true))) + assertFalse(ComponentUpdates.needsArm64x(ec, listOf(false, false))) + assertFalse(ComponentUpdates.needsArm64x(ComponentUpdates.line("dxvk", false), listOf(null))) + assertFalse(ComponentUpdates.needsArm64x(ComponentUpdates.line("fex", false), listOf(null))) + } + + private val log = """ + [2026-11-05 20:00:00] Game process added : AppID 49520 "/root/.local/share/Steam/linuxarm64/steam-launch-wrapper -- /root/.local/share/Steam/steamrtarm64/reaper SteamLaunch AppId=49520 -- '/root/.local/share/Steam/compatibilitytools.d/DroidDeck-Proton 11-12.1'/droiddeck-proton-wrap waitforexitandrun 'Borderlands2.exe'" + [2026-11-05 20:00:05] Game process updated : AppID 49520 "x" + [2026-11-05 20:10:00] Game process removed: AppID 49520 "x" + [2026-11-05 20:11:00] Game process added : AppID 413150 "/root/.local/share/Steam/steamapps/common/Proton - Experimental/proton waitforexitandrun 'Stardew Valley.exe'" + [2026-11-05 20:11:12] Game process removed: AppID 413150 "x" + [2026-11-05 20:12:00] Game process added : AppID 22380 "/usr/bin/true no tool here" + [2026-11-05 20:12:02] Game process removed: AppID 22380 "x" + """.trimIndent().lines().asSequence() + + @Test fun launchesComeFromSteamsOwnProcessLinesWithTheirProtonAndDuration() { + val runs = ComponentUpdates.launches(log, "") + assertEquals(listOf( + ComponentUpdates.Launch("49520", "DroidDeck-Proton 11-12.1", "2026-11-05 20:00:00", 600), + ComponentUpdates.Launch("413150", "Proton - Experimental", "2026-11-05 20:11:00", 12), + ), runs) + assertEquals(listOf("413150"), ComponentUpdates.launches(log, "2026-11-05 20:10:30").map { it.app }) + } + + private fun run(app: String, start: String, seconds: Long) = ComponentUpdates.Launch(app, "DroidDeck-Proton 11-12.1", start, seconds) + + private val trial = ComponentUpdates.Trial("new.wcp", ComponentUpdates.ORIGINAL, "2026-11-05 12:00:00", emptyMap(), emptyMap()) + + @Test fun aGameThatBootedOnThePreviousBuildAndTwiceFailsOnTheNewOneRollsTheLineBack() { + val verdict = ComponentUpdates.judge(trial, listOf( + run("100", "2026-11-05 10:00:00", 900), + run("100", "2026-11-05 13:00:00", 4), + run("100", "2026-11-05 13:05:00", 6), + )) + assertTrue(verdict.rollBack) + assertEquals(2, verdict.failed["100"]) + } + + @Test fun oneFailedBootOrAGameThatNeverBootedBeforeDoesNotRollBack() { + assertFalse(ComponentUpdates.judge(trial, listOf(run("100", "2026-11-05 10:00:00", 900), run("100", "2026-11-05 13:00:00", 4))).rollBack) + assertFalse(ComponentUpdates.judge(trial, listOf(run("200", "2026-11-05 13:00:00", 4), run("200", "2026-11-05 13:05:00", 4))).rollBack) + } + + @Test fun aGameThatBootsOnTheNewBuildStopsCountingShortRunsAsFailures() { + val verdict = ComponentUpdates.judge(trial, listOf( + run("100", "2026-11-05 10:00:00", 900), + run("100", "2026-11-05 13:00:00", 4), + run("100", "2026-11-05 13:10:00", 1200), + run("100", "2026-11-05 14:00:00", 4), + )) + assertFalse(verdict.rollBack) + assertEquals("new.wcp", verdict.booted["100"]) + assertNull(verdict.failed["100"]) + } + + @Test fun bootsOnTheOriginalBeforeTheFirstUpdateLetTheFirstBuildRollBack() { + val original = ComponentUpdates.Trial(ComponentUpdates.ORIGINAL, ComponentUpdates.ORIGINAL, "", emptyMap(), emptyMap()) + val before = ComponentUpdates.judge(original, listOf(run("100", "2026-11-05 10:00:00", 900), run("200", "2026-11-05 10:30:00", 3))) + assertFalse(before.rollBack) + assertEquals(mapOf("100" to ComponentUpdates.ORIGINAL), before.booted) + val after = ComponentUpdates.judge(trial.copy(booted = before.booted), listOf(run("100", "2026-11-05 13:00:00", 4), run("100", "2026-11-05 13:05:00", 6))) + assertTrue(after.rollBack) + } + + @Test fun aProtonUpdatedInPlaceIsReadFromItsOwnFilesAgain() { + val context = ApplicationProvider.getApplicationContext() + val dir = Files.createTempDirectory(context.cacheDir.toPath(), "proton").toFile() + File(dir, "files/lib/wine/dxvk/aarch64-windows").apply { mkdirs() }.resolve("d3d11.dll").writeBytes(pe(0xaa64, true, true)) + val proton = ComponentsManager.Proton("Test-Proton", "Test Proton", dir, "/p", "Test-Proton-2", false) + val state = File(context.filesDir, "components/state.json").apply { parentFile?.mkdirs() } + fun active(version: String) = state.writeText(JSONObject().put("active", JSONObject().put("Test-Proton", JSONObject() + .put("dxvk", JSONObject().put("file", "DD-dxvk-arm64ec-3.1.1+188-nightly.wcp").put("protonVersion", version)))).toString()) + + active("Test-Proton-1") + assertEquals(true, ComponentsManager.arm64ec(context, proton, "dxvk")) + active("Test-Proton-2") + assertNull(ComponentsManager.arm64ec(context, proton, "dxvk")) + } + + @Test fun aFailedSaveKeepsTheLastGoodStateAndTheNextSaveReplacesItWhole() { + val context = ApplicationProvider.getApplicationContext() + val dir = File(context.filesDir, "components").apply { mkdirs() } + val state = File(dir, "updates.json") + val saved = JSONObject().put("checkedAt", System.currentTimeMillis()).put("lines", JSONObject().put("fex", JSONObject() + .put("current", "DD-FEXCore-2611+3-nightly.wcp").put("bad", JSONArray().put("DD-FEXCore-2611+2-nightly.wcp")))).toString() + state.writeText(saved) + state.setWritable(false) + dir.setWritable(false) + try { + org.junit.Assume.assumeFalse(state.canWrite() || dir.canWrite()) + ComponentUpdater.ensure(context, false) + } finally { + dir.setWritable(true) + state.setWritable(true) + } + assertEquals(saved, state.readText()) + + ComponentUpdater.ensure(context, false) + val fex = JSONObject(state.readText()).getJSONObject("lines").getJSONObject("fex") + assertEquals("DD-FEXCore-2611+3-nightly.wcp", fex.getString("current")) + assertEquals("DD-FEXCore-2611+2-nightly.wcp", fex.getJSONArray("bad").getString(0)) + assertFalse(state.readText() == saved) + assertTrue(dir.list()!!.none { it.startsWith("updates.json.") }) + } + + @Test fun aLineWithAnUnfinishedRollbackTakesNoNewerBuildUntilItIsApplied() { + assertTrue(ComponentUpdater.rollingBack(JSONObject().put("restore", JSONObject().put("proton", "DD-dxvk-2.5.wcp")))) + assertTrue(ComponentUpdater.rollingBack(JSONObject().put("pendingNote", "rolled back"))) + assertFalse(ComponentUpdater.rollingBack(JSONObject().put("restore", JSONObject()).put("current", "DD-dxvk-2.4.wcp"))) + } + + @Test fun aRemovedProtonNoLongerHoldsItsLineInARollback() { + val line = JSONObject().put("restore", JSONObject().put("gone", "DD-dxvk-2.5.wcp")) + val state = JSONObject().put("lines", JSONObject().put("dxvk", line)) + ComponentUpdater.dropRemoved(state, emptyList()) + assertFalse(ComponentUpdater.rollingBack(line)) + } + + @Test fun aTwoDigitNightlyBuildIsNewerThanASingleDigitOne() { + val items = listOf(item("DD-FEXCore-2611+9-nightly.wcp", "fex"), item("DD-FEXCore-2611+10-nightly.wcp", "fex")) + assertEquals("DD-FEXCore-2611+10-nightly.wcp", ComponentUpdates.pick(items, ComponentUpdates.line("fex", false), emptySet())?.file) + assertNull(ComponentUpdates.pick(items, ComponentUpdates.line("fex", false), setOf("DD-FEXCore-2611+10-nightly.wcp"))) + } + + @Test fun readsDuringSavesNeverLoseTheState() { + val context = ApplicationProvider.getApplicationContext() + val state = File(context.filesDir, "components/updates.json").apply { parentFile?.mkdirs() } + state.writeText(JSONObject().put("checkedAt", System.currentTimeMillis()).put("lines", JSONObject().put("fex", JSONObject() + .put("current", "DD-FEXCore-2611+3-nightly.wcp").put("bad", JSONArray().put("DD-FEXCore-2611+2-nightly.wcp")))).toString()) + val done = java.util.concurrent.atomic.AtomicBoolean(false) + val reader = Thread { + while (!done.get()) { + ComponentUpdater.settle(context) + ComponentUpdater.status(context, "fex") + } + }.apply { start() } + try { + repeat(400) { ComponentUpdater.ensure(context, false) } + } finally { + done.set(true) + reader.join() + } + val fex = JSONObject(state.readText()).getJSONObject("lines").getJSONObject("fex") + assertEquals("DD-FEXCore-2611+2-nightly.wcp", fex.getJSONArray("bad").getString(0)) + } + + @Test fun onlyTheCurrentAndThePreviousBuildAndUserSelectionsAreKept() { + assertEquals(setOf("b.wcp", "a.wcp", "mine.wcp"), ComponentUpdates.keep("b.wcp", "a.wcp", setOf("mine.wcp"))) + assertEquals(setOf("b.wcp"), ComponentUpdates.keep("b.wcp", ComponentUpdates.ORIGINAL, emptySet())) + } +} diff --git a/docs/development/game-environment.md b/docs/development/game-environment.md index c1607ec5fb..682f930360 100644 --- a/docs/development/game-environment.md +++ b/docs/development/game-environment.md @@ -35,6 +35,22 @@ selection, and restores Default component choices for the next game. **Use Default** removes the game override. Component packages must first be downloaded or imported on the Default Components page. +FEX, DXVK and VKD3D-Proton each have an **Auto** or **Manual** mode on the Default +Components page. Auto is the default unless a component already uses a package the +user picked, which keeps it on Manual. In Auto, DroidDeck checks the +DroidDeck-Components nightly release when DroidDeck is opened, at most hourly and +never during a running session, and installs the newest build into every Proton that ships that +component. DXVK and VKD3D-Proton follow the flavour of each Proton's own files: +ARM64EC/ARM64X builds get the `arm64ec` package, plain x64 builds the plain one. +Auto keeps the current build and the one it replaced and deletes older builds it +downloaded itself; packages selected anywhere, including in game profiles, are never +removed. Steam's process log tells it how long each game ran. A game that ran +for at least a minute on the previous build and then exits within 30 seconds twice +on the new one rolls back every component line that changed since that boot, and +each failed build is skipped until a newer one is published. Games with their own component override are +not counted. DXVK stays on Manual while a GPU rule pins a DXVK version (Adreno 6xx and +the Vulkan bridge). Manual keeps the existing download, import and restore lists. + Before publishing game component choices, DroidDeck preserves each Proton build's original components, including an explicitly empty bundle when a component is not shipped. Those restore choices remain after the last override is cleared. A missing