From de73e429ccd26945b285a4d34fe996014c485dad Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Thu, 19 Nov 2026 13:41:57 -0500 Subject: [PATCH] feat(proton): list prerelease builds under Experimental and install from any archive (#2889) * feat(proton): install prerelease builds * fix(proton): harden prerelease archive installs * refactor(proton): drop the superseded test build path * fix(proton): list only current prerelease builds and label the file install * fix(proton): hide prerelease rows that are already installed * fix(proton): keep relative links and modes when unpacking zip and 7z builds * fix(proton): name file installs without the archive suffix * fix(proton): confirm a release is gone before removing its build and tighten archive handling * Show the Experimental section without Developer tools * Share the refresh guard, recheck sessions before removal, skip other architectures The update check guard is shared between menu instances and held until the result is published, so a recreated screen joins the running check and results arrive in order. Automatic removal rechecks for a running session after each release lookup. Experimental assets for other CPU architectures are ignored, and in-tree links may start with the current directory. * Keep an experimental build in place when a session starts during its removal Removal and session start now share one lock. The tree is renamed out of the tools folder under that lock only while no session is running, and deleted afterwards, so a session that starts first keeps its build. --- .../droiddeck/launcher/FrontEndActivity.kt | 7 +- .../java/com/droiddeck/launcher/ProtonMenu.kt | 47 ++- .../droiddeck/launcher/core/Downloader.java | 6 + .../launcher/session/ExperimentalProtons.kt | 236 +++++++++++++-- .../launcher/session/ProtonExtras.kt | 86 +++--- .../launcher/session/SessionService.kt | 10 +- .../launcher/session/SessionState.kt | 2 + .../droiddeck/launcher/ui/ComponentsPage.kt | 32 +- app/src/main/res/values-ar/strings.xml | 10 +- app/src/main/res/values-b+es+419/strings.xml | 10 +- app/src/main/res/values-bg/strings.xml | 10 +- app/src/main/res/values-cs/strings.xml | 10 +- app/src/main/res/values-da/strings.xml | 10 +- app/src/main/res/values-de/strings.xml | 10 +- app/src/main/res/values-el/strings.xml | 10 +- app/src/main/res/values-es/strings.xml | 10 +- app/src/main/res/values-fi/strings.xml | 10 +- app/src/main/res/values-fr/strings.xml | 10 +- app/src/main/res/values-hi/strings.xml | 10 +- app/src/main/res/values-hu/strings.xml | 10 +- app/src/main/res/values-in/strings.xml | 10 +- app/src/main/res/values-it/strings.xml | 10 +- app/src/main/res/values-ja/strings.xml | 10 +- app/src/main/res/values-ko/strings.xml | 10 +- app/src/main/res/values-ms/strings.xml | 10 +- app/src/main/res/values-nb/strings.xml | 10 +- app/src/main/res/values-nl/strings.xml | 10 +- app/src/main/res/values-pl/strings.xml | 10 +- app/src/main/res/values-pt-rPT/strings.xml | 10 +- app/src/main/res/values-pt/strings.xml | 10 +- app/src/main/res/values-ro/strings.xml | 10 +- app/src/main/res/values-ru/strings.xml | 10 +- app/src/main/res/values-sv/strings.xml | 10 +- app/src/main/res/values-th/strings.xml | 10 +- app/src/main/res/values-tr/strings.xml | 10 +- app/src/main/res/values-uk/strings.xml | 10 +- app/src/main/res/values-vi/strings.xml | 10 +- app/src/main/res/values-zh-rCN/strings.xml | 10 +- app/src/main/res/values-zh-rHK/strings.xml | 10 +- app/src/main/res/values-zh-rTW/strings.xml | 10 +- app/src/main/res/values/strings.xml | 8 +- .../droiddeck/launcher/CompatLaunchTest.kt | 2 +- .../droiddeck/launcher/ProtonMenuAutoTest.kt | 88 +++++- .../session/ExperimentalProtonsTest.kt | 280 ++++++++++++++++++ .../launcher/session/ProtonExtrasTest.kt | 165 +++++------ 45 files changed, 897 insertions(+), 392 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 629986abf2..c15996d8fe 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -99,6 +99,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet this, ui, idle = { !busy && flood == null && compatLaunch == null && pkgStage == null && components.compBusy == null }, onInstalled = { if (!OfflineMode.enabled(this)) components.checkComponentUpdates(force = false) }, + onRemoved = { components.refreshComponents() }, ) private var installed by mutableStateOf(null) @@ -2433,17 +2434,18 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet protons = com.droiddeck.launcher.ui.ProtonsState( rows = protons.protonRows, busyId = protons.protonBusyId, stage = protons.protonStage, percent = protons.protonPercent, runtimeReady = ready && !busy, sessionRunning = SessionState.running, experimental = protons.experimentalDirs, + experimentalReleases = protons.experimentalReleases, ), protonActions = com.droiddeck.launcher.ui.ProtonsActions( onInstall = { id -> protons.installProton(id) }, - onInstallTest = { id -> protons.installProton(id, test = true) }, onCancel = { id -> ProtonExtras.tools.firstOrNull { it.id == id }?.let { ProtonExtras.unqueue(this, it) }; protons.refreshProtons() }, onRemove = { id, dir -> protons.removeProton(id, dir) }, onRemoveOlder = { id -> protons.removeProton(id, older = true) }, onExperimentalFile = { - pickExperimentalProton.launch(InAppFilePicker.buildIntent(this, ZIP_EXT, getString(R.string.xproton_pick), + pickExperimentalProton.launch(InAppFilePicker.buildIntent(this, EXPERIMENTAL_PROTON_EXT, getString(R.string.xproton_install_file), android.os.Environment.getExternalStoragePublicDirectory(android.os.Environment.DIRECTORY_DOWNLOADS).path)) }, + onExperimentalRelease = { release -> protons.installExperimentalRelease(release) }, onRemoveExperimental = { dir -> protons.removeExperimental(dir) }, ), protonOptions = { @@ -3413,6 +3415,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet private const val KEY_SWITCH_DEADLINE = "switch_deadline" private val SESSION_ENDED = setOf(SessionPhase.IDLE, SessionPhase.FAILED) private val ZIP_EXT = listOf("zip") + private val EXPERIMENTAL_PROTON_EXT = listOf("zip", "7z", "tar", "gz", "xz", "zst", "bz2", "tgz", "txz", "tbz2", "tzst") private val WCP_EXT = listOf("wcp") } } diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt index c076df2209..aaaa2cf34f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt @@ -20,6 +20,7 @@ internal class ProtonMenu( private val activity: android.app.Activity, private val ui: Handler, private val onInstalled: () -> Unit = {}, + private val onRemoved: () -> Unit = {}, private val idle: () -> Boolean = { true }, ) { private object Operation { @@ -29,6 +30,9 @@ internal class ProtonMenu( val percent = mutableIntStateOf(-1) val problem = mutableStateOf(null) val experimental = mutableStateOf>(emptyList()) + val experimentalReleases = mutableStateOf>(emptyList()) + var fetchedReleases = emptyList() + val checking = java.util.concurrent.atomic.AtomicBoolean(false) } var protonRows by Operation.rows var protonBusyId by Operation.busyId @@ -36,14 +40,16 @@ internal class ProtonMenu( var protonPercent by Operation.percent var protonProblem by Operation.problem var experimentalDirs by Operation.experimental + var experimentalReleases by Operation.experimentalReleases companion object { const val EXPERIMENTAL = "experimental" } - private val checking = java.util.concurrent.atomic.AtomicBoolean(false) - @VisibleForTesting internal var installer: (ProtonExtras.Tool, Boolean, (String, Int) -> Unit) -> String? = - { tool, test, progress -> ProtonExtras.install(activity, tool, test, progress) } + @VisibleForTesting internal var latestCheck: (Boolean) -> Boolean = { force -> ProtonExtras.checkLatest(activity, force) } + @VisibleForTesting internal var experimentalRefresh: () -> List? = { ExperimentalProtons.refresh(activity) } + @VisibleForTesting internal var installer: (ProtonExtras.Tool, (String, Int) -> Unit) -> String? = + { tool, progress -> ProtonExtras.install(activity, tool, progress) } - fun installProton(id: String, automatic: Boolean = false, test: Boolean = false) { + fun installProton(id: String, automatic: Boolean = false) { val tool = ProtonExtras.tools.firstOrNull { it.id == id } ?: return if (protonBusyId != null || ProtonExtras.installInProgress || SessionState.running) return ProtonExtras.unqueue(activity, tool) @@ -53,7 +59,7 @@ internal class ProtonMenu( protonPercent = -1 Thread({ val problem = runCatching { - installer(tool, test) { label, value -> + installer(tool) { label, value -> ui.post { protonStage = label; protonPercent = value } } }.getOrElse { it.message ?: it.javaClass.simpleName } @@ -114,6 +120,10 @@ internal class ProtonMenu( }, "install-proton-experimental").start() } + fun installExperimentalRelease(release: ExperimentalProtons.Release) { + installExperimental { progress -> ExperimentalProtons.installRelease(activity, release, progress) } + } + fun removeExperimental(dir: String) { if (protonBusyId != null || SessionState.running) return protonBusyId = EXPERIMENTAL @@ -131,22 +141,37 @@ internal class ProtonMenu( }, "remove-proton-experimental").start() } + private fun refreshExperimental() { + val installed = ExperimentalProtons.installed(activity) + experimentalDirs = installed.map { it.dir } + experimentalReleases = ExperimentalProtons.available(Operation.fetchedReleases, installed) + } + fun refreshProtons() { - experimentalDirs = ExperimentalProtons.installed(activity).map { it.dir } + refreshExperimental() protonRows = ProtonExtras.tools.map { val all = ProtonExtras.installedAll(activity, it) - ProtonRow(it.id, it.name, all.lastOrNull(), ProtonExtras.queued(activity, it), all, ProtonExtras.update(activity, it), ProtonExtras.testBuild(activity, it)) + ProtonRow(it.id, it.name, all.lastOrNull(), ProtonExtras.queued(activity, it), all, ProtonExtras.update(activity, it)) } } fun checkUpdates(force: Boolean = false) { - if (!checking.compareAndSet(false, true)) return + if (!Operation.checking.compareAndSet(false, true)) return Thread({ - val asked = try { ProtonExtras.checkLatest(activity, force) } catch (_: Throwable) { false } finally { checking.set(false) } - ui.post { - if (asked) refreshProtons() + val asked = runCatching { latestCheck(force) }.getOrDefault(false) + val experimental = runCatching { experimentalRefresh() }.getOrNull() + val published = ui.post { + try { + val before = experimentalDirs + Operation.fetchedReleases = experimental ?: emptyList() + if (asked) refreshProtons() else refreshExperimental() + if (!experimentalDirs.containsAll(before)) onRemoved() + } finally { + Operation.checking.set(false) + } ensureAutoUpdates() } + if (!published) Operation.checking.set(false) }, "proton-updates").start() } diff --git a/app/src/main/java/com/droiddeck/launcher/core/Downloader.java b/app/src/main/java/com/droiddeck/launcher/core/Downloader.java index 7d5427a8cb..7990e57073 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/Downloader.java +++ b/app/src/main/java/com/droiddeck/launcher/core/Downloader.java @@ -122,6 +122,12 @@ public final class Downloader { return null; } + public static Boolean gone(String url) { + Fetch fetch = fetch(url); + if (fetch.body != null) return Boolean.FALSE; + return fetch.fatal ? Boolean.TRUE : null; + } + public static String downloadDirect(String url) { LAST_FAILURE.remove(); return fetch(url).body; diff --git a/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt b/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt index cc2831bc8c..c02858e449 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt @@ -3,16 +3,23 @@ package com.droiddeck.launcher.session import android.content.Context import android.os.StatFs import android.util.Log +import com.droiddeck.launcher.core.Downloader +import com.droiddeck.launcher.core.Hashes import com.droiddeck.launcher.R import com.droiddeck.launcher.runtime.LinuxRuntime import java.io.File import java.io.FileOutputStream +import java.io.InputStream import java.nio.file.Files +import java.nio.file.attribute.PosixFilePermission import java.security.DigestOutputStream import java.security.MessageDigest import java.util.zip.ZipFile +import org.apache.commons.compress.archivers.sevenz.SevenZFile +import org.apache.commons.compress.archivers.zip.ZipFile as CommonsZipFile import kotlin.io.path.ExperimentalPathApi import kotlin.io.path.deleteRecursively +import org.json.JSONArray import org.json.JSONObject object ExperimentalProtons { @@ -22,12 +29,17 @@ object ExperimentalProtons { private const val STAGING = ".droiddeck-experimental" private const val BACKUPS = ".droiddeck-experimental-old" private const val INCOMING = ".droiddeck-experimental-new" + private const val REMOVED = ".droiddeck-experimental-gone" private const val GUEST_TOOLS = "/root/.local/share/Steam/compatibilitytools.d" private const val NEED_BYTES = 4L * 1024 * 1024 * 1024 private const val USER_SETTINGS = "user_settings.py" - private val TARBALL = Regex("(?i)\\.tar(\\.(gz|xz|zst|bz2))?$") + internal val TARBALL = Regex("(?i)\\.tar(\\.(gz|xz|zst|bz2))?$") + internal val FOREIGN_ARCH = Regex("(?i)(^|[^a-z0-9])(x86|x64|amd64|i[3-6]86)([^a-z0-9]|$)") + private val DOWNLOAD_PREFIX = "droiddeck-" - data class Installed(val dir: String, val label: String, val source: String) + data class Installed(val dir: String, val label: String, val source: String, val releaseTag: String? = null) + data class Release(val tag: String, val asset: String, val url: String, val sha512: String?, val size: Long, val name: String = tag) + enum class ArchiveType { ZIP, SEVEN_Z, TAR, UNKNOWN } private fun toolsDir(context: Context) = File(LinuxRuntime.rootDir(context), GUEST_TOOLS.removePrefix("/")) @@ -36,7 +48,7 @@ object ExperimentalProtons { ?.filter { it.isDirectory && File(it, MARKER).isFile } ?.map { dir -> val info = runCatching { JSONObject(File(dir, MARKER).readText()) }.getOrDefault(JSONObject()) - Installed(dir.name, info.optString("label").ifEmpty { dir.name }, info.optString("source")) + Installed(dir.name, info.optString("label").ifEmpty { dir.name }, info.optString("source"), info.optString("releaseTag").ifEmpty { null }) } ?.sortedBy { it.dir } ?: emptyList() @@ -45,9 +57,15 @@ object ExperimentalProtons { val tools = toolsDir(context) val target = File(tools, dir) if (!File(target, MARKER).isFile) return false - val gone = deleteTree(target) && deleteTree(File(File(tools, BACKUPS), dir)) && deleteTree(File(File(tools, INCOMING), dir)) - if (gone) ComponentsManager.forgetProton(context, dir) - return gone + val doomed = File(File(tools, REMOVED).apply { mkdirs() }, dir) + if (!deleteTree(doomed)) return false + val detached = synchronized(SessionState.startLock) { !SessionState.running && target.renameTo(doomed) } + if (!detached) return false + ComponentsManager.forgetProton(context, dir) + deleteTree(doomed) + deleteTree(File(File(tools, BACKUPS), dir)) + deleteTree(File(File(tools, INCOMING), dir)) + return true } internal fun dirName(tree: String, label: String?): String { @@ -56,6 +74,49 @@ object ExperimentalProtons { return PREFIX + base + (tag?.let { "-$it" } ?: "") } + fun refresh(context: Context): List? { + val tool = ProtonExtras.tools.first { it.id == ProtonExtras.OWN } + val fetched = ProtonExtras.releasesForRemoval(tool) ?: return null + val assets = ProtonExtras.assets(tool, fetched.releases, prerelease = true) + val rows = assets.map { Release(it.tag, it.name, it.url, it.sha512, it.size, it.releaseName) }.distinctBy { it.tag } + if (!SessionState.running) { + reconcile(context, fetched) + if (fetched.complete) removeStaleDownloads(context, fetched.releases.tags()) + } + return rows + } + + private fun JSONArray.tags(): Set = (0 until length()).mapNotNull { optJSONObject(it)?.optString("tag_name")?.takeIf(String::isNotEmpty) }.toSet() + + internal fun removeStaleDownloads(context: Context, availableTags: Set) { + val downloads = File(context.filesDir, "proton-downloads") + downloads.listFiles()?.filter { file -> + file.isFile && file.name.startsWith(DOWNLOAD_PREFIX) && availableTags.none { tag -> file.name.startsWith("$DOWNLOAD_PREFIX${ComponentsManager.safeName(tag)}-") } + }?.forEach { it.delete() } + } + + internal fun available(releases: List, installed: List): List = + releases.filter { release -> installed.none { it.releaseTag == release.tag } } + + internal fun shouldRemove(installedReleaseTag: String?, fetched: ProtonExtras.ReleaseFetch, gone: (String) -> Boolean): Boolean { + val tag = installedReleaseTag ?: return false + val release = (0 until fetched.releases.length()).asSequence() + .mapNotNull { fetched.releases.optJSONObject(it) } + .firstOrNull { it.optString("tag_name") == tag } + return if (release != null) !release.optBoolean("prerelease", false) else fetched.complete && gone(tag) + } + + internal fun reconcile( + context: Context, + fetched: ProtonExtras.ReleaseFetch, + gone: (String) -> Boolean = { tag -> ProtonExtras.releaseGone(ProtonExtras.tools.first { it.id == ProtonExtras.OWN }, tag) }, + ) { + for (build in installed(context)) { + if (SessionState.running) return + if (shouldRemove(build.releaseTag, fetched, gone)) remove(context, build.dir) + } + } + internal fun compatVdf(name: String): String = """"compatibilitytools" { "compat_tools" @@ -71,21 +132,55 @@ object ExperimentalProtons { } """ - fun installFromFile(context: Context, zip: File, onProgress: (String, Int) -> Unit): String? { + fun installFromFile(context: Context, file: File, onProgress: (String, Int) -> Unit): String? { preflight(context)?.let { return it } - if (StatFs(LinuxRuntime.rootDir(context).path).availableBytes < NEED_BYTES + zip.length()) { + if (StatFs(LinuxRuntime.rootDir(context).path).availableBytes < NEED_BYTES + file.length()) { return context.getString(R.string.xproton_no_space) } - return install(context, zip, zip.name.substringBeforeLast('.'), zip.name, onProgress) + return install(context, file, fileLabel(file.name), file.name, null, onProgress, false) } + internal fun fileLabel(name: String): String = + if (TARBALL.containsMatchIn(name)) name.replace(TARBALL, "") else name.substringBeforeLast('.') + + fun installRelease(context: Context, release: Release, onProgress: (String, Int) -> Unit): String? { + preflight(context)?.let { return it } + val downloads = File(context.filesDir, "proton-downloads").apply { mkdirs() } + val archive = File(downloads, "droiddeck-${ComponentsManager.safeName(release.tag)}-${release.asset}") + if (release.size > 0 && archive.length() > release.size) archive.delete() + val missing = (release.size - archive.length()).coerceAtLeast(0L) + val copyBytes = if (sameFileStore(archive, toolsDir(context))) 0L else release.size + if (StatFs(LinuxRuntime.rootDir(context).path).availableBytes < NEED_BYTES + missing + copyBytes) return context.getString(R.string.xproton_no_space) + val title = context.getString(R.string.pextra_downloading, "Proton", release.tag) + onProgress(title, 0) + if (!Downloader.downloadFile(release.url, archive, true) { fraction -> + onProgress(title, if (fraction < 0) -1 else (fraction * 100f).toInt().coerceIn(0, 100)) + }) return context.getString(R.string.pextra_download_failed) + if (release.size > 0 && archive.length() != release.size) return context.getString(R.string.pextra_incomplete) + if (release.sha512 != null) { + val expected = Downloader.downloadDirect(release.sha512)?.let(::checksumIn) + ?: return context.getString(R.string.pextra_checksum_unreadable) + if (!expected.equals(Hashes.sha512(archive), true)) { + archive.delete() + return context.getString(R.string.pextra_checksum_mismatch) + } + } + return try { install(context, archive, release.tag, release.tag, release.tag, onProgress, true) } + finally { archive.delete() } + } + + private fun sameFileStore(file: File, directory: File): Boolean = runCatching { + directory.mkdirs() + Files.getFileStore((file.takeIf(File::exists) ?: file.parentFile).toPath()) == Files.getFileStore(directory.toPath()) + }.getOrDefault(false) + private fun preflight(context: Context): String? = when { SessionState.running -> context.getString(R.string.pextra_stop_session) !LinuxRuntime.isInstalled(context) -> context.getString(R.string.user_apps_runtime_required) else -> null } - private fun install(context: Context, zip: File, label: String, source: String, onProgress: (String, Int) -> Unit): String? { + private fun install(context: Context, archive: File, label: String, source: String, releaseTag: String?, onProgress: (String, Int) -> Unit, downloaded: Boolean): String? { val tools = toolsDir(context).apply { mkdirs() } val staging = File(tools, STAGING) val forget = { name: String -> ComponentsManager.forgetProton(context, name) } @@ -95,23 +190,40 @@ object ExperimentalProtons { try { LinuxRuntime.writeAccounts(context) SessionFiles.stage(context, LinuxRuntime.rootDir(context)) - onProgress(context.getString(R.string.xproton_unzipping), -1) - val tarball = runCatching { extractTarball(zip, staging) } - .getOrElse { return it.message ?: context.getString(R.string.xproton_bad_zip) } - ?: return context.getString(R.string.xproton_bad_zip) + onProgress(context.getString(R.string.xproton_unpacking), -1) + val unpacked = File(staging, "unpacked").apply { mkdirs() } + val type = archiveType(archive) if (SessionState.running) return context.getString(R.string.pextra_session_started) onProgress(context.getString(R.string.xproton_unpacking), -1) - val unpacked = File(staging, "unpacked").apply { mkdirs() } - val status = runGuest(context, listOf("tar", "-xf", "$GUEST_TOOLS/$STAGING/${tarball.name}", "-C", "$GUEST_TOOLS/$STAGING/unpacked")) - tarball.delete() - if (status != 0) return context.getString(R.string.xproton_untar_failed, status) + when (type) { + ArchiveType.ZIP -> { + val tarball = extractTarball(archive, staging) + if (tarball == null) { + extractDirect(archive, unpacked, ArchiveType.ZIP) + } else { + val status = runGuest(context, listOf("tar", "-xf", "$GUEST_TOOLS/$STAGING/${tarball.name}", "-C", "$GUEST_TOOLS/$STAGING/unpacked")) + tarball.delete() + if (status != 0) return context.getString(R.string.xproton_untar_failed, status) + } + } + ArchiveType.SEVEN_Z -> extractDirect(archive, unpacked, ArchiveType.SEVEN_Z) + ArchiveType.TAR -> { + val stagedArchive = File(staging, archive.name) + if (!archive.canonicalFile.equals(stagedArchive.canonicalFile) && !(downloaded && archive.renameTo(stagedArchive))) { + archive.copyTo(stagedArchive, overwrite = true) + } + val status = runGuest(context, listOf("tar", "-xf", "$GUEST_TOOLS/$STAGING/${stagedArchive.name}", "-C", "$GUEST_TOOLS/$STAGING/unpacked")) + if (status != 0) return context.getString(R.string.xproton_untar_failed, status) + } + ArchiveType.UNKNOWN -> return context.getString(R.string.xproton_archive_invalid) + } val tree = buildTree(unpacked) ?: return context.getString(R.string.xproton_no_tree) val name = dirName(tree.name, label) ownFile(tree, "compatibilitytool.vdf").writeText(compatVdf(name)) ownFile(tree, MARKER).writeText( - JSONObject().put("label", name).put("source", source).put("at", System.currentTimeMillis() / 1000).toString(), + JSONObject().put("label", name).put("source", source).putOpt("releaseTag", releaseTag).put("at", System.currentTimeMillis() / 1000).toString(), ) val final = File(tools, name) val settings = File(final, USER_SETTINGS) @@ -125,7 +237,7 @@ object ExperimentalProtons { return null } catch (e: Exception) { Log.e(TAG, "install $source", e) - return e.message ?: context.getString(R.string.xproton_bad_zip) + return if (e is UnsafeArchiveException) context.getString(R.string.xproton_archive_unsafe) else context.getString(R.string.xproton_archive_invalid) } finally { deleteTree(staging) } @@ -171,10 +283,22 @@ object ExperimentalProtons { } internal fun restoreInterrupted(tools: File, forget: (String) -> Boolean) { + deleteTree(File(tools, REMOVED)) File(tools, INCOMING).listFiles()?.forEach { finishPlacing(tools, it.name, forget) } File(tools, BACKUPS).listFiles()?.forEach { if (File(tools, it.name).exists()) deleteTree(it) else it.renameTo(File(tools, it.name)) } } + internal fun archiveType(file: File): ArchiveType { + val head = runCatching { file.inputStream().use { ByteArray(300).also { b -> it.read(b) } } }.getOrNull() ?: return ArchiveType.UNKNOWN + fun at(i: Int, vararg bytes: Int) = bytes.indices.all { head.getOrNull(i + it) == bytes[it].toByte() } + return when { + at(0, 0x50, 0x4B) -> ArchiveType.ZIP + at(0, 0x37, 0x7A, 0xBC, 0xAF, 0x27, 0x1C) -> ArchiveType.SEVEN_Z + at(0, 0x1F, 0x8B) || at(0, 0x42, 0x5A, 0x68) || at(0, 0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00) || at(0, 0x28, 0xB5, 0x2F, 0xFD) || at(257, 0x75, 0x73, 0x74, 0x61, 0x72) -> ArchiveType.TAR + else -> ArchiveType.UNKNOWN + } + } + private fun extractTarball(zip: File, into: File): File? = ZipFile(zip).use { z -> val entries = z.entries().toList().filter { !it.isDirectory } val entry = entries.filter { TARBALL.containsMatchIn(it.name) }.maxByOrNull { it.size } ?: return null @@ -194,6 +318,78 @@ object ExperimentalProtons { out } + internal class UnsafeArchiveException : Exception() + + internal fun extractDirect(archive: File, into: File, type: ArchiveType) { + val root = into.toPath().toAbsolutePath().normalize() + fun target(name: String): File { + val clean = name.replace('\\', '/') + val parts = clean.split('/') + if (clean.startsWith('/') || parts.any { it == ".." }) throw UnsafeArchiveException() + val path = root.resolve(clean).normalize() + if (!path.startsWith(root)) throw UnsafeArchiveException() + var parent = path.parent + while (parent != null && parent.startsWith(root) && parent != root) { + if (Files.isSymbolicLink(parent)) throw UnsafeArchiveException() + parent = parent.parent + } + return path.toFile() + } + fun applyMode(file: File, mode: Int) { + val permissions = mutableSetOf() + if (mode and 0x100 != 0) permissions += PosixFilePermission.OWNER_READ + if (mode and 0x80 != 0) permissions += PosixFilePermission.OWNER_WRITE + if (mode and 0x40 != 0) permissions += PosixFilePermission.OWNER_EXECUTE + if (mode and 0x20 != 0) permissions += PosixFilePermission.GROUP_READ + if (mode and 0x10 != 0) permissions += PosixFilePermission.GROUP_WRITE + if (mode and 0x08 != 0) permissions += PosixFilePermission.GROUP_EXECUTE + if (mode and 0x04 != 0) permissions += PosixFilePermission.OTHERS_READ + if (mode and 0x02 != 0) permissions += PosixFilePermission.OTHERS_WRITE + if (mode and 0x01 != 0) permissions += PosixFilePermission.OTHERS_EXECUTE + if (permissions.isNotEmpty()) Files.setPosixFilePermissions(file.toPath(), permissions) + } + val directoryModes = mutableListOf>() + fun place(name: String, mode: Int, directory: Boolean, content: () -> InputStream) { + val file = target(name) + when { + mode and 0xF000 == 0xA000 -> { + val link = content().use { it.readBytes().decodeToString() } + val parent = file.parentFile ?: throw UnsafeArchiveException() + val climbsLater = link.split('/').filter { it != "." }.dropWhile { it == ".." }.any { it == ".." } + if (link.startsWith('/') || climbsLater || !parent.toPath().resolve(link).normalize().startsWith(root)) throw UnsafeArchiveException() + parent.mkdirs() + Files.deleteIfExists(file.toPath()) + Files.createSymbolicLink(file.toPath(), java.nio.file.Paths.get(link)) + } + directory -> { + file.mkdirs() + directoryModes += file to mode + } + else -> { + if (Files.isSymbolicLink(file.toPath())) throw UnsafeArchiveException() + file.parentFile?.mkdirs() + content().use { input -> file.outputStream().use { output -> input.copyTo(output, 1 shl 16) } } + applyMode(file, mode) + } + } + } + when (type) { + ArchiveType.ZIP -> CommonsZipFile.builder().setFile(archive).get().use { zip -> + for (entry in zip.entries) place(entry.name, entry.unixMode, entry.isDirectory) { zip.getInputStream(entry) } + } + ArchiveType.SEVEN_Z -> Files.newByteChannel(archive.toPath()).use { channel -> + SevenZFile.builder().setSeekableByteChannel(channel).get().use { seven -> + for (entry in seven.entries) { + val unix = entry.hasWindowsAttributes && entry.windowsAttributes and 0x8000 != 0 + place(entry.name, if (unix) entry.windowsAttributes ushr 16 else 0, entry.isDirectory) { seven.getInputStream(entry) } + } + } + } + else -> error("Unsupported direct archive") + } + directoryModes.sortedByDescending { it.first.path.length }.forEach { (directory, mode) -> applyMode(directory, mode) } + } + internal fun checksumIn(text: String): String? = Regex("(?i)\\b[0-9a-f]{128}\\b").find(text)?.value internal fun checksumEntry(entries: List, tarball: String): String? { diff --git a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt index c277b7b279..0d0e20c41d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt @@ -16,8 +16,10 @@ import org.json.JSONObject object ProtonExtras { private const val TAG = "ProtonExtras" private const val NEED_BYTES = 4L * 1024 * 1024 * 1024 - private const val RELEASES = "https://api.github.com/repos/%s/releases?per_page=15&page=%d" + private const val RELEASE_PAGE_SIZE = 15 + private const val RELEASES = "https://api.github.com/repos/%s/releases?per_page=$RELEASE_PAGE_SIZE&page=%d" private const val RELEASE_PAGES = 5 + private const val RELEASE_TAG = "https://api.github.com/repos/%s/releases/tags/%s" const val CHECK_EVERY_MS = 60L * 60 * 1000 @Volatile var installInProgress = false @@ -28,7 +30,8 @@ object ProtonExtras { class Tool(val id: String, val name: String, val prefix: String, val repo: String, val assetPattern: Regex) internal data class Asset(val tag: String, val name: String, val url: String, val sha512: String?, val size: Long, - val sha256: String? = null) + val sha256: String? = null, val releaseName: String = tag) + internal data class ReleaseFetch(val releases: JSONArray, val complete: Boolean) const val OWN = "droiddeck" @@ -106,12 +109,6 @@ object ProtonExtras { fun cachedLatest(context: Context, tool: Tool): String? = readJson(latestFile(context)).optJSONObject(tool.id)?.optString("tag")?.ifEmpty { null } - fun testBuild(context: Context, tool: Tool): String? = - testFor(installedTags(context, tool), readJson(latestFile(context)).optJSONObject(tool.id)?.optString("test")?.ifEmpty { null }) - - internal fun testFor(installed: List, test: String?): String? = - test?.takeIf { it !in installed && (installed.isEmpty() || updateFor(installed, it) != null) } - private val checkLock = Any() private const val RETRY_MS = 15L * 60 * 1000 private const val USER_SETTINGS = "user_settings.py" @@ -135,20 +132,18 @@ object ProtonExtras { } } - internal fun recordLatest(latest: JSONObject, tool: Tool, tag: String, test: Boolean, now: Long): Boolean { - if (test) return false + internal fun recordLatest(latest: JSONObject, tool: Tool, tag: String, now: Long): Boolean { val entry = latest.optJSONObject(tool.id) val known = entry?.optString("tag") if (!known.isNullOrEmpty() && compareVersions(tag, known) < 0) return false - val ahead = entry?.optString("test")?.takeIf { it.isNotEmpty() && compareVersions(it, tag) > 0 } - latest.put(tool.id, JSONObject().put("tag", tag).put("at", now).putOpt("test", ahead)) + latest.put(tool.id, JSONObject().put("tag", tag).put("at", now)) return true } - private fun record(context: Context, tool: Tool, dir: String?, tag: String, test: Boolean) { + private fun record(context: Context, tool: Tool, dir: String?, tag: String) { runCatching { val latest = readJson(latestFile(context)) - if (recordLatest(latest, tool, tag, test, System.currentTimeMillis())) latestFile(context).writeText(latest.toString()) + if (recordLatest(latest, tool, tag, System.currentTimeMillis())) latestFile(context).writeText(latest.toString()) if (dir != null) { val releases = readJson(releasesFile(context)) val present = toolsDir(context).list()?.toSet() ?: emptySet() @@ -221,17 +216,17 @@ object ProtonExtras { } @Synchronized - fun install(context: Context, tool: Tool, test: Boolean = false, onProgress: (String, Int) -> Unit): String? { + fun install(context: Context, tool: Tool, onProgress: (String, Int) -> Unit): String? { if (installInProgress) return context.getString(R.string.pextra_busy) installInProgress = true - return try { installNow(context, tool, test, onProgress) } finally { installInProgress = false } + return try { installNow(context, tool, onProgress) } finally { installInProgress = false } } - private fun installNow(context: Context, tool: Tool, test: Boolean, onProgress: (String, Int) -> Unit): String? { + private fun installNow(context: Context, tool: Tool, onProgress: (String, Int) -> Unit): String? { if (SessionState.running) return context.getString(R.string.pextra_stop_session) if (!LinuxRuntime.isInstalled(context)) return context.getString(R.string.user_apps_runtime_required) - val asset = releases(tool)?.let { pickAsset(tool, it, test && tool.id == OWN) } ?: return context.getString(R.string.pextra_no_release, tool.name) + val asset = releases(tool)?.let { pickAsset(tool, it) } ?: return context.getString(R.string.pextra_no_release, tool.name) val downloads = File(context.filesDir, "proton-downloads").apply { mkdirs() } val archive = File(downloads, "${tool.id}-${asset.name}") if (asset.size > 0 && archive.length() > asset.size) archive.delete() @@ -312,7 +307,7 @@ object ProtonExtras { else { archive.delete() unqueue(context, tool) - record(context, tool, placed, asset.tag, test) + record(context, tool, placed, asset.tag) if (tool.id == OWN) replaceOlder(context, tool) if (EsyncPacks.enabled(context)) { onProgress(context.getString(R.string.esync_fetching), -1) @@ -349,7 +344,7 @@ object ProtonExtras { } } - private fun releases(tool: Tool): JSONArray? = releases(tool) { page -> + internal fun releases(tool: Tool): JSONArray? = releases(tool) { page -> Downloader.downloadString(RELEASES.format(Locale.ROOT, tool.repo, page))?.let { body -> try { JSONArray(body) @@ -361,51 +356,70 @@ object ProtonExtras { } internal fun releases(tool: Tool, fetch: (Int) -> JSONArray?): JSONArray? { + return releasesResult(tool, fetch, stopAtStable = true)?.releases + } + + internal fun releasesForRemoval(tool: Tool, fetch: (Int) -> JSONArray? = { page -> + Downloader.downloadString(RELEASES.format(Locale.ROOT, tool.repo, page))?.let { body -> + runCatching { JSONArray(body) }.getOrNull() + } + }): ReleaseFetch? = releasesResult(tool, fetch, stopAtStable = false) + + internal fun releaseGone(tool: Tool, tag: String): Boolean = + Downloader.gone(RELEASE_TAG.format(Locale.ROOT, tool.repo, java.net.URLEncoder.encode(tag, "UTF-8").replace("+", "%20"))) == true + + private fun releasesResult(tool: Tool, fetch: (Int) -> JSONArray?, stopAtStable: Boolean): ReleaseFetch? { val all = fetch(1) ?: return null var page = 1 var last = all.length() - while (last > 0 && page < RELEASE_PAGES && pickAsset(tool, all) == null) { + var complete = last < RELEASE_PAGE_SIZE + while (!complete && page < RELEASE_PAGES && (!stopAtStable || pickAsset(tool, all) == null)) { val next = fetch(++page) ?: return null for (i in 0 until next.length()) all.put(next.opt(i)) last = next.length() + complete = last < RELEASE_PAGE_SIZE } - return all + return ReleaseFetch(all, complete) } - internal fun pickAsset(tool: Tool, array: JSONArray, test: Boolean = false): Asset? { + internal fun assets(tool: Tool, array: JSONArray, prerelease: Boolean): List { + val releases = (0 until array.length()).mapNotNull { array.optJSONObject(it) }.filter { !it.optBoolean("draft", false) } + val stableAt = releases.filter { !it.optBoolean("prerelease", false) }.maxOfOrNull { it.optString("published_at") }.orEmpty() + return releases + .filter { it.optBoolean("prerelease", false) == prerelease && (!prerelease || it.optString("published_at") > stableAt) } + .mapNotNull { assetOf(tool, it, experimental = prerelease) } + } + + internal fun pickAsset(tool: Tool, array: JSONArray): Asset? { val candidates = (0 until array.length()).asSequence() .mapNotNull { array.optJSONObject(it) } - .filter { !it.optBoolean("draft", false) && it.optBoolean("prerelease", false) == test } - if (!test) return candidates.firstNotNullOfOrNull { assetOf(tool, it) } - val stable = pickAsset(tool, array)?.tag ?: return null - return candidates - .filter { it.optString("tag_name").startsWith(tool.prefix) && updateFor(listOf(stable), it.optString("tag_name")) != null } - .mapNotNull { assetOf(tool, it, requireChecksum = true) } - .maxWithOrNull { a, b -> compareVersions(a.tag, b.tag) } + .filter { !it.optBoolean("draft", false) && !it.optBoolean("prerelease", false) } + return candidates.firstNotNullOfOrNull { assetOf(tool, it) } } internal fun updateLatest(cache: JSONObject, tool: Tool, array: JSONArray?, now: Long) { if (array == null) return - val test = if (tool.id == OWN) pickAsset(tool, array, test = true)?.tag else null val tag = pickAsset(tool, array)?.tag if (tag == null) { - cache.optJSONObject(tool.id)?.remove("test") return } - cache.put(tool.id, JSONObject().put("tag", tag).put("at", now).putOpt("test", test)) + cache.put(tool.id, JSONObject().put("tag", tag).put("at", now)) } - private fun assetOf(tool: Tool, release: JSONObject, requireChecksum: Boolean = false): Asset? = try { + internal fun assetOf(tool: Tool, release: JSONObject, requireChecksum: Boolean = false, experimental: Boolean = false): Asset? = try { val assets = release.optJSONArray("assets") val entries = assets?.let { list -> (0 until list.length()).mapNotNull { list.optJSONObject(it) } }.orEmpty() - entries.sortedBy { it.optString("name") }.filter { tool.assetPattern.containsMatchIn(it.optString("name")) }.mapNotNull { archive -> + entries.sortedBy { it.optString("name") }.filter { + val name = it.optString("name") + if (experimental && tool.id == OWN) name.startsWith(release.optString("tag_name")) && ExperimentalProtons.TARBALL.containsMatchIn(name) && !ExperimentalProtons.FOREIGN_ARCH.containsMatchIn(name) else tool.assetPattern.containsMatchIn(name) + }.mapNotNull { archive -> val name = archive.optString("name") val stem = name.substringBefore(".tar") val checksum = entries.firstOrNull { it.optString("name").startsWith(stem) && it.optString("name").contains("sha512", ignoreCase = true) }?.optString("browser_download_url")?.takeIf { it.startsWith("http") } archive.optString("browser_download_url").takeIf { it.startsWith("http") }?.let { url -> - Asset(release.optString("tag_name"), name, url, checksum, archive.optLong("size", 0L), Hashes.githubSha256(archive.optString("digest"))) + Asset(release.optString("tag_name"), name, url, checksum, archive.optLong("size", 0L), Hashes.githubSha256(archive.optString("digest")), release.optString("name").ifEmpty { release.optString("tag_name") }) } }.let { found -> if (requireChecksum) found.firstOrNull { it.sha256 != null || it.sha512 != null } else found.firstOrNull() } } catch (e: Exception) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index aaf77c3f5f..e15fac1c64 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -417,10 +417,12 @@ class SessionService : Service() { SessionPrefs.screenEffectsProfileId(SessionState.mode, resolvedGameId, SessionState.program), ) com.droiddeck.launcher.stores.battlenet.BattleNetClient.clearRequests(LinuxRuntime.sessionRoot(this)) - val gen = synchronized(stopLock) { - SessionState.steamClientArch = null - SessionState.running = true - ++sessionGen + val gen = synchronized(SessionState.startLock) { + synchronized(stopLock) { + SessionState.steamClientArch = null + SessionState.running = true + ++sessionGen + } } if (SessionState.stopRequested) { stopSession(0) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt index 5f17212e52..6124947151 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt @@ -43,6 +43,8 @@ object SessionState { @Volatile var stopRequested = false + val startLock = Any() + @Volatile var running = false @Volatile diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt index 13d300c5f6..908f229e3a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt @@ -84,6 +84,7 @@ import com.droiddeck.launcher.R import com.droiddeck.launcher.session.ComponentUpdater import com.droiddeck.launcher.session.ComponentUpdates import com.droiddeck.launcher.session.ComponentsManager +import com.droiddeck.launcher.session.ExperimentalProtons import com.droiddeck.launcher.session.ComponentsManager.CatalogItem import com.droiddeck.launcher.session.ComponentsManager.Snapshot import kotlinx.coroutines.delay @@ -597,11 +598,9 @@ fun ComponentsPage( if (rows.isEmpty()) EmptyLine(stringResource(R.string.comp_nothing_new)) for (row in rows) { val idle = protons.busyId == null && protons.runtimeReady && !protons.sessionRunning - val test = row.test != null && (nightlyPicked[row.id] == true || row.installed != null && row.update == null) GetLine( row.name, when { - test -> row.test!! row.update != null -> stringResource(R.string.proton_update_available, row.update) row.queued -> stringResource(R.string.proton_queued) else -> stringResource(R.string.proton_not_installed) @@ -610,11 +609,8 @@ fun ComponentsPage( stage = if (protons.busyId == row.id) protons.stage else null, enabled = idle, onCancel = if (row.queued && protons.busyId == null && !protons.sessionRunning) ({ protonActions.onCancel(row.id) }) else null, - action = if (!test && row.update != null) stringResource(R.string.common_update) else null, - channel = if (row.test != null) ({ - ChannelToggle(test, enabled = idle && (row.installed == null || row.update != null), other = R.string.comp_channel_test) { nightlyPicked[row.id] = !test } - }) else null, - ) { if (test) protonActions.onInstallTest(row.id) else protonActions.onInstall(row.id) } + action = if (row.update != null) stringResource(R.string.common_update) else null, + ) { protonActions.onInstall(row.id) } } } else -> { @@ -742,11 +738,9 @@ fun ComponentsPage( } } } - if (l == PROTON_TAB && DeveloperTools.on) { + if (l == PROTON_TAB) { Spacer(Modifier.height(12.dp)) ExperimentalProtonGroup(protons, protonActions) - } - if (l == PROTON_TAB) { Spacer(Modifier.height(12.dp)) Note(stringResource(R.string.comp_about_text)) } @@ -1645,8 +1639,15 @@ private fun ExperimentalProtonGroup(protons: ProtonsState, actions: ProtonsActio val idle = protons.busyId == null && protons.runtimeReady && !protons.sessionRunning RowGroup(stringResource(R.string.xproton_title)) { if (busy) GetLine(stringResource(R.string.xproton_title), "", progress = protons.percent, enabled = false, stage = protons.stage) {} - else Row(horizontalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.padding(start = 14.dp, top = 4.dp, bottom = 8.dp)) { - SmallButton(stringResource(R.string.xproton_pick_zip), enabled = idle, onClick = actions.onExperimentalFile) + else { + protons.experimentalReleases.forEach { release -> + GetLine(release.name, release.tag, progress = null, enabled = idle, action = stringResource(R.string.proton_install_now)) { + actions.onExperimentalRelease(release) + } + } + Row(horizontalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.padding(start = 14.dp, top = 4.dp, bottom = 8.dp)) { + SmallButton(stringResource(R.string.xproton_install_file), enabled = idle, onClick = actions.onExperimentalFile) + } } } } @@ -1659,23 +1660,24 @@ class ProtonsState( val runtimeReady: Boolean = true, val sessionRunning: Boolean = false, val experimental: List = emptyList(), + val experimentalReleases: List = emptyList(), ) class ProtonsActions( val onInstall: (String) -> Unit = {}, - val onInstallTest: (String) -> Unit = {}, val onCancel: (String) -> Unit = {}, val onRemove: (String, String) -> Unit = { _, _ -> }, val onRemoveOlder: (String) -> Unit = {}, val onExperimentalFile: () -> Unit = {}, + val onExperimentalRelease: (ExperimentalProtons.Release) -> Unit = {}, val onRemoveExperimental: (String) -> Unit = {}, ) class ProtonRow( val id: String, val name: String, val installed: String?, val queued: Boolean, - val installedAll: List = listOfNotNull(installed), val update: String? = null, val test: String? = null, + val installedAll: List = listOfNotNull(installed), val update: String? = null, ) { - val available: Boolean get() = installed == null || update != null || test != null + val available: Boolean get() = installed == null || update != null } @Composable diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index dc432165d9..52c5f64a1e 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -585,7 +585,6 @@ في الإصدارات الليلية · %1$d مستقر ليلي - تجريبي حدّث لعرض الحزم في إصدارات Nightlies وDroidDeck. لا جديد منذ آخر فحص. استيراد ملف ‎.wcp @@ -2406,12 +2405,11 @@ بدأت جلسة خلال التنزيل، أوقفها قبل تثبيت أدوات التوافق جارٍ تثبيت %1$s إصدارات تجريبية - اختر ملف .zip لإصدار Proton - تثبيت من ملف .zip + تثبيت من ملف + يحتوي الأرشيف على رابط أو مسار غير آمن + أرشيف غير مدعوم أو غير صالح لا توجد مساحة كافية لإصدار Proton هذا - جارٍ فك الضغط جارٍ تفريغ Proton (بضع دقائق) - ملف .zip لا يحتوي على أرشيف tar لـ Proton فشل التفريغ (tar %1$d) الأرشيف لا يحتوي على إصدار Proton تعذّر وضع إصدار Proton @@ -4276,4 +4274,4 @@ الإبرازات نجاح خطأ - \ No newline at end of file + diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index e6b952e051..6bb03b842b 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -579,7 +579,6 @@ En las Nightlies · %1$d Estable Nocturna - Prueba Actualiza para listar los paquetes de Nightlies y DroidDeck. Nada nuevo desde la última comprobación. Importar .wcp @@ -2398,12 +2397,11 @@ Se inició una sesión durante la descarga; detenla antes de instalar herramientas de compatibilidad Instalando %1$s Versiones experimentales - Elige un .zip de una versión de Proton - Instalar desde .zip + Instalar desde archivo + El archivo contiene un enlace o una ruta no segura + Archivo no compatible o no válido No hay espacio libre suficiente para esta versión de Proton - Descomprimiendo Desempaquetando Proton (unos minutos) - El .zip no contiene ningún tarball de Proton Error al desempaquetar (tar %1$d) El archivo no contiene ninguna versión de Proton No se pudo colocar la versión de Proton @@ -4156,4 +4154,4 @@ Destacados Éxito Error - \ No newline at end of file + diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 68e8f04c51..cc99224c93 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -577,7 +577,6 @@ В Nightlies · %1$d Стабилна Нощна - Тестова Обновете, за да видите пакетите в Nightlies и DroidDeck. Нищо ново от последната проверка. Импортиране на .wcp @@ -2302,12 +2301,11 @@ По време на изтеглянето започна сесия - спри я, преди да инсталираш инструменти за съвместимост Инсталиране на %1$s Експериментални версии - Изберете .zip с версия на Proton - Инсталиране от .zip + Инсталиране от файл + Архивът съдържа опасна връзка или път + Неподдържан или невалиден архив Няма достатъчно свободно място за тази версия на Proton - Разархивиране Разопаковане на Proton (няколко минути) - В .zip няма архив tar на Proton Разопаковането не успя (tar %1$d) Архивът не съдържа версия на Proton Версията на Proton не можа да бъде поставена @@ -4116,4 +4114,4 @@ Акценти Успех Грешка - \ No newline at end of file + diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 9adcee02c7..15df9624b9 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -581,7 +581,6 @@ Na Nightlies · %1$d Stabilní Noční - Testovací Obnovte pro zobrazení balíčků na Nightlies a DroidDeck. Od poslední kontroly nic nového. Importovat .wcp @@ -2354,12 +2353,11 @@ Během stahování se spustila relace; před instalací nástrojů kompatibility ji zastavte Instalování %1$s Experimentální sestavení - Vyberte .zip se sestavením Proton - Instalovat ze souboru .zip + Instalovat ze souboru + Archiv obsahuje nebezpečný odkaz nebo cestu + Nepodporovaný nebo neplatný archiv Pro toto sestavení Proton není dost volného místa - Rozbalování Rozbalování Proton (několik minut) - Soubor .zip neobsahuje archiv tar s Proton Rozbalení se nezdařilo (tar %1$d) Archiv neobsahuje sestavení Proton Sestavení Proton se nepodařilo umístit @@ -4196,4 +4194,4 @@ Zvýraznění Úspěch Chyba - \ No newline at end of file + diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index e46157c608..4a5dac730f 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -577,7 +577,6 @@ På Nightlies · %1$d Stabil Nightly - Test Opdater for at se pakker på Nightlies og DroidDeck. Intet nyt siden sidste kontrol. Importer .wcp @@ -2302,12 +2301,11 @@ En session startede under downloadet; stop den før du installerer kompatibilitetsværktøjer Installerer %1$s Eksperimentelle builds - Vælg en Proton-build som .zip - Installer fra .zip + Installer fra fil + Arkivet indeholder et usikkert link eller en sti + Ikke-understøttet eller ugyldigt arkiv Der er ikke nok ledig plads til denne Proton-build - Udpakker zip Udpakker Proton (nogle få minutter) - Filen .zip indeholder ingen Proton-tarball Udpakning mislykkedes (tar %1$d) Arkivet indeholder ingen Proton-build Kunne ikke placere Proton-builden @@ -4116,4 +4114,4 @@ Fremhævninger Succes Fejl - \ No newline at end of file + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c3d3db896f..068f519c59 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -577,7 +577,6 @@ In den Nightlies · %1$d Stabil Nightly - Test Aktualisiere, um die Pakete in den Nightlies und bei DroidDeck aufzulisten. Nichts Neues seit der letzten Prüfung. .wcp importieren @@ -2294,12 +2293,11 @@ Während des Downloads wurde eine Sitzung gestartet; beende sie, bevor du Kompatibilitätstools installierst %1$s wird installiert Experimentelle Builds - Proton-Build als .zip auswählen - Aus .zip installieren + Aus Datei installieren + Das Archiv enthält einen unsicheren Link oder Pfad + Nicht unterstütztes oder ungültiges Archiv Nicht genug freier Speicher für diesen Proton-Build - Wird entpackt Proton wird entpackt (einige Minuten) - Die .zip enthält kein Proton-Tarball Entpacken fehlgeschlagen (tar %1$d) Das Archiv enthält keinen Proton-Build Der Proton-Build konnte nicht abgelegt werden @@ -4116,4 +4114,4 @@ Hervorhebungen Erfolg Fehler - \ No newline at end of file + diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 1c4e366e1c..f4873ceb7c 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -577,7 +577,6 @@ Στα Nightlies · %1$d Σταθερή Νυχτερινή - Δοκιμαστική Ανανεώστε για να εμφανιστούν τα πακέτα στα Nightlies και στο DroidDeck. Τίποτα νέο από τον τελευταίο έλεγχο. Εισαγωγή .wcp @@ -2302,12 +2301,11 @@ Μια συνεδρία ξεκίνησε κατά τη λήψη· διακόψτε την πριν εγκαταστήσετε εργαλεία συμβατότητας Εγκατάσταση %1$s Πειραματικές εκδόσεις - Επιλέξτε ένα .zip έκδοσης Proton - Εγκατάσταση από .zip + Εγκατάσταση από αρχείο + Το αρχείο περιέχει μη ασφαλή σύνδεσμο ή διαδρομή + Μη υποστηριζόμενο ή μη έγκυρο αρχείο Δεν υπάρχει αρκετός ελεύθερος χώρος για αυτήν την έκδοση Proton - Αποσυμπίεση Αποσυσκευασία του Proton (λίγα λεπτά) - Το .zip δεν περιέχει αρχείο tar του Proton Η αποσυσκευασία απέτυχε (tar %1$d) Το αρχείο δεν περιέχει έκδοση Proton Δεν ήταν δυνατή η τοποθέτηση της έκδοσης Proton @@ -4116,4 +4114,4 @@ Επισημάνσεις Επιτυχία Σφάλμα - \ No newline at end of file + diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index bd4fddf71d..e39fae7b8a 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -579,7 +579,6 @@ En las Nightlies · %1$d Estable Nocturna - Prueba Actualiza para listar los paquetes de Nightlies y DroidDeck. Nada nuevo desde la última comprobación. Importar .wcp @@ -2328,12 +2327,11 @@ Se inició una sesión durante la descarga; detenla antes de instalar herramientas de compatibilidad Instalando %1$s Versiones experimentales - Elige un .zip de una versión de Proton - Instalar desde .zip + Instalar desde archivo + El archivo contiene un enlace o una ruta no segura + Archivo no compatible o no válido No hay espacio libre suficiente para esta versión de Proton - Descomprimiendo Desempaquetando Proton (unos minutos) - El .zip no contiene ningún tarball de Proton Error al desempaquetar (tar %1$d) El archivo no contiene ninguna versión de Proton No se pudo colocar la versión de Proton @@ -4156,4 +4154,4 @@ Destacados Éxito Error - \ No newline at end of file + diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 5bb3bd1af5..e9dacd8e0f 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -577,7 +577,6 @@ Nightliesissä · %1$d Vakaa Yöversio - Testi Päivitä nähdäksesi Nightliesin ja DroidDeckin paketit. Ei mitään uutta viimeisimmän tarkistuksen jälkeen. Tuo .wcp @@ -2302,12 +2301,11 @@ Istunto käynnistyi latauksen aikana; pysäytä se ennen yhteensopivuustyökalujen asentamista Asennetaan %1$s Kokeelliset versiot - Valitse Proton-version .zip - Asenna .zip-tiedostosta + Asenna tiedostosta + Arkisto sisältää vaarallisen linkin tai polun + Arkistoa ei tueta tai se on virheellinen Tälle Proton-versiolle ei ole tarpeeksi vapaata tilaa - Puretaan zip Puretaan Protonia (muutama minuutti) - Tiedostossa .zip ei ole Proton-tar-pakettia Purku epäonnistui (tar %1$d) Arkisto ei sisällä Proton-versiota Proton-versiota ei voitu sijoittaa @@ -4116,4 +4114,4 @@ Korostukset Onnistuminen Virhe - \ No newline at end of file + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1177bfc170..e76d3e6dab 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -579,7 +579,6 @@ Dans Nightlies · %1$d Stable Nightly - Test Actualiser pour lister les paquets dans Nightlies et DroidDeck. Aucun nouvel élément depuis la dernière vérification. Importer .wcp @@ -2327,12 +2326,11 @@ Une session a démarré pendant le téléchargement ; arrêtez-la avant d\'installer des outils de compatibilité Installation de %1$s Versions expérimentales - Choisir un .zip de version Proton - Installer depuis un .zip + Installer depuis un fichier + L’archive contient un lien ou chemin dangereux + Archive non prise en charge ou invalide Espace libre insuffisant pour cette version de Proton - Décompression Extraction de Proton (quelques minutes) - Le .zip ne contient aucune archive tar de Proton Échec de l\'extraction (tar %1$d) L\'archive ne contient aucune version de Proton Impossible de placer la version de Proton @@ -4155,4 +4153,4 @@ Mises en évidence Succès Erreur - \ No newline at end of file + diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index c92d69ca9f..2f5d3957fc 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -577,7 +577,6 @@ Nightlies पर · %1$d स्थिर नाइटली - परीक्षण Nightlies और DroidDeck के पैकेज सूचीबद्ध करने के लिए रीफ़्रेश करें। पिछली जांच के बाद कुछ नया नहीं है। .wcp इंपोर्ट करें @@ -2302,12 +2301,11 @@ डाउनलोड के दौरान एक सेशन शुरू हुआ; कम्पैटिबिलिटी टूल इंस्टॉल करने से पहले इसे बंद करें %1$s इंस्टॉल हो रहा है प्रायोगिक बिल्ड - Proton बिल्ड की .zip चुनें - .zip से इंस्टॉल करें + फ़ाइल से इंस्टॉल करें + आर्काइव में असुरक्षित लिंक या पथ है + असमर्थित या अमान्य आर्काइव इस Proton बिल्ड के लिए पर्याप्त खाली जगह नहीं है - अनज़िप हो रहा है Proton अनपैक हो रहा है (कुछ मिनट) - .zip में Proton का कोई tar आर्काइव नहीं है अनपैक करना विफल रहा (tar %1$d) आर्काइव में कोई Proton बिल्ड नहीं है Proton बिल्ड को रखा नहीं जा सका @@ -4116,4 +4114,4 @@ हाइलाइट सफलता त्रुटि - \ No newline at end of file + diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 301db987d2..50d616a3ca 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -577,7 +577,6 @@ A Nightliesen · %1$d Stabil Nightly - Teszt Frissítsen a Nightlies és a DroidDeck csomagjainak listázásához. Nincs semmi új az utolsó ellenőrzés óta. .wcp importálása @@ -2302,12 +2301,11 @@ Egy munkamenet elindult a letöltés közben; állítsa le a kompatibilitási eszközök telepítése előtt %1$s telepítése Kísérleti buildek - Válassz egy Proton-build .zip fájlt - Telepítés .zip fájlból + Telepítés fájlból + Az archívum nem biztonságos hivatkozást vagy útvonalat tartalmaz + Nem támogatott vagy érvénytelen archívum Nincs elég szabad hely ehhez a Proton-buildhez - Kicsomagolás A Proton kibontása (néhány perc) - A .zip nem tartalmaz Proton tar-csomagot A kibontás nem sikerült (tar %1$d) Az archívum nem tartalmaz Proton-buildet Nem sikerült elhelyezni a Proton-buildet @@ -4116,4 +4114,4 @@ Kiemelések Siker Hiba - \ No newline at end of file + diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 29598f3980..1191dc3ac7 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -575,7 +575,6 @@ Di Nightlies · %1$d Stabil Nightly - Uji Segarkan untuk melihat daftar paket di Nightlies dan DroidDeck. Tidak ada yang baru sejak pemeriksaan terakhir. Impor .wcp @@ -2277,12 +2276,11 @@ Sesi dimulai saat pengunduhan berlangsung; hentikan sesi tersebut sebelum menginstal alat kompatibilitas Menginstal %1$s Build eksperimental - Pilih .zip build Proton - Instal dari .zip + Instal dari file + Arsip berisi tautan atau jalur yang tidak aman + Arsip tidak didukung atau tidak valid Ruang kosong tidak cukup untuk build Proton ini - Mengekstrak zip Membuka paket Proton (beberapa menit) - .zip tidak berisi tarball Proton Gagal membuka paket (tar %1$d) Arsip tidak berisi build Proton Tidak dapat menempatkan build Proton @@ -4086,4 +4084,4 @@ Sorotan Berhasil Kesalahan - \ No newline at end of file + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 7b4d3f2870..66fcd52a17 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -579,7 +579,6 @@ Nelle Nightlies · %1$d Stabile Nightly - Test Aggiorna per elencare i pacchetti nelle Nightlies e in DroidDeck. Niente di nuovo dall\'ultimo controllo. Importa .wcp @@ -2319,12 +2318,11 @@ È stata avviata una sessione durante il download; interrompila prima di installare strumenti di compatibilità Installazione di %1$s Build sperimentali - Scegli uno .zip di una build di Proton - Installa da .zip + Installa da file + L\'archivio contiene un collegamento o percorso non sicuro + Archivio non supportato o non valido Spazio libero insufficiente per questa build di Proton - Decompressione Estrazione di Proton (qualche minuto) - Lo .zip non contiene alcun tarball di Proton Estrazione non riuscita (tar %1$d) L\'archivio non contiene alcuna build di Proton Impossibile posizionare la build di Proton @@ -4155,4 +4153,4 @@ Evidenziazioni Successo Errore - \ No newline at end of file + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index e5cdba2950..a274e0c638 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -575,7 +575,6 @@ Nightlies内 · %1$d 安定版 ナイトリー - テスト 更新してNightliesとDroidDeckのパッケージを一覧表示します。 前回の確認以降、新しいものはありません。 .wcpをインポート @@ -2277,12 +2276,11 @@ ダウンロード中にセッションが開始されました。停止してから互換性ツールをインストールしてください %1$sをインストール中 試験版ビルド - Protonビルドの.zipを選択 - .zipからインストール + ファイルからインストール + アーカイブに安全でないリンクまたはパスが含まれています + 未対応または無効なアーカイブ このProtonビルド用の空き容量が足りません - 解凍中 Protonを展開中(数分かかります) - .zipにProtonのtarballが含まれていません 展開に失敗しました(tar %1$d) アーカイブにProtonビルドが含まれていません Protonビルドを配置できませんでした @@ -4086,4 +4084,4 @@ 強調表示 成功 エラー - \ No newline at end of file + diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 536d332105..c3bd68537b 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -575,7 +575,6 @@ Nightlies 내 · %1$d 안정판 나이틀리 - 테스트 새로 고쳐 Nightlies 및 DroidDeck의 패키지를 나열합니다. 마지막 확인 이후 새로운 내용이 없습니다. .wcp 가져오기 @@ -2277,12 +2276,11 @@ 다운로드 중에 세션이 시작되었습니다. 호환성 도구를 설치하기 전에 세션을 중지하세요 %1$s 설치 중 실험용 빌드 - Proton 빌드 .zip 선택 - .zip에서 설치 + 파일에서 설치 + 압축 파일에 안전하지 않은 링크 또는 경로가 포함되어 있습니다 + 지원되지 않거나 잘못된 압축 파일 이 Proton 빌드를 설치할 여유 공간이 부족합니다 - 압축 해제 중 Proton 풀는 중 (몇 분 소요) - .zip에 Proton tar 파일이 없습니다 압축 풀기 실패 (tar %1$d) 아카이브에 Proton 빌드가 없습니다 Proton 빌드를 배치할 수 없습니다 @@ -4086,4 +4084,4 @@ 강조 표시 성공 오류 - \ No newline at end of file + diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index bcc31c2f02..134f1702c0 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -575,7 +575,6 @@ Pada Nightlies · %1$d Stabil Nightly - Ujian Segarkan semula untuk menyenaraikan pakej pada Nightlies dan DroidDeck. Tiada apa-apa yang baharu sejak semakan terakhir. Import .wcp @@ -2277,12 +2276,11 @@ Sesi dimulakan semasa muat turun; hentikan dahulu sebelum memasang alat keserasian Memasang %1$s Binaan eksperimen - Pilih .zip binaan Proton - Pasang daripada .zip + Pasang daripada fail + Arkib mengandungi pautan atau laluan tidak selamat + Arkib tidak disokong atau tidak sah Ruang kosong tidak mencukupi untuk binaan Proton ini - Menyahzip Membuka pakej Proton (beberapa minit) - .zip tidak mengandungi tarball Proton Gagal membuka pakej (tar %1$d) Arkib tidak mengandungi binaan Proton Tidak dapat meletakkan binaan Proton @@ -4086,4 +4084,4 @@ Sorotan Berjaya Ralat - \ No newline at end of file + diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 2c1878427c..de0bac7fc6 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -577,7 +577,6 @@ På Nightlies · %1$d Stabil Nightly - Test Oppdater for å liste pakker på Nightlies og DroidDeck. Ingenting nytt siden siste sjekk. Importer .wcp @@ -2302,12 +2301,11 @@ En sesjon startet under nedlastingen; avslutt den før du installerer kompatibilitetsverktøy Installerer %1$s Eksperimentelle bygg - Velg en Proton-bygg som .zip - Installer fra .zip + Installer fra fil + Arkivet inneholder en utrygg lenke eller bane + Arkivet støttes ikke eller er ugyldig Ikke nok ledig plass til dette Proton-bygget - Pakker ut zip Pakker ut Proton (noen få minutter) - .zip-filen inneholder ingen Proton-tarball Utpakking mislyktes (tar %1$d) Arkivet inneholder ingen Proton-bygg Kunne ikke plassere Proton-bygget @@ -4116,4 +4114,4 @@ Uthevinger Suksess Feil - \ No newline at end of file + diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 8134e019ed..16b5a74ec8 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -577,7 +577,6 @@ In de Nightlies · %1$d Stabiel Nightly - Test Vernieuw om de pakketten in de Nightlies en bij DroidDeck te tonen. Niets nieuws sinds de laatste controle. .wcp importeren @@ -2302,12 +2301,11 @@ Er is een sessie gestart tijdens het downloaden; stop die voordat je compatibiliteitstools installeert %1$s installeren Experimentele builds - Kies een Proton-build als .zip - Installeren vanuit .zip + Installeren vanuit bestand + Archief bevat een onveilige link of pad + Niet-ondersteund of ongeldig archief Niet genoeg vrije ruimte voor deze Proton-build - Uitpakken van zip Proton uitpakken (enkele minuten) - De .zip bevat geen Proton-tarball Uitpakken mislukt (tar %1$d) Het archief bevat geen Proton-build Kan de Proton-build niet plaatsen @@ -4116,4 +4114,4 @@ Accenten Geslaagd Fout - \ No newline at end of file + diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 6bae94dd48..8b624db10e 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -581,7 +581,6 @@ W wersjach nightly · %1$d Stabilna Nightly - Testowa Odśwież, aby wyświetlić pakiety w Nightlies i DroidDeck. Nic nowego od ostatniego sprawdzenia. Importuj .wcp @@ -2354,12 +2353,11 @@ Podczas pobierania uruchomiono sesję; zatrzymaj ją przed instalacją narzędzi zgodności Instalowanie %1$s Kompilacje eksperymentalne - Wybierz plik .zip z kompilacją Proton - Zainstaluj z pliku .zip + Instaluj z pliku + Archiwum zawiera niebezpieczne łącze lub ścieżkę + Nieobsługiwane lub nieprawidłowe archiwum Za mało wolnego miejsca na tę kompilację Proton - Rozpakowywanie Rozpakowywanie Proton (kilka minut) - Plik .zip nie zawiera archiwum tar z Proton Rozpakowywanie nie powiodło się (tar %1$d) Archiwum nie zawiera kompilacji Proton Nie udało się umieścić kompilacji Proton @@ -4196,4 +4194,4 @@ Wyróżnienia Sukces Błąd - \ No newline at end of file + diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index bda1ae5614..732df24c4c 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -579,7 +579,6 @@ Nas Nightlies · %1$d Estável Nightly - Teste Atualize para listar os pacotes nas Nightlies e no DroidDeck. Nada de novo desde a última verificação. Importar .wcp @@ -2333,12 +2332,11 @@ Foi iniciada uma sessão durante a transferência; pare-a antes de instalar ferramentas de compatibilidade A instalar %1$s Versões experimentais - Escolha um .zip de versão do Proton - Instalar a partir de .zip + Instalar a partir de ficheiro + O arquivo contém uma ligação ou caminho inseguro + Arquivo não suportado ou inválido Não há espaço livre suficiente para esta versão do Proton - A descompactar A desempacotar o Proton (alguns minutos) - O .zip não contém nenhum tarball do Proton Falha ao desempacotar (tar %1$d) O arquivo não contém nenhuma versão do Proton Não foi possível colocar a versão do Proton @@ -4155,4 +4153,4 @@ Inteiro Ajustar Suavização de serrilhado - \ No newline at end of file + diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index e49853cb6a..f0814f45b2 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -579,7 +579,6 @@ Nas Nightlies · %1$d Estável Nightly - Teste Atualize para listar os pacotes nas Nightlies e no DroidDeck. Nada novo desde a última verificação. Importar .wcp @@ -2341,12 +2340,11 @@ Uma sessão foi iniciada durante o download; pare-a antes de instalar ferramentas de compatibilidade Instalando %1$s Builds experimentais - Escolha um .zip de build do Proton - Instalar a partir de .zip + Instalar do arquivo + O arquivo contém um link ou caminho inseguro + Arquivo sem suporte ou inválido Não há espaço livre suficiente para este build do Proton - Descompactando Desempacotando o Proton (alguns minutos) - O .zip não contém nenhum tarball do Proton Falha ao desempacotar (tar %1$d) O arquivo não contém nenhum build do Proton Não foi possível colocar o build do Proton @@ -4163,4 +4161,4 @@ Inteiro Ajustar Suavização de serrilhado - \ No newline at end of file + diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 940364de71..c228979545 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -579,7 +579,6 @@ Pe versiunile nightly · %1$d Stabilă Nightly - Test Reîmprospătează pentru a lista pachetele din Nightlies și DroidDeck. Nimic nou de la ultima verificare. Importă .wcp @@ -2328,12 +2327,11 @@ O sesiune a pornit în timpul descărcării; oprește-o înainte de a instala instrumente de compatibilitate Se instalează %1$s Versiuni experimentale - Alege un .zip cu o versiune Proton - Instalează din .zip + Instalează din fișier + Arhiva conține o legătură sau o cale nesigură + Arhivă neacceptată sau nevalidă Nu există suficient spațiu liber pentru această versiune Proton - Se dezarhivează Se despachetează Proton (câteva minute) - Fișierul .zip nu conține nicio arhivă tar Proton Despachetarea a eșuat (tar %1$d) Arhiva nu conține nicio versiune Proton Versiunea Proton nu a putut fi plasată @@ -4156,4 +4154,4 @@ Evidențieri Succes Eroare - \ No newline at end of file + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 2673ee7ccd..58a3c4e745 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -581,7 +581,6 @@ В Nightlies · %1$d Стабильная Ночная - Тестовая Обновите, чтобы увидеть пакеты в Nightlies и DroidDeck. С момента последней проверки нового нет. Импорт .wcp @@ -2354,12 +2353,11 @@ Во время загрузки запустилась сессия; остановите ее перед установкой инструментов совместимости Установка %1$s Экспериментальные сборки - Выберите .zip со сборкой Proton - Установить из .zip + Установить из файла + Архив содержит небезопасную ссылку или путь + Неподдерживаемый или недействительный архив Недостаточно свободного места для этой сборки Proton - Распаковка архива Распаковка Proton (несколько минут) - В .zip нет архива tar с Proton Не удалось распаковать (tar %1$d) В архиве нет сборки Proton Не удалось разместить сборку Proton @@ -4196,4 +4194,4 @@ Выделения Успех Ошибка - \ No newline at end of file + diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 8e169e62a2..73c1f9dbe0 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -577,7 +577,6 @@ I nattbyggena · %1$d Stabil Nattbygge - Test Uppdatera för att lista paket i Nightlies och DroidDeck. Inget nytt sedan senaste kontrollen. Importera .wcp @@ -2302,12 +2301,11 @@ En session startade under nedladdningen. Stoppa den innan du installerar kompatibilitetsverktyg Installerar %1$s Experimentella byggen - Välj en Proton-version som .zip - Installera från .zip + Installera från fil + Arkivet innehåller en osäker länk eller sökväg + Arkivet stöds inte eller är ogiltigt Inte tillräckligt med ledigt utrymme för den här Proton-versionen - Packar upp zip Packar upp Proton (några minuter) - .zip-filen innehåller ingen Proton-tarball Uppackningen misslyckades (tar %1$d) Arkivet innehåller ingen Proton-version Det gick inte att placera Proton-versionen @@ -4116,4 +4114,4 @@ Markeringar Lyckades Fel - \ No newline at end of file + diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 243108da7f..43c49d86fa 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -575,7 +575,6 @@ ใน Nightlies · %1$d เสถียร Nightly - ทดสอบ รีเฟรชเพื่อแสดงรายการแพ็กเกจใน Nightlies และ DroidDeck ไม่มีอะไรใหม่ตั้งแต่การตรวจสอบครั้งล่าสุด นำเข้า .wcp @@ -2277,12 +2276,11 @@ มีเซสชันเริ่มขึ้นระหว่างการดาวน์โหลด หยุดเซสชันก่อนติดตั้งเครื่องมือความเข้ากันได้ กำลังติดตั้ง %1$s บิลด์ทดลอง - เลือกไฟล์ .zip ของบิลด์ Proton - ติดตั้งจากไฟล์ .zip + ติดตั้งจากไฟล์ + ไฟล์เก็บถาวรมีลิงก์หรือเส้นทางที่ไม่ปลอดภัย + ไฟล์เก็บถาวรไม่รองรับหรือไม่ถูกต้อง พื้นที่ว่างไม่เพียงพอสำหรับบิลด์ Proton นี้ - กำลังแตกไฟล์ zip กำลังแตกไฟล์ Proton (ใช้เวลาไม่กี่นาที) - ไฟล์ .zip ไม่มี tarball ของ Proton แตกไฟล์ไม่สำเร็จ (tar %1$d) ไฟล์เก็บถาวรไม่มีบิลด์ Proton ไม่สามารถวางบิลด์ Proton ได้ @@ -4086,4 +4084,4 @@ จุดเน้น สำเร็จ ข้อผิดพลาด - \ No newline at end of file + diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 25944dc95e..7fd0d204d3 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -577,7 +577,6 @@ Nightlies içinde · %1$d Kararlı Nightly - Test Nightlies ve DroidDeck paketlerini listelemek için yenileyin. Son kontrolden beri yeni bir şey yok. .wcp içe aktar @@ -2294,12 +2293,11 @@ İndirme sırasında bir oturum başladı; uyumluluk araçlarını yüklemeden önce durdurun %1$s yükleniyor Deneysel sürümler - Bir Proton sürümü .zip dosyası seçin - Şuradan yükle: .zip + Dosyadan yükle + Arşiv güvenli olmayan bir bağlantı veya yol içeriyor + Desteklenmeyen veya geçersiz arşiv Bu Proton sürümü için yeterli boş alan yok - Zip açılıyor Proton paketten çıkarılıyor (birkaç dakika) - .zip dosyasında Proton tar arşivi yok Paketten çıkarma başarısız oldu (tar %1$d) Arşivde Proton sürümü yok Proton sürümü yerleştirilemedi @@ -4116,4 +4114,4 @@ Vurgular Başarılı Hata - \ No newline at end of file + diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 55bd3196c9..be20c1fb05 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -581,7 +581,6 @@ У нічних збірках · %1$d Стабільна Нічна - Тестова Оновіть, щоб побачити пакети з Nightlies і DroidDeck. Нічого нового з часу останньої перевірки. Імпортувати .wcp @@ -2354,12 +2353,11 @@ Під час завантаження розпочався сеанс; зупиніть його, перш ніж встановлювати інструменти сумісності Встановлення %1$s Експериментальні збірки - Виберіть .zip зі збіркою Proton - Встановити з .zip + Встановити з файлу + Архів містить небезпечне посилання або шлях + Непідтримуваний або недійсний архів Недостатньо вільного місця для цієї збірки Proton - Розпакування архіву Розпакування Proton (кілька хвилин) - У .zip немає архіву tar із Proton Не вдалося розпакувати (tar %1$d) В архіві немає збірки Proton Не вдалося розмістити збірку Proton @@ -4196,4 +4194,4 @@ Виділення Успіх Помилка - \ No newline at end of file + diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 347822317f..33796ad9c4 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -575,7 +575,6 @@ Trên Nightlies · %1$d Ổn định Nightly - Thử nghiệm Làm mới để liệt kê các gói trên Nightlies và DroidDeck. Không có gì mới từ lần kiểm tra trước. Nhập tệp .wcp @@ -2277,12 +2276,11 @@ Một phiên đã bắt đầu trong khi tải; hãy dừng nó trước khi cài công cụ tương thích Đang cài %1$s Bản dựng thử nghiệm - Chọn tệp .zip bản dựng Proton - Cài đặt từ .zip + Cài đặt từ tệp + Tệp lưu trữ chứa liên kết hoặc đường dẫn không an toàn + Tệp lưu trữ không được hỗ trợ hoặc không hợp lệ Không đủ dung lượng trống cho bản dựng Proton này - Đang giải nén zip Đang giải nén Proton (vài phút) - Tệp .zip không chứa tarball Proton Giải nén thất bại (tar %1$d) Tệp lưu trữ không chứa bản dựng Proton Không thể đặt bản dựng Proton @@ -4086,4 +4084,4 @@ Điểm nhấn Thành công Lỗi - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2ece3be681..667f1cb9c1 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -575,7 +575,6 @@ 在 Nightlies 上 · %1$d 稳定版 每夜版 - 测试 刷新以列出 Nightlies 和 DroidDeck 上的软件包。 自上次检查以来没有新内容。 导入 .wcp @@ -2354,12 +2353,11 @@ 下载期间有会话启动;请先停止它,再安装兼容性工具 正在安装 %1$s 实验版本 - 选择 Proton 版本 .zip - 从 .zip 安装 + 从文件安装 + 压缩包包含不安全的链接或路径 + 不支持或无效的压缩包 可用空间不足,无法安装此 Proton 版本 - 正在解压 正在解包 Proton(需要几分钟) - .zip 中不含 Proton tar 包 解包失败(tar %1$d) 压缩包中不含 Proton 版本 无法放置 Proton 版本 @@ -4086,4 +4084,4 @@ 高亮 成功 错误 - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 8ba6d09f98..2ec673e61b 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -575,7 +575,6 @@ Nightlies · %1$d 穩定版 每夜版 - 測試 重新整理以列出 Nightlies 及 DroidDeck 中的軟件包。 自上次檢查以來沒有新內容。 匯入 .wcp @@ -2276,12 +2275,11 @@ 下載期間有會話啟動;請先停止該會話,再安裝兼容性工具 正在安裝 %1$s 實驗版本 - 選擇 Proton 版本 .zip - 從 .zip 安裝 + 從檔案安裝 + 壓縮檔包含不安全的連結或路徑 + 不支援或無效的壓縮檔 可用空間不足,無法安裝此 Proton 版本 - 正在解壓縮 正在解包 Proton(需要幾分鐘) - .zip 中不含 Proton tar 包 解包失敗(tar %1$d) 壓縮檔中不含 Proton 版本 無法放置 Proton 版本 @@ -4086,4 +4084,4 @@ 重點標示 成功 錯誤 - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index dfb1bc732d..d6d0037309 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -575,7 +575,6 @@ Nightlies 中 · %1$d 穩定版 每夜版 - 測試 重新整理以列出 Nightlies 和 DroidDeck 中的套件。 自上次檢查以來沒有新內容。 匯入 .wcp @@ -2276,12 +2275,11 @@ 下載期間有工作階段啟動;請先停止它,再安裝相容性工具 正在安裝 %1$s 實驗版本 - 選擇 Proton 版本 .zip - 從 .zip 安裝 + 從檔案安裝 + 壓縮檔包含不安全的連結或路徑 + 不支援或無效的壓縮檔 可用空間不足,無法安裝此 Proton 版本 - 正在解壓縮 正在解包 Proton(需要幾分鐘) - .zip 中不含 Proton tar 包 解包失敗(tar %1$d) 壓縮檔中不含 Proton 版本 無法放置 Proton 版本 @@ -4086,4 +4084,4 @@ 醒目標示 成功 錯誤 - \ No newline at end of file + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 05a387b644..965ab2322e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -605,7 +605,6 @@ On the Nightlies · %1$d Stable Nightly - Test Refresh to list packages on the Nightlies and DroidDeck releases. Nothing new since the last check. Import .wcp @@ -2544,12 +2543,11 @@ A session started during the download; stop it before installing compatibility tools Installing %1$s Experimental builds - Pick a Proton build .zip - Install from .zip + Install from file + Archive contains an unsafe link or path + Unsupported or invalid archive Not enough free space for this Proton build - Unzipping Unpacking Proton (a few minutes) - The .zip holds no Proton tarball Unpacking failed (tar %1$d) The archive holds no Proton build Could not place the Proton build diff --git a/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt b/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt index 8e48d3c353..e19b1d6347 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 270b9de489..2e06a6d8fe 100644 --- a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt @@ -7,6 +7,7 @@ import android.os.Looper import androidx.compose.ui.geometry.Rect import com.droiddeck.launcher.frontend.AutoComponents import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.ExperimentalProtons import com.droiddeck.launcher.session.ProtonExtras import com.droiddeck.launcher.session.SessionState import com.droiddeck.launcher.session.SessionPhase @@ -25,7 +26,9 @@ import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config import org.robolectric.util.ReflectionHelpers import java.io.File +import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicInteger @RunWith(RobolectricTestRunner::class) @Config(sdk = [28], manifest = Config.NONE) @@ -60,7 +63,7 @@ class ProtonMenuAutoTest { menu.protonProblem = null menu.protonStage = null menu.protonPercent = -1 - menu.installer = { tool, _, progress -> + menu.installer = { tool, progress -> progress("Installing ${tool.name}", 50) install("${tool.prefix}-11-12") null @@ -88,6 +91,67 @@ class ProtonMenuAutoTest { File(this, "proton").apply { writeText(""); setExecutable(true) } } + private fun prerelease(tag: String) = ExperimentalProtons.Release(tag, "$tag.tar.xz", "https://github.com/o/r/releases/download/$tag/$tag.tar.xz", null, 1L) + + private fun recreatedMenu(refreshes: AtomicInteger, tag: String) = ProtonMenu(activity, Handler(Looper.getMainLooper())) { idle }.apply { + installer = menu.installer + latestCheck = { false } + experimentalRefresh = { + refreshes.incrementAndGet() + listOf(prerelease(tag)) + } + } + + @Test + fun aRecreatedMenuJoinsTheRunningRefresh() { + idle = false + val started = CountDownLatch(1) + val gate = CountDownLatch(1) + val refreshes = AtomicInteger() + menu.latestCheck = { false } + menu.experimentalRefresh = { + started.countDown() + gate.await(5, TimeUnit.SECONDS) + listOf(prerelease("first")) + } + menu.checkUpdates() + assertTrue(started.await(5, TimeUnit.SECONDS)) + val recreated = recreatedMenu(refreshes, "second") + recreated.checkUpdates() + gate.countDown() + waitUntil { recreated.experimentalReleases.map { it.tag } == listOf("first") } + assertEquals(0, refreshes.get()) + recreated.checkUpdates() + waitUntil { recreated.experimentalReleases.map { it.tag } == listOf("second") } + assertEquals(1, refreshes.get()) + } + + @Test + fun aFinishedRefreshIsPublishedBeforeTheNextOneStarts() { + idle = false + val finished = CountDownLatch(1) + val refreshes = AtomicInteger() + menu.experimentalReleases = emptyList() + menu.latestCheck = { false } + menu.experimentalRefresh = { + finished.countDown() + listOf(prerelease("older")) + } + menu.checkUpdates() + assertTrue(finished.await(5, TimeUnit.SECONDS)) + val recreated = recreatedMenu(refreshes, "newer") + repeat(20) { + recreated.checkUpdates() + Thread.sleep(10) + } + assertEquals(0, refreshes.get()) + assertTrue(recreated.experimentalReleases.isEmpty()) + waitUntil { recreated.experimentalReleases.map { it.tag } == listOf("older") } + recreated.checkUpdates() + waitUntil { recreated.experimentalReleases.map { it.tag } == listOf("newer") } + assertEquals(1, refreshes.get()) + } + private fun waitUntil(done: () -> Boolean) { val deadline = System.nanoTime() + 5_000_000_000L while (System.nanoTime() < deadline) { @@ -116,7 +180,7 @@ class ProtonMenuAutoTest { @Test fun downloadsWaitForTheSessionNetworkPowerAndOtherInstallWork() { install("DroidDeck-Proton-11-11.1") - menu.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } + menu.installer = { tool, _ -> attempts.add(tool.id); "failed" } SessionState.running = true menu.ensureAutoUpdates() SessionState.running = false @@ -139,11 +203,11 @@ class ProtonMenuAutoTest { @Test fun aFinishedInstallStartsTheComponentCheckAndAFailedOneDoesNot() { var checks = 0 val watched = ProtonMenu(activity, Handler(Looper.getMainLooper()), onInstalled = { checks++ }) { idle } - watched.installer = { tool, _, _ -> install("${tool.prefix}-11-12"); null } + watched.installer = { tool, _ -> install("${tool.prefix}-11-12"); null } watched.installProton("droiddeck") waitUntil { watched.protonBusyId == null && checks == 1 } assertEquals(1, checks) - watched.installer = { _, _, _ -> "failed" } + watched.installer = { _, _ -> "failed" } watched.installProton("ge") waitUntil { watched.protonBusyId == null } assertEquals(1, checks) @@ -152,7 +216,7 @@ class ProtonMenuAutoTest { @Test fun aFailedUpdateDoesNotLoopOrBlockOtherInstalledFamilies() { val ge = install("GE-Proton11-11") install("DroidDeck-Proton-11-11.1") - menu.installer = { tool, _, _ -> + menu.installer = { tool, _ -> attempts.add(tool.id) if (tool.id == "ge") throw IllegalStateException("download failed") install("${tool.prefix}-11-12") @@ -171,7 +235,7 @@ class ProtonMenuAutoTest { @Test fun anUninstalledRuntimeOrCurrentProtonDoesNotStartADownload() { install("DroidDeck-Proton-11-12") - menu.installer = { tool, _, _ -> attempts.add(tool.id); null } + menu.installer = { tool, _ -> attempts.add(tool.id); null } menu.ensureAutoUpdates() assertTrue(attempts.isEmpty()) install("GE-Proton11-11") @@ -183,12 +247,12 @@ class ProtonMenuAutoTest { @Test fun aFailedReleaseIsNotRetriedAfterRecreatingTheLauncher() { install("DroidDeck-Proton-11-11.1") - menu.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } + menu.installer = { tool, _ -> attempts.add(tool.id); "failed" } menu.ensureAutoUpdates() waitUntil { menu.protonBusyId == null } val recreated = Robolectric.buildActivity(Activity::class.java).setup().get() val next = ProtonMenu(recreated, Handler(Looper.getMainLooper())) - next.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } + next.installer = { tool, _ -> attempts.add(tool.id); "failed" } next.ensureAutoUpdates() assertNull(next.protonBusyId) assertEquals(listOf("droiddeck"), attempts) @@ -208,7 +272,7 @@ class ProtonMenuAutoTest { } @Test fun droidDeckProtonIsInstalledWhenMissingUnlessTheUserRemovedIt() { - menu.installer = { tool, test, _ -> attempts.add(if (test) "test" else tool.id); install("${tool.prefix}-11-12"); null } + menu.installer = { tool, _ -> attempts.add(tool.id); install("${tool.prefix}-11-12"); null } ProtonExtras.setDeclined(activity, true) menu.ensureAutoUpdates() assertNull(menu.protonBusyId) @@ -222,11 +286,11 @@ class ProtonMenuAutoTest { menu.removeProton("droiddeck") waitUntil { menu.protonBusyId == null } assertTrue(ProtonExtras.declined(activity)) - menu.installer = { _, _, _ -> "failed" } + menu.installer = { _, _ -> "failed" } menu.installProton("droiddeck") waitUntil { menu.protonBusyId == null } assertTrue(ProtonExtras.declined(activity)) - menu.installer = { tool, _, _ -> install("${tool.prefix}-11-12"); null } + menu.installer = { tool, _ -> install("${tool.prefix}-11-12"); null } menu.installProton("droiddeck") waitUntil { menu.protonBusyId == null } assertFalse(ProtonExtras.declined(activity)) @@ -236,7 +300,7 @@ class ProtonMenuAutoTest { install("DroidDeck-Proton-11-11.1") val launcher = Robolectric.buildActivity(FrontEndActivity::class.java).get() val protons = ReflectionHelpers.getField(launcher, "protons") - protons.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } + protons.installer = { tool, _ -> attempts.add(tool.id); "failed" } Motion.refresh(launcher) LaunchOrigin.mark(Rect(0f, 0f, 100f, 100f), "game") launcher.startActivity(Intent(launcher, SessionActivity::class.java)) diff --git a/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt index 1972a06310..cbb1c52c3f 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt @@ -1,7 +1,17 @@ package com.droiddeck.launcher.session import java.io.File +import java.io.RandomAccessFile import java.nio.file.Files +import org.apache.commons.compress.archivers.sevenz.SevenZArchiveEntry +import org.apache.commons.compress.archivers.sevenz.SevenZOutputFile +import org.apache.commons.compress.archivers.zip.ZipArchiveEntry +import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream +import android.app.Activity +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Before +import org.robolectric.Robolectric import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertNull @@ -17,6 +27,75 @@ import org.robolectric.annotation.Config @Config(sdk = [28], manifest = Config.NONE) class ExperimentalProtonsTest { @get:Rule val temp = TemporaryFolder() + private lateinit var activity: Activity + + @Before + fun setup() { + activity = Robolectric.buildActivity(Activity::class.java).setup().get() + } + + @Test + fun fileLabelsDropTheWholeArchiveSuffix() { + assertEquals("Build-12.8-r34", ExperimentalProtons.fileLabel("Build-12.8-r34.tar.xz")) + assertEquals("Build-12.8-r34", ExperimentalProtons.fileLabel("Build-12.8-r34.tar")) + assertEquals("Build-12.8-r34", ExperimentalProtons.fileLabel("Build-12.8-r34.7z")) + assertEquals("Build-12.8-r34", ExperimentalProtons.fileLabel("Build-12.8-r34.tgz")) + assertEquals("Experimental-Build", ExperimentalProtons.dirName("Build", ExperimentalProtons.fileLabel("Build.tar.gz"))) + } + + @Test + fun installedReleasesLeaveTheAvailableRows() { + val rows = listOf("r34", "r35").map { ExperimentalProtons.Release(it, "$it.tar.xz", "https://example.invalid/$it", null, 1L) } + val installed = listOf( + ExperimentalProtons.Installed("Experimental-r34", "r34", "release", "r34"), + ExperimentalProtons.Installed("Experimental-file", "file", "file"), + ) + assertEquals(listOf("r35"), ExperimentalProtons.available(rows, installed).map { it.tag }) + assertEquals(listOf("r34", "r35"), ExperimentalProtons.available(rows, emptyList()).map { it.tag }) + } + + @Test + fun releaseRowsOnlyUsePublishedPrereleaseTarAssets() { + val tool = ProtonExtras.tools.first { it.id == ProtonExtras.OWN } + val releases = JSONArray(""" + [{"tag_name":"stable","prerelease":false,"published_at":"2026-11-10T00:00:00Z","assets":[{"name":"stable-aarch64.tar.gz","browser_download_url":"https://example/stable"}]}, + {"tag_name":"pre","prerelease":true,"published_at":"2026-11-12T00:00:00Z","assets":[{"name":"pre-aarch64.tar.xz","browser_download_url":"https://example/pre"}]}, + {"tag_name":"superseded","prerelease":true,"published_at":"2026-10-25T00:00:00Z","assets":[{"name":"superseded-aarch64.tar.gz","browser_download_url":"https://example/superseded"}]}, + {"tag_name":"sources","prerelease":true,"published_at":"2026-11-13T00:00:00Z","assets":[{"name":"wine-gecko-x86.tar.xz","browser_download_url":"https://example/sources"}]}, + {"tag_name":"draft","draft":true,"prerelease":true,"published_at":"2026-11-14T00:00:00Z","assets":[{"name":"draft-aarch64.tar.gz","browser_download_url":"https://example/draft"}]}, + {"tag_name":"no-tar","prerelease":true,"published_at":"2026-11-15T00:00:00Z","assets":[{"name":"no-tar.sha512sum","browser_download_url":"https://example/sum"}]}] + """.trimIndent()) + assertEquals(listOf("pre"), ProtonExtras.assets(tool, releases, true).map { it.tag }) + } + + @Test + fun markerRoundTripKeepsReleaseTag() { + val dir = File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(activity), "root/.local/share/Steam/compatibilitytools.d/Experimental-pre").apply { mkdirs() } + File(dir, ".droiddeck-experimental.json").writeText(JSONObject().put("label", "Experimental-pre").put("source", "pre").put("releaseTag", "pre").toString()) + assertEquals("pre", ExperimentalProtons.installed(activity).single().releaseTag) + } + + @Test + fun missingReleaseTagsAreAutoRemovedButFileBuildsAreNot() { + val complete = ProtonExtras.ReleaseFetch(JSONArray().put(JSONObject().put("tag_name", "kept").put("prerelease", true)), true) + val partial = ProtonExtras.ReleaseFetch(JSONArray().put(JSONObject().put("tag_name", "gone").put("prerelease", true)), false) + val stable = ProtonExtras.ReleaseFetch(JSONArray().put(JSONObject().put("tag_name", "gone").put("prerelease", false)), false) + assertTrue(ExperimentalProtons.shouldRemove("gone", complete) { true }) + assertFalse(ExperimentalProtons.shouldRemove("gone", complete) { false }) + assertFalse(ExperimentalProtons.shouldRemove("gone", partial) { true }) + assertTrue(ExperimentalProtons.shouldRemove("gone", stable) { false }) + assertFalse(ExperimentalProtons.shouldRemove(null, complete) { true }) + } + + @Test + fun archiveTypeUsesMagicBytes() { + val zip = temp.newFile("wrong-name.bin").apply { writeBytes(byteArrayOf(0x50, 0x4B, 0x03, 0x04)) } + val seven = temp.newFile("seven.data").apply { writeBytes(byteArrayOf(0x37, 0x7A, 0xBC.toByte(), 0xAF.toByte(), 0x27, 0x1C)) } + val tar = temp.newFile("tar.data").apply { RandomAccessFile(this, "rw").use { it.seek(257); it.write("ustar".toByteArray()) } } + assertEquals(ExperimentalProtons.ArchiveType.ZIP, ExperimentalProtons.archiveType(zip)) + assertEquals(ExperimentalProtons.ArchiveType.SEVEN_Z, ExperimentalProtons.archiveType(seven)) + assertEquals(ExperimentalProtons.ArchiveType.TAR, ExperimentalProtons.archiveType(tar)) + } @Test fun namesNeverCollideWithReleasedBuilds() { @@ -74,6 +153,207 @@ class ExperimentalProtonsTest { assertTrue(File(kept, "file").isFile) } + @Test + fun directZipKeepsExecutableModeAndInTreeLinks() { + val archive = temp.newFile("tree.zip") + ZipArchiveOutputStream(archive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("build/proton").apply { unixMode = 0x81ED }) + zip.write("binary".toByteArray()) + zip.closeArchiveEntry() + zip.putArchiveEntry(ZipArchiveEntry("build/link").apply { unixMode = 0xA1FF }) + zip.write("proton".toByteArray()) + zip.closeArchiveEntry() + zip.putArchiveEntry(ZipArchiveEntry("build/files/lib/up").apply { unixMode = 0xA1FF }) + zip.write("../../proton".toByteArray()) + zip.closeArchiveEntry() + } + val unpacked = temp.newFolder("direct") + ExperimentalProtons.extractDirect(archive, unpacked, ExperimentalProtons.ArchiveType.ZIP) + assertTrue(File(unpacked, "build/proton").canExecute()) + assertTrue(Files.isSymbolicLink(File(unpacked, "build/link").toPath())) + assertEquals("proton", Files.readSymbolicLink(File(unpacked, "build/link").toPath()).toString()) + assertEquals("../../proton", Files.readSymbolicLink(File(unpacked, "build/files/lib/up").toPath()).toString()) + assertEquals("binary", File(unpacked, "build/files/lib/up").readText()) + } + + @Test + fun directArchivesFillReadOnlyDirectoriesBeforeLockingThem() { + val archive = temp.newFile("locked.zip") + ZipArchiveOutputStream(archive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("build/files/").apply { unixMode = 0x416D }) + zip.closeArchiveEntry() + zip.putArchiveEntry(ZipArchiveEntry("build/files/data").apply { unixMode = 0x81A4 }) + zip.write("data".toByteArray()) + zip.closeArchiveEntry() + } + val unpacked = temp.newFolder("locked") + ExperimentalProtons.extractDirect(archive, unpacked, ExperimentalProtons.ArchiveType.ZIP) + val directory = File(unpacked, "build/files") + assertEquals("data", File(directory, "data").readText()) + assertFalse(directory.canWrite()) + directory.setWritable(true) + } + + @Test + fun directSevenZipKeepsExecutableModeAndInTreeLinks() { + val archive = temp.newFile("tree.7z") + SevenZOutputFile(archive).use { seven -> + fun add(name: String, mode: Int, text: String) { + val entry = SevenZArchiveEntry().apply { + this.name = name + hasWindowsAttributes = true + windowsAttributes = (mode shl 16) or 0x8000 + } + seven.putArchiveEntry(entry) + seven.write(text.toByteArray()) + seven.closeArchiveEntry() + } + add("build/proton", 0x81ED, "binary") + add("build/files/lib/up", 0xA1FF, "../../proton") + add("build/plain", 0x81A4, "data") + } + val unpacked = temp.newFolder("seven") + ExperimentalProtons.extractDirect(archive, unpacked, ExperimentalProtons.ArchiveType.SEVEN_Z) + assertTrue(File(unpacked, "build/proton").canExecute()) + assertFalse(File(unpacked, "build/plain").canExecute()) + assertEquals("../../proton", Files.readSymbolicLink(File(unpacked, "build/files/lib/up").toPath()).toString()) + } + + @Test + fun directArchivesAllowCurrentDirectoryBeforeAClimb() { + val archive = temp.newFile("dot.zip") + ZipArchiveOutputStream(archive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("build/lib/wine").apply { unixMode = 0x81ED }) + zip.write("binary".toByteArray()) + zip.closeArchiveEntry() + zip.putArchiveEntry(ZipArchiveEntry("build/bin/wine").apply { unixMode = 0xA1FF }) + zip.write("./../lib/wine".toByteArray()) + zip.closeArchiveEntry() + } + val unpacked = temp.newFolder("dot") + ExperimentalProtons.extractDirect(archive, unpacked, ExperimentalProtons.ArchiveType.ZIP) + assertEquals("./../lib/wine", Files.readSymbolicLink(File(unpacked, "build/bin/wine").toPath()).toString()) + assertEquals("binary", File(unpacked, "build/bin/wine").readText()) + } + + @Test + fun directArchivesRejectLinksThatClimbAfterACurrentDirectoryAndAName() { + for (link in listOf("./top/../outside", "./../a/./../..", "top/./../outside")) { + val archive = temp.newFile() + ZipArchiveOutputStream(archive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("build/a/b/out").apply { unixMode = 0xA1FF }) + zip.write(link.toByteArray()) + zip.closeArchiveEntry() + } + val result = runCatching { ExperimentalProtons.extractDirect(archive, temp.newFolder(), ExperimentalProtons.ArchiveType.ZIP) } + assertTrue(link, result.exceptionOrNull() is ExperimentalProtons.UnsafeArchiveException) + } + } + + @Test + fun reconcileKeepsBuildsWhenASessionStartsDuringTheLookup() { + val tools = File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(activity), "root/.local/share/Steam/compatibilitytools.d") + val dirs = listOf("Experimental-gone-a", "Experimental-gone-b").map { name -> + File(tools, name).apply { + mkdirs() + File(this, ".droiddeck-experimental.json").writeText(JSONObject().put("label", name).put("source", name).put("releaseTag", name).toString()) + } + } + val complete = ProtonExtras.ReleaseFetch(JSONArray(), true) + var lookups = 0 + try { + ExperimentalProtons.reconcile(activity, complete) { + lookups++ + SessionState.running = true + true + } + } finally { + SessionState.running = false + } + assertEquals(1, lookups) + assertTrue(dirs.all { it.isDirectory }) + ExperimentalProtons.reconcile(activity, complete) { true } + assertTrue(dirs.none { it.exists() }) + } + + @Test + fun removeWaitsForAStartingSessionAndThenKeepsTheBuild() { + val tools = File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(activity), "root/.local/share/Steam/compatibilitytools.d") + val dir = File(tools, "Experimental-starting").apply { + mkdirs() + File(this, ".droiddeck-experimental.json").writeText(JSONObject().put("label", name).put("source", name).toString()) + File(this, "proton").writeText("build") + } + var removed: Boolean? = null + val removal = Thread { removed = ExperimentalProtons.remove(activity, dir.name) } + try { + synchronized(SessionState.startLock) { + removal.start() + val deadline = System.nanoTime() + 10_000_000_000L + while (removal.state != Thread.State.BLOCKED && System.nanoTime() < deadline) Thread.sleep(5) + assertEquals(Thread.State.BLOCKED, removal.state) + assertTrue(File(dir, "proton").isFile) + SessionState.running = true + } + removal.join(10_000) + assertEquals(false, removed) + assertTrue(File(dir, "proton").isFile) + } finally { + SessionState.running = false + removal.join(10_000) + } + assertTrue(ExperimentalProtons.remove(activity, dir.name)) + assertTrue(!dir.exists()) + assertTrue(File(tools, ".droiddeck-experimental-gone").list().isNullOrEmpty()) + } + + @Test + fun directArchivesRejectLinksThatClimbAfterAName() { + val archive = temp.newFile("climb.zip") + ZipArchiveOutputStream(archive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("build/a/b/top").apply { unixMode = 0xA1FF }) + zip.write("../../..".toByteArray()) + zip.closeArchiveEntry() + zip.putArchiveEntry(ZipArchiveEntry("build/a/b/out").apply { unixMode = 0xA1FF }) + zip.write("top/../outside".toByteArray()) + zip.closeArchiveEntry() + } + val result = runCatching { ExperimentalProtons.extractDirect(archive, temp.newFolder("climb-out"), ExperimentalProtons.ArchiveType.ZIP) } + assertTrue(result.exceptionOrNull() is ExperimentalProtons.UnsafeArchiveException) + } + + @Test + fun directZipRejectsEscapingLinksAndEntries() { + val linkArchive = temp.newFile("link.zip") + ZipArchiveOutputStream(linkArchive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("build/link").apply { unixMode = 0xA1FF }) + zip.write("../../outside".toByteArray()) + zip.closeArchiveEntry() + } + val entryArchive = temp.newFile("entry.zip") + ZipArchiveOutputStream(entryArchive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("../outside")) + zip.write("x".toByteArray()) + zip.closeArchiveEntry() + } + val linkResult = runCatching { ExperimentalProtons.extractDirect(linkArchive, temp.newFolder("link-out"), ExperimentalProtons.ArchiveType.ZIP) } + val entryResult = runCatching { ExperimentalProtons.extractDirect(entryArchive, temp.newFolder("entry-out"), ExperimentalProtons.ArchiveType.ZIP) } + assertTrue(linkResult.exceptionOrNull() is ExperimentalProtons.UnsafeArchiveException) + assertTrue(entryResult.exceptionOrNull() is ExperimentalProtons.UnsafeArchiveException) + } + + @Test + fun staleDownloadCleanupOnlyDeletesItsOwnUnlistedFiles() { + val downloads = File(activity.filesDir, "proton-downloads").apply { mkdirs() } + val stale = File(downloads, "droiddeck-gone-archive.tar.xz").apply { writeText("partial") } + val kept = File(downloads, "droiddeck-kept-archive.tar.xz").apply { writeText("partial") } + val other = File(downloads, "other-archive.tar.xz").apply { writeText("partial") } + ExperimentalProtons.removeStaleDownloads(activity, setOf("kept")) + assertFalse(stale.exists()) + assertTrue(kept.exists()) + assertTrue(other.exists()) + } + @Test fun checksumFileWithoutADigestIsRejected() { assertNull(ExperimentalProtons.checksumIn("not a checksum\n")) diff --git a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt index 15e0280a76..105205a849 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt @@ -30,7 +30,7 @@ class ProtonExtrasTest { .apply { if (digest != null) put("digest", digest) } private fun release(tag: String, vararg assets: JSONObject, prerelease: Boolean = false, draft: Boolean = false) = JSONObject() - .put("tag_name", tag).put("prerelease", prerelease).put("draft", draft) + .put("tag_name", tag).put("prerelease", prerelease).put("draft", draft).put("published_at", "2026-11-12T00:00:00Z") .put("assets", JSONArray().apply { assets.forEach { put(it) } }) private fun droiddeckRelease(ver: String, prerelease: Boolean = false) = release( @@ -48,6 +48,34 @@ class ProtonExtrasTest { File(this, "proton").apply { writeText(""); setExecutable(true) } } + @Test + fun experimentalRowsUseTheReleaseNameAndTagDetail() { + val current = release("DroidDeck-Bionic-12.8-r34", asset("DroidDeck-Bionic-12.8-r34-aarch64.tar.xz"), prerelease = true) + .put("name", "DroidDeck Bionic 12.8 r34") + val selectedAsset = ProtonExtras.assetOf(tool("droiddeck"), current, experimental = true)!! + val selected = ProtonExtras.assets(tool("droiddeck"), JSONArray().put(current), true).single() + assertEquals("DroidDeck-Bionic-12.8-r34-aarch64.tar.xz", selectedAsset.name) + assertEquals("DroidDeck Bionic 12.8 r34", selected.releaseName) + assertEquals("DroidDeck-Bionic-12.8-r34", selected.tag) + } + + @Test + fun experimentalAssetsIgnoreChecksumSidecars() { + val sidecarOnly = release("DroidDeck-Bionic-12.8-r36", asset("DroidDeck-Bionic-12.8-r36-aarch64.tar.xz.sha512sum")) + assertEquals(null, ProtonExtras.assetOf(tool("droiddeck"), sidecarOnly, experimental = true)) + } + + @Test + fun experimentalAssetsSkipOtherArchitectures() { + val foreign = release("DroidDeck-Bionic-12.8-r37", asset("DroidDeck-Bionic-12.8-r37-x86_64.tar.xz"), asset("DroidDeck-Bionic-12.8-r37-amd64.tar.gz"), prerelease = true) + val mixed = release("DroidDeck-Bionic-12.8-r38", asset("DroidDeck-Bionic-12.8-r38-x86_64.tar.xz"), asset("DroidDeck-Bionic-12.8-r38.tar.xz"), prerelease = true) + val named = release("DroidDeck-Bionic-12.8-r39", asset("DroidDeck-Bionic-12.8-r39-aarch64.tar.xz"), asset("DroidDeck-Bionic-12.8-r39-x86_64.tar.xz"), prerelease = true) + assertEquals(null, ProtonExtras.assetOf(tool("droiddeck"), foreign, experimental = true)) + assertEquals("DroidDeck-Bionic-12.8-r38.tar.xz", ProtonExtras.assetOf(tool("droiddeck"), mixed, experimental = true)!!.name) + assertEquals("DroidDeck-Bionic-12.8-r39-aarch64.tar.xz", ProtonExtras.assetOf(tool("droiddeck"), named, experimental = true)!!.name) + assertTrue(ProtonExtras.assets(tool("droiddeck"), JSONArray().put(foreign), true).isEmpty()) + } + @Test fun theThreeSourcesInOrder() { assertEquals(listOf("ge", "cachyos", "droiddeck"), ProtonExtras.tools.map { it.id }) @@ -72,6 +100,14 @@ class ProtonExtrasTest { assertNull(picked.sha256) } + @Test + fun ownExperimentalReleaseUsesItsCurrentBionicTarballShape() { + val current = release("DroidDeck-Bionic-12.8-r34", asset("DroidDeck-Bionic-12.8-r34-aarch64.tar.xz"), asset("DroidDeck-Bionic-12.8-r34-aarch64.sha512sum"), prerelease = true) + val rows = ProtonExtras.assets(tool("droiddeck"), JSONArray().put(current), prerelease = true) + assertEquals(listOf("DroidDeck-Bionic-12.8-r34"), rows.map { it.tag }) + assertTrue(ProtonExtras.assets(tool("droiddeck"), JSONArray().put(release("DroidDeck-Bionic-12.8-r35", asset("DroidDeck-Bionic-12.8-r35-aarch64.sha512sum"), prerelease = true)), true).isEmpty()) + } + @Test fun githubsDigestIsKeptBesideTheSha512File() { val sum = "ab".repeat(32) @@ -83,20 +119,6 @@ class ProtonExtrasTest { assertTrue(picked.sha512!!.endsWith("GE-Proton11-7-aarch64.sha512sum")) } - @Test - fun aTestBuildChoosesACompatibleArchiveWithVerification() { - val release = release( - "DroidDeck-Proton-11-12.9", - asset("DroidDeck-Proton-11-12.9-aarch64.tar.gz"), - asset("DroidDeck-Proton-11-12.9-aarch64.tar.xz", "sha256:" + "ab".repeat(32)), - prerelease = true, - ) - val releases = JSONArray().put(release).put(droiddeckRelease("11-12.8")) - val picked = ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!! - assertEquals("DroidDeck-Proton-11-12.9-aarch64.tar.xz", picked.name) - assertEquals("ab".repeat(32), picked.sha256) - } - @Test fun prereleasesDraftsAndReleasesWithoutAnArm64BuildAreSkipped() { val releases = JSONArray() @@ -274,64 +296,11 @@ class ProtonExtrasTest { assertEquals("DroidDeck-Proton-11-11.4", ProtonExtras.update(context, tool("droiddeck"))) } - @Test - fun theNewestPrereleaseAheadOfTheLatestReleaseIsTheTestBuild() { - val releases = JSONArray() - .put(release("DroidDeck-Bionic-12.8-r25", asset("DroidDeck-Bionic-12.8-r25-aarch64.tar.xz"), prerelease = true)) - .put(droiddeckRelease("11-12.9", prerelease = true)) - .put(droiddeckRelease("11-12.8")) - assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!!.tag) - assertEquals("DroidDeck-Proton-11-12.8", ProtonExtras.pickAsset(tool("droiddeck"), releases)!!.tag) - } - - @Test - fun aPrereleaseOlderThanTheLatestReleaseIsNotOffered() { - val releases = JSONArray() - .put(droiddeckRelease("11-12.9")) - .put(droiddeckRelease("11-12.8", prerelease = true)) - assertNull(ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)) - assertNull(ProtonExtras.pickAsset(tool("droiddeck"), JSONArray().put(droiddeckRelease("11-12.8")), test = true)) - } - - @Test - fun aTestBuildIsOfferedOnlyWhenNotInstalledAndNewer() { - assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.testFor(emptyList(), "DroidDeck-Proton-11-12.9")) - assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.testFor(listOf("DroidDeck-Proton-11-12.8"), "DroidDeck-Proton-11-12.9")) - assertNull(ProtonExtras.testFor(listOf("DroidDeck-Proton-11-12.9"), "DroidDeck-Proton-11-12.9")) - assertNull(ProtonExtras.testFor(listOf("DroidDeck-Proton-11-13.0"), "DroidDeck-Proton-11-12.9")) - assertNull(ProtonExtras.testFor(listOf("DroidDeck-Proton-11-12.8"), null)) - } - - @Test - fun theHighestEligibleTestBuildWinsWhateverTheListOrder() { - val releases = JSONArray() - .put(droiddeckRelease("11-12.7", prerelease = true)) - .put(droiddeckRelease("11-12.9", prerelease = true)) - .put(droiddeckRelease("11-12.8.5", prerelease = true)) - .put(droiddeckRelease("11-12.8")) - assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!!.tag) - } - - @Test - fun noTestBuildWithoutAStableBaseline() { - val releases = JSONArray().put(droiddeckRelease("11-12.9", prerelease = true)) - assertNull(ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)) - } - - @Test - fun aTestBuildWithNoChecksumIsNotOffered() { - val releases = JSONArray() - .put(release("DroidDeck-Proton-11-12.10", asset("DroidDeck-Proton-11-12.10-aarch64.tar.gz"), prerelease = true)) - .put(droiddeckRelease("11-12.9", prerelease = true)) - .put(droiddeckRelease("11-12.8")) - assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!!.tag) - } - @Test fun laterPagesAreReadOnlyUntilAStableBaselineIsFound() { val tool = tool("droiddeck") val pages = mapOf( - 1 to JSONArray().put(droiddeckRelease("11-12.10", prerelease = true)), + 1 to JSONArray().apply { repeat(15) { put(droiddeckRelease("11-12.${10 - it}", prerelease = true)) } }, 2 to JSONArray().put(droiddeckRelease("11-12.8")), 3 to JSONArray().put(droiddeckRelease("11-12.7")), ) @@ -339,7 +308,6 @@ class ProtonExtrasTest { val all = ProtonExtras.releases(tool) { asked += it; pages[it] ?: JSONArray() }!! assertEquals(listOf(1, 2), asked) assertEquals("DroidDeck-Proton-11-12.8", ProtonExtras.pickAsset(tool, all)!!.tag) - assertEquals("DroidDeck-Proton-11-12.10", ProtonExtras.pickAsset(tool, all, test = true)!!.tag) asked.clear() ProtonExtras.releases(tool) { asked += it; pages.getValue(2) } @@ -353,35 +321,20 @@ class ProtonExtrasTest { asked.clear() assertNull(ProtonExtras.releases(tool) { page -> asked += page - if (page == 1) JSONArray().put(droiddeckRelease("11-12.10", prerelease = true)) else null + if (page == 1) JSONArray().apply { repeat(15) { put(droiddeckRelease("11-12.${10 - it}", prerelease = true)) } } else null }) assertEquals(listOf(1, 2), asked) } @Test - fun anIncompleteLookupKeepsTheCachedTestBuildAndACompletedLookupClearsIt() { - val tool = tool("droiddeck") - val cache = JSONObject().put(tool.id, JSONObject().put("tag", "DroidDeck-Proton-11-12.8").put("test", "DroidDeck-Proton-11-12.9")) - ProtonExtras.updateLatest(cache, tool, null, 1L) - assertEquals("DroidDeck-Proton-11-12.9", cache.getJSONObject(tool.id).getString("test")) - ProtonExtras.updateLatest(cache, tool, JSONArray().put(droiddeckRelease("11-12.8")), 1L) - assertFalse(cache.getJSONObject(tool.id).has("test")) - } - - @Test - fun aTestInstallLeavesTheStableEntryAndAStableInstallKeepsTheTestOffer() { - val tool = tool("droiddeck") - val cache = JSONObject().put(tool.id, JSONObject().put("tag", "DroidDeck-Proton-11-12.8").put("test", "DroidDeck-Proton-11-12.9")) - assertFalse(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-12.9", true, 2L)) - assertEquals("DroidDeck-Proton-11-12.8", cache.getJSONObject(tool.id).getString("tag")) - assertEquals("DroidDeck-Proton-11-12.9", cache.getJSONObject(tool.id).getString("test")) - assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.testFor(emptyList(), cache.getJSONObject(tool.id).getString("test"))) - assertFalse(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-12.7", false, 2L)) - assertTrue(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-12.8", false, 2L)) - assertEquals("DroidDeck-Proton-11-12.9", cache.getJSONObject(tool.id).getString("test")) - assertEquals(2L, cache.getJSONObject(tool.id).getLong("at")) - assertTrue(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-13.0", false, 3L)) - assertFalse(cache.getJSONObject(tool.id).has("test")) + fun anOldTestButtonInstallRemainsAUsableInstalledBuild() { + val context = RuntimeEnvironment.getApplication() + val tools = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/compatibilitytools.d") + val installed = installTool(tools, "DroidDeck-Proton 11-12.9") + val releases = File(context.filesDir, "proton-extras.json") + releases.writeText(JSONObject().put(installed.name, "DroidDeck-Proton-11-12.9").toString()) + assertEquals(listOf(installed.name), ProtonExtras.installedAll(context, tool("droiddeck"))) + assertEquals(listOf("DroidDeck-Proton-11-12.9"), ProtonExtras.installedTags(context, tool("droiddeck"))) } @Test @@ -390,4 +343,28 @@ class ProtonExtrasTest { assertEquals("DroidDeck-Proton-11-12.8", ProtonExtras.pickAsset(tool("droiddeck"), releases)!!.tag) assertNull(ProtonExtras.pickAsset(tool("droiddeck"), JSONArray("[null]"))) } + + @Test + fun failedOrPartialReleaseFetchDoesNotPretendMissingBuildsAreGone() { + val tool = tool("droiddeck") + assertNull(ProtonExtras.releasesForRemoval(tool) { null }) + val asked = mutableListOf() + val result = ProtonExtras.releasesForRemoval(tool) { page -> + asked += page + if (page == 1) JSONArray().apply { repeat(15) { put(droiddeckRelease("11-12.${10 - it}", prerelease = true)) } } else null + } + assertNull(result) + assertEquals(listOf(1, 2), asked) + } + + @Test + fun aShortReleasePageCompletesTheRemovalLookup() { + val asked = mutableListOf() + val result = ProtonExtras.releasesForRemoval(tool("droiddeck")) { page -> + asked += page + JSONArray().put(droiddeckRelease("11-12.8", prerelease = true)) + } + assertTrue(result!!.complete) + assertEquals(listOf(1), asked) + } }