From b06c6cb4786e464f0772e3b5dad54f758b32adaf Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 27 Sep 2026 20:37:43 -0400 Subject: [PATCH] Add game file and Proton prefix shortcuts (#39) --- .../com/droiddeck/launcher/MainActivity.kt | 12 +++++- .../launcher/files/FileManagerActivity.kt | 8 +++- .../droiddeck/launcher/frontend/Library.kt | 38 ++++++++++++++++--- .../droiddeck/launcher/ui/FrontEndGames.kt | 25 ++++++++---- .../droiddeck/launcher/ui/FrontEndScreen.kt | 3 ++ 5 files changed, 71 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index fbdfb96700..71c68ab4a3 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -320,6 +320,10 @@ class MainActivity : ComponentActivity() { onPerformance = { refreshCores(); showProtons = false; showComponents = false; showMapping = false; showPerformance = true }, onRoms = { showRoms = true }, onFiles = { startActivity(Intent(this, com.droiddeck.launcher.files.FileManagerActivity::class.java)) }, + onBrowseFiles = { dir -> + startActivity(Intent(this, com.droiddeck.launcher.files.FileManagerActivity::class.java) + .putExtra(com.droiddeck.launcher.files.FileManagerActivity.EXTRA_START_DIR, dir.absolutePath)) + }, onLogs = { SessionPrefs.setLogsEnabled(this, !SessionPrefs.logsEnabled(this)) logsEnabled = SessionPrefs.logsEnabled(this) @@ -952,7 +956,13 @@ class MainActivity : ComponentActivity() { // The libraries, off the main thread: manifests and a folder scan. Thread({ val games = if (ready) Library.steamGames(this) + com.droiddeck.launcher.frontend.AddedGames.scan(this).map { g -> - com.droiddeck.launcher.frontend.AddedGameArt.resolve(this, g).let { art -> Library.SteamGame(g.appId.toInt(), g.name, art.portrait ?: art.header, "added", g.gameId, hero = art.hero ?: art.header) } + com.droiddeck.launcher.frontend.AddedGameArt.resolve(this, g).let { art -> + Library.SteamGame( + g.appId.toInt(), g.name, art.portrait ?: art.header, "added", g.gameId, + hero = art.hero ?: art.header, gameFiles = g.folder, + protonPrefix = Library.protonPrefix(this, g.appId), + ) + } } else emptyList() val emus = Library.emulators(this) { id -> DesktopCatalog.installed(this, id) != null } ui.post { steamGames = games; emulatorList = emus } diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt index 8a3c56bbaf..88c2462ed0 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt @@ -11,6 +11,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.ui.Modifier import com.droiddeck.launcher.ui.DroidDeckTheme +import java.io.File /** The File Manager as a screen of its own, from the Files tile on the main screen. */ class FileManagerActivity : ComponentActivity() { @@ -19,10 +20,11 @@ class FileManagerActivity : ComponentActivity() { if (checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { requestPermissions(arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), 1) } + val initialDir = intent.getStringExtra(EXTRA_START_DIR)?.let(::File) setContent { DroidDeckTheme { Surface(modifier = Modifier.fillMaxSize().systemBarsPadding(), color = MaterialTheme.colorScheme.background) { - FileManagerScreen() + FileManagerScreen(initialDir = initialDir) } } } @@ -32,4 +34,8 @@ class FileManagerActivity : ComponentActivity() { super.onRequestPermissionsResult(requestCode, permissions, grantResults) if (requestCode == 1 && grantResults.firstOrNull() == PackageManager.PERMISSION_GRANTED) recreate() } + + companion object { + const val EXTRA_START_DIR = "com.droiddeck.launcher.files.START_DIR" + } } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt index 273972ada7..29191c37eb 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -21,6 +21,7 @@ object Library { class SteamGame( val appId: Int, val name: String, val art: File?, val library: String, val gameId: Long = appId.toLong(), val hero: File? = null, val lastPlayed: Long = 0L, + val gameFiles: File? = null, val protonPrefix: File? = null, ) class Rom(val name: String, val hostPath: File, val guestPath: String, val emulatorId: String, val art: File? = null) class Emulator(val id: String, val name: String, val system: String, val program: String, val installed: Boolean, val games: List) { @@ -66,14 +67,31 @@ object Library { private val NAME = Regex("^\\s*\"name\"\\s*\"([^\"]*)\"", RegexOption.MULTILINE) private val STATE = Regex("^\\s*\"StateFlags\"\\s*\"(\\d+)\"", RegexOption.MULTILINE) private val LAST_PLAYED = Regex("^\\s*\"LastPlayed\"\\s*\"(\\d+)\"", RegexOption.MULTILINE) + private val INSTALL_DIR = Regex("^\\s*\"installdir\"\\s*\"([^\"]*)\"", RegexOption.MULTILINE) + + /** Steam's library roots visible to this launcher: its private default plus the selected library. */ + private fun steamLibraries(context: Context): List> { + val root = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam") + return listOfNotNull( + root to "internal", + GameStorage.effective(context)?.let { File(it.path) to it.label }, + ) + } + + /** Proton keeps each game's prefix below compatdata//pfx in a Steam library. */ + fun protonPrefix(context: Context, appId: Long, preferredLibrary: File? = null): File? { + val ids = listOf(appId.toString(), java.lang.Integer.toString(appId.toInt())).distinct() + val roots = (listOfNotNull(preferredLibrary) + steamLibraries(context).map { it.first }) + .distinctBy { runCatching { it.canonicalPath }.getOrDefault(it.absolutePath) } + return roots.asSequence() + .flatMap { root -> ids.asSequence().map { id -> File(root, "steamapps/compatdata/$id/pfx") } } + .firstOrNull { it.isDirectory } + } fun steamGames(context: Context): List { val root = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam") val cache = File(root, "appcache/librarycache") - val libraries = listOfNotNull( - root to "internal", - GameStorage.effective(context)?.let { File(it.path) to it.label }, - ) + val libraries = steamLibraries(context) val out = LinkedHashMap() for ((library, label) in libraries) { val steamapps = File(library, "steamapps") @@ -89,7 +107,17 @@ object Library { val art = steamCacheImage(cache, appId, STEAM_CAPSULES) val hero = steamCacheImage(cache, appId, STEAM_HEROES) val lastPlayed = LAST_PLAYED.find(text)?.groupValues?.get(1)?.toLongOrNull() ?: 0L - out[appId] = SteamGame(appId, name, art, label, hero = hero, lastPlayed = lastPlayed) + // App manifests are Valve KeyValues (VDF) files. installdir is one folder + // below steamapps/common; only expose it when the directory exists and the + // manifest value cannot escape that directory. + val installDir = INSTALL_DIR.find(text)?.groupValues?.get(1)?.trim() + ?.takeIf { it.isNotEmpty() && it != "." && it != ".." && '/' !in it && '\\' !in it } + val gameFiles = installDir?.let { File(steamapps, "common/$it").takeIf(File::isDirectory) } + out[appId] = SteamGame( + appId, name, art, label, hero = hero, lastPlayed = lastPlayed, + gameFiles = gameFiles, + protonPrefix = protonPrefix(context, appId.toLong(), library), + ) } } return out.values.toList() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt index f607c5c0ea..523ce958a1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt @@ -81,10 +81,7 @@ internal fun GamesPage(s: FrontEndState, a: FrontEndActions, selected: String, o Row(verticalAlignment = Alignment.Bottom) { GameHero(current, Modifier.weight(1f).heightIn(min = if (narrow) 190.dp else 250.dp)) { GameHeroCopy(current, if (narrow) 28.sp else 38.sp) - Actions { - PrimaryButton("Launch", enabled = !s.busy, main = true, icon = Icons.Filled.PlayArrow) { a.onSteamGame(current) } - BusyChip(s) - } + GameActions(current, s, a) } if (!narrow) Poster(current.art, current.name, Modifier.width(168.dp)) } @@ -105,10 +102,7 @@ internal fun GamesPage(s: FrontEndState, a: FrontEndActions, selected: String, o ) { GameHero(current, Modifier.fillMaxWidth().heightIn(min = if (narrow) 170.dp else 200.dp)) { GameHeroCopy(current, if (narrow) 24.sp else 32.sp) - Actions { - PrimaryButton("Launch", enabled = !s.busy, main = true, icon = Icons.Filled.PlayArrow) { a.onSteamGame(current) } - BusyChip(s) - } + GameActions(current, s, a) } SectionTitle("Launch settings", null) LaunchSettings(s, a, host) @@ -116,6 +110,21 @@ internal fun GamesPage(s: FrontEndState, a: FrontEndActions, selected: String, o } } + +@Composable +private fun GameActions(g: Library.SteamGame, s: FrontEndState, a: FrontEndActions) { + Actions { + PrimaryButton("Launch", enabled = !s.busy, main = true, icon = Icons.Filled.PlayArrow) { a.onSteamGame(g) } + g.gameFiles?.takeIf { it.isDirectory }?.let { dir -> + SecondaryButton("Game files", compact = true) { a.onBrowseFiles(dir) } + } + g.protonPrefix?.takeIf { it.isDirectory }?.let { dir -> + SecondaryButton("Proton prefix", compact = true) { a.onBrowseFiles(dir) } + } + BusyChip(s) + } +} + /** When it was last played (or where it is, if never) over its name, then room for Launch. */ @Composable private fun ColumnScope.GameHeroCopy(g: Library.SteamGame, titleSize: androidx.compose.ui.unit.TextUnit) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 307ae05b20..ee5153f0d9 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -1,5 +1,7 @@ package com.droiddeck.launcher.ui +import java.io.File + import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.ExperimentalComposeUiApi @@ -134,6 +136,7 @@ class FrontEndActions( val onPerformance: () -> Unit, val onRoms: () -> Unit, val onFiles: () -> Unit, + val onBrowseFiles: (File) -> Unit = {}, val onLogs: () -> Unit, val onShareLogs: () -> Unit = {}, val onOffline: () -> Unit,