diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex index ad4232a350..93964cfcd5 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex @@ -11,6 +11,7 @@ import shutil import struct import subprocess import sys +import time HOME = os.environ.get("HOME") or "/root" STEAM_ROOT = os.path.join(HOME, ".local", "share", "Steam") @@ -160,9 +161,25 @@ def update_own_fex(): return if (read_text(OWN_FEX_TAG) or "").strip() == wanted and os.access(os.path.join(OWN_FEX, "bin", "FEX"), os.X_OK): return + failed = os.path.join(STATE, "update-failed") + try: + if (read_text(failed) or "").strip() == wanted and time.time() - os.path.getmtime(failed) < 3600: + return + except OSError: + pass say("installing DroidDeck's FEX build %s" % wanted) - if subprocess.call([os.path.join(BIN_DIR, "droiddeck-fex-update")], stdout=sys.stderr) != 0: - say("DroidDeck's FEX build %s did not install; using the FEX already here" % wanted) + try: + code = subprocess.call([os.path.join(BIN_DIR, "droiddeck-fex-update")], stdout=sys.stderr) + except OSError: + code = 1 + if code == 0: + with contextlib.suppress(OSError): + os.remove(failed) + return + with contextlib.suppress(OSError): + with open(failed, "w", encoding="utf-8") as handle: + handle.write(wanted + "\n") + say("DroidDeck's FEX build %s did not install; using the FEX already here" % wanted) def fex_install(): diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update index 33346cfbb6..3611978f54 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update @@ -19,7 +19,7 @@ fex_install() { local tag=$1 sha=$2 urls=$3 dst=/ tmp u f tmp=$(mktemp -d) for u in $urls; do - curl -fsSL --retry 2 "$u" -o "$tmp/fex.tzst" && echo "$sha $tmp/fex.tzst" | sha256sum -c --quiet >/dev/null 2>&1 && break + curl -fsSL --retry 2 --connect-timeout 20 --speed-limit 1024 --speed-time 60 "$u" -o "$tmp/fex.tzst" && echo "$sha $tmp/fex.tzst" | sha256sum -c --quiet >/dev/null 2>&1 && break rm -f "$tmp/fex.tzst" done if [ ! -s "$tmp/fex.tzst" ]; then diff --git a/tools/tests/test_droiddeck_fex.py b/tools/tests/test_droiddeck_fex.py index fda93362e0..9be22f6845 100644 --- a/tools/tests/test_droiddeck_fex.py +++ b/tools/tests/test_droiddeck_fex.py @@ -227,6 +227,30 @@ class LocateTest(FexTestCase): FEX["update_own_fex"]() self.assertEqual([[str(BIN / "droiddeck-fex-update")]], calls) + def test_a_failed_build_waits_an_hour_unless_the_session_names_another(self): + self.own_fex("fex-2610-r6") + Path(G["STATE"]).mkdir(parents=True, exist_ok=True) + calls = [] + tag = {"BL_FEX_TAG": "fex-2610-r7"} + with mock.patch.dict(os.environ, tag), \ + mock.patch.object(G["subprocess"], "call", lambda args, **kw: calls.append(os.environ["BL_FEX_TAG"]) or 1): + FEX["update_own_fex"]() + FEX["update_own_fex"]() + failed = Path(G["STATE"]) / "update-failed" + os.utime(failed, (failed.stat().st_atime, failed.stat().st_mtime - 3601)) + FEX["update_own_fex"]() + os.environ["BL_FEX_TAG"] = "fex-2610-r8" + FEX["update_own_fex"]() + self.assertEqual(["fex-2610-r7", "fex-2610-r7", "fex-2610-r8"], calls) + + def test_a_missing_updater_falls_back_to_the_fex_already_here(self): + self.fex_tool(self.steam) + Path(G["STATE"]).mkdir(parents=True, exist_ok=True) + with mock.patch.dict(os.environ, {"BL_FEX_TAG": "fex-2610-r7"}), \ + mock.patch.object(G["subprocess"], "call", mock.Mock(side_effect=FileNotFoundError)): + FEX["update_own_fex"]() + self.assertEqual(FEX["fex_install"]()["bin"], str(self.steam / "steamapps/common/FEX-Emu/usr/bin/FEX")) + def test_no_build_is_installed_without_one_from_the_session(self): calls = [] with mock.patch.dict(os.environ, {}, clear=False), \