mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-18 20:36:04 +00:00
Make Games folders Steam libraries and skip the zero-filled reservation (#388)
With Second library on Automatic, every writable Games folder is now a Steam library: it gets the same private prefix and tool binds as the card, the app hands the session the list (BL_STEAM_LIBRARIES), and droiddeck-steam-library registers, relabels and forgets entries from it. Steam offers them in the install dialog as "<folder> (<volume>)", and Proton mapping, esync, the redist seeder, desktop entries and the compat beat read every registered library instead of only the card. Games folder libraries stop at the fast path's bind budget. Steam's preallocation on Android's FUSE storage either failed outright (NTFS answers EPERM, so installs were cancelled as "not enough disk space") or zero-filled the whole download first (exFAT, minutes for a small game). After fallocate is refused, the Steam client's ftruncate extension of its own staging files is reported as done; the writes that follow fill the file. A 76 MB install to a USB SSD now preallocates instantly instead of taking about 3.5 minutes. A library that is not there is left out of the list and forgotten until it returns, imports whose folder is missing are set aside rather than offered as broken installs, and the front end refreshes when storage is mounted or removed.
This commit is contained in:
1 parent
bc0f6e7271
commit
6ee8866599
29 files changed
+746
-70
No files matched your search
@@ -73,11 +73,19 @@ def client_entries():
|
||||
return found
|
||||
|
||||
|
||||
def registered():
|
||||
try:
|
||||
with open(os.path.join(STEAM_ROOT, "steamapps", "libraryfolders.vdf"), encoding="utf-8", errors="replace") as f:
|
||||
return [path.replace("\\\\", "\\") for path in re.findall(r'"path"\s+"((?:[^"\\]|\\.)*)"', f.read())]
|
||||
except OSError:
|
||||
return []
|
||||
|
||||
|
||||
def write_entries():
|
||||
os.makedirs(APPS_DIR, exist_ok=True)
|
||||
wanted = {}
|
||||
theirs = client_entries()
|
||||
for library, _ in LIBRARIES:
|
||||
for library in dict.fromkeys([library for library, _ in LIBRARIES] + registered()):
|
||||
for appid, name in games(library):
|
||||
if appid not in theirs:
|
||||
wanted.setdefault(appid, name)
|
||||
|
||||
@@ -954,8 +954,19 @@ def choose(root, command, env, tool, stock):
|
||||
return command, env
|
||||
|
||||
|
||||
def libraries(steam_root):
|
||||
found = [steam_root]
|
||||
try:
|
||||
with open(os.path.join(steam_root, "steamapps", "libraryfolders.vdf"), encoding="utf-8", errors="replace") as f:
|
||||
found += [path.replace("\\\\", "\\") for path in re.findall(r'"path"\s+"((?:[^"\\]|\\.)*)"', f.read())]
|
||||
except OSError:
|
||||
pass
|
||||
found.append(SD_LIBRARY)
|
||||
return list(dict.fromkeys(found))
|
||||
|
||||
|
||||
def find_tools(steam_root):
|
||||
candidates = [os.path.join(library, "steamapps", "common", name) for library in (steam_root, SD_LIBRARY) for name in SOURCES]
|
||||
candidates = [os.path.join(library, "steamapps", "common", name) for library in libraries(steam_root) for name in SOURCES]
|
||||
folder = os.path.join(steam_root, "compatibilitytools.d")
|
||||
try:
|
||||
names = sorted(os.listdir(folder))
|
||||
|
||||
@@ -72,6 +72,7 @@ cache="$steam_root/.droiddeck-game-scripts"
|
||||
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
|
||||
{
|
||||
@@ -133,9 +134,12 @@ $(vcrt "$(date +%s)")"
|
||||
# prefix moments later, so the template carries the markers too. Its date is kept: Proton reads a
|
||||
# changed one as a new template and upgrades every prefix made from the old.
|
||||
for reg in "$steam_root"/steamapps/common/Proton*/files/share/default_pfx*/system.reg \
|
||||
/mnt/droiddeck-sd/steamapps/common/Proton*/files/share/default_pfx*/system.reg \
|
||||
/root/Games/*/steamapps/common/Proton*/files/share/default_pfx*/system.reg \
|
||||
"$steam_root"/compatibilitytools.d/*/files/share/default_pfx*/system.reg \
|
||||
"$steam_root"/steamapps/compatdata/*/pfx/system.reg \
|
||||
/mnt/droiddeck-sd/steamapps/compatdata/*/pfx/system.reg; do
|
||||
/mnt/droiddeck-sd/steamapps/compatdata/*/pfx/system.reg \
|
||||
/root/Games/*/steamapps/compatdata/*/pfx/system.reg; do
|
||||
[ -f "$reg" ] || continue
|
||||
seeded=$(dirname "$reg")/.droiddeck-redists
|
||||
legacy=$(dirname "$reg")/.bannerlator-redists
|
||||
|
||||
@@ -568,7 +568,7 @@ case $mode in
|
||||
local d
|
||||
[ -e "$compat_stamp" ] && [ "$((beat % 12))" -ne 0 ] || return 0
|
||||
for d in "$steam_root/steamapps" "$steam_root/steamapps/common" "$steam_root/config" \
|
||||
"$steam_root/compatibilitytools.d" /mnt/droiddeck-sd/steamapps; do
|
||||
"$steam_root/compatibilitytools.d" /mnt/droiddeck-sd/steamapps /root/Games/*/steamapps; do
|
||||
[ "$d" -nt "$compat_stamp" ] && return 0
|
||||
done
|
||||
return 1
|
||||
|
||||
@@ -16,6 +16,7 @@ STATE = ".droiddeck-games.json"
|
||||
WINNATIVE = ".winnative-steam/steamapps"
|
||||
LIBRARY = "/mnt/droiddeck-sd"
|
||||
LEGACY_LIBRARY = "/mnt/bannerlator-sd"
|
||||
PARKED = ".droiddeck-parked"
|
||||
BASE_ID = 76561197960265728
|
||||
|
||||
|
||||
@@ -282,6 +283,42 @@ def update_not_started(text, steamapps, appid, installdir):
|
||||
and not (steamapps / "downloading" / str(appid)).exists())
|
||||
|
||||
|
||||
def libraries(steam_root):
|
||||
try:
|
||||
text = (Path(steam_root) / "steamapps/libraryfolders.vdf").read_text(errors="replace")
|
||||
except OSError:
|
||||
text = ""
|
||||
paths = [path.replace("\\\\", "\\") for path in re.findall(r'"path"\s+"((?:[^"\\]|\\.)*)"', text)]
|
||||
return list(dict.fromkeys([Path(steam_root), Path(LIBRARY)] + [Path(path) for path in paths]))
|
||||
|
||||
|
||||
def ours(manifest, appid):
|
||||
try:
|
||||
return re.search(rf'"installdir"\s*"DroidDeck-{appid}"', manifest.read_text(errors="replace")) is not None
|
||||
except OSError:
|
||||
return False
|
||||
|
||||
|
||||
def unpark(steamapps):
|
||||
for manifest in sorted((steamapps / PARKED).glob("appmanifest_*.acf")):
|
||||
appid = manifest.stem.removeprefix("appmanifest_")
|
||||
live = steamapps / manifest.name
|
||||
if os.path.lexists(live):
|
||||
manifest.unlink(missing_ok=True)
|
||||
elif (steamapps / "common" / f"DroidDeck-{appid}").is_dir():
|
||||
os.replace(manifest, live)
|
||||
|
||||
|
||||
def park(steamapps):
|
||||
for target in sorted((steamapps / "common").glob("DroidDeck-*")):
|
||||
appid = target.name.removeprefix("DroidDeck-")
|
||||
manifest = steamapps / f"appmanifest_{appid}.acf"
|
||||
if appid.isdigit() and target.is_symlink() and not target.exists() and manifest.is_file() and ours(manifest, appid):
|
||||
(steamapps / PARKED).mkdir(exist_ok=True)
|
||||
os.replace(manifest, steamapps / PARKED / manifest.name)
|
||||
print(f"droiddeck-steam-games: {appid} is not here this session; its install is set aside until it is")
|
||||
|
||||
|
||||
def seed_install(steam_root, game, appid):
|
||||
steamapps = Path(steam_root) / "steamapps"
|
||||
common = steamapps / "common"
|
||||
@@ -305,7 +342,7 @@ def seed_install(steam_root, game, appid):
|
||||
relink.unlink(missing_ok=True)
|
||||
relink.symlink_to(source, target_is_directory=True)
|
||||
os.replace(relink, target)
|
||||
for root in [Path(steam_root), Path(LIBRARY)]:
|
||||
for root in libraries(steam_root):
|
||||
existing = root / "steamapps" / manifest.name
|
||||
if existing.is_file():
|
||||
if (existing == manifest and source.is_dir() and target.is_symlink()
|
||||
@@ -343,6 +380,11 @@ def route(steam_root, acct, games):
|
||||
if not all(isinstance(value, dict) for value in (owned, candidates, sources)):
|
||||
owned, candidates, sources = {}, {}, {}
|
||||
shortcuts, routes = [], {}
|
||||
steamapps = Path(steam_root) / "steamapps"
|
||||
try:
|
||||
unpark(steamapps)
|
||||
except OSError as error:
|
||||
print(f"droiddeck-steam-games: set-aside installs not restored ({error})")
|
||||
for game in games:
|
||||
folder = game.get("folder", "")
|
||||
appid = candidates.get(folder, candidates.get(legacy_path(folder)))
|
||||
@@ -359,6 +401,10 @@ def route(steam_root, acct, games):
|
||||
except OSError as error:
|
||||
print(f"droiddeck-steam-games: import unavailable ({error})")
|
||||
shortcuts.append(game)
|
||||
try:
|
||||
park(steamapps)
|
||||
except OSError as error:
|
||||
print(f"droiddeck-steam-games: missing installs not set aside ({error})")
|
||||
save_json(Path(acct) / "config/.droiddeck-routes.json", routes)
|
||||
return shortcuts, routes
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
# droiddeck-steam-library <steam root>
|
||||
#
|
||||
# Ported from WinNative's gamescope runtime (GPL-3.0).
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
@@ -168,6 +169,29 @@ def relabel(steam_root, target, label):
|
||||
print("droiddeck-steam-library: labelled %s in its own marker too" % target)
|
||||
|
||||
|
||||
GAMES_DIR = "/root/Games/"
|
||||
|
||||
|
||||
def wanted():
|
||||
listing = os.environ.get("BL_STEAM_LIBRARIES")
|
||||
if not listing:
|
||||
return None
|
||||
try:
|
||||
with open(listing, encoding="utf-8") as f:
|
||||
entries = json.load(f)
|
||||
return [(str(e["path"]), str(e["label"]).replace('"', " ").replace("\\", " ")) for e in entries]
|
||||
except (OSError, ValueError, KeyError, TypeError):
|
||||
return None
|
||||
|
||||
|
||||
def registered(steam_root):
|
||||
try:
|
||||
with open(os.path.join(steam_root, "steamapps", "libraryfolders.vdf"), encoding="utf-8", errors="replace") as f:
|
||||
return re.findall(r'"path"\s+"([^"]*)"', f.read())
|
||||
except OSError:
|
||||
return []
|
||||
|
||||
|
||||
def main():
|
||||
steam_root = sys.argv[1]
|
||||
for library in RETIRED:
|
||||
@@ -175,12 +199,19 @@ def main():
|
||||
for old, new in RENAMED:
|
||||
rename(steam_root, old, new)
|
||||
relabel(steam_root, steam_root, MAIN_LABEL)
|
||||
for library, label in LIBRARIES:
|
||||
libraries = wanted()
|
||||
managed = libraries is not None
|
||||
for library, label in libraries if managed else LIBRARIES:
|
||||
if os.path.isdir(os.path.join(library, "steamapps")):
|
||||
register(steam_root, library, label)
|
||||
relabel(steam_root, library, label)
|
||||
else:
|
||||
forget(steam_root, library)
|
||||
if managed:
|
||||
keep = {library for library, _ in libraries}
|
||||
for library in registered(steam_root):
|
||||
if library not in keep and (library == LIBRARIES[0][0] or library.startswith(GAMES_DIR)):
|
||||
forget(steam_root, library)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
@@ -277,9 +277,10 @@ done
|
||||
# The depot this tool is named after, newest across the libraries that hold it; the others in the
|
||||
# list stand in only when it is missing.
|
||||
depot=
|
||||
libraries=$(printf '%%s\\n' "$steam_root" /mnt/droiddeck-sd; sed -n 's/^[[:space:]]*"path"[[:space:]]*"\\(.*\\)"[[:space:]]*$/\\1/p' "$steam_root/steamapps/libraryfolders.vdf" 2>/dev/null)
|
||||
for name in %s; do
|
||||
best=0
|
||||
for library in "$steam_root" /mnt/droiddeck-sd; do
|
||||
while IFS= read -r library; do
|
||||
candidate="$library/steamapps/common/$name"
|
||||
[ -d "$candidate/files/bin-arm64" ] && [ -x "$candidate/proton" ] || continue
|
||||
build=0
|
||||
@@ -289,7 +290,7 @@ for name in %s; do
|
||||
depot=$candidate
|
||||
best=$build
|
||||
fi
|
||||
done
|
||||
done <<< "$libraries"
|
||||
[ -n "$depot" ] && break
|
||||
done
|
||||
if [ -n "$depot" ]; then
|
||||
@@ -615,10 +616,21 @@ NOT_GAMES = frozenset((
|
||||
))
|
||||
|
||||
|
||||
def libraries(steam_root):
|
||||
found = [steam_root]
|
||||
try:
|
||||
with open(os.path.join(steam_root, "steamapps", "libraryfolders.vdf"), encoding="utf-8", errors="replace") as f:
|
||||
found += [path.replace("\\\\", "\\") for path in re.findall(r'"path"\s+"((?:[^"\\]|\\.)*)"', f.read())]
|
||||
except OSError:
|
||||
pass
|
||||
found.append(LIBRARY + "-sd")
|
||||
return list(dict.fromkeys(found))
|
||||
|
||||
|
||||
def installed_apps(steam_root):
|
||||
"""App ids of the titles the client has installed, tools and runtimes excluded."""
|
||||
apps = set()
|
||||
for library in (steam_root, LIBRARY + "-sd"):
|
||||
for library in libraries(steam_root):
|
||||
steamapps = os.path.join(library, "steamapps")
|
||||
try:
|
||||
names = os.listdir(steamapps)
|
||||
@@ -778,7 +790,7 @@ def fex_missing(steam_root):
|
||||
missing = []
|
||||
for app in FEX_DEPENDENCIES:
|
||||
if not any(os.path.isfile(os.path.join(library, "steamapps", "appmanifest_%s.acf" % app))
|
||||
for library in (steam_root, LIBRARY + "-sd")):
|
||||
for library in libraries(steam_root)):
|
||||
missing.append(app)
|
||||
return missing
|
||||
|
||||
@@ -1065,7 +1077,7 @@ def depot_build(depot):
|
||||
def find_source(steam_root, sources=SOURCES):
|
||||
"""The first of `sources` the client has downloaded, newest across the libraries holding it."""
|
||||
for name in sources:
|
||||
found = [os.path.join(root, "steamapps", "common", name) for root in (steam_root, "/mnt/droiddeck-sd")
|
||||
found = [os.path.join(root, "steamapps", "common", name) for root in libraries(steam_root)
|
||||
if os.path.isdir(os.path.join(root, "steamapps", "common", name, "files", "bin-arm64"))]
|
||||
if found:
|
||||
return max(found, key=depot_build)
|
||||
|
||||
Reference in new issue
Block a user