From b5f6122d49a29ee07f889ce05695e59e4d8af3d6 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Thu, 12 Nov 2026 16:03:41 -0500 Subject: [PATCH] Stop walking SD card libraries on every session start and game launch (#2533) * Stop searching whole libraries on every game launch and session start The install script search ran over every library whenever any game's manifest changed, and again on each launch. It now runs per game, only when that game's build changes, and a launch that names its scripts does no search at all. A store game's shortcut walked its install folder on every scan instead of reusing the ranking the scan keeps. * Search a library for install scripts after the session has started, not before * fix(session): keep deferred seeding off a running prefix and recheck old folder caches * test(session): bound the held library search in the deferred seeding test * fix(session): search a game again when its install script search failed --- .../droiddeck/launcher/frontend/AddedGames.kt | 2 +- .../droiddeck/launcher/runtime/BattleNet.kt | 2 +- .../launcher/runtime/BattleNetTest.kt | 14 +++ .../usr/local/bin/droiddeck-seed-redists | 79 ++++++++++-- .../overlay/usr/local/bin/droiddeck-session | 4 +- tools/tests/test_seed_redists.py | 118 ++++++++++++++++++ 6 files changed, 204 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt index c7d774bf2e..02edb1bcf8 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -97,7 +97,7 @@ object AddedGames { return File(LinuxRuntime.rootDir(context), guest.removePrefix("/")) } - fun candidates(folder: File): List = rank(folder).exes + fun candidates(folder: File, reuse: Boolean = false): List = rank(folder, reuse).exes fun rank(folder: File, reuse: Boolean = false): GameExePicker.Ranking { val key = "${folder.path}|${folder.lastModified()}" diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt index e1dd1fff21..eeab317afe 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt @@ -374,7 +374,7 @@ object BattleNet { val guestPrefix = added.guestPath(context, prefix(context)) ?: return null val crc = java.util.zip.CRC32().apply { update("\"$guestExe\"${game.name}".toByteArray()) }.value val appId = com.droiddeck.launcher.session.SessionPrefs.addedGameAppId(context, game.folder.path, crc or 0x80000000L) - val exe = added.candidates(game.folder).firstOrNull() ?: client + val exe = added.candidates(game.folder, reuse = true).firstOrNull() ?: client return com.droiddeck.launcher.frontend.AddedGames.Game( game.folder, game.name, exe, guestExe, guestDir, appId, (appId shl 32) or 0x02000000L, listOf(exe), source = com.droiddeck.launcher.stores.Store.BATTLENET.id, storeId = game.uid, diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt index c9a3fcb9e4..f74528c725 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt @@ -374,6 +374,20 @@ class BattleNetTest { } + @Test fun aScannedGamesShortcutReusesTheKeptRankingInsteadOfWalkingItsFolder() { + val added = com.droiddeck.launcher.frontend.AddedGames + val folder = File(BattleNet.prefix(context), "pfx/drive_c/Program Files (x86)/Kept Game").apply { mkdirs() } + File(folder, "Game.exe").writeBytes(byteArrayOf(0x4d, 0x5a)) + val kept = File(folder, "Other.exe").apply { writeBytes(byteArrayOf(0x4d, 0x5a)) } + com.droiddeck.launcher.frontend.AddedGamesCache(File(context.filesDir, com.droiddeck.launcher.frontend.AddedGamesCache.FILE)).apply { + keepRank(folder, com.droiddeck.launcher.frontend.GameExePicker.Ranking(listOf(kept), listOf(10), false)) + save() + } + added.scan(context) + assertEquals(kept, BattleNet.shortcut(context, BattleNet.Game("fenris", "Kept Game", "Fen", folder))!!.exe) + assertEquals("Game.exe", added.candidates(folder).first().name) + } + @Test fun aGamesShortcutHasBattleNetLaunchItInItsPrefix() { val folder = File(BattleNet.prefix(context), "pfx/drive_c/Program Files (x86)/Diablo IV").apply { mkdirs() } File(folder, "Diablo IV Launcher.exe").writeBytes(byteArrayOf(0x4d, 0x5a)) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists index babcb86d3d..d2d2809bd3 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists @@ -56,18 +56,75 @@ libraries="$steam_root" for library in $LIBRARIES; do libraries="$libraries $library"; done libraries=$(printf '%s\n%s\n' "$libraries" "$(sed -n 's/^[[:space:]]*"path"[[:space:]]*"\(.*\)"[[:space:]]*$/\1/p' "$steam_root/steamapps/libraryfolders.vdf" 2>/dev/null)" | awk 'NF && !seen[$0]++') -sig=$(while IFS= read -r library; do ls -l --time-style=+%s "$library"/steamapps/appmanifest_*.acf 2>/dev/null; done <<<"$libraries" | cksum) -if [ "$(head -n 1 "$cache" 2>/dev/null)" != "$sig" ]; then - { - printf '%s\n' "$sig" - while IFS= read -r library; do - [ -d "$library/steamapps/common" ] || continue - find "$library/steamapps/common" -mindepth 2 -maxdepth 5 -iname 'installscript*.vdf' \ - -not -path '*/Steamworks Shared/*' 2>/dev/null - done <<<"$libraries" | sort -u - } >"$cache.tmp" && mv -f "$cache.tmp" "$cache" +games=$(while IFS= read -r library; do + library="$library" awk ' + function flush() { if (dir != "") printf "%s|%s|%s|%s\t%s/steamapps/common/%s\n", file, build, updated, size, ENVIRON["library"], dir } + FNR == 1 { flush(); file = FILENAME; dir = build = updated = size = "" } + { + n = split($0, part, "\"") + for (i = 2; i + 2 <= n; i += 2) { + name = tolower(part[i]) + if (name == "installdir" && dir == "") dir = part[i + 2] + else if (name == "buildid" && build == "") build = part[i + 2] + else if (name == "lastupdated" && updated == "") updated = part[i + 2] + else if (name == "sizeondisk" && size == "") size = part[i + 2] + else continue + i += 2 + } + } + END { flush() } + ' "$library"/steamapps/appmanifest_*.acf 2>/dev/null +done <<<"$libraries") +legacy= +[ -s "$cache" ] && ! grep -q $'\t' "$cache" && legacy=$(tail -n +2 "$cache"; echo .) +declare -A scanned=() current=() +read_scanned() { + scanned=() + while IFS=$'\t' read -r key _; do + [ -n "$key" ] && scanned[$key]=1 + done < <(grep $'\t' "$cache" 2>/dev/null) +} +read_scanned +later= +fresh=() +while IFS=$'\t' read -r key dir; do + [ -n "$key" ] || continue + current[$key]=1 + [ -z "${scanned[$key]:-}" ] || continue + if [ -z "$legacy" ] && [ -n "${DROIDDECK_SEED_SCRIPTS:-}${DROIDDECK_SEED_LATER:-}" ]; then + [ -z "${DROIDDECK_SEED_LATER:-}" ] || later=1 + continue + fi + [ -d "$dir" ] || continue + scanned[$key]=1 + if [ -n "$legacy" ] && [ "$cache" -nt "${key%%|*}" ]; then + found=$(printf '%s\n' "${legacy%.}" | dir="$dir" awk 'index($0, ENVIRON["dir"] "/") == 1') + else + found=$(find "$dir" -mindepth 1 -maxdepth 4 -iname 'installscript*.vdf' \ + -not -path '*/Steamworks Shared/*' 2>/dev/null) || continue + found=$(printf '%s\n' "$found" | sort -u) + fi + fresh+=("$key" "$found") +done <<<"$games" +exec 9>"$cache.lock" && command -v flock >/dev/null 2>&1 && flock 9 +if [ ${#fresh[@]} -gt 0 ]; then + read_scanned + for ((i = 0; i < ${#fresh[@]}; i += 2)); do + [ -z "${scanned[${fresh[i]}]:-}" ] || continue + printf '%s\n' "${fresh[i + 1]}" | key="${fresh[i]}" awk '{ print ENVIRON["key"] "\t" $0 }' >>"$cache" + done fi -game_scripts() { { tail -n +2 "$cache" 2>/dev/null; printf '%s\n' "${DROIDDECK_SEED_SCRIPTS:-}"; } | sed '/^$/d' | tr '\n' '\0'; } +if [ -n "$later" ]; then + (DROIDDECK_SEED_LATER= DROIDDECK_SEED_SCRIPTS= DROIDDECK_SEED_DEFERRED=1 setsid "$0" "$steam_root" >/dev/null 2>&1 9>&- &) +fi +if [ -e "$cache" ]; then + keys=$(printf '%s\n' "${!current[@]}") awk -F'\t' ' + BEGIN { n = split(ENVIRON["keys"], key, "\n"); for (i = 1; i <= n; i++) want[key[i]] = 1 } + NF > 1 && ($1 in want) + ' "$cache" >"$cache.tmp" && { cmp -s "$cache.tmp" "$cache" && rm -f "$cache.tmp" || mv -f "$cache.tmp" "$cache"; } +fi +[ -z "${DROIDDECK_SEED_DEFERRED:-}" ] || ! pgrep -x wineserver >/dev/null 2>&1 || exit 0 +game_scripts() { { cut -s -f2- "$cache" 2>/dev/null; printf '%s\n' "${DROIDDECK_SEED_SCRIPTS:-}"; } | sed '/^$/d' | tr '\n' '\0'; } game_pairs=$(game_scripts | read_scripts) [ -n "$(printf '%s' "$game_pairs" | tr -d '[:space:]')" ] && pairs=$(printf '%s\n%s\n' "$pairs" "$game_pairs" | sort -u | sed '/^$/d') declare -A vulkan=() diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 9ec12398f4..8bb519db52 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -1190,7 +1190,7 @@ case $mode in step "adding the app's own games to the client's library" droiddeck-steam-shortcuts "$steam_root" "$BL_ADDED_GAMES" || true fi - droiddeck-seed-redists "$steam_root" || true + DROIDDECK_SEED_LATER=1 droiddeck-seed-redists "$steam_root" || true else _bl_x64_tool=$(droiddeck-steam-x64 --default-tool) if [ -n "$_bl_x64_tool" ]; then @@ -1204,7 +1204,7 @@ case $mode in if [ -z "${BL_DESKTOP:-}" ] && [ "${BL_STEAM_UI:-}" != desktop ]; then droiddeck-steam-ui-scale "$steam_root" "${BL_WIDTH:-1280}" "${BL_HEIGHT:-720}" || true fi - droiddeck-seed-redists "$steam_root" || true + DROIDDECK_SEED_LATER=1 droiddeck-seed-redists "$steam_root" || true fi if [ -n "${BL_SHADER_PRECACHE:-}" ]; then droiddeck-steam-shaders "$BL_SHADER_PRECACHE" "$XDG_DATA_HOME/Steam" \ diff --git a/tools/tests/test_seed_redists.py b/tools/tests/test_seed_redists.py index 1440b41b0f..f00dc1ae26 100644 --- a/tools/tests/test_seed_redists.py +++ b/tools/tests/test_seed_redists.py @@ -2,6 +2,7 @@ import os import shutil import subprocess import tempfile +import time import unittest from pathlib import Path @@ -128,6 +129,67 @@ class SeedRedistsTest(unittest.TestCase): self.run_seed(str(sd)) self.assertIn('"VCRedist2022"=dword:00000001', self.reg.read_text()) + def manifest(self, name, build): + path = self.steam / "steamapps/appmanifest_77.acf" + path.write_text('"AppState"\n{\n\t"installdir"\t\t"%s"\n\t"buildid"\t\t"%s"\n}\n' % (name, build)) + return path + + def test_a_game_is_searched_again_only_when_its_build_changes(self): + late = self.steam / "steamapps/common/Late Game/installscript.vdf" + late.parent.mkdir(parents=True) + manifest = self.manifest("Late Game", "1") + self.run_seed() + late.write_text(GAME_SCRIPT) + manifest.write_text(manifest.read_text() + "\n") + self.run_seed() + self.assertNotIn("VCRedist2022", self.reg.read_text()) + self.manifest("Late Game", "2") + self.run_seed() + self.assertIn('"VCRedist2022"=dword:00000001', self.reg.read_text()) + + def test_one_changed_game_leaves_the_other_games_unsearched(self): + other = self.game("Other Game").parent / "installscript_extra.vdf" + self.manifest("Late Game", "1") + self.run_seed() + other.write_text(GAME_SCRIPT.replace("VCRedist2022", "Unsearched")) + self.manifest("Late Game", "2") + self.run_seed() + self.assertNotIn("Unsearched", self.reg.read_text()) + + def test_a_call_that_names_its_scripts_does_not_search_the_libraries(self): + script = self.game() + named = self.tmp / "legacycompat/evaluatorscript_1.vdf" + named.parent.mkdir(parents=True) + named.write_text(GAME_SCRIPT.replace("VCRedist2022", "Named")) + env = dict(os.environ, DROIDDECK_LIBRARIES="", DROIDDECK_SEED_SCRIPTS=str(named)) + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, capture_output=True, text=True, check=True) + reg = self.reg.read_text() + self.assertIn('"Named"=dword:00000001', reg) + self.assertNotIn("VCRedist2022", reg) + self.run_seed() + self.assertIn('"VCRedist2022"=dword:00000001', self.reg.read_text()) + self.assertIn(str(script), (self.steam / ".droiddeck-game-scripts").read_text()) + + def test_a_removed_game_leaves_the_list(self): + script = self.game() + self.run_seed() + cache = self.steam / ".droiddeck-game-scripts" + self.assertIn(str(script), cache.read_text()) + for manifest in (self.steam / "steamapps").glob("appmanifest_*.acf"): + manifest.unlink() + self.run_seed() + self.assertEqual("", cache.read_text()) + + def test_a_list_from_an_earlier_version_is_taken_over_without_a_search(self): + script = self.steam / "steamapps/common/Old Game/a/b/c/d/e/installscript.vdf" + script.parent.mkdir(parents=True) + script.write_text(GAME_SCRIPT) + self.manifest("Old Game", "1") + (self.steam / ".droiddeck-game-scripts").write_text("123 456\n%s\n" % script) + self.run_seed() + self.assertIn('"VCRedist2022"=dword:00000001', self.reg.read_text()) + self.assertIn("\t%s\n" % script, (self.steam / ".droiddeck-game-scripts").read_text()) + def test_current_user_and_machine_markers_go_to_their_own_registries(self): self.game(script=GAME_SCRIPT + GAME_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER").replace("VCRedist2022", "UserRedist")) with self.reg.open("a") as out: @@ -398,6 +460,62 @@ class SeedRedistsTest(unittest.TestCase): self.assertEqual(self.reg.read_text().count('"Vulkan111080"'), 2) + def test_a_session_start_leaves_the_library_search_to_a_later_run(self): + self.game(script=GAME_SCRIPT.replace("Software\\\\Valve\\\\Steam\\\\Apps\\\\CommonRedist\\\\vcredist\\\\2022", "SOFTWARE\\\\AGEIA Technologies").replace("VCRedist2022", "PhysX Version")) + shim = self.tmp / "bin" + shim.mkdir() + go = self.tmp / "go" + (shim / "find").write_text('#!/bin/sh\ncase "$*" in *"installscript*"*) n=0; while [ ! -e "%s" ] && [ $n -lt 600 ]; do sleep 0.1; n=$((n + 1)); done;; esac\nexec %s "$@"\n' % (go, shutil.which("find"))) + (shim / "find").chmod(0o755) + env = dict(os.environ, DROIDDECK_LIBRARIES="", DROIDDECK_SEED_LATER="1", PATH="%s:%s" % (shim, os.environ["PATH"])) + marker = '"PhysX Version"=dword:00000001' + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True) + self.assertNotIn(marker, self.reg.read_text()) + go.touch() + deadline = time.monotonic() + 30 + while marker not in self.reg.read_text() and time.monotonic() < deadline: + time.sleep(0.2) + self.assertIn(marker, self.reg.read_text()) + before = self.reg.read_text() + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True) + time.sleep(0.5) + self.assertEqual(before, self.reg.read_text()) + + def test_a_game_whose_search_failed_is_searched_again(self): + self.game() + broken = self.tmp / "broken" + broken.touch() + shim = self.tmp / "bin" + shim.mkdir() + (shim / "find").write_text('#!/bin/sh\n%s "$@"\n[ ! -e "%s" ]\n' % (shutil.which("find"), broken)) + (shim / "find").chmod(0o755) + env = dict(os.environ, DROIDDECK_LIBRARIES="", PATH="%s:%s" % (shim, os.environ["PATH"])) + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, capture_output=True, check=True) + self.assertNotIn("VCRedist2022", self.reg.read_text()) + broken.unlink() + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, capture_output=True, check=True) + self.assertIn('"VCRedist2022"=dword:00000001', self.reg.read_text()) + + def test_a_later_run_leaves_the_registry_alone_while_a_wine_server_runs(self): + self.game(script=GAME_SCRIPT.replace("Software\\\\Valve\\\\Steam\\\\Apps\\\\CommonRedist\\\\vcredist\\\\2022", "SOFTWARE\\\\AGEIA Technologies").replace("VCRedist2022", "PhysX Version")) + shim = self.tmp / "bin" + shim.mkdir() + (shim / "pgrep").write_text("#!/bin/sh\nexit 0\n") + (shim / "pgrep").chmod(0o755) + env = dict(os.environ, DROIDDECK_LIBRARIES="", DROIDDECK_SEED_LATER="1", PATH="%s:%s" % (shim, os.environ["PATH"])) + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True) + cache = self.steam / ".droiddeck-game-scripts" + deadline = time.monotonic() + 30 + while not (cache.exists() and "installscript" in cache.read_text().lower()) and time.monotonic() < deadline: + time.sleep(0.2) + self.assertIn("installscript", cache.read_text().lower()) + time.sleep(1) + self.assertNotIn("PhysX Version", self.reg.read_text()) + env.pop("DROIDDECK_SEED_LATER") + env["PATH"] = os.environ["PATH"] + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True) + self.assertIn('"PhysX Version"=dword:00000001', self.reg.read_text()) + def evaluator(self, appid, install_script): script = self.tmp / ("legacycompat/evaluatorscript_%s.vdf" % appid) script.parent.mkdir(parents=True)