From 473ac666b3ef461b5be0f0dc608a3f1052045b67 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 00:46:59 -0400 Subject: [PATCH] Take over Steam's Default startup movie pick --- .../droiddeck/launcher/session/BootMovie.kt | 12 ++++---- .../launcher/session/BootMovieLibrary.kt | 16 +++++++---- .../launcher/session/SessionFiles.kt | 6 ++-- .../launcher/session/BootMovieLibraryTest.kt | 28 +++++++++++++++++-- 4 files changed, 46 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt b/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt index 8267edd57a..953196900c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt @@ -51,7 +51,7 @@ object BootMovie { SessionPrefs.setBootMovieApplyNext(context, true) BootMovieReport.note(context, "picked $id here; Steam names ${SessionFiles.startupMoviePath(BootMovieLibrary.steamConfig(context))}") // Whatever Steam names right now is about to be replaced, so it is not a pick to adopt later. - SessionFiles.startupMoviePath(BootMovieLibrary.steamConfig(context))?.let { SessionPrefs.setBootMovieSteamSeen(context, it) } + SessionFiles.startupMovieLocalPath(BootMovieLibrary.steamConfig(context))?.let { SessionPrefs.setBootMovieSteamSeen(context, it) } } fun customName(context: Context): String? = @@ -167,10 +167,12 @@ object BootMovie { * that movie becomes the choice here. Steam already plays it, so nothing is staged over it. True when the choice changed. */ fun syncFromSteam(context: Context): Boolean { - val path = SessionFiles.startupMoviePath(BootMovieLibrary.steamConfig(context)) ?: return false - if (path == SessionPrefs.bootMovieSteamSeen(context)) return false - SessionPrefs.setBootMovieSteamSeen(context, path) - if (path == SessionFiles.BOOT_MOVIE_PATH) return false + val named = SessionFiles.startupMovieLocalPath(BootMovieLibrary.steamConfig(context)) ?: return false + val seen = SessionPrefs.bootMovieSteamSeen(context) + if (named == seen) return false + SessionPrefs.setBootMovieSteamSeen(context, named) + if (named == SessionFiles.BOOT_MOVIE_PATH || (named.isEmpty() && seen == null)) return false + val path = named.ifEmpty { "/movies/steam_os_startup.webm" } val prefix = "/uioverrides/movies/" // The list names a bought movie from the Steam folder (/config/communityitemscache/...), Steam's config from its config folder. val id = if (path.startsWith(prefix)) BootMovieLibrary.idOf(path.removePrefix(prefix)) else { diff --git a/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt b/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt index 7c125e8196..0dd7a0fadf 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt @@ -79,8 +79,9 @@ object BootMovieLibrary { return customMovieDirs(context).map { File(it, name) }.firstOrNull { it.isFile && it.length() > 0L } } - private fun isMovie(file: File) = file.isFile && file.length() > 0L && file.name.endsWith(".webm", ignoreCase = true) && - file.name !in STAGED && !file.name.startsWith(".") + private fun isMovie(file: File) = isWebm(file) && file.name !in STAGED + + private fun isWebm(file: File) = file.isFile && file.length() > 0L && file.name.endsWith(".webm", ignoreCase = true) && !file.name.startsWith(".") private fun readMeta(context: Context): JSONObject = runCatching { JSONObject(metaFile(context).readText()) }.getOrDefault(JSONObject()) @@ -136,7 +137,7 @@ object BootMovieLibrary { } val bought = HashMap() for (root in steamRoots(context)) { - File(root, "steamui/movies").listFiles { f -> isMovie(f) && f.nameWithoutExtension.lowercase() in NATIVE }.orEmpty() + File(root, "steamui/movies").listFiles { f -> isWebm(f) && f.nameWithoutExtension.lowercase() in NATIVE }.orEmpty() .sortedBy { it.name.lowercase() }.forEach { steam.putIfAbsent(STEAM_PREFIX + "/movies/" + it.name, it) } val scan = pointShopMovies(root) bought.putAll(scan.titles) @@ -144,8 +145,8 @@ object BootMovieLibrary { } val seen = HashSet() for ((id, file) in steam) { - if (file.name in STAGED || !seen.add(file.canonicalPath)) continue val native = file.nameWithoutExtension.lowercase() in NATIVE + if ((file.name in STAGED && !native) || !seen.add(file.canonicalPath)) continue // Steam names a bought movie by an item number and a hash; the points shop's own title is shown when Steam has it. val title = if (native) NATIVE[file.nameWithoutExtension.lowercase()] ?: file.nameWithoutExtension else bought[file.path] ?: boughtId(file)?.let { "#$it" } ?: file.nameWithoutExtension out.add(Entry(id, title, if (native) SOURCE_STEAM else SOURCE_POINTSHOP, file, removable = false)) @@ -153,8 +154,11 @@ object BootMovieLibrary { return out } - /** The three startup movies Steam ships with; Steam's movies folder holds many more videos that are not startup movies. */ - private val NATIVE = mapOf("deck_startup" to "Deck startup", "oled_startup" to "Oled startup", "startup_machine" to "Machine startup") + /** The four startup movies Steam ships with; Steam's movies folder holds many more videos that are not startup movies. */ + private val NATIVE = mapOf( + "deck_startup" to "Deck startup", "oled_startup" to "Oled startup", "startup_machine" to "Machine startup", + "steam_os_startup" to "SteamOS startup", + ) private val skippedFolders = setOf("uioverrides", "steamapps", "librarycache", "httpcache", "logs", "compatdata", "shadercache") diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt index 4824a44424..8cd846513d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -390,10 +390,12 @@ object SessionFiles { private fun activeStartupMovie(text: String): VdfBlock? = customizationMovie(text) ?: olderMovie(text) /** The movie Steam's config selects, as a path like `/uioverrides/movies/x.webm`; null when none is named. */ - internal fun startupMoviePath(config: File): String? { + internal fun startupMoviePath(config: File): String? = startupMovieLocalPath(config)?.takeIf { it.isNotEmpty() } + + internal fun startupMovieLocalPath(config: File): String? { val text = runCatching { config.readText() }.getOrNull() ?: return null val movie = activeStartupMovie(text) ?: return null - return scalar(text.substring(movie.keyStart, movie.close + 1), "LocalPath")?.takeIf { it.isNotEmpty() } + return scalar(text.substring(movie.keyStart, movie.close + 1), "LocalPath") } /** Both `StartupMovie` sections of Steam's config as written there, for the report; null when there is none. */ diff --git a/app/src/test/java/com/droiddeck/launcher/session/BootMovieLibraryTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BootMovieLibraryTest.kt index ca68f58678..2c1d90ca0c 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/BootMovieLibraryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/BootMovieLibraryTest.kt @@ -178,17 +178,39 @@ class BootMovieLibraryTest { assertNull(SessionFiles.startupMoviePath(BootMovieLibrary.steamConfig(app))) } - @Test fun onlyTheThreeStartupMoviesOfSteamAreListed() { - listOf("deck_startup", "oled_startup", "startup_machine", "controller_generic_thumbstick_move").forEach { + @Test fun onlyTheStartupMoviesOfSteamAreListed() { + listOf("deck_startup", "oled_startup", "startup_machine", "steam_os_startup", "controller_generic_thumbstick_move").forEach { File(BootMovieLibrary.steamRoot(app), "steamui/movies/$it.webm").also { f -> f.parentFile!!.mkdirs(); f.writeText("movie") } } val ids = BootMovieLibrary.list(app).map { it.id }.filter { it.startsWith("steam:") } assertEquals( - listOf("steam:/movies/deck_startup.webm", "steam:/movies/oled_startup.webm", "steam:/movies/startup_machine.webm"), + listOf( + "steam:/movies/deck_startup.webm", "steam:/movies/oled_startup.webm", "steam:/movies/startup_machine.webm", + "steam:/movies/steam_os_startup.webm", + ), ids.sorted(), ) } + @Test fun steamsDefaultPickIsTakenOverAsItsOwnStartupMovie() { + val native = File(BootMovieLibrary.steamRoot(app), "steamui/movies/steam_os_startup.webm").also { it.parentFile!!.mkdirs(); it.writeText("movie") } + movie("a.webm") + steamPicksAt(SessionFiles.BOOT_MOVIE_PATH) + BootMovie.select(app, "file:a.webm") + steamPicksAt("") + assertTrue(BootMovie.syncFromSteam(app)) + assertEquals("steam:/movies/steam_os_startup.webm", BootMovie.choice(app)) + assertEquals(native, BootMovie.currentFile(app)) + assertFalse(BootMovie.syncFromSteam(app)) + } + + @Test fun anEmptySteamPickThatWasNeverSeenChangesNothing() { + File(BootMovieLibrary.steamRoot(app), "steamui/movies/steam_os_startup.webm").also { it.parentFile!!.mkdirs(); it.writeText("movie") } + steamPicksAt("") + assertFalse(BootMovie.syncFromSteam(app)) + assertEquals(BootMovie.DROIDDECK_30, BootMovie.choice(app)) + } + @Test fun aMovieBoughtInThePointsShopIsListedAndAdopted() { val file = File(BootMovieLibrary.steamRoot(app), "appcache/startupmovies/Bought.webm").also { it.parentFile!!.mkdirs(); it.writeText("movie") } val entry = BootMovieLibrary.list(app).first { it.id == "steam:/appcache/startupmovies/Bought.webm" }