mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 12:56:06 +00:00
fix(components): DXVK Auto on Adreno 6xx keeps DroidDeck-Proton on DXVK-gplasync 2.7.1 (#2226)
* fix(components): DXVK Auto on Adreno 6xx keeps DroidDeck-Proton on DXVK-gplasync 2.7.1 * fix(components): DXVK Auto says so when the pinned DXVK could not be installed * fix(components): a DXVK the player picked is shown as their choice, not a failed pinned install
This commit is contained in:
1 parent
e4d4096342
commit
d74575ed7f
40 files changed
+231
-11
No files matched your search
@@ -39,7 +39,7 @@ internal class ComponentsMenu(private val activity: android.app.Activity, privat
|
||||
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()
|
||||
val held = if (runCatching { ComponentsManager.autoDxvkHeld(activity) }.getOrDefault(false)) setOf("dxvk") else emptySet()
|
||||
ui.post {
|
||||
compModes = modes
|
||||
compAuto = auto
|
||||
|
||||
@@ -5,15 +5,17 @@ import android.util.AtomicFile
|
||||
import android.util.Log
|
||||
import com.droiddeck.launcher.R
|
||||
import com.droiddeck.launcher.frontend.AutoComponents
|
||||
import com.droiddeck.launcher.gpu.GpuInfo
|
||||
import java.io.File
|
||||
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 const val HANDED_BACK = "handedBack"
|
||||
private const val PINNED_NOTE = "pinnedNote"
|
||||
internal const val HAND_BACK_FILES = "handBackFiles"
|
||||
private const val IMPORTED = "imported"
|
||||
private val lock = Any()
|
||||
@@ -103,6 +105,13 @@ object ComponentUpdater {
|
||||
val protons = found ?: emptyList()
|
||||
if (found != null) handBack(context, state, found)
|
||||
judge(context, state, protons, notes)
|
||||
ComponentsManager.pinnedAutoDxvk(context)?.let { pinned ->
|
||||
runCatching { ComponentsManager.ensureForcedPackages(context) }
|
||||
.onSuccess { if (it != null) Log.i(TAG, it) }.onFailure { Log.w(TAG, "pinned DXVK", it) }
|
||||
val followers = protons.filter { ComponentUpdates.follows(it) && ComponentsManager.supports(it, "dxvk") }.map { it.id to it.version }
|
||||
if (pinnedHeld(pinned, followers, ComponentsManager.activeChoices(context), pinnedBase())) state.remove(PINNED_NOTE)
|
||||
else state.put(PINNED_NOTE, context.getString(R.string.comp_auto_install_failed, pinned.removeSuffix(".wcp")))
|
||||
}
|
||||
val due = force || System.currentTimeMillis() - state.optLong("checkedAt") >= CHECK_EVERY_MS
|
||||
val wanted = ComponentsManager.COMPONENTS.filter { managed(context, it) }
|
||||
if (wanted.isEmpty() || protons.isEmpty()) {
|
||||
@@ -385,7 +394,32 @@ object ComponentUpdater {
|
||||
}
|
||||
}
|
||||
|
||||
internal fun pinnedHeld(pinned: String, followers: List<Pair<String, String>>, choices: Map<String, Map<String, ComponentsManager.Choice>>, base: String?): Boolean =
|
||||
followers.all { (id, version) ->
|
||||
val choice = choices[id]?.get("dxvk")
|
||||
ownChoice(choice, version, pinned, base) || choice?.let { it.file == ComponentsManager.safeName(pinned) && it.protonVersion == version } == true
|
||||
}
|
||||
|
||||
internal fun ownChoice(choice: ComponentsManager.Choice?, version: String, pinned: String, base: String?): Boolean =
|
||||
choice != null && !choice.auto && choice.protonVersion == version && choice.file != ComponentsManager.safeName(pinned) &&
|
||||
(base == null || choice.file != ComponentsManager.safeName(base))
|
||||
|
||||
private fun pinnedBase(): String? = ComponentsManager.forcedDxvk(GpuInfo.detect())?.file
|
||||
|
||||
fun status(context: Context, comp: String): List<Status> {
|
||||
val pinned = if (comp == "dxvk") ComponentsManager.pinnedAutoDxvk(context) else null
|
||||
if (pinned != null) {
|
||||
val on = runCatching { ComponentsManager.protons(context) }.getOrDefault(emptyList())
|
||||
.filter { ComponentUpdates.follows(it) && ComponentsManager.supports(it, comp) }
|
||||
if (on.isEmpty()) return emptyList()
|
||||
val choices = ComponentsManager.activeChoices(context)
|
||||
val base = pinnedBase()
|
||||
val (own, auto) = on.partition { ownChoice(choices[it.id]?.get(comp), it.version, pinned, base) }
|
||||
val held = pinnedHeld(pinned, auto.map { it.id to it.version }, choices, base)
|
||||
val pinnedLine = if (auto.isEmpty()) emptyList()
|
||||
else listOf(Status(comp, pinned, pinned, auto.map { it.name }, if (held) "" else load(context).optString(PINNED_NOTE)))
|
||||
return pinnedLine + own.groupBy { choices.getValue(it.id).getValue(comp).file }.map { (file, ps) -> Status(comp, file, file, ps.map { it.name }, "") }
|
||||
}
|
||||
val state = load(context)
|
||||
val lines = state.optJSONObject("lines") ?: JSONObject()
|
||||
val protons = runCatching { ComponentsManager.protons(context) }.getOrDefault(emptyList())
|
||||
|
||||
@@ -1065,14 +1065,24 @@ object ComponentsManager {
|
||||
val file: String,
|
||||
val release: String,
|
||||
val models: Set<Int> = emptySet(),
|
||||
val autoFile: String? = null,
|
||||
val autoRelease: String? = null,
|
||||
) {
|
||||
fun matches(gpu: GpuInfo) = gpu.family in families && (models.isEmpty() || gpu.model in models)
|
||||
|
||||
fun autoRule(): ForcedPackage? =
|
||||
if (autoFile != null && autoRelease != null) copy(file = autoFile, release = autoRelease, autoFile = null, autoRelease = null) else null
|
||||
}
|
||||
|
||||
internal val FORCED_PACKAGES = listOf(
|
||||
ForcedPackage(setOf(GpuInfo.Family.A6XX), "dxvk", "dxvk-2.7.1-linux.wcp", "Dxvk-Linux"),
|
||||
ForcedPackage(setOf(GpuInfo.Family.A6XX), "dxvk", "dxvk-2.7.1-linux.wcp", "Dxvk-Linux",
|
||||
autoFile = "dxvk-gplasync-2.7.1-1-linux.wcp", autoRelease = "Dxvk-gplasync-Linux"),
|
||||
)
|
||||
|
||||
internal fun autoDxvk(gpu: GpuInfo): ForcedPackage? = forcedDxvk(gpu)?.autoRule()
|
||||
|
||||
internal fun forcedDxvk(gpu: GpuInfo): ForcedPackage? = FORCED_PACKAGES.firstOrNull { it.comp == "dxvk" && it.matches(gpu) }
|
||||
|
||||
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)
|
||||
@@ -1124,6 +1134,12 @@ object ComponentsManager {
|
||||
(com.droiddeck.launcher.core.DeviceSupport.vkBridge(context) && !SessionPrefs.bridgeProtonDxvk(context) &&
|
||||
bridgeDxvk(AppVulkan.detect(context)) != null)
|
||||
|
||||
fun autoDxvkHeld(context: Context): Boolean =
|
||||
hardwareDxvk(context) && (runtimeManaged(context, "dxvk") || autoDxvk(GpuInfo.detect()) == null)
|
||||
|
||||
fun pinnedAutoDxvk(context: Context): String? =
|
||||
if (SessionPrefs.componentMode(context, "dxvk") == ComponentUpdates.AUTO) autoDxvk(GpuInfo.detect())?.file else null
|
||||
|
||||
data class Choice(val file: String, val auto: Boolean, val protonVersion: String)
|
||||
|
||||
fun activeChoices(context: Context): Map<String, Map<String, Choice>> = synchronized(lock) {
|
||||
@@ -1168,6 +1184,14 @@ object ComponentsManager {
|
||||
internal const val DXVK_FOR_VULKAN_1_1 = "dxvk-1.10.3-linux.wcp"
|
||||
internal const val DXVK_FOR_VULKAN_1_3_NO_INT64 = "dxvk-2.6.2-linux.wcp"
|
||||
|
||||
private data class ForcedRule(
|
||||
val pkg: ForcedPackage,
|
||||
val auto: Boolean,
|
||||
val covers: (Proton) -> Boolean,
|
||||
val replaces: String? = null,
|
||||
val label: String? = null,
|
||||
)
|
||||
|
||||
internal fun autoDxvkUndoWanted(bridgeSession: Boolean, keepProtonDxvk: Boolean, vulkan: AppVulkan?, bridgeRule: ForcedPackage?): Boolean =
|
||||
!bridgeSession || keepProtonDxvk || (vulkan != null && bridgeRule == null)
|
||||
|
||||
@@ -1200,6 +1224,7 @@ object ComponentsManager {
|
||||
undoAuto = { id, comp -> undoAutoChoice(context, id, comp) },
|
||||
keepProtonDxvk = SessionPrefs.bridgeProtonDxvk(context),
|
||||
autoPossible = !com.droiddeck.launcher.core.DeviceSupport.adreno(),
|
||||
dxvkAuto = pinnedAutoDxvk(context) != null,
|
||||
) }
|
||||
|
||||
fun settleAutoDxvk(context: Context) {
|
||||
@@ -1239,10 +1264,16 @@ object ComponentsManager {
|
||||
undoAuto: (protonId: String, comp: String) -> String = { _, _ -> "" },
|
||||
keepProtonDxvk: Boolean = false,
|
||||
autoPossible: Boolean = true,
|
||||
dxvkAuto: Boolean = false,
|
||||
follows: (Proton) -> Boolean = ComponentUpdates::follows,
|
||||
): String? {
|
||||
val chooseDxvk = bridgeSession && !keepProtonDxvk
|
||||
val bridgeRule = if (chooseDxvk) bridgeDxvk(vulkan) else null
|
||||
val rules = FORCED_PACKAGES.filter { it.matches(gpu) }.map { it to false } + listOfNotNull(bridgeRule?.let { it to true })
|
||||
val family = FORCED_PACKAGES.filter { it.matches(gpu) }
|
||||
val pinned = if (dxvkAuto) family.mapNotNull { base -> base.autoRule()?.let { base to it } } else emptyList()
|
||||
val rules = family.map { base -> ForcedRule(base, false, if (pinned.any { it.first == base }) { p -> !follows(p) } else { _ -> true }) } +
|
||||
pinned.map { (base, rule) -> ForcedRule(rule, true, follows, replaces = base.file) } +
|
||||
listOfNotNull(bridgeRule?.let { ForcedRule(it, true, { true }, label = "${vulkan?.label}: DXVK ${it.file}") })
|
||||
if (rules.isEmpty() && !autoPossible) return null
|
||||
val installed = protons(context)
|
||||
val lines = mutableListOf<String>()
|
||||
@@ -1256,12 +1287,13 @@ object ComponentsManager {
|
||||
if (autoChoiceStale(entry, null)) lines.add(each(p) { undoAuto(p.id, "dxvk") })
|
||||
}
|
||||
}
|
||||
for ((rule, auto) in rules) {
|
||||
for ((rule, auto, covers, replaces, label) in rules) {
|
||||
val state = loadState(context)
|
||||
val targets = installed.filter { p ->
|
||||
val active = state.optJSONObject("active")?.optJSONObject(p.id)?.optJSONObject(rule.comp)
|
||||
forcedPackageWanted(active?.optString("file"), active?.optString("protonVersion") == p.version) ||
|
||||
(auto && autoChoiceStale(active, rule.file))
|
||||
val current = active?.optString("protonVersion") == p.version
|
||||
covers(p) && (forcedPackageWanted(active?.optString("file"), current) ||
|
||||
(auto && autoChoiceStale(active, rule.file)) || (replaces != null && current && active?.optString("file") == replaces))
|
||||
}
|
||||
if (targets.isEmpty()) continue
|
||||
val missing = missingPackage(context, rule, lookup, fetch)
|
||||
@@ -1269,7 +1301,7 @@ object ComponentsManager {
|
||||
lines.add(missing)
|
||||
continue
|
||||
}
|
||||
if (auto) lines.add("${vulkan?.label}: DXVK ${rule.file}")
|
||||
if (label != null) lines.add(label)
|
||||
lines.add(targets.joinToString("; ") { p -> if (auto) each(p) { applyAuto(p.id, rule.file) } else apply(p.id, rule.file) })
|
||||
}
|
||||
return lines.filter { it.isNotEmpty() }.joinToString("; ").ifEmpty { null }
|
||||
|
||||
@@ -1112,7 +1112,7 @@ private fun AutoComponentBody(label: String, lines: List<ComponentUpdater.Status
|
||||
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)
|
||||
val fallback = if (line.current.isEmpty() || line.current == line.previous) 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(" · "),
|
||||
|
||||
@@ -574,6 +574,7 @@
|
||||
<string name="comp_auto_none">لا يستخدمه أي DroidDeck-Proton</string>
|
||||
<string name="comp_auto_waits_network">تنتظر تحديثات Auto اتصالًا.</string>
|
||||
<string name="comp_auto_check_failed">تعذّر البحث عن إصدارات جديدة.</string>
|
||||
<string name="comp_auto_install_failed">تعذّر تثبيت %1$s.</string>
|
||||
<string name="comp_auto_waits_unmetered">تنتظر الإصدارات الجديدة اتصالًا غير محدود، وإيقاف توفير البطارية، وجهازًا غير ساخن.</string>
|
||||
<string name="comp_auto_updated">تم تحديث %1$s إلى %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">أغلق %1$s %2$s لعبة خلال ثوانٍ مرتين، لذا عاد Auto إلى %3$s.</string>
|
||||
|
||||
@@ -568,6 +568,7 @@
|
||||
<string name="comp_auto_none">Ningún DroidDeck-Proton lo usa</string>
|
||||
<string name="comp_auto_waits_network">Las actualizaciones Auto esperan una conexión.</string>
|
||||
<string name="comp_auto_check_failed">No se pudieron buscar nuevas versiones.</string>
|
||||
<string name="comp_auto_install_failed">No se pudo instalar %1$s.</string>
|
||||
<string name="comp_auto_waits_unmetered">Las nuevas versiones esperan una conexión sin límite de datos, el ahorro de batería desactivado y el dispositivo frío.</string>
|
||||
<string name="comp_auto_updated">%1$s actualizado a %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s cerró un juego en segundos dos veces, así que Auto volvió a %3$s.</string>
|
||||
|
||||
@@ -566,6 +566,7 @@
|
||||
<string name="comp_auto_none">Нито един DroidDeck-Proton не го използва</string>
|
||||
<string name="comp_auto_waits_network">Актуализациите Auto чакат връзка.</string>
|
||||
<string name="comp_auto_check_failed">Новите версии не можаха да бъдат проверени.</string>
|
||||
<string name="comp_auto_install_failed">%1$s не можа да бъде инсталиран.</string>
|
||||
<string name="comp_auto_waits_unmetered">Новите версии чакат неотчитана връзка, изключен режим за пестене на батерията и охладено устройство.</string>
|
||||
<string name="comp_auto_updated">%1$s е обновен до %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s два пъти затвори игра до секунди, затова Auto се върна към %3$s.</string>
|
||||
|
||||
@@ -570,6 +570,7 @@
|
||||
<string name="comp_auto_none">Žádný DroidDeck-Proton to nepoužívá</string>
|
||||
<string name="comp_auto_waits_network">Aktualizace Auto čekají na připojení.</string>
|
||||
<string name="comp_auto_check_failed">Nová sestavení nelze zkontrolovat.</string>
|
||||
<string name="comp_auto_install_failed">%1$s nelze nainstalovat.</string>
|
||||
<string name="comp_auto_waits_unmetered">Nová sestavení čekají na neměřené připojení, vypnutou úsporu baterie a nepřehřáté zařízení.</string>
|
||||
<string name="comp_auto_updated">%1$s aktualizováno na %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s dvakrát zavřelo hru během pár sekund, proto se Auto vrátilo k %3$s.</string>
|
||||
|
||||
@@ -566,6 +566,7 @@
|
||||
<string name="comp_auto_none">Ingen DroidDeck-Proton bruger dette</string>
|
||||
<string name="comp_auto_waits_network">Auto-opdateringer venter på en forbindelse.</string>
|
||||
<string name="comp_auto_check_failed">Kunne ikke søge efter nye builds.</string>
|
||||
<string name="comp_auto_install_failed">Kunne ikke installere %1$s.</string>
|
||||
<string name="comp_auto_waits_unmetered">Nye builds venter på en ubegrænset forbindelse, slået batterisparer fra og en kølig enhed.</string>
|
||||
<string name="comp_auto_updated">%1$s opdateret til %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s lukkede et spil inden for sekunder to gange, så Auto gik tilbage til %3$s.</string>
|
||||
|
||||
@@ -566,6 +566,7 @@
|
||||
<string name="comp_auto_none">Kein DroidDeck-Proton nutzt dies</string>
|
||||
<string name="comp_auto_waits_network">Auto-Updates warten auf eine Verbindung.</string>
|
||||
<string name="comp_auto_check_failed">Neue Builds konnten nicht geprüft werden.</string>
|
||||
<string name="comp_auto_install_failed">%1$s konnte nicht installiert werden.</string>
|
||||
<string name="comp_auto_waits_unmetered">Neue Builds warten auf eine nicht getaktete Verbindung, ausgeschalteten Energiesparmodus und ein kühles Gerät.</string>
|
||||
<string name="comp_auto_updated">%1$s auf %2$s aktualisiert.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s hat ein Spiel zweimal nach wenigen Sekunden beendet, daher ist Auto zu %3$s zurückgekehrt.</string>
|
||||
|
||||
@@ -566,6 +566,7 @@
|
||||
<string name="comp_auto_none">Κανένα DroidDeck-Proton δεν το χρησιμοποιεί</string>
|
||||
<string name="comp_auto_waits_network">Οι ενημερώσεις Auto περιμένουν σύνδεση.</string>
|
||||
<string name="comp_auto_check_failed">Δεν ήταν δυνατός ο έλεγχος για νέες εκδόσεις.</string>
|
||||
<string name="comp_auto_install_failed">Δεν ήταν δυνατή η εγκατάσταση του %1$s.</string>
|
||||
<string name="comp_auto_waits_unmetered">Οι νέες εκδόσεις περιμένουν σύνδεση χωρίς όριο δεδομένων, απενεργοποιημένη εξοικονόμηση μπαταρίας και δροσερή συσκευή.</string>
|
||||
<string name="comp_auto_updated">Το %1$s ενημερώθηκε σε %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">Το %1$s %2$s έκλεισε ένα παιχνίδι μέσα σε δευτερόλεπτα δύο φορές, οπότε το Auto επέστρεψε στο %3$s.</string>
|
||||
|
||||
@@ -568,6 +568,7 @@
|
||||
<string name="comp_auto_none">Ningún DroidDeck-Proton lo usa</string>
|
||||
<string name="comp_auto_waits_network">Las actualizaciones Auto esperan una conexión.</string>
|
||||
<string name="comp_auto_check_failed">No se pudieron buscar nuevas versiones.</string>
|
||||
<string name="comp_auto_install_failed">No se pudo instalar %1$s.</string>
|
||||
<string name="comp_auto_waits_unmetered">Las nuevas versiones esperan una conexión sin límite de datos, el ahorro de batería desactivado y el dispositivo frío.</string>
|
||||
<string name="comp_auto_updated">%1$s actualizado a %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s cerró un juego en segundos dos veces, así que Auto volvió a %3$s.</string>
|
||||
|
||||
@@ -566,6 +566,7 @@
|
||||
<string name="comp_auto_none">Mikään DroidDeck-Proton ei käytä tätä</string>
|
||||
<string name="comp_auto_waits_network">Auto-päivitykset odottavat yhteyttä.</string>
|
||||
<string name="comp_auto_check_failed">Uusia versioita ei voitu tarkistaa.</string>
|
||||
<string name="comp_auto_install_failed">Kohdetta %1$s ei voitu asentaa.</string>
|
||||
<string name="comp_auto_waits_unmetered">Uudet versiot odottavat rajoittamatonta yhteyttä, virransäästön poistoa ja viileää laitetta.</string>
|
||||
<string name="comp_auto_updated">%1$s päivitetty versioon %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s sulki pelin sekunneissa kahdesti, joten Auto palasi versioon %3$s.</string>
|
||||
|
||||
@@ -568,6 +568,7 @@
|
||||
<string name="comp_auto_none">Aucun DroidDeck-Proton ne l\'utilise</string>
|
||||
<string name="comp_auto_waits_network">Les mises à jour Auto attendent une connexion.</string>
|
||||
<string name="comp_auto_check_failed">Impossible de vérifier les nouvelles versions.</string>
|
||||
<string name="comp_auto_install_failed">Impossible d\'installer %1$s.</string>
|
||||
<string name="comp_auto_waits_unmetered">Les nouvelles versions attendent une connexion non limitée, l\'économiseur de batterie désactivé et un appareil frais.</string>
|
||||
<string name="comp_auto_updated">%1$s mis à jour vers %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s a fermé un jeu en quelques secondes deux fois, Auto est donc revenu à %3$s.</string>
|
||||
|
||||
@@ -566,6 +566,7 @@
|
||||
<string name="comp_auto_none">कोई DroidDeck-Proton इसका उपयोग नहीं करता</string>
|
||||
<string name="comp_auto_waits_network">Auto अपडेट कनेक्शन का इंतज़ार कर रहे हैं।</string>
|
||||
<string name="comp_auto_check_failed">नए बिल्ड नहीं जाँचे जा सके।</string>
|
||||
<string name="comp_auto_install_failed">%1$s इंस्टॉल नहीं हो सका।</string>
|
||||
<string name="comp_auto_waits_unmetered">नए बिल्ड बिना सीमा वाले कनेक्शन, बंद बैटरी सेवर और ठंडे डिवाइस का इंतज़ार करते हैं।</string>
|
||||
<string name="comp_auto_updated">%1$s को %2$s पर अपडेट किया गया।</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s ने दो बार कुछ सेकंड में गेम बंद कर दिया, इसलिए Auto %3$s पर लौट गया।</string>
|
||||
|
||||
@@ -566,6 +566,7 @@
|
||||
<string name="comp_auto_none">Egyik DroidDeck-Proton sem használja</string>
|
||||
<string name="comp_auto_waits_network">Az Auto frissítések kapcsolatra várnak.</string>
|
||||
<string name="comp_auto_check_failed">Nem sikerült új buildeket keresni.</string>
|
||||
<string name="comp_auto_install_failed">Nem sikerült telepíteni: %1$s.</string>
|
||||
<string name="comp_auto_waits_unmetered">Az új buildek nem forgalomkorlátos kapcsolatra, kikapcsolt energiatakarékos módra és hűvös eszközre várnak.</string>
|
||||
<string name="comp_auto_updated">%1$s frissítve: %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%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.</string>
|
||||
|
||||
@@ -564,6 +564,7 @@
|
||||
<string name="comp_auto_none">Tidak ada DroidDeck-Proton yang memakainya</string>
|
||||
<string name="comp_auto_waits_network">Pembaruan Auto menunggu koneksi.</string>
|
||||
<string name="comp_auto_check_failed">Tidak dapat memeriksa build baru.</string>
|
||||
<string name="comp_auto_install_failed">Tidak dapat memasang %1$s.</string>
|
||||
<string name="comp_auto_waits_unmetered">Build baru menunggu koneksi tanpa kuota, penghemat baterai mati, dan perangkat yang dingin.</string>
|
||||
<string name="comp_auto_updated">%1$s diperbarui ke %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s menutup game dalam hitungan detik dua kali, jadi Auto kembali ke %3$s.</string>
|
||||
|
||||
@@ -568,6 +568,7 @@
|
||||
<string name="comp_auto_none">Nessun DroidDeck-Proton lo usa</string>
|
||||
<string name="comp_auto_waits_network">Gli aggiornamenti Auto attendono una connessione.</string>
|
||||
<string name="comp_auto_check_failed">Impossibile cercare nuove build.</string>
|
||||
<string name="comp_auto_install_failed">Impossibile installare %1$s.</string>
|
||||
<string name="comp_auto_waits_unmetered">Le nuove build attendono una connessione non a consumo, il risparmio batteria disattivato e un dispositivo fresco.</string>
|
||||
<string name="comp_auto_updated">%1$s aggiornato a %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s ha chiuso un gioco in pochi secondi per due volte, quindi Auto è tornato a %3$s.</string>
|
||||
|
||||
@@ -564,6 +564,7 @@
|
||||
<string name="comp_auto_none">これを使う DroidDeck-Proton はありません</string>
|
||||
<string name="comp_auto_waits_network">Auto 更新は接続を待っています。</string>
|
||||
<string name="comp_auto_check_failed">新しいビルドを確認できませんでした。</string>
|
||||
<string name="comp_auto_install_failed">%1$s をインストールできませんでした。</string>
|
||||
<string name="comp_auto_waits_unmetered">新しいビルドは従量制でない接続、バッテリーセーバーのオフ、端末が熱くない状態を待ちます。</string>
|
||||
<string name="comp_auto_updated">%1$s を %2$s に更新しました。</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s でゲームが数秒で 2 回終了したため、Auto は %3$s に戻しました。</string>
|
||||
|
||||
@@ -564,6 +564,7 @@
|
||||
<string name="comp_auto_none">이를 사용하는 DroidDeck-Proton이 없습니다</string>
|
||||
<string name="comp_auto_waits_network">Auto 업데이트가 연결을 기다리는 중입니다.</string>
|
||||
<string name="comp_auto_check_failed">새 빌드를 확인할 수 없습니다.</string>
|
||||
<string name="comp_auto_install_failed">%1$s을(를) 설치할 수 없습니다.</string>
|
||||
<string name="comp_auto_waits_unmetered">새 빌드는 데이터 무제한 연결, 배터리 세이버 꺼짐, 기기가 뜨겁지 않은 상태를 기다립니다.</string>
|
||||
<string name="comp_auto_updated">%1$s을(를) %2$s(으)로 업데이트했습니다.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s(으)로 게임이 몇 초 만에 두 번 종료되어 Auto가 %3$s(으)로 되돌렸습니다.</string>
|
||||
|
||||
@@ -564,6 +564,7 @@
|
||||
<string name="comp_auto_none">Tiada DroidDeck-Proton yang menggunakannya</string>
|
||||
<string name="comp_auto_waits_network">Kemas kini Auto menunggu sambungan.</string>
|
||||
<string name="comp_auto_check_failed">Tidak dapat menyemak binaan baharu.</string>
|
||||
<string name="comp_auto_install_failed">Tidak dapat memasang %1$s.</string>
|
||||
<string name="comp_auto_waits_unmetered">Binaan baharu menunggu sambungan tanpa meter, penjimat bateri dimatikan dan peranti yang sejuk.</string>
|
||||
<string name="comp_auto_updated">%1$s dikemas kini ke %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s menutup permainan dalam beberapa saat dua kali, jadi Auto kembali ke %3$s.</string>
|
||||
|
||||
@@ -566,6 +566,7 @@
|
||||
<string name="comp_auto_none">Ingen DroidDeck-Proton bruker dette</string>
|
||||
<string name="comp_auto_waits_network">Auto-oppdateringer venter på en tilkobling.</string>
|
||||
<string name="comp_auto_check_failed">Kunne ikke se etter nye bygg.</string>
|
||||
<string name="comp_auto_install_failed">Kunne ikke installere %1$s.</string>
|
||||
<string name="comp_auto_waits_unmetered">Nye bygg venter på en ubegrenset tilkobling, avslått batterisparing og en kjølig enhet.</string>
|
||||
<string name="comp_auto_updated">%1$s oppdatert til %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s lukket et spill innen sekunder to ganger, så Auto gikk tilbake til %3$s.</string>
|
||||
|
||||
@@ -566,6 +566,7 @@
|
||||
<string name="comp_auto_none">Geen DroidDeck-Proton gebruikt dit</string>
|
||||
<string name="comp_auto_waits_network">Auto-updates wachten op een verbinding.</string>
|
||||
<string name="comp_auto_check_failed">Kon niet op nieuwe builds controleren.</string>
|
||||
<string name="comp_auto_install_failed">Kon %1$s niet installeren.</string>
|
||||
<string name="comp_auto_waits_unmetered">Nieuwe builds wachten op een onbeperkte verbinding, batterijbesparing uit en een koel apparaat.</string>
|
||||
<string name="comp_auto_updated">%1$s bijgewerkt naar %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s sloot een game twee keer binnen enkele seconden, dus Auto ging terug naar %3$s.</string>
|
||||
|
||||
@@ -570,6 +570,7 @@
|
||||
<string name="comp_auto_none">Żaden DroidDeck-Proton tego nie używa</string>
|
||||
<string name="comp_auto_waits_network">Aktualizacje Auto czekają na połączenie.</string>
|
||||
<string name="comp_auto_check_failed">Nie udało się sprawdzić nowych wersji.</string>
|
||||
<string name="comp_auto_install_failed">Nie udało się zainstalować %1$s.</string>
|
||||
<string name="comp_auto_waits_unmetered">Nowe wersje czekają na połączenie bez limitu, wyłączone oszczędzanie baterii i chłodne urządzenie.</string>
|
||||
<string name="comp_auto_updated">%1$s zaktualizowano do %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s dwa razy zamknął grę po kilku sekundach, więc Auto wróciło do %3$s.</string>
|
||||
|
||||
@@ -568,6 +568,7 @@
|
||||
<string name="comp_auto_none">Nenhum DroidDeck-Proton usa isto</string>
|
||||
<string name="comp_auto_waits_network">As atualizações Auto aguardam uma ligação.</string>
|
||||
<string name="comp_auto_check_failed">Não foi possível procurar novas versões.</string>
|
||||
<string name="comp_auto_install_failed">Não foi possível instalar %1$s.</string>
|
||||
<string name="comp_auto_waits_unmetered">As novas versões aguardam uma ligação não limitada, a poupança de bateria desligada e o dispositivo fresco.</string>
|
||||
<string name="comp_auto_updated">%1$s atualizado para %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s fechou um jogo em segundos duas vezes, por isso Auto voltou a %3$s.</string>
|
||||
|
||||
@@ -568,6 +568,7 @@
|
||||
<string name="comp_auto_none">Nenhum DroidDeck-Proton usa isto</string>
|
||||
<string name="comp_auto_waits_network">As atualizações Auto aguardam uma conexão.</string>
|
||||
<string name="comp_auto_check_failed">Não foi possível procurar novas versões.</string>
|
||||
<string name="comp_auto_install_failed">Não foi possível instalar %1$s.</string>
|
||||
<string name="comp_auto_waits_unmetered">Novas versões aguardam uma conexão não limitada, a economia de bateria desligada e o aparelho frio.</string>
|
||||
<string name="comp_auto_updated">%1$s atualizado para %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s fechou um jogo em segundos duas vezes, então Auto voltou para %3$s.</string>
|
||||
|
||||
@@ -568,6 +568,7 @@
|
||||
<string name="comp_auto_none">Niciun DroidDeck-Proton nu folosește asta</string>
|
||||
<string name="comp_auto_waits_network">Actualizările Auto așteaptă o conexiune.</string>
|
||||
<string name="comp_auto_check_failed">Nu s-au putut căuta versiuni noi.</string>
|
||||
<string name="comp_auto_install_failed">Nu s-a putut instala %1$s.</string>
|
||||
<string name="comp_auto_waits_unmetered">Versiunile noi așteaptă o conexiune fără limită de date, economisirea bateriei oprită și un dispozitiv răcit.</string>
|
||||
<string name="comp_auto_updated">%1$s actualizat la %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s a închis un joc în câteva secunde de două ori, așa că Auto a revenit la %3$s.</string>
|
||||
|
||||
@@ -589,6 +589,7 @@
|
||||
<string name="comp_auto_none">Ни один DroidDeck-Proton это не использует</string>
|
||||
<string name="comp_auto_waits_network">Обновления Auto ждут подключения.</string>
|
||||
<string name="comp_auto_check_failed">Не удалось проверить новые сборки.</string>
|
||||
<string name="comp_auto_install_failed">Не удалось установить %1$s.</string>
|
||||
<string name="comp_auto_waits_unmetered">Новые сборки ждут безлимитного подключения, выключенной экономии заряда и остывшего устройства.</string>
|
||||
<string name="comp_auto_updated">%1$s обновлён до %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s дважды закрыл игру за несколько секунд, поэтому Auto вернулся к %3$s.</string>
|
||||
|
||||
@@ -566,6 +566,7 @@
|
||||
<string name="comp_auto_none">Ingen DroidDeck-Proton använder detta</string>
|
||||
<string name="comp_auto_waits_network">Auto-uppdateringar väntar på en anslutning.</string>
|
||||
<string name="comp_auto_check_failed">Kunde inte söka efter nya byggen.</string>
|
||||
<string name="comp_auto_install_failed">Kunde inte installera %1$s.</string>
|
||||
<string name="comp_auto_waits_unmetered">Nya byggen väntar på en obegränsad anslutning, avstängt batterisparläge och en sval enhet.</string>
|
||||
<string name="comp_auto_updated">%1$s uppdaterat till %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s stängde ett spel inom sekunder två gånger, så Auto gick tillbaka till %3$s.</string>
|
||||
|
||||
@@ -564,6 +564,7 @@
|
||||
<string name="comp_auto_none">ไม่มี DroidDeck-Proton ที่ใช้สิ่งนี้</string>
|
||||
<string name="comp_auto_waits_network">การอัปเดต Auto กำลังรอการเชื่อมต่อ</string>
|
||||
<string name="comp_auto_check_failed">ตรวจหาบิลด์ใหม่ไม่ได้</string>
|
||||
<string name="comp_auto_install_failed">ติดตั้ง %1$s ไม่ได้</string>
|
||||
<string name="comp_auto_waits_unmetered">บิลด์ใหม่จะรอการเชื่อมต่อที่ไม่จำกัดปริมาณ ปิดโหมดประหยัดแบตเตอรี่ และอุปกรณ์ที่ไม่ร้อน</string>
|
||||
<string name="comp_auto_updated">อัปเดต %1$s เป็น %2$s แล้ว</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s ทำให้เกมปิดภายในไม่กี่วินาทีสองครั้ง Auto จึงกลับไปใช้ %3$s</string>
|
||||
|
||||
@@ -566,6 +566,7 @@
|
||||
<string name="comp_auto_none">Hiçbir DroidDeck-Proton bunu kullanmıyor</string>
|
||||
<string name="comp_auto_waits_network">Auto güncellemeleri bağlantı bekliyor.</string>
|
||||
<string name="comp_auto_check_failed">Yeni sürümler denetlenemedi.</string>
|
||||
<string name="comp_auto_install_failed">%1$s yüklenemedi.</string>
|
||||
<string name="comp_auto_waits_unmetered">Yeni sürümler sınırsız bir bağlantı, kapalı pil tasarrufu ve serin bir cihaz bekler.</string>
|
||||
<string name="comp_auto_updated">%1$s, %2$s sürümüne güncellendi.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s bir oyunu iki kez saniyeler içinde kapattı, bu yüzden Auto %3$s sürümüne döndü.</string>
|
||||
|
||||
@@ -570,6 +570,7 @@
|
||||
<string name="comp_auto_none">Жоден DroidDeck-Proton цього не використовує</string>
|
||||
<string name="comp_auto_waits_network">Оновлення Auto чекають на з’єднання.</string>
|
||||
<string name="comp_auto_check_failed">Не вдалося перевірити нові збірки.</string>
|
||||
<string name="comp_auto_install_failed">Не вдалося встановити %1$s.</string>
|
||||
<string name="comp_auto_waits_unmetered">Нові збірки чекають на безлімітне з’єднання, вимкнену економію заряду та охолоджений пристрій.</string>
|
||||
<string name="comp_auto_updated">%1$s оновлено до %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s двічі закрив гру за кілька секунд, тому Auto повернувся до %3$s.</string>
|
||||
|
||||
@@ -564,6 +564,7 @@
|
||||
<string name="comp_auto_none">Không DroidDeck-Proton nào dùng thành phần này</string>
|
||||
<string name="comp_auto_waits_network">Cập nhật Auto đang chờ kết nối.</string>
|
||||
<string name="comp_auto_check_failed">Không thể kiểm tra bản dựng mới.</string>
|
||||
<string name="comp_auto_install_failed">Không thể cài đặt %1$s.</string>
|
||||
<string name="comp_auto_waits_unmetered">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.</string>
|
||||
<string name="comp_auto_updated">Đã cập nhật %1$s lên %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%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.</string>
|
||||
|
||||
@@ -564,6 +564,7 @@
|
||||
<string name="comp_auto_none">没有 DroidDeck-Proton 使用它</string>
|
||||
<string name="comp_auto_waits_network">Auto 更新正在等待网络连接。</string>
|
||||
<string name="comp_auto_check_failed">无法检查新版本。</string>
|
||||
<string name="comp_auto_install_failed">无法安装 %1$s。</string>
|
||||
<string name="comp_auto_waits_unmetered">新版本将等待不按流量计费的网络、关闭省电模式且设备不过热时下载。</string>
|
||||
<string name="comp_auto_updated">%1$s 已更新到 %2$s。</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s 两次在几秒内关闭了游戏,因此 Auto 已退回到 %3$s。</string>
|
||||
|
||||
@@ -564,6 +564,7 @@
|
||||
<string name="comp_auto_none">沒有 DroidDeck-Proton 使用它</string>
|
||||
<string name="comp_auto_waits_network">Auto 更新正在等待網絡連線。</string>
|
||||
<string name="comp_auto_check_failed">無法檢查新版本。</string>
|
||||
<string name="comp_auto_install_failed">無法安裝 %1$s。</string>
|
||||
<string name="comp_auto_waits_unmetered">新版本將等待非按流量收費的網絡、關閉省電模式且裝置不過熱時下載。</string>
|
||||
<string name="comp_auto_updated">%1$s 已更新至 %2$s。</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s 兩次在幾秒內關閉了遊戲,因此 Auto 已退回到 %3$s。</string>
|
||||
|
||||
@@ -564,6 +564,7 @@
|
||||
<string name="comp_auto_none">沒有 DroidDeck-Proton 使用它</string>
|
||||
<string name="comp_auto_waits_network">Auto 更新正在等待網路連線。</string>
|
||||
<string name="comp_auto_check_failed">無法檢查新版本。</string>
|
||||
<string name="comp_auto_install_failed">無法安裝 %1$s。</string>
|
||||
<string name="comp_auto_waits_unmetered">新版本將等待非計量網路、關閉省電模式且裝置不過熱時下載。</string>
|
||||
<string name="comp_auto_updated">%1$s 已更新至 %2$s。</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s 兩次在幾秒內關閉了遊戲,因此 Auto 已退回到 %3$s。</string>
|
||||
|
||||
@@ -614,6 +614,7 @@
|
||||
<string name="comp_auto_none">No DroidDeck-Proton uses this</string>
|
||||
<string name="comp_auto_waits_network">Auto updates wait for a connection.</string>
|
||||
<string name="comp_auto_check_failed">Couldn\'t check for new builds.</string>
|
||||
<string name="comp_auto_install_failed">Couldn\'t install %1$s.</string>
|
||||
<string name="comp_auto_waits_unmetered">New builds wait for an unmetered connection, battery saver off and a cool device.</string>
|
||||
<string name="comp_auto_updated">%1$s updated to %2$s.</string>
|
||||
<string name="comp_auto_rolled_back">%1$s %2$s closed a game within seconds twice, so Auto went back to %3$s.</string>
|
||||
|
||||
@@ -21,6 +21,7 @@ import java.io.File
|
||||
@Config(sdk = [28], manifest = Config.NONE)
|
||||
class ForcedPackageTest {
|
||||
private val dxvk2 = "dxvk-2.7.1-linux.wcp"
|
||||
private val gplasync = "dxvk-gplasync-2.7.1-1-linux.wcp"
|
||||
private lateinit var context: Context
|
||||
|
||||
@Before fun setUp() {
|
||||
@@ -54,6 +55,74 @@ class ForcedPackageTest {
|
||||
assertTrue(ComponentsManager.FORCED_PACKAGES.none { GpuInfo.Family.A7XX in it.families })
|
||||
}
|
||||
|
||||
@Test fun onlyAdreno6xxPinsDxvkAutoToGplasync() {
|
||||
val rule = ComponentsManager.autoDxvk(gpu(644, GpuInfo.Family.A6XX))!!
|
||||
assertEquals(gplasync, rule.file)
|
||||
assertEquals("Dxvk-gplasync-Linux", rule.release)
|
||||
assertNull(rule.autoRule())
|
||||
assertNull(ComponentsManager.autoDxvk(gpu(740, GpuInfo.Family.A7XX)))
|
||||
assertNull(ComponentsManager.autoDxvk(gpu(830, GpuInfo.Family.A8XX)))
|
||||
}
|
||||
|
||||
@Test fun dxvkAutoGivesDroidDeckProtonGplasyncAndOtherProtonsKeepDxvk2() {
|
||||
proton("dd-proton")
|
||||
proton("valve")
|
||||
val fetched = mutableListOf<String>()
|
||||
val plain = mutableListOf<String>()
|
||||
val auto = mutableListOf<String>()
|
||||
installAuto(
|
||||
gpu(644, GpuInfo.Family.A6XX),
|
||||
fetch = { fetched += it.file },
|
||||
apply = { id, file -> plain += "$id $file"; "" },
|
||||
applyAuto = { id, file -> auto += "$id $file"; "" },
|
||||
)
|
||||
assertEquals(listOf("valve $dxvk2"), plain)
|
||||
assertEquals(listOf("dd-proton $gplasync"), auto)
|
||||
assertEquals(listOf(dxvk2, gplasync), fetched)
|
||||
}
|
||||
|
||||
@Test fun dxvkAutoReplacesTheForcedDxvk2ButKeepsAUserChoice() {
|
||||
proton("dd-proton")
|
||||
proton("dd-picked")
|
||||
proton("valve")
|
||||
writeState("dd-proton", dxvk2, "experimental-11")
|
||||
writeState("dd-picked", "dxvk-3.1-linux.wcp", "experimental-11")
|
||||
writeState("valve", dxvk2, "experimental-11")
|
||||
val plain = mutableListOf<String>()
|
||||
val auto = mutableListOf<String>()
|
||||
installAuto(
|
||||
gpu(644, GpuInfo.Family.A6XX),
|
||||
apply = { id, file -> plain += "$id $file"; "" },
|
||||
applyAuto = { id, file -> auto += "$id $file"; "" },
|
||||
)
|
||||
assertTrue(plain.isEmpty())
|
||||
assertEquals(listOf("dd-proton $gplasync"), auto)
|
||||
}
|
||||
|
||||
@Test fun dxvkAutoLeavesGplasyncInPlace() {
|
||||
proton("dd-proton")
|
||||
writeState("dd-proton", gplasync, "experimental-11")
|
||||
assertNull(installAuto(gpu(644, GpuInfo.Family.A6XX)))
|
||||
}
|
||||
|
||||
@Test fun dxvkManualKeepsDxvk2ForEveryProton() {
|
||||
proton("dd-proton")
|
||||
proton("valve")
|
||||
val plain = mutableListOf<String>()
|
||||
installAuto(
|
||||
gpu(644, GpuInfo.Family.A6XX),
|
||||
apply = { id, file -> plain += "$id $file"; "" },
|
||||
dxvkAuto = false,
|
||||
)
|
||||
assertEquals(listOf("dd-proton $dxvk2", "valve $dxvk2"), plain)
|
||||
}
|
||||
|
||||
@Test fun dxvkAutoLeavesAdreno7xxAnd8xxAlone() {
|
||||
proton("dd-proton")
|
||||
assertNull(installAuto(gpu(740, GpuInfo.Family.A7XX)))
|
||||
assertNull(installAuto(gpu(830, GpuInfo.Family.A8XX)))
|
||||
}
|
||||
|
||||
@Test fun aModelListOnlyMatchesThoseChips() {
|
||||
val rule = ComponentsManager.ForcedPackage(
|
||||
setOf(GpuInfo.Family.A7XX_LOW), "dxvk", dxvk2, "Dxvk-Linux", setOf(710),
|
||||
@@ -517,6 +586,17 @@ class ForcedPackageTest {
|
||||
apply: (String, String) -> String = ::refuseApply,
|
||||
) = ComponentsManager.ensureForcedPackages(context, gpu, lookup, fetch, apply)
|
||||
|
||||
private fun installAuto(
|
||||
gpu: GpuInfo,
|
||||
fetch: (ComponentsManager.CatalogItem) -> Unit = {},
|
||||
apply: (String, String) -> String = ::refuseApply,
|
||||
applyAuto: (String, String) -> String = ::refuseApply,
|
||||
dxvkAuto: Boolean = true,
|
||||
) = ComponentsManager.ensureForcedPackages(
|
||||
context, gpu, { file, release -> item(file, release) }, fetch, apply,
|
||||
applyAuto = applyAuto, dxvkAuto = dxvkAuto, follows = { it.id.startsWith("dd-") },
|
||||
)
|
||||
|
||||
private fun refuseLookup(file: String, release: String): ComponentsManager.CatalogItem? = error("catalog $file $release")
|
||||
|
||||
private fun refuseFetch(item: ComponentsManager.CatalogItem) { error("fetch ${item.file}") }
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
package com.droiddeck.launcher.session
|
||||
|
||||
import org.junit.Assert.assertFalse
|
||||
import org.junit.Assert.assertTrue
|
||||
import org.junit.Test
|
||||
|
||||
class PinnedDxvkStatusTest {
|
||||
private val pinned = "dxvk-gplasync-2.7.1-1-linux.wcp"
|
||||
private val base = "dxvk-2.7.1-linux.wcp"
|
||||
private fun choice(file: String, version: String, auto: Boolean = true) = mapOf("dxvk" to ComponentsManager.Choice(file, auto, version))
|
||||
|
||||
@Test fun thePinIsHeldOnlyWhenEveryFollowingProtonRunsIt() {
|
||||
val followers = listOf("a" to "10.0-1", "b" to "10.0-2")
|
||||
assertTrue(ComponentUpdater.pinnedHeld(pinned, followers, mapOf("a" to choice(pinned, "10.0-1"), "b" to choice(pinned, "10.0-2")), base))
|
||||
assertFalse(ComponentUpdater.pinnedHeld(pinned, followers, mapOf("a" to choice(pinned, "10.0-1")), base))
|
||||
assertFalse(ComponentUpdater.pinnedHeld(pinned, followers, mapOf("a" to choice(pinned, "10.0-1"), "b" to choice("DD-dxvk-arm64ec-3.1.1.wcp", "10.0-2")), base))
|
||||
assertFalse(ComponentUpdater.pinnedHeld(pinned, followers, mapOf("a" to choice(pinned, "9.0-1"), "b" to choice(pinned, "10.0-2")), base))
|
||||
}
|
||||
|
||||
@Test fun noFollowingProtonMeansNothingToReport() {
|
||||
assertTrue(ComponentUpdater.pinnedHeld(pinned, emptyList(), emptyMap(), base))
|
||||
}
|
||||
|
||||
@Test fun aDxvkThePlayerPickedIsTheirChoiceNotAFailedInstall() {
|
||||
val followers = listOf("a" to "10.0-1", "b" to "10.0-2")
|
||||
val own = choice("DD-dxvk-arm64ec-3.1.1.wcp", "10.0-2", auto = false)
|
||||
assertTrue(ComponentUpdater.pinnedHeld(pinned, followers, mapOf("a" to choice(pinned, "10.0-1"), "b" to own), base))
|
||||
assertTrue(ComponentUpdater.ownChoice(own.getValue("dxvk"), "10.0-2", pinned, base))
|
||||
assertFalse(ComponentUpdater.ownChoice(own.getValue("dxvk"), "10.0-3", pinned, base))
|
||||
assertFalse(ComponentUpdater.ownChoice(choice("DD-dxvk-arm64ec-3.1.1.wcp", "10.0-2").getValue("dxvk"), "10.0-2", pinned, base))
|
||||
}
|
||||
|
||||
@Test fun theForcedDxvkThePinReplacesStillCountsAsNotInstalled() {
|
||||
val followers = listOf("a" to "10.0-1")
|
||||
assertFalse(ComponentUpdater.pinnedHeld(pinned, followers, mapOf("a" to choice(base, "10.0-1", auto = false)), base))
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user