diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 748048d335..dd9c787f78 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -2166,9 +2166,11 @@ class FrontEndActivity : ComponentActivity() { private fun importComponent(uri: Uri) { val name = displayNameOf(uri) ?: "imported.wcp" components.componentAction(getString(R.string.comp_busy_importing)) { - val tmp = File(cacheDir, "component-import.wcp") - contentResolver.openInputStream(uri)?.use { input -> tmp.outputStream().use { input.copyTo(it) } } ?: error(getString(R.string.comp_cannot_read)) - try { getString(R.string.comp_imported, ComponentsManager.importPackage(this, tmp, name).version) } finally { tmp.delete() } + val tmp = File.createTempFile("component-import", ".wcp", cacheDir) + try { + contentResolver.openInputStream(uri)?.use { input -> tmp.outputStream().use { input.copyTo(it) } } ?: error(getString(R.string.comp_cannot_read)) + getString(R.string.comp_imported, ComponentUpdater.importPackage(this, tmp, name).version) + } finally { tmp.delete() } } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdater.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdater.kt index 4c3c431480..05f89fce4a 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdater.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdater.kt @@ -15,6 +15,7 @@ object ComponentUpdater { private const val BOOTED_KEPT = 200 private const val HANDED_BACK = "handedBack" internal const val HAND_BACK_FILES = "handBackFiles" + private const val IMPORTED = "imported" private val lock = Any() private val io = Any() @@ -40,8 +41,10 @@ object ComponentUpdater { } } - private fun Map>.fileOf(p: ComponentsManager.Proton, comp: String): String? = - this[p.id]?.get(comp)?.takeIf { it.protonVersion == p.version }?.file + private fun Map>.choiceOf(p: ComponentsManager.Proton, comp: String): ComponentsManager.Choice? = + this[p.id]?.get(comp)?.takeIf { it.protonVersion == p.version } + + private fun Map>.fileOf(p: ComponentsManager.Proton, comp: String): String? = choiceOf(p, comp)?.file private class Target(val comp: String, val p: ComponentsManager.Proton, val line: ComponentUpdates.Line, val ls: JSONObject) { val key: String get() = line.key @@ -63,7 +66,7 @@ object ComponentUpdater { val choices = ComponentsManager.activeChoices(context).filterKeys { it in own }.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 ") } + val manual = choices.any { (c, choice) -> c == comp && ComponentUpdates.manual(choice, null, owned) } SessionPrefs.setComponentMode(context, comp, if (manual) ComponentUpdates.MANUAL else ComponentUpdates.AUTO) } } @@ -158,7 +161,7 @@ object ComponentUpdater { complete = false continue } - ls.put("owned", JSONArray(ls.strings("owned") + current)) + own(state, ls, current) } val target = ComponentUpdates.pick(catalog, line, ls.strings("bad")) if (target == null || current == target.file) continue @@ -186,7 +189,7 @@ object ComponentUpdater { } ls.put("previous", if (missing && relisted == null) ComponentUpdates.ORIGINAL else 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)) + if (!stored) own(state, ls, target.file) ls.remove("note") notes += context.getString(R.string.comp_auto_updated, ComponentsManager.LABEL[comp], target.file.removeSuffix(".wcp")) } @@ -195,10 +198,11 @@ object ComponentUpdater { private fun apply(context: Context, state: JSONObject, protons: List, wanted: List, notes: MutableList) { val lines = state.obj("lines") + val auto = placed(state) + val choices = ComponentsManager.activeChoices(context) 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) + }.filterNot { t -> ComponentUpdates.manual(choices.choiceOf(t.p, t.comp), t.ls.optJSONObject("applied")?.optString(t.p.id), auto, t.ls.optString("current")) } for (t in targets) { val from = t.ls.optJSONObject("restore")?.optString(t.p.id).orEmpty() val current = t.ls.optString("current") @@ -208,7 +212,8 @@ object ComponentUpdater { } 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) } + runCatching { ComponentsManager.swap(context, t.p.id, current) } + .onFailure { Log.w(TAG, "${t.p.name} ${t.key}", it) } } } val after = ComponentsManager.activeChoices(context) @@ -218,9 +223,13 @@ object ComponentUpdater { 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 + if (after.fileOf(t.p, t.comp) == from) unfinished += t.key + else { + restore?.remove(t.p.id) + if (after.choiceOf(t.p, t.comp)?.file?.startsWith("original ") != false) t.ls.optJSONObject("applied")?.remove(t.p.id) + } + } else if (current.isNotEmpty()) { + if (after.fileOf(t.p, t.comp) == current) t.ls.obj("applied").put(t.p.id, current) else unfinished += t.key } } for (key in lines.keys().asSequence().toList()) { @@ -233,13 +242,32 @@ object ComponentUpdater { } } + private fun own(state: JSONObject, ls: JSONObject, file: String) { + ls.put("owned", JSONArray(ls.strings("owned") + file)) + state.put(IMPORTED, JSONArray(state.strings(IMPORTED) - file)) + } + + fun importPackage(context: Context, source: File, name: String): ComponentsManager.Package = synchronized(lock) { + ComponentsManager.importPackage(context, source, name).also { disown(context, it.file) } + } + + fun disown(context: Context, file: String) = synchronized(lock) { + val state = load(context) + state.optJSONObject("lines")?.let { lines -> + lines.keys().asSequence().mapNotNull { lines.optJSONObject(it) }.filter { file in it.strings("owned") } + .forEach { it.put("owned", JSONArray(it.strings("owned") - file)) } + } + state.put(IMPORTED, JSONArray(state.strings(IMPORTED) + file)) + save(context, state) + } + internal fun placed(state: JSONObject): Set { val remembered = state.strings(HAND_BACK_FILES) - val lines = state.optJSONObject("lines") ?: return remembered + val lines = state.optJSONObject("lines") ?: return remembered - state.strings(IMPORTED) return remembered + lines.keys().asSequence().flatMap { k -> val ls = lines.optJSONObject(k) ?: return@flatMap emptySequence() (ls.strings("owned") + ls.strings("bad") + ls.optString("current") + ls.optString("previous")).asSequence() - }.filter { it.isNotEmpty() }.toSet() + }.filter { it.isNotEmpty() }.toSet() - state.strings(IMPORTED) } private fun handBack(context: Context, state: JSONObject, protons: List) { @@ -303,9 +331,13 @@ object ComponentUpdater { 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 onLine = protons.filter { lineOf(context, state, it, comp)?.key == key } + val line = ComponentUpdates.LINES.first { it.key == key } + val back = ls.optString("previous").takeIf { prev -> prev == ComponentUpdates.ORIGINAL || (ComponentsManager.isStored(context, prev) && + (!ComponentUpdates.needsArm64x(line, onLine.map { ComponentsManager.arm64x(context, it, comp) }) || ComponentsManager.packageArm64x(context, prev, comp))) } + ?: ComponentUpdates.ORIGINAL val choices = ComponentsManager.activeChoices(context) - val targets = protons.filter { lineOf(context, state, it, comp)?.key == key && choices.fileOf(it, comp) == bad } + val targets = onLine.filter { choices.fileOf(it, comp) == bad } for (p in targets) { runCatching { if (back == ComponentUpdates.ORIGINAL) ComponentsManager.restore(context, p.id, comp, ComponentsManager.safeName(p.version)) @@ -314,6 +346,10 @@ object ComponentUpdater { } val after = ComponentsManager.activeChoices(context) val unfinished = targets.filter { after.fileOf(it, comp) == bad } + for (p in targets - unfinished.toSet()) { + if (back == ComponentUpdates.ORIGINAL) ls.optJSONObject("applied")?.remove(p.id) + else if (after.fileOf(p, comp) == back) ls.obj("applied").put(p.id, back) + } 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) } } @@ -338,10 +374,13 @@ object ComponentUpdater { val ls = lines.optJSONObject(k) ?: return@flatMap emptySequence() ComponentUpdates.keep(ls.optString("current"), ls.optString("previous"), selected).asSequence() }.toSet() + val stored = ComponentsManager.storedFiles(context) + val followed = ComponentUpdates.LINES.filter { managed(context, it.comp) } 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 } + val stale = ComponentUpdates.stale(followed.firstOrNull { it.key == k }, owned, stored, keep, ls.optString("current"), ls.strings("bad").toSet()) + val gone = stale.filter { runCatching { ComponentsManager.deleteUnused(context, it) }.getOrDefault(false) } ls.put("owned", JSONArray(owned - gone.toSet())) } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdates.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdates.kt index cd22696ed9..63aa4c5a65 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdates.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentUpdates.kt @@ -89,6 +89,11 @@ object ComponentUpdates { b.getInt(header) == 0x4550 && (b.getShort(header + 4).toInt() and 0xffff) == 0xaa64 && arm64ec(pe) == true }.getOrDefault(false) + fun allArm64x(dlls: Map, owned: Set): Boolean { + val graphics = dlls.filterKeys { it.lowercase() in owned } + return graphics.isNotEmpty() && graphics.values.all(::arm64x) + } + fun needsArm64x(line: Line, stocks: List): Boolean = line.key.endsWith("-arm64ec") && stocks.any { it != false } @@ -148,4 +153,15 @@ object ComponentUpdates { fun keep(current: String, previous: String, selected: Set): Set = (setOf(current, previous) + selected) - ORIGINAL + + fun manual(choice: ComponentsManager.Choice?, applied: String?, auto: Set, current: String? = null): Boolean = + choice != null && !choice.auto && !choice.file.startsWith("original ") && choice.file != current && + (if (applied.isNullOrEmpty()) choice.file !in auto else choice.file != applied) + + fun stale(line: Line?, owned: Set, stored: List, keep: Set, current: String, bad: Set = emptySet()): List { + val ranked = line?.takeIf { belongs(current, it) } + fun newer(file: String) = ranked != null && belongs(file, ranked) && ProtonExtras.compareVersions(file, current) > 0 + return (owned + stored.filter { ranked != null && belongs(it, ranked) }) + .filter { it !in keep && ((it in bad && it in owned) || !newer(it)) }.distinct() + } } 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 2e912bae50..3c1c92c0d1 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -782,7 +782,11 @@ object ComponentsManager { internal fun liveSelection(key: String, entry: JSONObject, proton: Proton?): Boolean = proton != null && (key == "queued" || entry.optString("protonVersion") == proton.version) - private fun packagesInUse(state: JSONObject, installed: Map): Set { + internal fun liveOnAny(key: String, entry: JSONObject, installs: List?): Boolean = + installs?.any { liveSelection(key, entry, it) } == true + + internal fun packagesInUse(state: JSONObject, installed: List): Set { + val byId = installed.groupBy { it.id } val names = HashSet() for (key in listOf("active", "queued")) { val byProton = state.optJSONObject(key) ?: continue @@ -790,7 +794,7 @@ object ComponentsManager { val comps = byProton.optJSONObject(pid) ?: continue for (comp in comps.keys()) { val entry = comps.optJSONObject(comp) ?: continue - if (liveSelection(key, entry, installed[pid])) entry.optString("file").takeIf { it.isNotEmpty() }?.let(names::add) + if (liveOnAny(key, entry, byId[pid])) entry.optString("file").takeIf { it.isNotEmpty() }?.let(names::add) } } } @@ -812,7 +816,7 @@ object ComponentsManager { fun stored(context: Context): Stored = synchronized(lock) { val state = loadState(context) val installed = protons(context).distinctBy { it.id }.associateBy { it.id } - val used = packagesInUse(state, installed) + val used = packagesInUse(state, protons(context)) val originals = originalsDir(context).listFiles()?.filter { it.isDirectory }?.flatMap { proton -> proton.listFiles()?.filter { it.isDirectory }?.flatMap { version -> COMPONENTS.mapNotNull { comp -> @@ -839,15 +843,15 @@ object ComponentsManager { } private fun checkPackageUnused(context: Context, state: JSONObject, name: String) { - val installed = protons(context).distinctBy { it.id }.associateBy { it.id } + val installed = protons(context).groupBy { it.id } for (key in listOf("queued", "active")) { val byProton = state.sub(key) for (pid in byProton.keys()) { val comps = byProton.optJSONObject(pid) ?: continue for (comp in comps.keys()) { val entry = comps.optJSONObject(comp) ?: continue - check(entry.optString("file") != name || !liveSelection(key, entry, installed[pid])) { - context.getString(R.string.cmgr_package_in_use, name, installed[pid]?.name ?: pid) + check(entry.optString("file") != name || !liveOnAny(key, entry, installed[pid])) { + context.getString(R.string.cmgr_package_in_use, name, installed[pid]?.firstOrNull()?.name ?: pid) } } } @@ -937,7 +941,7 @@ object ComponentsManager { fun deletePackage(context: Context, file: String): String = synchronized(lock) { val name = safeName(file) val state = loadState(context) - val installed = protons(context).distinctBy { it.id }.associateBy { it.id } + val installed = protons(context).groupBy { it.id } var changed = false for (key in listOf("queued", "active")) { val byProton = state.sub(key) @@ -946,7 +950,7 @@ object ComponentsManager { for (comp in comps.keys().asSequence().toList()) { val entry = comps.optJSONObject(comp) ?: continue if (entry.optString("file") != name) continue - check(!liveSelection(key, entry, installed[pid])) { context.getString(R.string.cmgr_package_in_use, name, installed[pid]?.name ?: pid) } + check(!liveOnAny(key, entry, installed[pid])) { context.getString(R.string.cmgr_package_in_use, name, installed[pid]?.firstOrNull()?.name ?: pid) } comps.remove(comp) changed = true } @@ -1076,9 +1080,20 @@ object ComponentsManager { 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 dir = "${COMP_DIR[comp] ?: return false}/aarch64-windows/" val f = File(packagesDir(context), safeName(file)).takeIf { it.isFile } ?: return false - return runCatching { readWcpEntry(f, rel) }.getOrNull()?.let(ComponentUpdates::arm64x) == true + val dlls = runCatching { + readWcp(f) { tar -> + val found = HashMap() + while (true) { + val e = tar.nextTarEntry ?: break + val rel = normalize(e.name) + if (!e.isDirectory && rel.startsWith(dir) && '/' !in rel.removePrefix(dir)) found[rel.removePrefix(dir)] = tar.readBytes() + } + found + } + }.getOrNull() ?: return false + return ComponentUpdates.allArm64x(dlls, COMP_DLLS.getValue(comp)) } private fun readWcpEntry(f: File, rel: String): ByteArray? = readWcp(f) { tar -> @@ -1122,23 +1137,20 @@ object ComponentsManager { } 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) - } - } + packagesInUse(loadState(context), protons(context)) } + fun deleteUnused(context: Context, file: String): Boolean = synchronized(lock) { + val name = safeName(file) + val f = File(packagesDir(context), name) + if (!f.isFile || name in packagesInUse(loadState(context), protons(context))) return false + deletePackage(context, name) + true + } + + fun storedFiles(context: Context): List = + packagesDir(context).listFiles()?.filter { it.isFile && it.name.endsWith(".wcp") }?.map { it.name } ?: emptyList() + fun isStored(context: Context, file: String): Boolean = File(packagesDir(context), safeName(file)).isFile internal fun forcedPackageWanted(activeFile: String?, protonVersionMatches: Boolean): Boolean = diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index c552295915..e547dae0cd 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -571,7 +571,7 @@ تُثبَّت الإصدارات الجديدة في الخلفية. إذا أُغلقت لعبة كانت تعمل خلال ثوانٍ مرتين، يعود Auto إلى الإصدار الذي كان يعمل. الاحتياطي: %1$s جارٍ البحث عن إصدارات… - لا يستخدمه أي Proton مثبّت + لا يستخدمه أي DroidDeck-Proton تنتظر تحديثات Auto اتصالًا. تعذّر البحث عن إصدارات جديدة. تنتظر الإصدارات الجديدة اتصالًا غير محدود، وإيقاف توفير البطارية، وجهازًا غير ساخن. 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 32d66b003d..810abb2618 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -565,7 +565,7 @@ 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 + Ningún DroidDeck-Proton 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. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 5c961b0336..09fe1c1604 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -563,7 +563,7 @@ Новите версии се инсталират във фонов режим. Ако игра, която е работила, се затвори до секунди два пъти, Auto се връща към работещата версия. Резервна: %1$s Търсене на версии… - Нито един инсталиран Proton не го използва + Нито един DroidDeck-Proton не го използва Актуализациите Auto чакат връзка. Новите версии не можаха да бъдат проверени. Новите версии чакат неотчитана връзка, изключен режим за пестене на батерията и охладено устройство. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 5eb8849f47..3474768ff3 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -567,7 +567,7 @@ 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á + Žádný DroidDeck-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í. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 2048de93e7..489005d1e6 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -563,7 +563,7 @@ 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 + Ingen DroidDeck-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. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ae04fc0d9c..68e733f1bf 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -563,7 +563,7 @@ 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 + Kein DroidDeck-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. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 8d7be5031f..0040421cd3 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -563,7 +563,7 @@ Οι νέες εκδόσεις εγκαθίστανται στο παρασκήνιο. Αν ένα παιχνίδι που λειτουργούσε κλείσει μέσα σε δευτερόλεπτα δύο φορές, το Auto επιστρέφει στην έκδοση που λειτουργούσε. Εφεδρική: %1$s Αναζήτηση εκδόσεων… - Κανένα εγκατεστημένο Proton δεν το χρησιμοποιεί + Κανένα DroidDeck-Proton δεν το χρησιμοποιεί Οι ενημερώσεις Auto περιμένουν σύνδεση. Δεν ήταν δυνατός ο έλεγχος για νέες εκδόσεις. Οι νέες εκδόσεις περιμένουν σύνδεση χωρίς όριο δεδομένων, απενεργοποιημένη εξοικονόμηση μπαταρίας και δροσερή συσκευή. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 3ac7f5a9cf..c4e9748793 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -565,7 +565,7 @@ 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 + Ningún DroidDeck-Proton 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. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index c2a8c24cc6..f18ba8b909 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -563,7 +563,7 @@ 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ä + Mikään DroidDeck-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. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1b8ff67fbe..e8b4dcb518 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -565,7 +565,7 @@ 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 + Aucun DroidDeck-Proton 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. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 3bae590a2d..1098f96d21 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -563,7 +563,7 @@ नए बिल्ड बैकग्राउंड में इंस्टॉल होते हैं। अगर पहले चलने वाला गेम दो बार कुछ सेकंड में बंद हो जाए, तो Auto काम करने वाले बिल्ड पर लौट जाता है। फ़ॉलबैक: %1$s बिल्ड खोजे जा रहे हैं… - कोई इंस्टॉल Proton इसका उपयोग नहीं करता + कोई DroidDeck-Proton इसका उपयोग नहीं करता Auto अपडेट कनेक्शन का इंतज़ार कर रहे हैं। नए बिल्ड नहीं जाँचे जा सके। नए बिल्ड बिना सीमा वाले कनेक्शन, बंद बैटरी सेवर और ठंडे डिवाइस का इंतज़ार करते हैं। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 3d560663ad..e2e5b6b40e 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -563,7 +563,7 @@ 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 + Egyik DroidDeck-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. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index f7b605249a..6279d3c6a2 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -561,7 +561,7 @@ 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 + Tidak ada DroidDeck-Proton yang memakainya Pembaruan Auto menunggu koneksi. Tidak dapat memeriksa build baru. Build baru menunggu koneksi tanpa kuota, penghemat baterai mati, dan perangkat yang dingin. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 0aa5bccc70..0f0de6a0a0 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -565,7 +565,7 @@ 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 + Nessun DroidDeck-Proton 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. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ba0c4cb1a0..9d8c675759 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -561,7 +561,7 @@ 新しいビルドはバックグラウンドでインストールされます。以前動いていたゲームが数秒で 2 回終了した場合、Auto は動作していたビルドに戻します。 予備: %1$s ビルドを確認中… - これを使うインストール済み Proton はありません + これを使う DroidDeck-Proton はありません Auto 更新は接続を待っています。 新しいビルドを確認できませんでした。 新しいビルドは従量制でない接続、バッテリーセーバーのオフ、端末が熱くない状態を待ちます。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index b3a368777a..baf68c37b9 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -561,7 +561,7 @@ 새 빌드는 백그라운드에서 설치됩니다. 이전에 실행되던 게임이 몇 초 만에 두 번 종료되면 Auto가 작동하던 빌드로 되돌립니다. 대체: %1$s 빌드 확인 중… - 이를 사용하는 설치된 Proton이 없습니다 + 이를 사용하는 DroidDeck-Proton이 없습니다 Auto 업데이트가 연결을 기다리는 중입니다. 새 빌드를 확인할 수 없습니다. 새 빌드는 데이터 무제한 연결, 배터리 세이버 꺼짐, 기기가 뜨겁지 않은 상태를 기다립니다. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 15512b395b..fef1314c88 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -561,7 +561,7 @@ 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 + Tiada DroidDeck-Proton 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. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index ab859f0e15..14f1ce3c84 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -563,7 +563,7 @@ 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 + Ingen DroidDeck-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. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index ea4e0eb572..279a434e7b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -563,7 +563,7 @@ 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 + Geen DroidDeck-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. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 52a42187a6..f7e6920f62 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -567,7 +567,7 @@ 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 + Żaden DroidDeck-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. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 668919b906..b3e112cd19 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -565,7 +565,7 @@ 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 + Nenhum DroidDeck-Proton 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. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 2fbd7414c9..26660803f5 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -565,7 +565,7 @@ 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 + Nenhum DroidDeck-Proton 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. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 69751c27cb..c19ea386d5 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -565,7 +565,7 @@ 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 + Niciun DroidDeck-Proton 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. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index b8198adfcc..c3192a88d0 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -586,7 +586,7 @@ Новые сборки ставятся в фоне. Если игра, которая раньше работала, дважды закроется за несколько секунд, Auto вернётся к рабочей сборке. Запасная: %1$s Поиск сборок… - Ни один установленный Proton это не использует + Ни один DroidDeck-Proton это не использует Обновления Auto ждут подключения. Не удалось проверить новые сборки. Новые сборки ждут безлимитного подключения, выключенной экономии заряда и остывшего устройства. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 0fcfbcb0f8..85564ecfb0 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -563,7 +563,7 @@ 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 + Ingen DroidDeck-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. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index c1b88770b2..86ba4d427e 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -561,7 +561,7 @@ บิลด์ใหม่จะติดตั้งในเบื้องหลัง หากเกมที่เคยเล่นได้ปิดลงภายในไม่กี่วินาทีสองครั้ง Auto จะกลับไปใช้บิลด์ที่ใช้งานได้ สำรอง: %1$s กำลังค้นหาบิลด์… - ไม่มี Proton ที่ติดตั้งใช้สิ่งนี้ + ไม่มี DroidDeck-Proton ที่ใช้สิ่งนี้ การอัปเดต Auto กำลังรอการเชื่อมต่อ ตรวจหาบิลด์ใหม่ไม่ได้ บิลด์ใหม่จะรอการเชื่อมต่อที่ไม่จำกัดปริมาณ ปิดโหมดประหยัดแบตเตอรี่ และอุปกรณ์ที่ไม่ร้อน diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 30708430fd..80d9523b75 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -563,7 +563,7 @@ 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 + Hiçbir DroidDeck-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. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index dad9d6c46a..19812c988f 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -567,7 +567,7 @@ Нові збірки встановлюються у фоні. Якщо гра, яка раніше працювала, двічі закриється за кілька секунд, Auto повернеться до робочої збірки. Запасна: %1$s Пошук збірок… - Жоден встановлений Proton цього не використовує + Жоден DroidDeck-Proton цього не використовує Оновлення Auto чекають на з’єднання. Не вдалося перевірити нові збірки. Нові збірки чекають на безлімітне з’єднання, вимкнену економію заряду та охолоджений пристрій. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 8b1b6c93c5..6450ad295d 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -561,7 +561,7 @@ 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 + Không DroidDeck-Proton nào 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. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2e480621bb..3c0bff104f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -561,7 +561,7 @@ 新版本会在后台安装。如果之前能运行的游戏两次在几秒内关闭,Auto 会退回到之前可用的版本。 备用:%1$s 正在检查版本… - 没有已安装的 Proton 使用它 + 没有 DroidDeck-Proton 使用它 Auto 更新正在等待网络连接。 无法检查新版本。 新版本将等待不按流量计费的网络、关闭省电模式且设备不过热时下载。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 30f10dfa3b..04ca81b85c 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -561,7 +561,7 @@ 新版本會在背景安裝。如果之前能執行的遊戲兩次在幾秒內關閉,Auto 會退回到之前可用的版本。 備用:%1$s 正在檢查版本… - 沒有已安裝的 Proton 使用它 + 沒有 DroidDeck-Proton 使用它 Auto 更新正在等待網絡連線。 無法檢查新版本。 新版本將等待非按流量收費的網絡、關閉省電模式且裝置不過熱時下載。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 20bab6679c..67fbf05d1e 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -561,7 +561,7 @@ 新版本會在背景安裝。如果先前能執行的遊戲兩次在幾秒內關閉,Auto 會退回到先前可用的版本。 備用:%1$s 正在檢查版本… - 沒有已安裝的 Proton 使用它 + 沒有 DroidDeck-Proton 使用它 Auto 更新正在等待網路連線。 無法檢查新版本。 新版本將等待非計量網路、關閉省電模式且裝置不過熱時下載。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 936935e11e..32382c40d4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -611,7 +611,7 @@ 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 + No DroidDeck-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. diff --git a/app/src/test/java/com/droiddeck/launcher/session/ComponentUpdatesTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ComponentUpdatesTest.kt index 0941bd888b..70e9eb7cd7 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ComponentUpdatesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ComponentUpdatesTest.kt @@ -6,6 +6,9 @@ import org.junit.Assert.assertNull import org.junit.Assert.assertTrue import android.content.Context import androidx.test.core.app.ApplicationProvider +import com.github.luben.zstd.ZstdOutputStream +import org.apache.commons.compress.archivers.tar.TarArchiveEntry +import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream import org.json.JSONArray import org.json.JSONObject import org.junit.Test @@ -346,4 +349,186 @@ class ComponentUpdatesTest { 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())) } + + private fun choice(file: String, auto: Boolean = false) = ComponentsManager.Choice(file, auto, "1") + + @Test fun aBuildTheUserPickedOnAProtonIsNeverReplacedByAuto() { + val auto = setOf("DD-dxvk-3.1.1+188-nightly.wcp", "DD-dxvk-3.1.1+190-nightly.wcp") + assertTrue(ComponentUpdates.manual(choice("DD-dxvk-gplasync-3.1.1+190-nightly.wcp"), null, auto)) + assertTrue(ComponentUpdates.manual(choice("DD-dxvk-3.1.1+188-nightly.wcp"), "DD-dxvk-3.1.1+190-nightly.wcp", auto)) + assertFalse(ComponentUpdates.manual(choice("DD-dxvk-3.1.1+190-nightly.wcp"), "DD-dxvk-3.1.1+190-nightly.wcp", auto)) + assertFalse(ComponentUpdates.manual(choice("DD-dxvk-3.1.1+188-nightly.wcp"), null, auto)) + assertFalse(ComponentUpdates.manual(choice("original 11-7.4"), null, auto)) + assertFalse(ComponentUpdates.manual(choice("dxvk-2.6.2-linux.wcp", auto = true), null, auto)) + assertFalse(ComponentUpdates.manual(null, null, auto)) + } + + @Test fun aQueuedSwapThatNeverRanLeavesTheOldAutoBuildToAuto() { + val auto = setOf("DD-dxvk-3.1.1+188-nightly.wcp", "DD-dxvk-3.1.1+190-nightly.wcp") + assertFalse(ComponentUpdates.manual(choice("DD-dxvk-3.1.1+188-nightly.wcp"), "DD-dxvk-3.1.1+188-nightly.wcp", auto, "DD-dxvk-3.1.1+190-nightly.wcp")) + assertFalse(ComponentUpdates.manual(choice("DD-dxvk-3.1.1+190-nightly.wcp"), "DD-dxvk-3.1.1+188-nightly.wcp", auto, "DD-dxvk-3.1.1+190-nightly.wcp")) + assertTrue(ComponentUpdates.manual(choice("DD-dxvk-3.1.1+186-nightly.wcp"), "DD-dxvk-3.1.1+188-nightly.wcp", auto, "DD-dxvk-3.1.1+190-nightly.wcp")) + } + + @Test fun oldBuildsOfAnAutoLineAreDeletedButOtherFlavoursAndKeptBuildsStay() { + val line = ComponentUpdates.line("dxvk", false) + val stored = listOf( + "DD-dxvk-3.1.1+186-nightly.wcp", "DD-dxvk-3.1.1+188-nightly.wcp", "DD-dxvk-3.1.1+190-nightly.wcp", + "DD-dxvk-arm64ec-3.1.1+188-nightly.wcp", "DD-dxvk-gplasync-3.1.1+190-nightly.wcp", "dxvk-2.6.2-linux.wcp", + ) + val keep = ComponentUpdates.keep("DD-dxvk-3.1.1+190-nightly.wcp", "DD-dxvk-3.1.1+188-nightly.wcp", emptySet()) + assertEquals(listOf("DD-dxvk-3.1.1+186-nightly.wcp"), ComponentUpdates.stale(line, emptySet(), stored, keep, "DD-dxvk-3.1.1+190-nightly.wcp")) + assertEquals(listOf("DD-dxvk-3.1.1+184-nightly.wcp", "DD-dxvk-3.1.1+186-nightly.wcp"), + ComponentUpdates.stale(line, setOf("DD-dxvk-3.1.1+184-nightly.wcp", "DD-dxvk-3.1.1+190-nightly.wcp"), stored, keep, "DD-dxvk-3.1.1+190-nightly.wcp")) + assertEquals(emptyList(), ComponentUpdates.stale(line, emptySet(), stored, keep + "DD-dxvk-3.1.1+186-nightly.wcp", "DD-dxvk-3.1.1+190-nightly.wcp")) + assertEquals(emptyList(), ComponentUpdates.stale(null, emptySet(), stored, keep, "DD-dxvk-3.1.1+190-nightly.wcp")) + } + + @Test fun aNewerAutoBuildIsKeptUnlessItWasRolledBack() { + val line = ComponentUpdates.line("dxvk", false) + val owned = setOf("DD-dxvk-3.1.1+188-nightly.wcp", "DD-dxvk-3.1.1+192-nightly.wcp", "DD-dxvk-3.1.1+194-nightly.wcp") + val current = "DD-dxvk-3.1.1+190-nightly.wcp" + val keep = ComponentUpdates.keep(current, ComponentUpdates.ORIGINAL, emptySet()) + assertEquals(listOf("DD-dxvk-3.1.1+188-nightly.wcp", "DD-dxvk-3.1.1+194-nightly.wcp"), + ComponentUpdates.stale(line, owned, emptyList(), keep, current, setOf("DD-dxvk-3.1.1+194-nightly.wcp"))) + assertEquals(listOf("DD-dxvk-3.1.1+188-nightly.wcp"), ComponentUpdates.stale(line, owned, emptyList(), keep, current)) + } + + @Test fun anImportBeforePruningTakesTheFileAwayFromAuto() { + val context = ApplicationProvider.getApplicationContext() + val updates = File(context.filesDir, "components/updates.json").apply { parentFile?.mkdirs() } + updates.writeText(JSONObject().put("lines", JSONObject().put("dxvk", JSONObject() + .put("current", "DD-dxvk-3.1.1+190-nightly.wcp") + .put("owned", JSONArray(listOf("DD-dxvk-3.1.1+190-nightly.wcp", "DD-dxvk-3.1.1+194-nightly.wcp"))) + .put("bad", JSONArray(listOf("DD-dxvk-3.1.1+194-nightly.wcp"))))).toString()) + ComponentUpdater.disown(context, "DD-dxvk-3.1.1+194-nightly.wcp") + val line = JSONObject(updates.readText()).getJSONObject("lines").getJSONObject("dxvk") + val owned = (0 until line.getJSONArray("owned").length()).map { line.getJSONArray("owned").getString(it) }.toSet() + assertEquals(setOf("DD-dxvk-3.1.1+190-nightly.wcp"), owned) + val auto = ComponentUpdater.placed(JSONObject(updates.readText())) + assertFalse("DD-dxvk-3.1.1+194-nightly.wcp" in auto) + assertTrue(ComponentUpdates.manual(choice("DD-dxvk-3.1.1+194-nightly.wcp"), null, auto, "DD-dxvk-3.1.1+190-nightly.wcp")) + val keep = ComponentUpdates.keep("DD-dxvk-3.1.1+190-nightly.wcp", ComponentUpdates.ORIGINAL, emptySet()) + assertEquals(emptyList(), ComponentUpdates.stale(ComponentUpdates.line("dxvk", false), owned, + listOf("DD-dxvk-3.1.1+194-nightly.wcp"), keep, "DD-dxvk-3.1.1+190-nightly.wcp", setOf("DD-dxvk-3.1.1+194-nightly.wcp"))) + } + + @Test fun aRolledBackBuildTheUserImportsAgainIsKept() { + val line = ComponentUpdates.line("dxvk", false) + val current = "DD-dxvk-3.1.1+190-nightly.wcp" + val bad = setOf("DD-dxvk-3.1.1+194-nightly.wcp") + val keep = ComponentUpdates.keep(current, ComponentUpdates.ORIGINAL, emptySet()) + assertEquals(listOf("DD-dxvk-3.1.1+194-nightly.wcp"), + ComponentUpdates.stale(line, bad, listOf("DD-dxvk-3.1.1+194-nightly.wcp"), keep, current, bad)) + assertEquals(emptyList(), ComponentUpdates.stale(line, emptySet(), listOf("DD-dxvk-3.1.1+194-nightly.wcp"), keep, current, bad)) + } + + @Test fun aNewerBuildTheUserStoredIsNotPrunedBeforeAutoCatchesUp() { + val line = ComponentUpdates.line("dxvk", false) + val stored = listOf("DD-dxvk-3.1.1+186-nightly.wcp", "DD-dxvk-3.1.1+192-nightly.wcp") + val keep = ComponentUpdates.keep("DD-dxvk-3.1.1+190-nightly.wcp", ComponentUpdates.ORIGINAL, emptySet()) + assertEquals(listOf("DD-dxvk-3.1.1+186-nightly.wcp"), ComponentUpdates.stale(line, emptySet(), stored, keep, "DD-dxvk-3.1.1+190-nightly.wcp")) + assertEquals(listOf("DD-dxvk-3.1.1+184-nightly.wcp"), + ComponentUpdates.stale(line, setOf("DD-dxvk-3.1.1+184-nightly.wcp"), stored, emptySet(), ComponentUpdates.ORIGINAL)) + } + + @Test fun aPackageLeftSelectedOnARemovedProtonIsNoLongerKept() { + val context = ApplicationProvider.getApplicationContext() + File(context.filesDir, "components/state.json").apply { parentFile?.mkdirs() }.writeText(JSONObject() + .put("active", JSONObject().put("DroidDeck-Proton-11-7.4", JSONObject() + .put("dxvk", JSONObject().put("file", "DD-dxvk-3.1.1+186-nightly.wcp").put("protonVersion", "11-7.4")))) + .put("profiles", JSONObject().put("app:1", JSONObject().put("dxvk", "mine.wcp"))).toString()) + assertEquals(setOf("mine.wcp"), ComponentsManager.selectedPackages(context)) + } + + @Test fun pruningNeverDeletesAPackageAGameProfileSelected() { + val context = ApplicationProvider.getApplicationContext() + val dir = File(context.filesDir, "components").apply { mkdirs() } + File(dir, "state.json").writeText(JSONObject() + .put("profiles", JSONObject().put("app:1", JSONObject().put("dxvk", "DD-dxvk-3.1.1+186-nightly.wcp"))).toString()) + val packages = File(dir, "packages").apply { mkdirs() } + val kept = File(packages, "DD-dxvk-3.1.1+186-nightly.wcp").apply { writeText("x") } + val old = File(packages, "DD-dxvk-3.1.1+184-nightly.wcp").apply { writeText("x") } + assertFalse(ComponentsManager.deleteUnused(context, kept.name)) + assertTrue(kept.isFile) + assertEquals("DD-dxvk-3.1.1+186-nightly.wcp", JSONObject(File(dir, "state.json").readText()) + .getJSONObject("profiles").getJSONObject("app:1").getString("dxvk")) + assertTrue(ComponentsManager.deleteUnused(context, old.name)) + assertFalse(old.isFile) + assertFalse(ComponentsManager.deleteUnused(context, old.name)) + } + + @Test fun aSelectionStaysLiveWhenAnotherInstallSharesItsProtonId() { + fun p(version: String) = ComponentsManager.Proton("GE-Proton", "GE-Proton", File("/steam/$version"), "/p", version, false) + val state = JSONObject().put("active", JSONObject().put("GE-Proton", JSONObject() + .put("dxvk", JSONObject().put("file", "DD-dxvk-3.1.1+186-nightly.wcp").put("protonVersion", "2")))) + assertTrue("DD-dxvk-3.1.1+186-nightly.wcp" in ComponentsManager.packagesInUse(state, listOf(p("1"), p("2")))) + assertTrue("DD-dxvk-3.1.1+186-nightly.wcp" in ComponentsManager.packagesInUse(state, listOf(p("2"), p("1")))) + assertFalse("DD-dxvk-3.1.1+186-nightly.wcp" in ComponentsManager.packagesInUse(state, listOf(p("1")))) + val entry = state.getJSONObject("active").getJSONObject("GE-Proton").getJSONObject("dxvk") + assertTrue(ComponentsManager.liveOnAny("active", entry, listOf(p("1"), p("2")))) + assertFalse(ComponentsManager.liveOnAny("active", entry, listOf(p("1")))) + assertFalse(ComponentsManager.liveOnAny("active", entry, null)) + } + + @Test fun aPackageIsArm64xOnlyWhenEveryGraphicsDllInItIs() { + val owned = setOf("d3d11.dll", "dxgi.dll", "d3d9.dll") + val hybrid = pe(0xaa64, true, true) + val ec = pe(0x8664, true, true) + assertTrue(ComponentUpdates.allArm64x(mapOf("d3d11.dll" to hybrid, "dxgi.dll" to hybrid, "openvr_api_dxvk.dll" to pe(0x8664, true, false)), owned)) + assertFalse(ComponentUpdates.allArm64x(mapOf("d3d11.dll" to hybrid, "dxgi.dll" to ec), owned)) + assertFalse(ComponentUpdates.allArm64x(mapOf("D3D9.DLL" to ec, "d3d11.dll" to hybrid), owned)) + assertFalse(ComponentUpdates.allArm64x(mapOf("openvr_api_dxvk.dll" to hybrid), owned)) + assertFalse(ComponentUpdates.allArm64x(emptyMap(), owned)) + } + + private fun wcp(context: Context, name: String, dlls: Map) { + val out = File(context.filesDir, "components/packages/$name").apply { parentFile!!.mkdirs() } + TarArchiveOutputStream(ZstdOutputStream(out.outputStream())).use { tar -> + for ((path, body) in dlls) { + tar.putArchiveEntry(TarArchiveEntry(path).apply { size = body.size.toLong() }) + tar.write(body) + tar.closeArchiveEntry() + } + } + } + + @Test fun anImportWaitsForPruningAndLeavesTheFileTheUsers() { + val context = ApplicationProvider.getApplicationContext() + val name = "DD-dxvk-3.1.1+194-nightly.wcp" + File(context.filesDir, "components/updates.json").apply { parentFile?.mkdirs() }.writeText(JSONObject().put("lines", JSONObject() + .put("dxvk", JSONObject().put("current", "DD-dxvk-3.1.1+190-nightly.wcp").put("owned", JSONArray(listOf(name))))).toString()) + wcp(context, "source.wcp", mapOf("profile.json" to JSONObject().put("type", "DXVK-Linux").put("versionName", "3.1.1+194").toString().toByteArray())) + val source = File(context.filesDir, "source.wcp").also { File(context.filesDir, "components/packages/source.wcp").renameTo(it) } + val lock = ComponentUpdater::class.java.getDeclaredField("lock").apply { isAccessible = true }.get(ComponentUpdater) + val held = java.util.concurrent.CountDownLatch(1) + val release = java.util.concurrent.CountDownLatch(1) + val pruning = Thread { synchronized(lock) { held.countDown(); release.await() } }.apply { start() } + held.await() + val importing = Thread { ComponentUpdater.importPackage(context, source, name) }.apply { start() } + importing.join(300) + assertTrue(importing.isAlive) + assertFalse(File(context.filesDir, "components/packages/$name").exists()) + release.countDown() + pruning.join() + importing.join(5000) + assertTrue(File(context.filesDir, "components/packages/$name").isFile) + val state = JSONObject(File(context.filesDir, "components/updates.json").readText()) + assertEquals(0, state.getJSONObject("lines").getJSONObject("dxvk").getJSONArray("owned").length()) + assertFalse(name in ComponentUpdater.placed(state)) + } + + @Test fun aStoredPackageWithOneArm64ecOnlyDllIsNotArm64x() { + val context = ApplicationProvider.getApplicationContext() + val dir = "files/lib/wine/dxvk/aarch64-windows" + val hybrid = pe(0xaa64, true, true) + wcp(context, "mixed.wcp", mapOf("$dir/d3d11.dll" to hybrid, "$dir/dxgi.dll" to pe(0x8664, true, true), + "files/lib/wine/dxvk/i386-windows/d3d11.dll" to pe(0x14c, false, null))) + wcp(context, "hybrid.wcp", mapOf("./$dir/d3d11.dll" to hybrid, "./$dir/dxgi.dll" to hybrid, + "$dir/openvr_api_dxvk.dll" to pe(0x8664, true, false))) + assertFalse(ComponentsManager.packageArm64x(context, "mixed.wcp", "dxvk")) + assertTrue(ComponentsManager.packageArm64x(context, "hybrid.wcp", "dxvk")) + assertFalse(ComponentsManager.packageArm64x(context, "hybrid.wcp", "vkd3d")) + assertFalse(ComponentsManager.packageArm64x(context, "missing.wcp", "dxvk")) + } } diff --git a/docs/development/game-environment.md b/docs/development/game-environment.md index 682f930360..de215be39a 100644 --- a/docs/development/game-environment.md +++ b/docs/development/game-environment.md @@ -39,12 +39,19 @@ FEX, DXVK and VKD3D-Proton each have an **Auto** or **Manual** mode on the Defau 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 +never during a running session, and installs the newest build into DroidDeck-Proton. +Valve's Proton, GE-Proton, proton-cachyos and any other tool keep their own components; +builds an earlier Auto had placed in them go back to the original once. A build the user +picks on a DroidDeck-Proton by hand stays until they restore the original. 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. Where the Proton's own build is ARM64X, an +`arm64ec` package is used only when every Direct3D and DXGI DLL in it is ARM64X, because native +ARM64 programs such as `Wow-arm64.exe` cannot load an ARM64EC-only `dxgi.dll`. A rollback whose +previous build fails that check, or was deleted, goes back to the original. Auto keeps the current build and the one +it replaced and deletes every older stored build of the same line, including ones that were +stored before Auto took over, and downloads the current build again if it was deleted. +Other flavours such as gplasync and packages selected on an installed Proton or in a game +profile 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