mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 04:46:08 +00:00
feat: add store maintenance
This commit is contained in:
1 parent
aef1f85aa9
commit
cd09deddba
46 files changed
+3830
-251
No files matched your search
@@ -67,6 +67,7 @@ def generation(pid):
|
||||
|
||||
|
||||
def lease(folder, owner):
|
||||
folder = Path(folder).resolve(strict=True)
|
||||
root = control(folder)
|
||||
with lock_file(root) as stream:
|
||||
fcntl.lockf(stream, fcntl.LOCK_SH | fcntl.LOCK_NB)
|
||||
@@ -76,6 +77,36 @@ def lease(folder, owner):
|
||||
journal = root / "operation.json"
|
||||
if journal.exists() and read(journal).get("phase") != "download":
|
||||
raise ValueError("GOG maintenance is incomplete")
|
||||
common_journal = folder / ".droiddeck-maintenance" / "operation.json"
|
||||
if common_journal.exists() and read(common_journal).get("phase") not in ("queued", "download"):
|
||||
raise ValueError("Store maintenance is incomplete")
|
||||
start = generation(owner)
|
||||
if start is None:
|
||||
raise ValueError("Game launcher has exited")
|
||||
print("ready", flush=True)
|
||||
sys.stdout.close()
|
||||
while generation(owner) == start:
|
||||
time.sleep(0.25)
|
||||
return 0
|
||||
|
||||
|
||||
def store_lease(folder, owner):
|
||||
folder = Path(folder).resolve(strict=True)
|
||||
root = folder / ".droiddeck-maintenance"
|
||||
if root.is_symlink():
|
||||
raise ValueError("maintenance control directory is a symbolic link")
|
||||
root.mkdir(exist_ok=True)
|
||||
with lock_file(root) as stream:
|
||||
fcntl.lockf(stream, fcntl.LOCK_SH | fcntl.LOCK_NB)
|
||||
sidecar = read(folder / ".droiddeck-store.json")
|
||||
if sidecar.get("state", "installed") != "installed":
|
||||
raise ValueError("Resume or recover the store update before playing")
|
||||
journal = root / "operation.json"
|
||||
if journal.exists() and read(journal).get("phase") not in ("queued", "download"):
|
||||
raise ValueError("Store maintenance is incomplete")
|
||||
gog_journal = folder / ".droiddeck-gog" / "operation.json"
|
||||
if gog_journal.exists() and read(gog_journal).get("phase") != "download":
|
||||
raise ValueError("GOG maintenance is incomplete")
|
||||
start = generation(owner)
|
||||
if start is None:
|
||||
raise ValueError("Game launcher has exited")
|
||||
@@ -325,6 +356,8 @@ def prepare_setup(folder, command, env):
|
||||
def main(argv):
|
||||
if len(argv) == 3 and argv[0] == "lease":
|
||||
return lease(argv[1], int(argv[2]))
|
||||
if len(argv) == 3 and argv[0] == "store-lease":
|
||||
return store_lease(argv[1], int(argv[2]))
|
||||
if len(argv) == 4 and argv[0] == "idle":
|
||||
return idle(*argv[1:])
|
||||
if len(argv) == 2 and argv[0] == "status":
|
||||
|
||||
@@ -566,6 +566,9 @@ def main(argv):
|
||||
return 0
|
||||
folder, sidecar = found
|
||||
store, game = str(sidecar.get("store")), str(sidecar.get("id"))
|
||||
if sidecar.get("state", "installed") != "installed":
|
||||
log("%s: resume or recover maintenance before playing" % store)
|
||||
return RAN_FAILED
|
||||
if store == "gog":
|
||||
helper = Path(__file__).resolve().with_name("droiddeck-gog-maintenance")
|
||||
if helper.is_file():
|
||||
@@ -578,6 +581,18 @@ def main(argv):
|
||||
if ready != "ready":
|
||||
log("gog: close or recover the maintenance operation before playing")
|
||||
return RAN_FAILED
|
||||
else:
|
||||
helper = Path(__file__).resolve().with_name("droiddeck-gog-maintenance")
|
||||
if helper.is_file():
|
||||
child = subprocess.Popen([sys.executable, str(helper), "store-lease", str(folder), str(os.getppid())],
|
||||
stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, stdin=subprocess.DEVNULL,
|
||||
start_new_session=True)
|
||||
ready = child.stdout.readline().decode().strip()
|
||||
child.stdout.close()
|
||||
threading.Thread(target=child.wait, daemon=True).start()
|
||||
if ready != "ready":
|
||||
log("%s: close or recover the maintenance operation before playing" % store)
|
||||
return RAN_FAILED
|
||||
compat_data = os.environ.get("STEAM_COMPAT_DATA_PATH", "").rstrip("/")
|
||||
prefix_id = os.path.basename(compat_data) if compat_data else ""
|
||||
launch_dir = os.environ.get("BL_LAUNCH_DIR", "")
|
||||
|
||||
@@ -109,6 +109,35 @@ class GogMaintenance(unittest.TestCase):
|
||||
with self.assertRaises(ValueError):
|
||||
G["lease"](self.folder, os.getpid())
|
||||
|
||||
def test_shared_store_lease_excludes_updates_until_the_game_exits(self):
|
||||
import fcntl
|
||||
(self.folder / ".droiddeck-store.json").write_text(json.dumps({"store": "epic", "id": "1"}))
|
||||
control = self.folder / ".droiddeck-maintenance"
|
||||
control.mkdir()
|
||||
owner = subprocess.Popen([sys.executable, "-c", "import time; time.sleep(30)"])
|
||||
self.addCleanup(lambda: owner.poll() is None and owner.kill())
|
||||
lease = subprocess.Popen([sys.executable, str(BIN / "droiddeck-gog-maintenance"), "store-lease", str(self.folder), str(owner.pid)],
|
||||
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
self.addCleanup(lease.stdout.close)
|
||||
self.addCleanup(lease.stderr.close)
|
||||
self.addCleanup(lambda: lease.poll() is None and lease.kill())
|
||||
self.assertEqual(b"ready\n", lease.stdout.readline())
|
||||
with G["lock_file"](control) as stream:
|
||||
with self.assertRaises(BlockingIOError):
|
||||
fcntl.lockf(stream, fcntl.LOCK_EX | fcntl.LOCK_NB)
|
||||
owner.terminate(); owner.wait()
|
||||
lease.wait(timeout=5)
|
||||
with G["lock_file"](control) as stream:
|
||||
fcntl.lockf(stream, fcntl.LOCK_EX | fcntl.LOCK_NB)
|
||||
|
||||
def test_shared_store_lease_rejects_applying_or_incomplete_journals(self):
|
||||
(self.folder / ".droiddeck-store.json").write_text(json.dumps({"store": "amazon", "id": "1"}))
|
||||
control = self.folder / ".droiddeck-maintenance"
|
||||
control.mkdir()
|
||||
(control / "operation.json").write_text(json.dumps({"schema": 1, "store": "amazon", "id": "1", "phase": "applying"}))
|
||||
with self.assertRaises(ValueError):
|
||||
G["store_lease"](self.folder, os.getpid())
|
||||
|
||||
def test_running_game_and_wrong_prefix_are_distinguished(self):
|
||||
proc = self.folder / "proc"
|
||||
for pid, prefix, name in [(10, "/prefix/pfx", "game.exe"), (11, "/other/pfx", "other.exe"), (12, "/prefix/pfx", "services.exe")]:
|
||||
|
||||
Reference in new issue
Block a user