diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 56787a7146..37e92c04b0 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -2431,6 +2431,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet ), protonActions = com.droiddeck.launcher.ui.ProtonsActions( onInstall = { id -> protons.installProton(id) }, + onInstallTest = { id -> protons.installProton(id, test = true) }, onCancel = { id -> ProtonExtras.tools.firstOrNull { it.id == id }?.let { ProtonExtras.unqueue(this, it) }; protons.refreshProtons() }, onRemove = { id, dir -> protons.removeProton(id, dir) }, onRemoveOlder = { id -> protons.removeProton(id, older = true) }, diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt index c8fe30c9e1..22d7b2ec0d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt @@ -34,10 +34,10 @@ internal class ProtonMenu( var protonPercent by Operation.percent var protonProblem by Operation.problem private val checking = java.util.concurrent.atomic.AtomicBoolean(false) - @VisibleForTesting internal var installer: (ProtonExtras.Tool, (String, Int) -> Unit) -> String? = - { tool, progress -> ProtonExtras.install(activity, tool, progress) } + @VisibleForTesting internal var installer: (ProtonExtras.Tool, Boolean, (String, Int) -> Unit) -> String? = + { tool, test, progress -> ProtonExtras.install(activity, tool, test, progress) } - fun installProton(id: String, automatic: Boolean = false) { + fun installProton(id: String, automatic: Boolean = false, test: Boolean = false) { val tool = ProtonExtras.tools.firstOrNull { it.id == id } ?: return if (protonBusyId != null || ProtonExtras.installInProgress || SessionState.running) return ProtonExtras.unqueue(activity, tool) @@ -47,7 +47,7 @@ internal class ProtonMenu( protonPercent = -1 Thread({ val problem = runCatching { - installer(tool) { label, value -> + installer(tool, test) { label, value -> ui.post { protonStage = label; protonPercent = value } } }.getOrElse { it.message ?: it.javaClass.simpleName } @@ -89,7 +89,7 @@ internal class ProtonMenu( fun refreshProtons() { protonRows = ProtonExtras.tools.map { val all = ProtonExtras.installedAll(activity, it) - ProtonRow(it.id, it.name, all.lastOrNull(), ProtonExtras.queued(activity, it), all, ProtonExtras.update(activity, it)) + ProtonRow(it.id, it.name, all.lastOrNull(), ProtonExtras.queued(activity, it), all, ProtonExtras.update(activity, it), ProtonExtras.testBuild(activity, it)) } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt index b27326969c..63307c1596 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt @@ -9,13 +9,15 @@ import com.droiddeck.launcher.core.Downloader import com.droiddeck.launcher.core.FileUtils import com.droiddeck.launcher.runtime.LinuxRuntime import java.io.File +import java.util.Locale import org.json.JSONArray import org.json.JSONObject object ProtonExtras { private const val TAG = "ProtonExtras" private const val NEED_BYTES = 4L * 1024 * 1024 * 1024 - private const val RELEASES = "https://api.github.com/repos/%s/releases?per_page=15" + private const val RELEASES = "https://api.github.com/repos/%s/releases?per_page=15&page=%d" + private const val RELEASE_PAGES = 5 const val CHECK_EVERY_MS = 60L * 60 * 1000 @Volatile var installInProgress = false @@ -104,6 +106,12 @@ object ProtonExtras { fun cachedLatest(context: Context, tool: Tool): String? = readJson(latestFile(context)).optJSONObject(tool.id)?.optString("tag")?.ifEmpty { null } + fun testBuild(context: Context, tool: Tool): String? = + testFor(installedTags(context, tool), readJson(latestFile(context)).optJSONObject(tool.id)?.optString("test")?.ifEmpty { null }) + + internal fun testFor(installed: List, test: String?): String? = + test?.takeIf { it !in installed && (installed.isEmpty() || updateFor(installed, it) != null) } + private val checkLock = Any() private const val RETRY_MS = 15L * 60 * 1000 private const val USER_SETTINGS = "user_settings.py" @@ -120,22 +128,27 @@ object ProtonExtras { if (due.isEmpty() || !force && (now - lastAttempt) in 0 until RETRY_MS) return false lastAttempt = now for (tool in due) { - val tag = findLatestAsset(tool)?.tag ?: continue - cache.put(tool.id, JSONObject().put("tag", tag).put("at", now)) + updateLatest(cache, tool, releases(tool), now) } runCatching { file.writeText(cache.toString()) } return true } } - private fun record(context: Context, tool: Tool, dir: String?, tag: String) { + internal fun recordLatest(latest: JSONObject, tool: Tool, tag: String, test: Boolean, now: Long): Boolean { + if (test) return false + val entry = latest.optJSONObject(tool.id) + val known = entry?.optString("tag") + if (!known.isNullOrEmpty() && compareVersions(tag, known) < 0) return false + val ahead = entry?.optString("test")?.takeIf { it.isNotEmpty() && compareVersions(it, tag) > 0 } + latest.put(tool.id, JSONObject().put("tag", tag).put("at", now).putOpt("test", ahead)) + return true + } + + private fun record(context: Context, tool: Tool, dir: String?, tag: String, test: Boolean) { runCatching { val latest = readJson(latestFile(context)) - val known = latest.optJSONObject(tool.id)?.optString("tag") - if (known.isNullOrEmpty() || compareVersions(tag, known) >= 0) { - latest.put(tool.id, JSONObject().put("tag", tag).put("at", System.currentTimeMillis())) - latestFile(context).writeText(latest.toString()) - } + if (recordLatest(latest, tool, tag, test, System.currentTimeMillis())) latestFile(context).writeText(latest.toString()) if (dir != null) { val releases = readJson(releasesFile(context)) val present = toolsDir(context).list()?.toSet() ?: emptySet() @@ -208,17 +221,17 @@ object ProtonExtras { } @Synchronized - fun install(context: Context, tool: Tool, onProgress: (String, Int) -> Unit): String? { + fun install(context: Context, tool: Tool, test: Boolean = false, onProgress: (String, Int) -> Unit): String? { if (installInProgress) return context.getString(R.string.pextra_busy) installInProgress = true - return try { installNow(context, tool, onProgress) } finally { installInProgress = false } + return try { installNow(context, tool, test, onProgress) } finally { installInProgress = false } } - private fun installNow(context: Context, tool: Tool, onProgress: (String, Int) -> Unit): String? { + private fun installNow(context: Context, tool: Tool, test: Boolean, onProgress: (String, Int) -> Unit): String? { if (SessionState.running) return context.getString(R.string.pextra_stop_session) if (!LinuxRuntime.isInstalled(context)) return context.getString(R.string.user_apps_runtime_required) - val asset = findLatestAsset(tool) ?: return context.getString(R.string.pextra_no_release, tool.name) + val asset = releases(tool)?.let { pickAsset(tool, it, test && tool.id == OWN) } ?: return context.getString(R.string.pextra_no_release, tool.name) val downloads = File(context.filesDir, "proton-downloads").apply { mkdirs() } val archive = File(downloads, "${tool.id}-${asset.name}") if (asset.size > 0 && archive.length() > asset.size) archive.delete() @@ -313,7 +326,7 @@ object ProtonExtras { else { archive.delete() unqueue(context, tool) - record(context, tool, placed, asset.tag) + record(context, tool, placed, asset.tag, test) if (tool.id == OWN) replaceOlder(context, tool) if (EsyncPacks.enabled(context)) { onProgress(context.getString(R.string.esync_fetching), -1) @@ -331,36 +344,68 @@ object ProtonExtras { } } - private fun findLatestAsset(tool: Tool): Asset? { - val releases = Downloader.downloadString(RELEASES.format(tool.repo)) ?: return null - return try { - pickAsset(tool, JSONArray(releases)) - } catch (e: Exception) { - Log.w(TAG, "release metadata for ${tool.id}", e) - null + private fun releases(tool: Tool): JSONArray? = releases(tool) { page -> + Downloader.downloadString(RELEASES.format(Locale.ROOT, tool.repo, page))?.let { body -> + try { + JSONArray(body) + } catch (e: Exception) { + Log.w(TAG, "release metadata for ${tool.id}", e) + null + } } } - internal fun pickAsset(tool: Tool, array: JSONArray): Asset? { - for (i in 0 until array.length()) { - val release = array.getJSONObject(i) - if (release.optBoolean("draft", false) || release.optBoolean("prerelease", false)) continue - val assets = release.optJSONArray("assets") ?: continue - val entries = (0 until assets.length()).map { assets.getJSONObject(it) } - val archive = entries.sortedBy { it.optString("name") }.firstOrNull { tool.assetPattern.containsMatchIn(it.optString("name")) } ?: continue + internal fun releases(tool: Tool, fetch: (Int) -> JSONArray?): JSONArray? { + val all = fetch(1) ?: return null + var page = 1 + var last = all.length() + while (last > 0 && page < RELEASE_PAGES && pickAsset(tool, all) == null) { + val next = fetch(++page) ?: return null + for (i in 0 until next.length()) all.put(next.opt(i)) + last = next.length() + } + return all + } + + internal fun pickAsset(tool: Tool, array: JSONArray, test: Boolean = false): Asset? { + val candidates = (0 until array.length()).asSequence() + .mapNotNull { array.optJSONObject(it) } + .filter { !it.optBoolean("draft", false) && it.optBoolean("prerelease", false) == test } + if (!test) return candidates.firstNotNullOfOrNull { assetOf(tool, it) } + val stable = pickAsset(tool, array)?.tag ?: return null + return candidates + .filter { it.optString("tag_name").startsWith(tool.prefix) && updateFor(listOf(stable), it.optString("tag_name")) != null } + .mapNotNull { assetOf(tool, it, requireChecksum = true) } + .maxWithOrNull { a, b -> compareVersions(a.tag, b.tag) } + } + + internal fun updateLatest(cache: JSONObject, tool: Tool, array: JSONArray?, now: Long) { + if (array == null) return + val test = if (tool.id == OWN) pickAsset(tool, array, test = true)?.tag else null + val tag = pickAsset(tool, array)?.tag + if (tag == null) { + cache.optJSONObject(tool.id)?.remove("test") + return + } + cache.put(tool.id, JSONObject().put("tag", tag).put("at", now).putOpt("test", test)) + } + + private fun assetOf(tool: Tool, release: JSONObject, requireChecksum: Boolean = false): Asset? = try { + val assets = release.optJSONArray("assets") + val entries = assets?.let { list -> (0 until list.length()).mapNotNull { list.optJSONObject(it) } }.orEmpty() + entries.sortedBy { it.optString("name") }.filter { tool.assetPattern.containsMatchIn(it.optString("name")) }.mapNotNull { archive -> val name = archive.optString("name") val stem = name.substringBefore(".tar") val checksum = entries.firstOrNull { it.optString("name").startsWith(stem) && it.optString("name").contains("sha512", ignoreCase = true) }?.optString("browser_download_url")?.takeIf { it.startsWith("http") } - return Asset( - release.optString("tag_name"), name, - archive.optString("browser_download_url").takeIf { it.startsWith("http") } ?: continue, checksum, - archive.optLong("size", 0L), - Hashes.githubSha256(archive.optString("digest")), - ) - } - return null + archive.optString("browser_download_url").takeIf { it.startsWith("http") }?.let { url -> + Asset(release.optString("tag_name"), name, url, checksum, archive.optLong("size", 0L), Hashes.githubSha256(archive.optString("digest"))) + } + }.let { found -> if (requireChecksum) found.firstOrNull { it.sha256 != null || it.sha512 != null } else found.firstOrNull() } + } catch (e: Exception) { + Log.w(TAG, "release metadata for ${tool.id}", e) + null } private fun requestLines(context: Context): List = diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt index b00edeb98a..62ce4cf73d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt @@ -524,7 +524,7 @@ fun ComponentsPage( } val availableTitle: @Composable (String) -> String = { l -> when (l) { - PROTON_TAB -> stringResource(R.string.comp_available_count, protons.rows.count { it.installed == null || it.update != null }) + PROTON_TAB -> stringResource(R.string.comp_available_count, protons.rows.count(ProtonRow::available)) else -> stringResource(R.string.comp_nightlies_count, availableRows(l, catalog, snapshot).size) } } @@ -589,21 +589,29 @@ fun ComponentsPage( val availableRows: @Composable ColumnScope.(String) -> Unit = { l -> when (l) { PROTON_TAB -> { - val rows = protons.rows.filter { it.installed == null || it.update != null } + val rows = protons.rows.filter(ProtonRow::available) if (rows.isEmpty()) EmptyLine(stringResource(R.string.comp_nothing_new)) - for (row in rows) GetLine( - row.name, - when { - row.update != null -> stringResource(R.string.proton_update_available, row.update) - row.queued -> stringResource(R.string.proton_queued) - else -> stringResource(R.string.proton_not_installed) - }, - progress = if (protons.busyId == row.id) protons.percent else null, - stage = if (protons.busyId == row.id) protons.stage else null, - enabled = protons.busyId == null && protons.runtimeReady && !protons.sessionRunning, - onCancel = if (row.queued && protons.busyId == null && !protons.sessionRunning) ({ protonActions.onCancel(row.id) }) else null, - action = if (row.update != null) stringResource(R.string.common_update) else null, - ) { protonActions.onInstall(row.id) } + for (row in rows) { + val idle = protons.busyId == null && protons.runtimeReady && !protons.sessionRunning + val test = row.test != null && (nightlyPicked[row.id] == true || row.installed != null && row.update == null) + GetLine( + row.name, + when { + test -> row.test!! + row.update != null -> stringResource(R.string.proton_update_available, row.update) + row.queued -> stringResource(R.string.proton_queued) + else -> stringResource(R.string.proton_not_installed) + }, + progress = if (protons.busyId == row.id) protons.percent else null, + stage = if (protons.busyId == row.id) protons.stage else null, + enabled = idle, + onCancel = if (row.queued && protons.busyId == null && !protons.sessionRunning) ({ protonActions.onCancel(row.id) }) else null, + action = if (!test && row.update != null) stringResource(R.string.common_update) else null, + channel = if (row.test != null) ({ + ChannelToggle(test, enabled = idle && (row.installed == null || row.update != null), other = R.string.comp_channel_test) { nightlyPicked[row.id] = !test } + }) else null, + ) { if (test) protonActions.onInstallTest(row.id) else protonActions.onInstall(row.id) } + } } else -> { val available = availableRows(l, catalog, snapshot) @@ -1528,12 +1536,12 @@ private fun GetLine( } @Composable -private fun ChannelToggle(nightly: Boolean, enabled: Boolean, onFlip: () -> Unit) { +private fun ChannelToggle(nightly: Boolean, enabled: Boolean, other: Int = R.string.comp_channel_nightly, onFlip: () -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val src = remember { MutableInteractionSource() } val hot = rememberHot(src) && enabled - val state = stringResource(if (nightly) R.string.comp_channel_nightly else R.string.comp_channel_stable) + val state = stringResource(if (nightly) other else R.string.comp_channel_stable) Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(2.dp), modifier = Modifier.heightIn(min = 44.dp).clip(RoundedCornerShape(10.dp)) @@ -1544,12 +1552,12 @@ private fun ChannelToggle(nightly: Boolean, enabled: Boolean, onFlip: () -> Unit .semantics { stateDescription = state } .padding(4.dp), ) { - for ((label, on) in listOf(R.string.comp_channel_stable to !nightly, R.string.comp_channel_nightly to nightly)) { + for ((label, on) in listOf(R.string.comp_channel_stable to !nightly, other to nightly)) { Text( stringResource(label), fontSize = 13.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, - color = if (!enabled) colors.onSurfaceVariant else if (on) (if (hot) pal.onSignal else pal.signal) else colors.onSurfaceVariant, + color = if (on) (if (hot) pal.onSignal else pal.signal) else colors.onSurfaceVariant, modifier = Modifier.clip(RoundedCornerShape(7.dp)) - .background(if (on && enabled) (if (hot) pal.signal else pal.signal.copy(alpha = 0.16f)) else Color.Transparent) + .background(if (on) (if (hot) pal.signal else pal.signal.copy(alpha = 0.16f)) else Color.Transparent) .padding(horizontal = 10.dp, vertical = 6.dp), ) } @@ -1634,6 +1642,7 @@ class ProtonsState( class ProtonsActions( val onInstall: (String) -> Unit = {}, + val onInstallTest: (String) -> Unit = {}, val onCancel: (String) -> Unit = {}, val onRemove: (String, String) -> Unit = { _, _ -> }, val onRemoveOlder: (String) -> Unit = {}, @@ -1641,8 +1650,10 @@ class ProtonsActions( class ProtonRow( val id: String, val name: String, val installed: String?, val queued: Boolean, - val installedAll: List = listOfNotNull(installed), val update: String? = null, -) + val installedAll: List = listOfNotNull(installed), val update: String? = null, val test: String? = null, +) { + val available: Boolean get() = installed == null || update != null || test != null +} @Composable private fun gpuCardValue(gpu: GpuDriversState, auto: String): String { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 943fa41584..49440fa057 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -585,6 +585,7 @@ في الإصدارات الليلية · %1$d مستقر ليلي + تجريبي حدّث لعرض الحزم في إصدارات Nightlies وDroidDeck. لا جديد منذ آخر فحص. استيراد ملف ‎.wcp diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 1351982627..745e505055 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -579,6 +579,7 @@ En las Nightlies · %1$d Estable Nocturna + Prueba Actualiza para listar los paquetes de Nightlies y DroidDeck. Nada nuevo desde la última comprobación. Importar .wcp diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index f44b98d75d..15dd8ac28b 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -577,6 +577,7 @@ В Nightlies · %1$d Стабилна Нощна + Тестова Обновете, за да видите пакетите в Nightlies и DroidDeck. Нищо ново от последната проверка. Импортиране на .wcp diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index c27da890b3..d1c055687c 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -581,6 +581,7 @@ Na Nightlies · %1$d Stabilní Noční + Testovací Obnovte pro zobrazení balíčků na Nightlies a DroidDeck. Od poslední kontroly nic nového. Importovat .wcp diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 4eb0484c1f..ecb0723ccb 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -577,6 +577,7 @@ På Nightlies · %1$d Stabil Nightly + Test Opdater for at se pakker på Nightlies og DroidDeck. Intet nyt siden sidste kontrol. Importer .wcp diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b60fceb58d..0c202baf5f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -577,6 +577,7 @@ In den Nightlies · %1$d Stabil Nightly + Test Aktualisiere, um die Pakete in den Nightlies und bei DroidDeck aufzulisten. Nichts Neues seit der letzten Prüfung. .wcp importieren diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index faa6c9727f..749f779141 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -577,6 +577,7 @@ Στα Nightlies · %1$d Σταθερή Νυχτερινή + Δοκιμαστική Ανανεώστε για να εμφανιστούν τα πακέτα στα Nightlies και στο DroidDeck. Τίποτα νέο από τον τελευταίο έλεγχο. Εισαγωγή .wcp diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 15a280bac0..e734ac3ab0 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -579,6 +579,7 @@ En las Nightlies · %1$d Estable Nocturna + Prueba Actualiza para listar los paquetes de Nightlies y DroidDeck. Nada nuevo desde la última comprobación. Importar .wcp diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 2abc70d958..75505a4d0c 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -577,6 +577,7 @@ Nightliesissä · %1$d Vakaa Yöversio + Testi Päivitä nähdäksesi Nightliesin ja DroidDeckin paketit. Ei mitään uutta viimeisimmän tarkistuksen jälkeen. Tuo .wcp diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ef705ec2eb..cbe2334cf5 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -579,6 +579,7 @@ Dans Nightlies · %1$d Stable Nightly + Test Actualiser pour lister les paquets dans Nightlies et DroidDeck. Aucun nouvel élément depuis la dernière vérification. Importer .wcp diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index f758c55481..199a262959 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -577,6 +577,7 @@ Nightlies पर · %1$d स्थिर नाइटली + परीक्षण Nightlies और DroidDeck के पैकेज सूचीबद्ध करने के लिए रीफ़्रेश करें। पिछली जांच के बाद कुछ नया नहीं है। .wcp इंपोर्ट करें diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index e00b2643c9..aa74d6799a 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -577,6 +577,7 @@ A Nightliesen · %1$d Stabil Nightly + Teszt Frissítsen a Nightlies és a DroidDeck csomagjainak listázásához. Nincs semmi új az utolsó ellenőrzés óta. .wcp importálása diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index b52adf60a2..935869a359 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -575,6 +575,7 @@ Di Nightlies · %1$d Stabil Nightly + Uji Segarkan untuk melihat daftar paket di Nightlies dan DroidDeck. Tidak ada yang baru sejak pemeriksaan terakhir. Impor .wcp diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index b8495afa08..6aad28b977 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -579,6 +579,7 @@ Nelle Nightlies · %1$d Stabile Nightly + Test Aggiorna per elencare i pacchetti nelle Nightlies e in DroidDeck. Niente di nuovo dall\'ultimo controllo. Importa .wcp diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index fc7485bac0..fa800884aa 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -575,6 +575,7 @@ Nightlies内 · %1$d 安定版 ナイトリー + テスト 更新してNightliesとDroidDeckのパッケージを一覧表示します。 前回の確認以降、新しいものはありません。 .wcpをインポート diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 9c7bf0671a..49c59c7fe4 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -575,6 +575,7 @@ Nightlies 내 · %1$d 안정판 나이틀리 + 테스트 새로 고쳐 Nightlies 및 DroidDeck의 패키지를 나열합니다. 마지막 확인 이후 새로운 내용이 없습니다. .wcp 가져오기 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 95bde0cbb5..20c5977e38 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -575,6 +575,7 @@ Pada Nightlies · %1$d Stabil Nightly + Ujian Segarkan semula untuk menyenaraikan pakej pada Nightlies dan DroidDeck. Tiada apa-apa yang baharu sejak semakan terakhir. Import .wcp diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 6c64167883..5350381287 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -577,6 +577,7 @@ På Nightlies · %1$d Stabil Nightly + Test Oppdater for å liste pakker på Nightlies og DroidDeck. Ingenting nytt siden siste sjekk. Importer .wcp diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 1176b01733..ed67b367e6 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -577,6 +577,7 @@ In de Nightlies · %1$d Stabiel Nightly + Test Vernieuw om de pakketten in de Nightlies en bij DroidDeck te tonen. Niets nieuws sinds de laatste controle. .wcp importeren diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index da0c0e4c1f..2ac1cbfbfa 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -581,6 +581,7 @@ W wersjach nightly · %1$d Stabilna Nightly + Testowa Odśwież, aby wyświetlić pakiety w Nightlies i DroidDeck. Nic nowego od ostatniego sprawdzenia. Importuj .wcp diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index f36d346b39..54cca5da98 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -579,6 +579,7 @@ Nas Nightlies · %1$d Estável Nightly + Teste Atualize para listar os pacotes nas Nightlies e no DroidDeck. Nada de novo desde a última verificação. Importar .wcp diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index bc8927ea3c..8116d22156 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -579,6 +579,7 @@ Nas Nightlies · %1$d Estável Nightly + Teste Atualize para listar os pacotes nas Nightlies e no DroidDeck. Nada novo desde a última verificação. Importar .wcp diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 4ef9d1d8cb..9315e8d9fb 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -579,6 +579,7 @@ Pe versiunile nightly · %1$d Stabilă Nightly + Test Reîmprospătează pentru a lista pachetele din Nightlies și DroidDeck. Nimic nou de la ultima verificare. Importă .wcp diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index f2005f1af4..b4105decd9 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -581,6 +581,7 @@ В Nightlies · %1$d Стабильная Ночная + Тестовая Обновите, чтобы увидеть пакеты в Nightlies и DroidDeck. С момента последней проверки нового нет. Импорт .wcp diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 670a8019c6..ed197424fe 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -577,6 +577,7 @@ I nattbyggena · %1$d Stabil Nattbygge + Test Uppdatera för att lista paket i Nightlies och DroidDeck. Inget nytt sedan senaste kontrollen. Importera .wcp diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 576b285e7b..97e4ae05ca 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -575,6 +575,7 @@ ใน Nightlies · %1$d เสถียร Nightly + ทดสอบ รีเฟรชเพื่อแสดงรายการแพ็กเกจใน Nightlies และ DroidDeck ไม่มีอะไรใหม่ตั้งแต่การตรวจสอบครั้งล่าสุด นำเข้า .wcp diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 3fe7a74c55..5ee9d6ae24 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -577,6 +577,7 @@ Nightlies içinde · %1$d Kararlı Nightly + Test Nightlies ve DroidDeck paketlerini listelemek için yenileyin. Son kontrolden beri yeni bir şey yok. .wcp içe aktar diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index f7354e66e2..20b12469d1 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -581,6 +581,7 @@ У нічних збірках · %1$d Стабільна Нічна + Тестова Оновіть, щоб побачити пакети з Nightlies і DroidDeck. Нічого нового з часу останньої перевірки. Імпортувати .wcp diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 896a787697..1e1dd18566 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -575,6 +575,7 @@ Trên Nightlies · %1$d Ổn định Nightly + Thử nghiệm Làm mới để liệt kê các gói trên Nightlies và DroidDeck. Không có gì mới từ lần kiểm tra trước. Nhập tệp .wcp diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e91a58b486..8b99d82853 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -575,6 +575,7 @@ 在 Nightlies 上 · %1$d 稳定版 每夜版 + 测试 刷新以列出 Nightlies 和 DroidDeck 上的软件包。 自上次检查以来没有新内容。 导入 .wcp diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 25a9d22aea..bfe3e076fa 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -575,6 +575,7 @@ Nightlies · %1$d 穩定版 每夜版 + 測試 重新整理以列出 Nightlies 及 DroidDeck 中的軟件包。 自上次檢查以來沒有新內容。 匯入 .wcp diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 66a0480c55..1a1c502bd3 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -575,6 +575,7 @@ Nightlies 中 · %1$d 穩定版 每夜版 + 測試 重新整理以列出 Nightlies 和 DroidDeck 中的套件。 自上次檢查以來沒有新內容。 匯入 .wcp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c72a92b84b..14bfd4d601 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -605,6 +605,7 @@ On the Nightlies · %1$d Stable Nightly + Test Refresh to list packages on the Nightlies and DroidDeck releases. Nothing new since the last check. Import .wcp diff --git a/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt b/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt index e19b1d6347..8e48d3c353 100644 --- a/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt @@ -202,7 +202,7 @@ class CompatLaunchTest { val entered = CountDownLatch(1) val finish = CountDownLatch(1) protons.protonBusyId = null - protons.installer = { _, progress -> + protons.installer = { _, _, progress -> progress("Verifying download", 64) entered.countDown() check(finish.await(5, TimeUnit.SECONDS)) diff --git a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt index 14dbdb8338..270b9de489 100644 --- a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt @@ -60,7 +60,7 @@ class ProtonMenuAutoTest { menu.protonProblem = null menu.protonStage = null menu.protonPercent = -1 - menu.installer = { tool, progress -> + menu.installer = { tool, _, progress -> progress("Installing ${tool.name}", 50) install("${tool.prefix}-11-12") null @@ -116,7 +116,7 @@ class ProtonMenuAutoTest { @Test fun downloadsWaitForTheSessionNetworkPowerAndOtherInstallWork() { install("DroidDeck-Proton-11-11.1") - menu.installer = { tool, _ -> attempts.add(tool.id); "failed" } + menu.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } SessionState.running = true menu.ensureAutoUpdates() SessionState.running = false @@ -139,11 +139,11 @@ class ProtonMenuAutoTest { @Test fun aFinishedInstallStartsTheComponentCheckAndAFailedOneDoesNot() { var checks = 0 val watched = ProtonMenu(activity, Handler(Looper.getMainLooper()), onInstalled = { checks++ }) { idle } - watched.installer = { tool, _ -> install("${tool.prefix}-11-12"); null } + watched.installer = { tool, _, _ -> install("${tool.prefix}-11-12"); null } watched.installProton("droiddeck") waitUntil { watched.protonBusyId == null && checks == 1 } assertEquals(1, checks) - watched.installer = { _, _ -> "failed" } + watched.installer = { _, _, _ -> "failed" } watched.installProton("ge") waitUntil { watched.protonBusyId == null } assertEquals(1, checks) @@ -152,7 +152,7 @@ class ProtonMenuAutoTest { @Test fun aFailedUpdateDoesNotLoopOrBlockOtherInstalledFamilies() { val ge = install("GE-Proton11-11") install("DroidDeck-Proton-11-11.1") - menu.installer = { tool, _ -> + menu.installer = { tool, _, _ -> attempts.add(tool.id) if (tool.id == "ge") throw IllegalStateException("download failed") install("${tool.prefix}-11-12") @@ -171,7 +171,7 @@ class ProtonMenuAutoTest { @Test fun anUninstalledRuntimeOrCurrentProtonDoesNotStartADownload() { install("DroidDeck-Proton-11-12") - menu.installer = { tool, _ -> attempts.add(tool.id); null } + menu.installer = { tool, _, _ -> attempts.add(tool.id); null } menu.ensureAutoUpdates() assertTrue(attempts.isEmpty()) install("GE-Proton11-11") @@ -183,12 +183,12 @@ class ProtonMenuAutoTest { @Test fun aFailedReleaseIsNotRetriedAfterRecreatingTheLauncher() { install("DroidDeck-Proton-11-11.1") - menu.installer = { tool, _ -> attempts.add(tool.id); "failed" } + menu.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } menu.ensureAutoUpdates() waitUntil { menu.protonBusyId == null } val recreated = Robolectric.buildActivity(Activity::class.java).setup().get() val next = ProtonMenu(recreated, Handler(Looper.getMainLooper())) - next.installer = { tool, _ -> attempts.add(tool.id); "failed" } + next.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } next.ensureAutoUpdates() assertNull(next.protonBusyId) assertEquals(listOf("droiddeck"), attempts) @@ -208,7 +208,7 @@ class ProtonMenuAutoTest { } @Test fun droidDeckProtonIsInstalledWhenMissingUnlessTheUserRemovedIt() { - menu.installer = { tool, _ -> attempts.add(tool.id); install("${tool.prefix}-11-12"); null } + menu.installer = { tool, test, _ -> attempts.add(if (test) "test" else tool.id); install("${tool.prefix}-11-12"); null } ProtonExtras.setDeclined(activity, true) menu.ensureAutoUpdates() assertNull(menu.protonBusyId) @@ -222,11 +222,11 @@ class ProtonMenuAutoTest { menu.removeProton("droiddeck") waitUntil { menu.protonBusyId == null } assertTrue(ProtonExtras.declined(activity)) - menu.installer = { _, _ -> "failed" } + menu.installer = { _, _, _ -> "failed" } menu.installProton("droiddeck") waitUntil { menu.protonBusyId == null } assertTrue(ProtonExtras.declined(activity)) - menu.installer = { tool, _ -> install("${tool.prefix}-11-12"); null } + menu.installer = { tool, _, _ -> install("${tool.prefix}-11-12"); null } menu.installProton("droiddeck") waitUntil { menu.protonBusyId == null } assertFalse(ProtonExtras.declined(activity)) @@ -236,7 +236,7 @@ class ProtonMenuAutoTest { install("DroidDeck-Proton-11-11.1") val launcher = Robolectric.buildActivity(FrontEndActivity::class.java).get() val protons = ReflectionHelpers.getField(launcher, "protons") - protons.installer = { tool, _ -> attempts.add(tool.id); "failed" } + protons.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } Motion.refresh(launcher) LaunchOrigin.mark(Rect(0f, 0f, 100f, 100f), "game") launcher.startActivity(Intent(launcher, SessionActivity::class.java)) diff --git a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt index 43571a3ff0..5f3f3891fc 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt @@ -83,6 +83,20 @@ class ProtonExtrasTest { assertTrue(picked.sha512!!.endsWith("GE-Proton11-7-aarch64.sha512sum")) } + @Test + fun aTestBuildChoosesACompatibleArchiveWithVerification() { + val release = release( + "DroidDeck-Proton-11-12.9", + asset("DroidDeck-Proton-11-12.9-aarch64.tar.gz"), + asset("DroidDeck-Proton-11-12.9-aarch64.tar.xz", "sha256:" + "ab".repeat(32)), + prerelease = true, + ) + val releases = JSONArray().put(release).put(droiddeckRelease("11-12.8")) + val picked = ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!! + assertEquals("DroidDeck-Proton-11-12.9-aarch64.tar.xz", picked.name) + assertEquals("ab".repeat(32), picked.sha256) + } + @Test fun prereleasesDraftsAndReleasesWithoutAnArm64BuildAreSkipped() { val releases = JSONArray() @@ -242,4 +256,121 @@ class ProtonExtrasTest { assertNull(ProtonExtras.missing(context, tool("droiddeck"))) assertEquals("DroidDeck-Proton-11-11.4", ProtonExtras.update(context, tool("droiddeck"))) } + + @Test + fun theNewestPrereleaseAheadOfTheLatestReleaseIsTheTestBuild() { + val releases = JSONArray() + .put(release("DroidDeck-Bionic-12.8-r25", asset("DroidDeck-Bionic-12.8-r25-aarch64.tar.xz"), prerelease = true)) + .put(droiddeckRelease("11-12.9", prerelease = true)) + .put(droiddeckRelease("11-12.8")) + assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!!.tag) + assertEquals("DroidDeck-Proton-11-12.8", ProtonExtras.pickAsset(tool("droiddeck"), releases)!!.tag) + } + + @Test + fun aPrereleaseOlderThanTheLatestReleaseIsNotOffered() { + val releases = JSONArray() + .put(droiddeckRelease("11-12.9")) + .put(droiddeckRelease("11-12.8", prerelease = true)) + assertNull(ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)) + assertNull(ProtonExtras.pickAsset(tool("droiddeck"), JSONArray().put(droiddeckRelease("11-12.8")), test = true)) + } + + @Test + fun aTestBuildIsOfferedOnlyWhenNotInstalledAndNewer() { + assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.testFor(emptyList(), "DroidDeck-Proton-11-12.9")) + assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.testFor(listOf("DroidDeck-Proton-11-12.8"), "DroidDeck-Proton-11-12.9")) + assertNull(ProtonExtras.testFor(listOf("DroidDeck-Proton-11-12.9"), "DroidDeck-Proton-11-12.9")) + assertNull(ProtonExtras.testFor(listOf("DroidDeck-Proton-11-13.0"), "DroidDeck-Proton-11-12.9")) + assertNull(ProtonExtras.testFor(listOf("DroidDeck-Proton-11-12.8"), null)) + } + + @Test + fun theHighestEligibleTestBuildWinsWhateverTheListOrder() { + val releases = JSONArray() + .put(droiddeckRelease("11-12.7", prerelease = true)) + .put(droiddeckRelease("11-12.9", prerelease = true)) + .put(droiddeckRelease("11-12.8.5", prerelease = true)) + .put(droiddeckRelease("11-12.8")) + assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!!.tag) + } + + @Test + fun noTestBuildWithoutAStableBaseline() { + val releases = JSONArray().put(droiddeckRelease("11-12.9", prerelease = true)) + assertNull(ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)) + } + + @Test + fun aTestBuildWithNoChecksumIsNotOffered() { + val releases = JSONArray() + .put(release("DroidDeck-Proton-11-12.10", asset("DroidDeck-Proton-11-12.10-aarch64.tar.gz"), prerelease = true)) + .put(droiddeckRelease("11-12.9", prerelease = true)) + .put(droiddeckRelease("11-12.8")) + assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!!.tag) + } + + @Test + fun laterPagesAreReadOnlyUntilAStableBaselineIsFound() { + val tool = tool("droiddeck") + val pages = mapOf( + 1 to JSONArray().put(droiddeckRelease("11-12.10", prerelease = true)), + 2 to JSONArray().put(droiddeckRelease("11-12.8")), + 3 to JSONArray().put(droiddeckRelease("11-12.7")), + ) + val asked = mutableListOf() + val all = ProtonExtras.releases(tool) { asked += it; pages[it] ?: JSONArray() }!! + assertEquals(listOf(1, 2), asked) + assertEquals("DroidDeck-Proton-11-12.8", ProtonExtras.pickAsset(tool, all)!!.tag) + assertEquals("DroidDeck-Proton-11-12.10", ProtonExtras.pickAsset(tool, all, test = true)!!.tag) + + asked.clear() + ProtonExtras.releases(tool) { asked += it; pages.getValue(2) } + assertEquals(listOf(1), asked) + + asked.clear() + assertEquals(0, ProtonExtras.releases(tool) { asked += it; JSONArray() }!!.length()) + assertEquals(listOf(1), asked) + assertNull(ProtonExtras.releases(tool) { null }) + + asked.clear() + assertNull(ProtonExtras.releases(tool) { page -> + asked += page + if (page == 1) JSONArray().put(droiddeckRelease("11-12.10", prerelease = true)) else null + }) + assertEquals(listOf(1, 2), asked) + } + + @Test + fun anIncompleteLookupKeepsTheCachedTestBuildAndACompletedLookupClearsIt() { + val tool = tool("droiddeck") + val cache = JSONObject().put(tool.id, JSONObject().put("tag", "DroidDeck-Proton-11-12.8").put("test", "DroidDeck-Proton-11-12.9")) + ProtonExtras.updateLatest(cache, tool, null, 1L) + assertEquals("DroidDeck-Proton-11-12.9", cache.getJSONObject(tool.id).getString("test")) + ProtonExtras.updateLatest(cache, tool, JSONArray().put(droiddeckRelease("11-12.8")), 1L) + assertFalse(cache.getJSONObject(tool.id).has("test")) + } + + @Test + fun aTestInstallLeavesTheStableEntryAndAStableInstallKeepsTheTestOffer() { + val tool = tool("droiddeck") + val cache = JSONObject().put(tool.id, JSONObject().put("tag", "DroidDeck-Proton-11-12.8").put("test", "DroidDeck-Proton-11-12.9")) + assertFalse(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-12.9", true, 2L)) + assertEquals("DroidDeck-Proton-11-12.8", cache.getJSONObject(tool.id).getString("tag")) + assertEquals("DroidDeck-Proton-11-12.9", cache.getJSONObject(tool.id).getString("test")) + assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.testFor(emptyList(), cache.getJSONObject(tool.id).getString("test"))) + assertFalse(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-12.7", false, 2L)) + assertTrue(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-12.8", false, 2L)) + assertEquals("DroidDeck-Proton-11-12.9", cache.getJSONObject(tool.id).getString("test")) + assertEquals(2L, cache.getJSONObject(tool.id).getLong("at")) + assertTrue(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-13.0", false, 3L)) + assertFalse(cache.getJSONObject(tool.id).has("test")) + } + + @Test + fun malformedReleaseEntriesAreSkipped() { + val releases = JSONArray("[null, 5, {\"tag_name\": \"x\", \"assets\": [null]}]").put(droiddeckRelease("11-12.8")) + assertEquals("DroidDeck-Proton-11-12.8", ProtonExtras.pickAsset(tool("droiddeck"), releases)!!.tag) + assertNull(ProtonExtras.pickAsset(tool("droiddeck"), JSONArray("[null]"))) + } }