From 44ade5eeeea28b4dd3854f05f4c38372cf4cfee5 Mon Sep 17 00:00:00 2001 From: FryMcNugget Date: Thu, 19 Nov 2026 07:32:30 +0000 Subject: [PATCH] feat(proton): install experimental Proton builds from a .zip (#2864) Components > Proton gains an Experimental builds card that installs a Proton build from a .zip, lists it as Experimental- and removes it with its stored and unpacked originals and selections. Replacing a build keeps its user settings and is safe to interrupt. Co-authored-by: maxjivi05 --- .../droiddeck/launcher/FrontEndActivity.kt | 12 +- .../java/com/droiddeck/launcher/ProtonMenu.kt | 46 ++++ .../launcher/session/ComponentsManager.kt | 33 ++- .../launcher/session/ExperimentalProtons.kt | 216 ++++++++++++++++++ .../launcher/session/ProtonExtras.kt | 35 +-- .../droiddeck/launcher/ui/ComponentsPage.kt | 27 ++- app/src/main/res/values-ar/strings.xml | 12 + app/src/main/res/values-b+es+419/strings.xml | 12 + app/src/main/res/values-bg/strings.xml | 12 + app/src/main/res/values-cs/strings.xml | 12 + app/src/main/res/values-da/strings.xml | 12 + app/src/main/res/values-de/strings.xml | 12 + app/src/main/res/values-el/strings.xml | 12 + app/src/main/res/values-es/strings.xml | 12 + app/src/main/res/values-fi/strings.xml | 12 + app/src/main/res/values-fr/strings.xml | 12 + app/src/main/res/values-hi/strings.xml | 12 + app/src/main/res/values-hu/strings.xml | 12 + app/src/main/res/values-in/strings.xml | 12 + app/src/main/res/values-it/strings.xml | 12 + app/src/main/res/values-ja/strings.xml | 12 + app/src/main/res/values-ko/strings.xml | 12 + app/src/main/res/values-ms/strings.xml | 12 + app/src/main/res/values-nb/strings.xml | 12 + app/src/main/res/values-nl/strings.xml | 12 + app/src/main/res/values-pl/strings.xml | 12 + app/src/main/res/values-pt-rPT/strings.xml | 12 + app/src/main/res/values-pt/strings.xml | 12 + app/src/main/res/values-ro/strings.xml | 12 + app/src/main/res/values-ru/strings.xml | 12 + app/src/main/res/values-sv/strings.xml | 12 + app/src/main/res/values-th/strings.xml | 12 + app/src/main/res/values-tr/strings.xml | 12 + app/src/main/res/values-uk/strings.xml | 12 + app/src/main/res/values-vi/strings.xml | 12 + app/src/main/res/values-zh-rCN/strings.xml | 12 + app/src/main/res/values-zh-rHK/strings.xml | 12 + app/src/main/res/values-zh-rTW/strings.xml | 12 + app/src/main/res/values/strings.xml | 12 + .../session/ExperimentalProtonsTest.kt | 155 +++++++++++++ .../launcher/session/ProtonExtrasTest.kt | 19 +- .../overlay/usr/local/bin/steam-compatibility | 40 +++- tools/tests/test_game_environment.py | 116 ++++++++++ 43 files changed, 1059 insertions(+), 36 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 37e92c04b0..629986abf2 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -275,6 +275,11 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet private val pickAnyDriver = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { r -> if (r.resultCode == RESULT_OK) InAppFilePicker.pickedUri(r.data)?.let { drivers.importDriver(it, linux = null) } } + private val pickExperimentalProton = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { r -> + if (r.resultCode == RESULT_OK) InAppFilePicker.pickedFile(r.data)?.let { zip -> + protons.installExperimental { progress -> com.droiddeck.launcher.session.ExperimentalProtons.installFromFile(this, zip, progress) } + } + } private val pickLossless = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { r -> if (r.resultCode == RESULT_OK) InAppFilePicker.pickedFile(r.data)?.let { importLossless(it) } } @@ -2427,7 +2432,7 @@ 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, + runtimeReady = ready && !busy, sessionRunning = SessionState.running, experimental = protons.experimentalDirs, ), protonActions = com.droiddeck.launcher.ui.ProtonsActions( onInstall = { id -> protons.installProton(id) }, @@ -2435,6 +2440,11 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet 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), + android.os.Environment.getExternalStoragePublicDirectory(android.os.Environment.DIRECTORY_DOWNLOADS).path)) + }, + onRemoveExperimental = { dir -> protons.removeExperimental(dir) }, ), protonOptions = { com.droiddeck.launcher.ui.ProtonOptions( diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt index 22d7b2ec0d..c076df2209 100644 --- a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt @@ -7,6 +7,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue +import com.droiddeck.launcher.session.ExperimentalProtons import com.droiddeck.launcher.session.ProtonExtras import com.droiddeck.launcher.ui.ProtonRow import com.droiddeck.launcher.session.SessionState @@ -27,12 +28,17 @@ internal class ProtonMenu( val stage = mutableStateOf(null) val percent = mutableIntStateOf(-1) val problem = mutableStateOf(null) + val experimental = mutableStateOf>(emptyList()) } var protonRows by Operation.rows var protonBusyId by Operation.busyId var protonStage by Operation.stage var protonPercent by Operation.percent var protonProblem by Operation.problem + var experimentalDirs by Operation.experimental + 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) } @@ -86,7 +92,47 @@ internal class ProtonMenu( }, "remove-proton-$id").start() } + fun installExperimental(work: ((String, Int) -> Unit) -> String?) { + if (protonBusyId != null || ProtonExtras.installInProgress || SessionState.running) return + protonBusyId = EXPERIMENTAL + protonProblem = null + protonStage = activity.getString(R.string.store_starting) + protonPercent = -1 + Thread({ + val problem = runCatching { + work { label, value -> ui.post { protonStage = label; protonPercent = value } } + }.getOrElse { it.message ?: it.javaClass.simpleName } + ui.post { + protonProblem = problem + protonBusyId = null + protonStage = null + protonPercent = -1 + refreshProtons() + android.widget.Toast.makeText(activity, problem ?: activity.getString(R.string.xproton_installed), android.widget.Toast.LENGTH_LONG).show() + if (problem == null) onInstalled() + } + }, "install-proton-experimental").start() + } + + fun removeExperimental(dir: String) { + if (protonBusyId != null || SessionState.running) return + protonBusyId = EXPERIMENTAL + protonProblem = null + protonStage = activity.getString(R.string.main_removing_named, dir) + protonPercent = -1 + Thread({ + val removed = runCatching { ExperimentalProtons.remove(activity, dir) }.getOrDefault(false) + ui.post { + protonBusyId = null + protonStage = null + refreshProtons() + if (!removed) android.widget.Toast.makeText(activity, activity.getString(R.string.xproton_remove_failed, dir), android.widget.Toast.LENGTH_LONG).show() + } + }, "remove-proton-experimental").start() + } + fun refreshProtons() { + experimentalDirs = ExperimentalProtons.installed(activity).map { it.dir } 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)) diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt index e9409b74cd..749532cddf 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -282,6 +282,8 @@ object ComponentsManager { if (parts.size > 1) parts[1] else parts.firstOrNull()?.ifEmpty { null } ?: "unknown" }.getOrDefault("unknown") + internal fun isProtonTree(dir: File): Boolean = File(dir, WINE).isDirectory && File(dir, "proton").isFile + fun protons(context: Context): List { val found = LinkedHashMap() val bases = listOf(File(steam(context), "compatibilitytools.d") to false) + @@ -290,7 +292,7 @@ object ComponentsManager { for ((base, valve) in bases) { val entries = base.listFiles()?.sortedBy { it.name } ?: continue for (dir in entries) { - if (!File(dir, WINE).isDirectory || !File(dir, "proton").isFile) continue + if (!isProtonTree(dir)) continue val real = runCatching { dir.canonicalPath }.getOrDefault(dir.path) if (found.containsKey(real)) continue val guest = if (dir.absolutePath.startsWith(rootPath)) dir.absolutePath.removePrefix(rootPath) else dir.absolutePath @@ -900,15 +902,26 @@ object ComponentsManager { } } - fun forgetProton(context: Context, dirName: String) { - synchronized(lock) { - val id = safeName(dirName) - if (protons(context).any { it.id == id }) return - val state = loadState(context) - val selected = listOf("active", "queued").map { state.sub(it).remove(id) != null }.any { it } - if (selected && runCatching { saveState(context, state) }.onFailure { Log.w(TAG, "forget $id", it) }.isFailure) return - File(originalsDir(context), id).deleteRecursively() - } + fun forgetProton(context: Context, dirName: String): Boolean = synchronized(lock) { + val id = safeName(dirName) + if (protons(context).any { it.id == id }) return true + val state = loadState(context) + val selected = listOf("active", "queued").map { state.sub(it).remove(id) != null }.any { it } + val published = File(launchDir(context), "desired.tsv") + val listed = published.takeIf { it.isFile } + ?.useLines { rows -> rows.any { it.split('\t').getOrNull(1) == dirName } } == true + if ((selected || listed) && runCatching { saveState(context, state) }.onFailure { Log.w(TAG, "forget $id", it) }.isFailure) return false + val originals = File(originalsDir(context), id) + val store = File(launchDir(context), "store") + val used = published.takeIf { it.isFile }?.useLines { rows -> + rows.mapNotNull { it.substringAfterLast('\t').substringAfter("/store/", "").substringBefore('/').ifEmpty { null } }.toSet() + }.orEmpty() + val unpacked = originals.listFiles().orEmpty().flatMap { version -> + version.listFiles().orEmpty().map { File(store, "original-$id-${version.name}-${it.name.removeSuffix(".wcp")}") } + }.filter { it.name !in used } + if (unpacked.any { File(it, ".complete").delete(); !it.deleteRecursively() && it.exists() }) return false + originals.deleteRecursively() + true } private fun storePackage(context: Context, part: File, dest: File) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt b/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt new file mode 100644 index 0000000000..cc2831bc8c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt @@ -0,0 +1,216 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import android.os.StatFs +import android.util.Log +import com.droiddeck.launcher.R +import com.droiddeck.launcher.runtime.LinuxRuntime +import java.io.File +import java.io.FileOutputStream +import java.nio.file.Files +import java.security.DigestOutputStream +import java.security.MessageDigest +import java.util.zip.ZipFile +import kotlin.io.path.ExperimentalPathApi +import kotlin.io.path.deleteRecursively +import org.json.JSONObject + +object ExperimentalProtons { + private const val TAG = "ExperimentalProtons" + const val PREFIX = "Experimental-" + private const val MARKER = ".droiddeck-experimental.json" + private const val STAGING = ".droiddeck-experimental" + private const val BACKUPS = ".droiddeck-experimental-old" + private const val INCOMING = ".droiddeck-experimental-new" + 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))?$") + + data class Installed(val dir: String, val label: String, val source: String) + + private fun toolsDir(context: Context) = File(LinuxRuntime.rootDir(context), GUEST_TOOLS.removePrefix("/")) + + fun installed(context: Context): List = + toolsDir(context).listFiles() + ?.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")) + } + ?.sortedBy { it.dir } + ?: emptyList() + + fun remove(context: Context, dir: String): Boolean { + 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 + } + + internal fun dirName(tree: String, label: String?): String { + val base = ComponentsManager.safeName(tree) + val tag = label?.let(ComponentsManager::safeName)?.takeIf { it != "unnamed" && !base.contains(it, ignoreCase = true) } + return PREFIX + base + (tag?.let { "-$it" } ?: "") + } + + internal fun compatVdf(name: String): String = """"compatibilitytools" +{ + "compat_tools" + { + "$name" + { + "install_path" "." + "display_name" "$name" + "from_oslist" "windows" + "to_oslist" "linux" + } + } +} +""" + + fun installFromFile(context: Context, zip: File, onProgress: (String, Int) -> Unit): String? { + preflight(context)?.let { return it } + if (StatFs(LinuxRuntime.rootDir(context).path).availableBytes < NEED_BYTES + zip.length()) { + return context.getString(R.string.xproton_no_space) + } + return install(context, zip, zip.name.substringBeforeLast('.'), zip.name, onProgress) + } + + 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? { + val tools = toolsDir(context).apply { mkdirs() } + val staging = File(tools, STAGING) + val forget = { name: String -> ComponentsManager.forgetProton(context, name) } + restoreInterrupted(tools, forget) + deleteTree(staging) + staging.mkdirs() + 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) + 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) + + 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(), + ) + val final = File(tools, name) + val settings = File(final, USER_SETTINGS) + if (Files.isRegularFile(settings.toPath(), java.nio.file.LinkOption.NOFOLLOW_LINKS)) { + settings.copyTo(ownFile(tree, USER_SETTINGS)) + } + if (!placeTree(tree, tools, name, forget)) return context.getString(R.string.xproton_place_failed) + + onProgress(context.getString(R.string.pextra_installing, name), -1) + runGuest(context, listOf("steam-compatibility", "/root/.local/share/Steam")) + return null + } catch (e: Exception) { + Log.e(TAG, "install $source", e) + return e.message ?: context.getString(R.string.xproton_bad_zip) + } finally { + deleteTree(staging) + } + } + + internal fun buildTree(unpacked: File): File? { + val root = unpacked.canonicalFile + return unpacked.listFiles()?.sortedBy { it.name }?.firstOrNull { + !Files.isSymbolicLink(it.toPath()) && it.isDirectory && it.canonicalFile.parentFile == root && + Files.isRegularFile(File(it, "toolmanifest.vdf").toPath(), java.nio.file.LinkOption.NOFOLLOW_LINKS) && + ComponentsManager.isProtonTree(it) + } + } + + @OptIn(ExperimentalPathApi::class) + internal fun deleteTree(dir: File): Boolean = + runCatching { dir.toPath().deleteRecursively() }.onFailure { Log.w(TAG, "delete $dir", it) }.isSuccess && !Files.exists(dir.toPath(), java.nio.file.LinkOption.NOFOLLOW_LINKS) + + internal fun ownFile(tree: File, name: String): File { + val file = File(tree, name) + Files.deleteIfExists(file.toPath()) + return file + } + + internal fun placeTree(tree: File, tools: File, name: String, forget: (String) -> Boolean): Boolean { + val incoming = File(File(tools, INCOMING).apply { mkdirs() }, name) + if (!deleteTree(incoming) || !tree.renameTo(incoming)) return false + return finishPlacing(tools, name, forget) + } + + private fun finishPlacing(tools: File, name: String, forget: (String) -> Boolean): Boolean { + val incoming = File(File(tools, INCOMING), name) + val final = File(tools, name) + val backup = File(File(tools, BACKUPS).apply { mkdirs() }, name) + val moved = !final.exists() || (deleteTree(backup) && final.renameTo(backup)) + val placed = moved && (!backup.exists() || forget(name)) && incoming.renameTo(final) + if (!placed) { + if (!final.exists()) backup.renameTo(final) + deleteTree(incoming) + } + if (final.exists()) deleteTree(backup) + return placed + } + + internal fun restoreInterrupted(tools: File, forget: (String) -> Boolean) { + 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)) } + } + + 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 + val name = File(entry.name).name + val sums = checksumEntry(entries.map { it.name }, name)?.let { checksumName -> entries.first { it.name == checksumName } } + val expected = sums?.let { e -> + z.getInputStream(e).use { checksumIn(it.readBytes().decodeToString()) } + ?: throw IllegalStateException("${File(e.name).name} holds no SHA-512 checksum") + } + val out = File(into, name) + val digest = MessageDigest.getInstance("SHA-512") + z.getInputStream(entry).use { input -> DigestOutputStream(FileOutputStream(out), digest).use { input.copyTo(it, 1 shl 16) } } + if (expected != null && !expected.equals(digest.digest().joinToString("") { "%02x".format(it) }, ignoreCase = true)) { + out.delete() + throw IllegalStateException("Checksum mismatch in $name") + } + out + } + + 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? { + val stem = tarball.substringBefore(".tar") + return entries.firstOrNull { + val name = File(it).name + !TARBALL.containsMatchIn(name) && (name.startsWith("$tarball.") || name.startsWith("$stem.")) && name.contains("sha512", true) + } + } + + private fun runGuest(context: Context, command: List): Int { + val guest = listOf( + "/usr/bin/env", "-i", "HOME=/root", "USER=root", "PATH=/usr/local/bin:/usr/bin:/bin", + "LANG=C.UTF-8", "XDG_DATA_HOME=/root/.local/share", + ) + command + val child = ProtonExtras.guestProcess(context, guest).start() + child.inputStream.bufferedReader().useLines { lines -> lines.forEach { Log.i(TAG, it) } } + return child.waitFor() + } +} 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 63307c1596..c277b7b279 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt @@ -290,26 +290,12 @@ object ProtonExtras { val root = LinuxRuntime.rootDir(context) LinuxRuntime.writeAccounts(context) com.droiddeck.launcher.session.SessionFiles.stage(context, root) - val runtimeDir = File(context.filesDir, ".proton-install-rt").apply { mkdirs() } val guest = listOf( "/usr/bin/env", "-i", "HOME=/root", "USER=root", "PATH=/usr/local/bin:/usr/bin:/bin", "LANG=C.UTF-8", "XDG_DATA_HOME=/root/.local/share", "/usr/local/bin/droiddeck-proton-extra", "/root/.local/share/Steam", archive.absolutePath, ) - val process = if (com.droiddeck.launcher.runtime.NativeGuest.enabled(context)) { - com.droiddeck.launcher.runtime.NativeGuest.processBuilder(context, root, - LinuxRuntime.binds(context, null, runtimeDir, null, null), guest).redirectErrorStream(true) - } else { - ProcessBuilder(LinuxRuntime.command(context, null, runtimeDir, null, guest)) - .directory(root) - .redirectErrorStream(true) - .also { builder -> - val hostEnv = builder.environment() - hostEnv["PROOT_LOADER"] = LinuxRuntime.prootLoader(context).path - hostEnv["PROOT_TMP_DIR"] = LinuxRuntime.prootTempDir(context).path - LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { hostEnv["LD_LIBRARY_PATH"] = it } - } - } + val process = guestProcess(context, guest) val child = process.start() var placed: String? = null child.inputStream.bufferedReader().useLines { lines -> @@ -344,6 +330,25 @@ object ProtonExtras { } } + internal fun guestProcess(context: Context, guest: List): ProcessBuilder { + val root = LinuxRuntime.rootDir(context) + val runtimeDir = File(context.filesDir, ".proton-install-rt").apply { mkdirs() } + return if (com.droiddeck.launcher.runtime.NativeGuest.enabled(context)) { + com.droiddeck.launcher.runtime.NativeGuest.processBuilder(context, root, + LinuxRuntime.binds(context, null, runtimeDir, null, null), guest).redirectErrorStream(true) + } else { + ProcessBuilder(LinuxRuntime.command(context, null, runtimeDir, null, guest)) + .directory(root) + .redirectErrorStream(true) + .also { builder -> + val hostEnv = builder.environment() + hostEnv["PROOT_LOADER"] = LinuxRuntime.prootLoader(context).path + hostEnv["PROOT_TMP_DIR"] = LinuxRuntime.prootTempDir(context).path + LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { hostEnv["LD_LIBRARY_PATH"] = it } + } + } + } + private fun releases(tool: Tool): JSONArray? = releases(tool) { page -> Downloader.downloadString(RELEASES.format(Locale.ROOT, tool.repo, page))?.let { body -> try { 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 62ce4cf73d..13d300c5f6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt @@ -539,7 +539,8 @@ fun ComponentsPage( val key = "proton:${v.proton.id}" val swaps = v.components.values.count { it.activeFile != null } val extra = protons.rows.firstOrNull { v.proton.dir.name in it.installedAll } - val removable = extra != null && protons.busyId == null && protons.runtimeReady && !protons.sessionRunning + val experimental = v.proton.dir.name in protons.experimental + val removable = (extra != null || experimental) && protons.busyId == null && protons.runtimeReady && !protons.sessionRunning ChoiceLine( v.proton.name, (if (swaps > 0) stringResource(R.string.comp_swapped, v.proton.version, swaps) else stringResource(R.string.comp_all_original, v.proton.version)) @@ -548,7 +549,10 @@ fun ComponentsPage( modifier = (if (i == 0 && !moded(l)) Modifier.focusRequester(firstRow) else Modifier).trackRow(key, rowsAt), onSelect = { if (v.proton.id != view?.proton?.id) { onProton(v.proton.id); flyHome(key, PROTON_TAB) } }, onDelete = { - if (extra != null) ask(key, right, ctx.getString(R.string.proton_remove_title, v.proton.name), ctx.getString(R.string.proton_remove_body), ctx.getString(R.string.store_remove), true, v.proton.name) { + if (experimental) ask(key, right, ctx.getString(R.string.proton_remove_title, v.proton.name), ctx.getString(R.string.proton_remove_body), ctx.getString(R.string.store_remove), true, v.proton.name) { + protonActions.onRemoveExperimental(v.proton.dir.name) + } + else if (extra != null) ask(key, right, ctx.getString(R.string.proton_remove_title, v.proton.name), ctx.getString(R.string.proton_remove_body), ctx.getString(R.string.store_remove), true, v.proton.name) { protonActions.onRemove(extra.id, v.proton.dir.name) } }, @@ -738,6 +742,10 @@ fun ComponentsPage( } } } + if (l == PROTON_TAB && DeveloperTools.on) { + Spacer(Modifier.height(12.dp)) + ExperimentalProtonGroup(protons, protonActions) + } if (l == PROTON_TAB) { Spacer(Modifier.height(12.dp)) Note(stringResource(R.string.comp_about_text)) @@ -1631,6 +1639,18 @@ private fun DeviceChip(s: GpuDriversState) { ) { face() } } +@Composable +private fun ExperimentalProtonGroup(protons: ProtonsState, actions: ProtonsActions) { + val busy = protons.busyId == com.droiddeck.launcher.ProtonMenu.EXPERIMENTAL + 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) + } + } +} + class ProtonsState( val rows: List = emptyList(), val busyId: String? = null, @@ -1638,6 +1658,7 @@ class ProtonsState( val percent: Int = -1, val runtimeReady: Boolean = true, val sessionRunning: Boolean = false, + val experimental: List = emptyList(), ) class ProtonsActions( @@ -1646,6 +1667,8 @@ class ProtonsActions( val onCancel: (String) -> Unit = {}, val onRemove: (String, String) -> Unit = { _, _ -> }, val onRemoveOlder: (String) -> Unit = {}, + val onExperimentalFile: () -> Unit = {}, + val onRemoveExperimental: (String) -> Unit = {}, ) class ProtonRow( diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 49440fa057..2e20f14e1f 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2406,6 +2406,18 @@ عدم تطابق المجموع الاختباري؛ تم حذف التنزيل بدأت جلسة خلال التنزيل، أوقفها قبل تثبيت أدوات التوافق جارٍ تثبيت %1$s + إصدارات تجريبية + اختر ملف .zip لإصدار Proton + تثبيت من ملف .zip + لا توجد مساحة كافية لإصدار Proton هذا + جارٍ فك الضغط + جارٍ تفريغ Proton (بضع دقائق) + ملف .zip لا يحتوي على أرشيف tar لـ Proton + فشل التفريغ (tar %1$d) + الأرشيف لا يحتوي على إصدار Proton + تعذّر وضع إصدار Proton + تعذّرت الإزالة الكاملة لـ %1$s + تم تثبيت Proton التجريبي. اختره في Steam → الخصائص → التوافق. فشل تثبيت %1$s (حالة الخروج %2$d) تعذّر تثبيت %1$s جارٍ جلب حزمة droiddeck-esync 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 745e505055..80faccb1cf 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2398,6 +2398,18 @@ La suma de verificación no coincide; se eliminó la descarga 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 + 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 + No se pudo quitar %1$s por completo + Proton experimental instalado. Elígelo en Steam → Propiedades → Compatibilidad. Falló la instalación de %1$s (salida %2$d) No se pudo instalar %1$s Descargando el paquete droiddeck-esync diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 15dd8ac28b..0a333b7f85 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2302,6 +2302,18 @@ Несъответствие в контролната сума; изтеглянето беше изтрито По време на изтеглянето започна сесия - спри я, преди да инсталираш инструменти за съвместимост Инсталиране на %1$s + Експериментални версии + Изберете .zip с версия на Proton + Инсталиране от .zip + Няма достатъчно свободно място за тази версия на Proton + Разархивиране + Разопаковане на Proton (няколко минути) + В .zip няма архив tar на Proton + Разопаковането не успя (tar %1$d) + Архивът не съдържа версия на Proton + Версията на Proton не можа да бъде поставена + %1$s не можа да бъде премахнат напълно + Експерименталният Proton е инсталиран. Изберете го в Steam → Свойства → Съвместимост. Инсталирането на %1$s се провали (код %2$d) %1$s не можа да бъде инсталиран Извличане на пакета droiddeck-esync diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index d1c055687c..014b812692 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2354,6 +2354,18 @@ Neshoda kontrolního součtu; stahování bylo odstraněno 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 + 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 + Nepodařilo se úplně odebrat %1$s + Experimentální Proton je nainstalován. Vyberte ho ve Steam → Vlastnosti → Kompatibilita. Instalace %1$s se nezdařila (návratový kód %2$d) Nepodařilo se nainstalovat %1$s Stahování balíčku droiddeck-esync diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index ecb0723ccb..1e4231ae09 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2302,6 +2302,18 @@ Tjeksum stemmer ikke; downloadet blev slettet 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 + 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 + Kunne ikke fjerne %1$s helt + Eksperimentel Proton er installeret. Vælg den i Steam → Egenskaber → Kompatibilitet. Installation af %1$s mislykkedes (afslutningskode %2$d) Kunne ikke installere %1$s Henter droiddeck-esync-pakken diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 0c202baf5f..1d4bde9bf7 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2294,6 +2294,18 @@ Prüfsumme stimmt nicht überein; der Download wurde gelöscht 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 + 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 + %1$s konnte nicht vollständig entfernt werden + Experimentelles Proton installiert. Wähle es unter Steam → Eigenschaften → Kompatibilität aus. Installation von %1$s fehlgeschlagen (Exit-Code %2$d) %1$s konnte nicht installiert werden droiddeck-esync-Paket wird abgerufen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 749f779141..c50b3adcf1 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2302,6 +2302,18 @@ Αναντιστοιχία αθροίσματος ελέγχου· η λήψη διαγράφηκε Μια συνεδρία ξεκίνησε κατά τη λήψη· διακόψτε την πριν εγκαταστήσετε εργαλεία συμβατότητας Εγκατάσταση %1$s + Πειραματικές εκδόσεις + Επιλέξτε ένα .zip έκδοσης Proton + Εγκατάσταση από .zip + Δεν υπάρχει αρκετός ελεύθερος χώρος για αυτήν την έκδοση Proton + Αποσυμπίεση + Αποσυσκευασία του Proton (λίγα λεπτά) + Το .zip δεν περιέχει αρχείο tar του Proton + Η αποσυσκευασία απέτυχε (tar %1$d) + Το αρχείο δεν περιέχει έκδοση Proton + Δεν ήταν δυνατή η τοποθέτηση της έκδοσης Proton + Δεν ήταν δυνατή η πλήρης κατάργηση του %1$s + Το πειραματικό Proton εγκαταστάθηκε. Επιλέξτε το στο Steam → Ιδιότητες → Συμβατότητα. Η εγκατάσταση του %1$s απέτυχε (έξοδος %2$d) Δεν ήταν δυνατή η εγκατάσταση του %1$s Λήψη πακέτου droiddeck-esync diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e734ac3ab0..bd28c243b6 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2328,6 +2328,18 @@ La suma de verificación no coincide; se eliminó la descarga 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 + 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 + No se pudo quitar %1$s por completo + Proton experimental instalado. Elígelo en Steam → Propiedades → Compatibilidad. Falló la instalación de %1$s (salida %2$d) No se pudo instalar %1$s Descargando el paquete droiddeck-esync diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 75505a4d0c..042345d84a 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2302,6 +2302,18 @@ Tarkistussumma ei täsmää; lataus poistettiin Istunto käynnistyi latauksen aikana; pysäytä se ennen yhteensopivuustyökalujen asentamista Asennetaan %1$s + Kokeelliset versiot + Valitse Proton-version .zip + Asenna .zip-tiedostosta + 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 + Kohdetta %1$s ei voitu poistaa kokonaan + Kokeellinen Proton asennettu. Valitse se kohdassa Steam → Ominaisuudet → Yhteensopivuus. %1$s-asennus epäonnistui (poistumiskoodi %2$d) Kohdetta %1$s ei voitu asentaa Haetaan droiddeck-esync-pakettia diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index cbe2334cf5..b11a5a6741 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2327,6 +2327,18 @@ Somme de contrôle incorrecte ; le téléchargement a été supprimé 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 + 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 + Impossible de supprimer entièrement %1$s + Proton expérimental installé. Sélectionnez-le dans Steam → Propriétés → Compatibilité. Échec de l\'installation de %1$s (code %2$d) Impossible d\'installer %1$s Récupération du pack droiddeck-esync diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 199a262959..0e9ad3ed44 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2302,6 +2302,18 @@ चेकसम मेल नहीं खाया; डाउनलोड हटा दिया गया डाउनलोड के दौरान एक सेशन शुरू हुआ; कम्पैटिबिलिटी टूल इंस्टॉल करने से पहले इसे बंद करें %1$s इंस्टॉल हो रहा है + प्रायोगिक बिल्ड + Proton बिल्ड की .zip चुनें + .zip से इंस्टॉल करें + इस Proton बिल्ड के लिए पर्याप्त खाली जगह नहीं है + अनज़िप हो रहा है + Proton अनपैक हो रहा है (कुछ मिनट) + .zip में Proton का कोई tar आर्काइव नहीं है + अनपैक करना विफल रहा (tar %1$d) + आर्काइव में कोई Proton बिल्ड नहीं है + Proton बिल्ड को रखा नहीं जा सका + %1$s को पूरी तरह हटाया नहीं जा सका + प्रायोगिक Proton इंस्टॉल हो गया। इसे Steam → गुण → संगतता में चुनें। %1$s इंस्टॉलेशन विफल रहा (exit %2$d) %1$s इंस्टॉल नहीं हो सका droiddeck-esync पैक लिया जा रहा है diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index aa74d6799a..f8b6fbc273 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2302,6 +2302,18 @@ Az ellenőrzőösszeg nem egyezik; a letöltés törlésre került 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 + 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 + Nem sikerült teljesen eltávolítani: %1$s + A kísérleti Proton telepítve. Válaszd ki a Steam → Tulajdonságok → Kompatibilitás menüben. A %1$s telepítése sikertelen (kilépési kód: %2$d) Nem sikerült telepíteni a %1$s-t droiddeck-esync csomag letöltése diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 935869a359..d85a73b7c4 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2277,6 +2277,18 @@ Checksum tidak cocok; unduhan telah dihapus Sesi dimulai saat pengunduhan berlangsung; hentikan sesi tersebut sebelum menginstal alat kompatibilitas Menginstal %1$s + Build eksperimental + Pilih .zip build Proton + Instal dari .zip + 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 + Tidak dapat menghapus %1$s sepenuhnya + Proton eksperimental terinstal. Pilih di Steam → Properti → Kompatibilitas. Instalasi %1$s gagal (keluar %2$d) Tidak dapat menginstal %1$s Mengambil paket droiddeck-esync diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6aad28b977..207e3a5756 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2319,6 +2319,18 @@ Checksum non corrispondente; il download è stato eliminato È 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 + 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 + Impossibile rimuovere completamente %1$s + Proton sperimentale installato. Selezionalo in Steam → Proprietà → Compatibilità. Installazione di %1$s non riuscita (uscita %2$d) Impossibile installare %1$s Recupero del pacchetto droiddeck-esync diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index fa800884aa..0e0a721ead 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2277,6 +2277,18 @@ チェックサムが一致しないため、ダウンロードを削除しました ダウンロード中にセッションが開始されました。停止してから互換性ツールをインストールしてください %1$sをインストール中 + 試験版ビルド + Protonビルドの.zipを選択 + .zipからインストール + このProtonビルド用の空き容量が足りません + 解凍中 + Protonを展開中(数分かかります) + .zipにProtonのtarballが含まれていません + 展開に失敗しました(tar %1$d) + アーカイブにProtonビルドが含まれていません + Protonビルドを配置できませんでした + %1$sを完全に削除できませんでした + 試験版Protonをインストールしました。Steam → プロパティ → 互換性 で選択してください。 %1$sのインストールに失敗しました(終了コード %2$d) %1$sをインストールできませんでした droiddeck-esyncパックを取得中 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 49c59c7fe4..281827cb45 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2277,6 +2277,18 @@ 체크섬이 일치하지 않아 다운로드를 삭제했습니다 다운로드 중에 세션이 시작되었습니다. 호환성 도구를 설치하기 전에 세션을 중지하세요 %1$s 설치 중 + 실험용 빌드 + Proton 빌드 .zip 선택 + .zip에서 설치 + 이 Proton 빌드를 설치할 여유 공간이 부족합니다 + 압축 해제 중 + Proton 풀는 중 (몇 분 소요) + .zip에 Proton tar 파일이 없습니다 + 압축 풀기 실패 (tar %1$d) + 아카이브에 Proton 빌드가 없습니다 + Proton 빌드를 배치할 수 없습니다 + %1$s을(를) 완전히 제거할 수 없습니다 + 실험용 Proton이 설치되었습니다. Steam → 속성 → 호환성에서 선택하세요. %1$s 설치 실패(종료 코드 %2$d) %1$s을(를) 설치할 수 없습니다 droiddeck-esync 팩 받는 중 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 20c5977e38..a1b1f06c61 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2277,6 +2277,18 @@ Checksum tidak sepadan; muat turun telah dipadam Sesi dimulakan semasa muat turun; hentikan dahulu sebelum memasang alat keserasian Memasang %1$s + Binaan eksperimen + Pilih .zip binaan Proton + Pasang daripada .zip + 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 + Tidak dapat mengalih keluar %1$s sepenuhnya + Proton eksperimen telah dipasang. Pilihnya di Steam → Sifat → Keserasian. Pemasangan %1$s gagal (keluar %2$d) Tidak dapat memasang %1$s Mengambil pek droiddeck-esync diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 5350381287..071642efc6 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2302,6 +2302,18 @@ Sjekksummen stemmer ikke; nedlastingen ble slettet 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 + 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 + Kunne ikke fjerne %1$s helt + Eksperimentell Proton er installert. Velg den i Steam → Egenskaper → Kompatibilitet. Installasjonen av %1$s mislyktes (avslutningskode %2$d) Kunne ikke installere %1$s Henter droiddeck-esync-pakke diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index ed67b367e6..ca7a52268f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2302,6 +2302,18 @@ Checksum komt niet overeen; de download is verwijderd 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 + 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 + Kan %1$s niet volledig verwijderen + Experimentele Proton geïnstalleerd. Kies het in Steam → Eigenschappen → Compatibiliteit. Installeren van %1$s is mislukt (afsluitcode %2$d) Kan %1$s niet installeren Pakket droiddeck-esync ophalen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 2ac1cbfbfa..37feb93f86 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2354,6 +2354,18 @@ Niezgodna suma kontrolna; pobrany plik usunięto 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 + 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 + Nie udało się całkowicie usunąć %1$s + Eksperymentalny Proton został zainstalowany. Wybierz go w Steam → Właściwości → Zgodność. Instalacja %1$s nie powiodła się (kod %2$d) Nie udało się zainstalować %1$s Pobieranie pakietu droiddeck-esync diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 54cca5da98..d9911b434e 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2319,6 +2319,18 @@ A soma de verificação não corresponde; a transferência foi eliminada 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 + 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 + Não foi possível remover totalmente %1$s + Proton experimental instalado. Escolha-o em Steam → Propriedades → Compatibilidade. Falha na instalação de %1$s (saída %2$d) Não foi possível instalar %1$s A obter o pacote droiddeck-esync diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 8116d22156..4358d50e82 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2327,6 +2327,18 @@ A soma de verificação não confere; o download foi excluído 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 + 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 + Não foi possível remover totalmente o %1$s + Proton experimental instalado. Escolha-o em Steam → Propriedades → Compatibilidade. Falha na instalação do %1$s (código de saída %2$d) Não foi possível instalar o %1$s Buscando o pacote droiddeck-esync diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 9315e8d9fb..1d3ded24e2 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2328,6 +2328,18 @@ Sumă de control incorectă; descărcarea a fost ștearsă 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 + 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ă + %1$s nu a putut fi eliminat complet + Proton experimental a fost instalat. Selectează-l în Steam → Proprietăți → Compatibilitate. Instalarea %1$s a eșuat (cod de ieșire %2$d) %1$s nu a putut fi instalat Se obține pachetul droiddeck-esync diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index b4105decd9..2dbd904979 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2354,6 +2354,18 @@ Контрольная сумма не совпадает; загруженный файл удален Во время загрузки запустилась сессия; остановите ее перед установкой инструментов совместимости Установка %1$s + Экспериментальные сборки + Выберите .zip со сборкой Proton + Установить из .zip + Недостаточно свободного места для этой сборки Proton + Распаковка архива + Распаковка Proton (несколько минут) + В .zip нет архива tar с Proton + Не удалось распаковать (tar %1$d) + В архиве нет сборки Proton + Не удалось разместить сборку Proton + Не удалось полностью удалить %1$s + Экспериментальная сборка Proton установлена. Выберите её в Steam → Свойства → Совместимость. Ошибка установки %1$s (код выхода %2$d) Не удалось установить %1$s Загрузка пакета droiddeck-esync diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index ed197424fe..697b794933 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2302,6 +2302,18 @@ Kontrollsumman stämmer inte. Nedladdningen togs bort 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 + 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 + Det gick inte att ta bort %1$s helt + Experimentell Proton installerad. Välj den i Steam → Egenskaper → Kompatibilitet. Installationen av %1$s misslyckades (avslutningskod %2$d) Kunde inte installera %1$s Hämtar droiddeck-esync-paket diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 97e4ae05ca..eb9201563f 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2277,6 +2277,18 @@ ค่าตรวจสอบไม่ตรงกัน การดาวน์โหลดถูกลบแล้ว มีเซสชันเริ่มขึ้นระหว่างการดาวน์โหลด หยุดเซสชันก่อนติดตั้งเครื่องมือความเข้ากันได้ กำลังติดตั้ง %1$s + บิลด์ทดลอง + เลือกไฟล์ .zip ของบิลด์ Proton + ติดตั้งจากไฟล์ .zip + พื้นที่ว่างไม่เพียงพอสำหรับบิลด์ Proton นี้ + กำลังแตกไฟล์ zip + กำลังแตกไฟล์ Proton (ใช้เวลาไม่กี่นาที) + ไฟล์ .zip ไม่มี tarball ของ Proton + แตกไฟล์ไม่สำเร็จ (tar %1$d) + ไฟล์เก็บถาวรไม่มีบิลด์ Proton + ไม่สามารถวางบิลด์ Proton ได้ + ไม่สามารถลบ %1$s ออกให้หมดได้ + ติดตั้ง Proton รุ่นทดลองแล้ว เลือกได้ที่ Steam → คุณสมบัติ → ความเข้ากันได้ การติดตั้ง %1$s ล้มเหลว (ออกด้วยสถานะ %2$d) ไม่สามารถติดตั้ง %1$s ได้ กำลังดึงแพ็ก droiddeck-esync diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 5ee9d6ae24..0bdf537643 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2294,6 +2294,18 @@ Sağlama toplamı uyuşmuyor; indirme silindi İ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 + 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 + %1$s tamamen kaldırılamadı + Deneysel Proton yüklendi. Steam → Özellikler → Uyumluluk bölümünden seçin. %1$s yüklemesi başarısız oldu (çıkış %2$d) %1$s yüklenemedi droiddeck-esync paketi getiriliyor diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 20b12469d1..a3ae01f71d 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2354,6 +2354,18 @@ Контрольна сума не збіглася; завантаження видалено Під час завантаження розпочався сеанс; зупиніть його, перш ніж встановлювати інструменти сумісності Встановлення %1$s + Експериментальні збірки + Виберіть .zip зі збіркою Proton + Встановити з .zip + Недостатньо вільного місця для цієї збірки Proton + Розпакування архіву + Розпакування Proton (кілька хвилин) + У .zip немає архіву tar із Proton + Не вдалося розпакувати (tar %1$d) + В архіві немає збірки Proton + Не вдалося розмістити збірку Proton + Не вдалося повністю видалити %1$s + Експериментальну збірку Proton встановлено. Виберіть її в Steam → Властивості → Сумісність. Встановлення %1$s не вдалося (код виходу %2$d) Не вдалося встановити %1$s Отримання пакета droiddeck-esync diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 1e1dd18566..67403a00d1 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2277,6 +2277,18 @@ Checksum không khớp; tệp tải xuống đã bị xóa 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 + 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 + Không thể gỡ hoàn toàn %1$s + Đã cài Proton thử nghiệm. Hãy chọn nó trong Steam → Thuộc tính → Tương thích. Cài %1$s thất bại (mã thoát %2$d) Không thể cài %1$s Đang lấy pack droiddeck-esync diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 8b99d82853..2064b9df53 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2354,6 +2354,18 @@ 校验和不匹配;已删除下载的文件 下载期间有会话启动;请先停止它,再安装兼容性工具 正在安装 %1$s + 实验版本 + 选择 Proton 版本 .zip + 从 .zip 安装 + 可用空间不足,无法安装此 Proton 版本 + 正在解压 + 正在解包 Proton(需要几分钟) + .zip 中不含 Proton tar 包 + 解包失败(tar %1$d) + 压缩包中不含 Proton 版本 + 无法放置 Proton 版本 + 无法完全移除 %1$s + 实验版 Proton 已安装。请在 Steam → 属性 → 兼容性 中选择。 %1$s 安装失败(退出代码 %2$d) 无法安装 %1$s 正在获取 droiddeck-esync 包 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index bfe3e076fa..d1fd71fc10 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2276,6 +2276,18 @@ 校驗和不符;已刪除下載的檔案 下載期間有會話啟動;請先停止該會話,再安裝兼容性工具 正在安裝 %1$s + 實驗版本 + 選擇 Proton 版本 .zip + 從 .zip 安裝 + 可用空間不足,無法安裝此 Proton 版本 + 正在解壓縮 + 正在解包 Proton(需要幾分鐘) + .zip 中不含 Proton tar 包 + 解包失敗(tar %1$d) + 壓縮檔中不含 Proton 版本 + 無法放置 Proton 版本 + 無法完全移除 %1$s + 實驗版 Proton 已安裝。請在 Steam → 內容 → 相容性 中選擇。 %1$s 安裝失敗(結束代碼 %2$d) 無法安裝 %1$s 正在下載 droiddeck-esync 套件 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 1a1c502bd3..6c4037861c 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2276,6 +2276,18 @@ 校驗碼不符;已刪除下載內容 下載期間有工作階段啟動;請先停止它,再安裝相容性工具 正在安裝 %1$s + 實驗版本 + 選擇 Proton 版本 .zip + 從 .zip 安裝 + 可用空間不足,無法安裝此 Proton 版本 + 正在解壓縮 + 正在解包 Proton(需要幾分鐘) + .zip 中不含 Proton tar 包 + 解包失敗(tar %1$d) + 壓縮檔中不含 Proton 版本 + 無法放置 Proton 版本 + 無法完全移除 %1$s + 實驗版 Proton 已安裝。請在 Steam → 內容 → 相容性 中選擇。 %1$s 安裝失敗(結束代碼 %2$d) 無法安裝 %1$s 正在取得 droiddeck-esync 套件 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 14bfd4d601..d61f0ad01b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2530,6 +2530,18 @@ Checksum mismatch; the download was deleted 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 + 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 + Could not fully remove %1$s + Experimental Proton installed. Pick it in Steam → Properties → Compatibility. %1$s installation failed (exit %2$d) Could not install %1$s Fetching droiddeck-esync pack diff --git a/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt new file mode 100644 index 0000000000..1972a06310 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt @@ -0,0 +1,155 @@ +package com.droiddeck.launcher.session + +import java.io.File +import java.nio.file.Files +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class ExperimentalProtonsTest { + @get:Rule val temp = TemporaryFolder() + + @Test + fun namesNeverCollideWithReleasedBuilds() { + val name = ExperimentalProtons.dirName("DroidDeck-Proton-11-12.8-aarch64", "pr34-build") + assertEquals("Experimental-DroidDeck-Proton-11-12.8-aarch64-pr34-build", name) + assertFalse(name.startsWith("DroidDeck-Proton")) + assertEquals("Experimental-DroidDeck-Proton-11-12.8-aarch64", + ExperimentalProtons.dirName("DroidDeck-Proton-11-12.8-aarch64", "DroidDeck-Proton-11-12.8-aarch64")) + } + + @Test + fun buildTreeSkipsLinksOutOfTheArchive() { + val outside = protonTree(temp.newFolder("installed")) + val unpacked = temp.newFolder("unpacked") + Files.createSymbolicLink(File(unpacked, "a-link").toPath(), outside.toPath()) + assertNull(ExperimentalProtons.buildTree(unpacked)) + val real = protonTree(File(unpacked, "b-build")) + assertEquals(real.canonicalFile, ExperimentalProtons.buildTree(unpacked)?.canonicalFile) + } + + @Test + fun buildTreeNeedsWhatTheCatalogNeeds() { + val unpacked = temp.newFolder("unpacked") + val tree = File(unpacked, "build").apply { mkdirs(); File(this, "toolmanifest.vdf").writeText("x") } + assertNull(ExperimentalProtons.buildTree(unpacked)) + File(tree, "proton").writeText("x") + assertNull(ExperimentalProtons.buildTree(unpacked)) + File(tree, "files/lib/wine").mkdirs() + assertEquals(tree.canonicalFile, ExperimentalProtons.buildTree(unpacked)?.canonicalFile) + } + + private fun protonTree(dir: File): File = dir.apply { + File(this, "files/lib/wine").mkdirs() + File(this, "toolmanifest.vdf").writeText("x") + File(this, "proton").writeText("x") + } + + @Test + fun ownFileReplacesALinkWithoutTouchingItsTarget() { + val victim = temp.newFile("compatibilitytool.vdf").apply { writeText("released") } + val tree = temp.newFolder("tree") + Files.createSymbolicLink(File(tree, "compatibilitytool.vdf").toPath(), victim.toPath()) + ExperimentalProtons.ownFile(tree, "compatibilitytool.vdf").writeText("experimental") + assertEquals("released", victim.readText()) + assertFalse(Files.isSymbolicLink(File(tree, "compatibilitytool.vdf").toPath())) + } + + @Test + fun deleteTreeDoesNotFollowLinks() { + val kept = temp.newFolder("kept").apply { File(this, "file").writeText("x") } + val build = temp.newFolder("build") + Files.createSymbolicLink(File(build, "lib").toPath(), kept.toPath()) + assertTrue(ExperimentalProtons.deleteTree(build)) + assertFalse(build.exists()) + assertTrue(File(kept, "file").isFile) + } + + @Test + fun checksumFileWithoutADigestIsRejected() { + assertNull(ExperimentalProtons.checksumIn("not a checksum\n")) + val digest = "a".repeat(128) + assertEquals(digest, ExperimentalProtons.checksumIn("$digest DroidDeck-Proton.tar.gz\n")) + } + + @Test + fun checksumLookupDoesNotSelectTheTarball() { + assertNull(ExperimentalProtons.checksumEntry(listOf("Proton-sha512.tar.gz"), "Proton-sha512.tar.gz")) + assertEquals("Proton-sha512.tar.gz.sha512sum", ExperimentalProtons.checksumEntry( + listOf("Proton-sha512.tar.gz", "Proton-sha512.tar.gz.sha512sum"), "Proton-sha512.tar.gz")) + assertNull(ExperimentalProtons.checksumEntry(listOf("Proton.tar.gz"), "Proton.tar.gz")) + assertEquals("Proton.tar.gz.sha512sum", ExperimentalProtons.checksumEntry( + listOf("Proton-debug.tar.gz.sha512sum", "Proton.tar.gz.sha512sum"), "Proton.tar.gz")) + assertEquals("Proton.sha512sum", ExperimentalProtons.checksumEntry(listOf("Proton.sha512sum"), "Proton.tar.gz")) + assertNull(ExperimentalProtons.checksumEntry(listOf("Proton-debug.tar.gz.sha512sum"), "Proton.tar.gz")) + } + + private fun build(dir: File, marker: String): File = dir.apply { + mkdirs() + File(this, "marker").writeText(marker) + } + + @Test + fun failedPlacementRestoresTheExistingBuild() { + val tools = temp.newFolder("tools") + build(File(tools, "Experimental-A"), "old") + assertFalse(ExperimentalProtons.placeTree(File(tools, "missing"), tools, "Experimental-A") { true }) + assertEquals("old", File(tools, "Experimental-A/marker").readText()) + assertFalse(ExperimentalProtons.placeTree(build(File(tools, "staged"), "new"), tools, "Experimental-A") { false }) + assertEquals("old", File(tools, "Experimental-A/marker").readText()) + assertTrue(tools.walkTopDown().none { it.isFile && it.readText() == "new" }) + } + + @Test + fun aReplacedBuildIsForgottenWhileNeitherBuildIsInstalled() { + val tools = temp.newFolder("tools") + build(File(tools, "Experimental-A"), "old") + val forgotten = ArrayList() + assertTrue(ExperimentalProtons.placeTree(build(File(tools, "staged"), "new"), tools, "Experimental-A") { + assertFalse(File(tools, it).exists()) + forgotten.add(it) + }) + assertEquals(listOf("Experimental-A"), forgotten) + assertEquals("new", File(tools, "Experimental-A/marker").readText()) + assertTrue(ExperimentalProtons.placeTree(build(File(tools, "staged"), "first"), tools, "Experimental-B") { forgotten.add(it) }) + assertEquals(listOf("Experimental-A"), forgotten) + assertEquals(listOf("Experimental-A", "Experimental-B"), tools.walkTopDown().filter { it.name == "marker" }.map { it.parentFile.name }.sorted().toList()) + } + + @Test + fun anInterruptedReplacementIsFinishedWithItsOldStateForgotten() { + val tools = temp.newFolder("tools") + build(File(tools, "Experimental-A"), "old") + build(File(tools, ".droiddeck-experimental-new/Experimental-A"), "new") + build(File(tools, ".droiddeck-experimental-old/Experimental-B"), "old") + build(File(tools, ".droiddeck-experimental-new/Experimental-B"), "new") + build(File(tools, ".droiddeck-experimental-old/Experimental-C"), "old") + build(File(tools, ".droiddeck-experimental-old/Experimental-D"), "old") + build(File(tools, "Experimental-D"), "new") + val forgotten = ArrayList() + ExperimentalProtons.restoreInterrupted(tools) { forgotten.add(it) } + assertEquals(listOf("Experimental-A", "Experimental-B"), forgotten.sorted()) + assertEquals(listOf("new", "new", "old", "new"), listOf("A", "B", "C", "D").map { File(tools, "Experimental-$it/marker").readText() }) + assertTrue(File(tools, ".droiddeck-experimental-old").listFiles().isNullOrEmpty()) + assertTrue(File(tools, ".droiddeck-experimental-new").listFiles().isNullOrEmpty()) + } + + @Test + fun anInterruptedReplacementKeepsTheOldBuildWhenItsStateCannotBeForgotten() { + val tools = temp.newFolder("tools") + build(File(tools, ".droiddeck-experimental-old/Experimental-A"), "old") + build(File(tools, ".droiddeck-experimental-new/Experimental-A"), "new") + ExperimentalProtons.restoreInterrupted(tools) { false } + assertEquals("old", File(tools, "Experimental-A/marker").readText()) + assertTrue(File(tools, ".droiddeck-experimental-new").listFiles().isNullOrEmpty()) + } +} 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 5f3f3891fc..15e0280a76 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt @@ -222,8 +222,25 @@ class ProtonExtrasTest { assertFalse(state.getJSONObject("active").has("GE-Proton11-7")) assertFalse(state.getJSONObject("queued").has("GE-Proton11-7")) assertTrue(state.getJSONObject("active").has("GE-Proton11-8")) - ComponentsManager.forgetProton(context, kept.name) + assertTrue(ComponentsManager.forgetProton(context, kept.name)) assertTrue(File(originals, "GE-Proton11-8/GE-Proton11-8/dxvk.wcp").isFile) + val published = File(LinuxRuntime.rootDir(context), "root/.local/share/droiddeck-components/desired.tsv") + published.appendText("*\tExperimental-Gone\t11\tdxvk\tfiles/lib/wine/dxvk/x86_64-windows/dxgi.dll\t-\t-\n") + File(originals, "Experimental-Gone/11/dxvk.wcp").apply { parentFile?.mkdirs(); writeText("x") } + assertTrue(ComponentsManager.forgetProton(context, "Experimental-Gone")) + assertFalse(published.readLines().any { "Experimental-Gone" in it }) + assertFalse(File(originals, "Experimental-Gone").exists()) + + val store = File(LinuxRuntime.rootDir(context), "root/.local/share/droiddeck-components/store") + File(originals, "Experimental-Stale/11/dxvk.wcp").apply { parentFile?.mkdirs(); writeText("x") } + val stale = File(store, "original-Experimental-Stale-11-dxvk").apply { mkdirs(); File(this, ".complete").writeText("1\n") } + val other = File(store, "original-Experimental-Stale-2-11-dxvk").apply { mkdirs(); File(this, ".complete").writeText("1\n") } + File(originals, "Experimental-Stale/2-11/dxvk.wcp").apply { parentFile?.mkdirs(); writeText("x") } + published.appendText("*\tExperimental-Stale-2\t11\tdxvk\tfiles/a.dll\t0\t/root/.local/share/droiddeck-components/store/${other.name}/files/a.dll\n") + assertTrue(ComponentsManager.forgetProton(context, "Experimental-Stale")) + assertFalse(stale.exists()) + assertTrue(File(other, ".complete").isFile) + assertFalse(File(originals, "Experimental-Stale").exists()) } @Test diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index 4ad361e4e3..c8ac2ceb30 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -1089,9 +1089,10 @@ NATIVE_CHOICE = object() def plan_mapping(current, installed, runnable, default, auto, native=None, picks=(), overrides=None, managed=None, - native_choices=(), tools=None): + native_choices=(), tools=None, removed=()): tools = tools or {} runnable = {n.lower() for n in runnable} + removed = {n.lower() for n in removed} - runnable installed = set(installed) picks = set(picks) | {app for app, platforms in tools.items() if "linux" not in platforms} native = native or {} @@ -1121,7 +1122,7 @@ def plan_mapping(current, installed, runnable, default, auto, native=None, picks target = native.get(app, default) if not name and (app in native_choices or (app in current and app in FEX_DEFAULT_APPS)): target = NATIVE_CHOICE - stale = unrunnable(name, runnable) + stale = unrunnable(name, runnable) or name.lower() in removed if name and not stale and (mine is None or name != mine): continue if target is NATIVE_CHOICE: @@ -1163,6 +1164,26 @@ def followers(state, current): return {app: name for app, name in current.items() if app != "0" and name == TOOL} +REPLACING = ".droiddeck-experimental-old" + + +def removed_tools(state, catalog, directory=None): + known = state.get("tools") if isinstance(state.get("tools"), list) else () + previous = {t.get("name") for t in known if isinstance(t, dict) and not t.get("valve") and t.get("name")} + removed = previous - {t["name"] for t in catalog} + if directory is None: + return removed + known_dirs = {t.get("name"): t.get("dir") for t in known if isinstance(t, dict)} + return {name for name in removed if isinstance(known_dirs.get(name), str) and + not os.path.lexists(os.path.join(directory, known_dirs[name])) and + not os.path.lexists(os.path.join(directory, REPLACING, known_dirs[name]))} + + +def removed_dirs(state, removed): + known = state.get("tools") if isinstance(state.get("tools"), list) else () + return {t["dir"] for t in known if isinstance(t, dict) and not t.get("valve") and t.get("name") in removed and isinstance(t.get("dir"), str)} - {""} + + def tool_entry(name, display, path, valve): return {"name": name, "display": display, "dir": os.path.basename(path) if path else "", "valve": valve} @@ -1248,15 +1269,19 @@ def valid_game_request(app, request): request["dir"] != "" and isinstance(request.get("valve"), bool))) -def settle_game_requests(requests, state, current, catalog, missing_is_cleared=False): +def settle_game_requests(requests, state, current, catalog, missing_is_cleared=False, removed=()): recorded = state.get("games_applied") if isinstance(recorded, dict): applied = dict(recorded) else: applied = dict(requests) if "tools" in state else {} by_name = {t["name"]: t for t in catalog} + gone = removed_dirs(state, removed) out = dict(requests) for app, request in requests.items(): + if isinstance(request, dict) and request.get("valve") is False and isinstance(request.get("dir"), str) and request["dir"] in gone: + del out[app] + continue if not valid_game_request(app, request) or app not in applied or applied[app] != request: continue if request is None: @@ -1281,10 +1306,10 @@ def settle_game_requests(requests, state, current, catalog, missing_is_cleared=F return out, out != requests -def settled_game_requests(state, current, catalog, missing_is_cleared=False, directory=None): +def settled_game_requests(state, current, catalog, missing_is_cleared=False, directory=None, removed=()): for _ in range(2): requests, text = read_game_requests(directory) - settled, moved = settle_game_requests(requests, state, current, catalog, missing_is_cleared) + settled, moved = settle_game_requests(requests, state, current, catalog, missing_is_cleared, removed) if not moved or write_game_requests(settled, text, directory): return settled return None @@ -1579,7 +1604,8 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non set_mappings(tokens, mapping, moved) current.update(moved) steam_root = os.path.dirname(os.path.dirname(os.path.abspath(config_path))) - requests = settled_game_requests(state, current, catalog, not steam_running(), directory) + removed = removed_tools(state, catalog, os.path.join(steam_root, "compatibilitytools.d")) + requests = settled_game_requests(state, current, catalog, not steam_running(), directory, removed) overrides = requested_games(requests or {}, catalog) managed = state.get("auto", {}).keys() if isinstance(state.get("auto"), dict) else () native_choices = state.get("native_choices", ()) @@ -1590,7 +1616,7 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non current.setdefault(app, "") changes, auto = plan_mapping( current, apps, names, default, followers(state, current), native, picks, - overrides, managed, native_choices, tool_platforms(steam_root)) + overrides, managed, native_choices, tool_platforms(steam_root), removed) set_mappings(tokens, mapping, changes) text = serialize(tokens) if text != serialize(tokenize(original)): diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index fbc7bdc026..898bd3a22a 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -2254,6 +2254,87 @@ class ProtonDefaultTest(unittest.TestCase): self.assertEqual(changes, {"0": "GE-Proton11-7", "10": "GE-Proton11-7", "11": "GE-Proton11-7", "14": "GE-Proton11-7"}) self.assertEqual(auto, {"10": "GE-Proton11-7", "11": "GE-Proton11-7", "14": "GE-Proton11-7"}) + def test_games_on_a_removed_custom_proton_go_back_to_the_default(self): + changes, auto = COMPAT["plan_mapping"]( + {"0": self.TOOL, "311210": "bo3fix-proton", "42": "GE-Proton11-7"}, ["311210", "42"], self.NAMES, self.TOOL, {}, + removed={"bo3fix-proton"}) + self.assertEqual(changes, {"311210": self.TOOL}) + self.assertEqual(auto, {"311210": self.TOOL}) + + def test_removed_tools_are_custom_builds_missing_from_the_catalog(self): + state = {"tools": [ + {"name": self.TOOL, "valve": True}, + {"name": "bo3fix-proton", "valve": False}, + {"name": "GE-Proton11-7", "valve": False}, + ]} + self.assertEqual(COMPAT["removed_tools"](state, self.CATALOG), {"bo3fix-proton"}) + self.assertEqual(COMPAT["removed_tools"]({}, self.CATALOG), set()) + + def test_a_failed_extra_adoption_is_not_classified_as_removed(self): + with tempfile.TemporaryDirectory() as tmp: + tools = Path(tmp) / "compatibilitytools.d" + tools.mkdir() + state = {"tools": [{"name": "GE-Proton11-7", "dir": "GE-Proton11-7", "valve": False}]} + (tools / "GE-Proton11-7").mkdir() + catalog = [tool for tool in self.CATALOG if tool["name"] != "GE-Proton11-7"] + self.assertEqual(COMPAT["removed_tools"](state, catalog, str(tools)), set()) + (tools / "GE-Proton11-7").rmdir() + self.assertEqual(COMPAT["removed_tools"](state, catalog, str(tools)), {"GE-Proton11-7"}) + + def test_a_build_being_replaced_is_not_classified_as_removed(self): + with tempfile.TemporaryDirectory() as tmp: + tools = Path(tmp) / "compatibilitytools.d" + state = {"tools": [{"name": "GE-Proton11-7", "dir": "GE-Proton11-7", "valve": False}]} + catalog = [tool for tool in self.CATALOG if tool["name"] != "GE-Proton11-7"] + aside = tools / COMPAT["REPLACING"] / "GE-Proton11-7" + aside.mkdir(parents=True) + self.assertEqual(COMPAT["removed_tools"](state, catalog, str(tools)), set()) + aside.rmdir() + self.assertEqual(COMPAT["removed_tools"](state, catalog, str(tools)), {"GE-Proton11-7"}) + + def test_a_request_for_a_removed_tool_is_dropped_and_others_are_kept(self): + state = {"tools": self.CATALOG, "games_applied": {}} + requests = {"10": {"valve": False, "dir": "GE-Proton11-7"}, "11": {"valve": False, "dir": "Never-Installed"}, + "12": {"valve": True, "dir": "GE-Proton11-7"}} + catalog = [tool for tool in self.CATALOG if tool["name"] != "GE-Proton11-7"] + settled, moved = COMPAT["settle_game_requests"](requests, state, {}, catalog, removed={"GE-Proton11-7"}) + self.assertTrue(moved) + self.assertEqual(settled, {"11": requests["11"], "12": requests["12"]}) + self.assertEqual(COMPAT["settle_game_requests"](requests, state, {}, catalog), (requests, False)) + malformed = {"10": {"valve": False, "dir": []}} + self.assertEqual(COMPAT["settle_game_requests"](malformed, state, {}, catalog, removed={"GE-Proton11-7"}), (malformed, False)) + + def test_a_game_on_a_removed_tool_follows_the_default_across_registrations(self): + with tempfile.TemporaryDirectory() as tmp: + config = Path(tmp) / "config.vdf" + config.write_text(config_text([("0", self.TOOL), ("10", "GE-Proton11-7"), ("11", "GE-Proton11-7")])) + request = {"valve": False, "dir": "GE-Proton11-7"} + available = [tool for tool in self.CATALOG if tool["name"] != "GE-Proton11-7"] + (Path(tmp) / "games.json").write_text(json.dumps({"version": 1, "games": {"10": request}})) + (Path(tmp) / "state.json").write_text(json.dumps({ + "default": self.TOOL, + "tools": self.CATALOG, + })) + for default in (self.TOOL, self.TOOL, COMPAT["TOOL_11"]): + COMPAT["register_default"]( + str(config), ["10", "11"], default=default, catalog=available, + directory=tmp, + ) + self.assertEqual(mapping_of(config.read_text()), + {"0": COMPAT["TOOL_11"], "10": COMPAT["TOOL_11"], "11": COMPAT["TOOL_11"]}) + self.assertEqual(json.loads((Path(tmp) / "games.json").read_text())["games"], {}) + + def test_a_steam_pick_survives_the_removal_of_another_tool(self): + with tempfile.TemporaryDirectory() as tmp: + config = Path(tmp) / "config.vdf" + config.write_text(config_text([("0", self.TOOL), ("10", COMPAT["TOOL_11"])])) + available = [tool for tool in self.CATALOG if tool["name"] != "GE-Proton11-7"] + (Path(tmp) / "games.json").write_text(json.dumps( + {"version": 1, "games": {"10": {"valve": False, "dir": "GE-Proton11-7"}}})) + (Path(tmp) / "state.json").write_text(json.dumps({"default": self.TOOL, "tools": self.CATALOG, "auto": {}})) + COMPAT["register_default"](str(config), ["10"], default=self.TOOL, catalog=available, directory=tmp) + self.assertEqual(mapping_of(config.read_text()), {"0": self.TOOL, "10": COMPAT["TOOL_11"]}) + def test_windows_only_titles_still_follow_the_default(self): changes, auto = COMPAT["plan_mapping"]( {"0": self.TOOL}, ["42"], self.NAMES, self.TOOL, {}) @@ -2597,6 +2678,41 @@ class ProtonDefaultTest(unittest.TestCase): "11": COMPAT["TOOL_11"], }) + def test_per_game_proton_that_was_removed_goes_back_to_the_default(self): + with tempfile.TemporaryDirectory() as tmp: + config = Path(tmp) / "config.vdf" + config.write_text(config_text([ + ("0", self.TOOL), + ("10", "Experimental-DroidDeck-Proton-11-12.8-pr34-build"), + ("12", "GE-Proton9-1"), + ])) + (Path(tmp) / "games.json").write_text(json.dumps({ + "version": 1, + "games": { + "10": {"valve": False, "dir": "Experimental-DroidDeck-Proton-11-12.8-pr34-build"}, + "12": {"valve": False, "dir": "GE-Proton9-1"}, + }, + })) + (Path(tmp) / "state.json").write_text(json.dumps({ + "default": self.TOOL, + "tools": self.CATALOG + [{ + "name": "Experimental-DroidDeck-Proton-11-12.8-pr34-build", + "display": "Experimental-DroidDeck-Proton-11-12.8-pr34-build", + "dir": "Experimental-DroidDeck-Proton-11-12.8-pr34-build", "valve": False, + }], + })) + + COMPAT["register_default"]( + str(config), ["10", "12"], default=self.TOOL, + catalog=self.CATALOG, directory=tmp, + ) + + self.assertEqual(mapping_of(config.read_text()), { + "0": self.TOOL, + "10": self.TOOL, + "12": "GE-Proton9-1", + }) + def test_the_last_side_to_change_wins(self): state = {"default": self.TOOL, "applied": 5} default, state = COMPAT["choose_default"]("GE-Proton11-7", state, {"seq": 5, "dir": "Proton 11.0 (ARM64)", "valve": True}, self.CATALOG, now=100)