diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch index 48d39813e..f59c56052 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch @@ -271,6 +271,23 @@ def provision_prefix(compat_data, wait=SERVER_WAIT): return state + (" server-running" if busy else "") +def create_prefix(compat_data, proton, timeout=120): + if not compat_data or not proton or not Path(proton).is_file(): + return "no-proton" + reg = Path(compat_data) / "pfx/user.reg" + if reg.is_file(): + return "present" + try: + Path(compat_data).mkdir(parents=True, exist_ok=True) + subprocess.run([proton, "run", "cmd.exe", "/d", "/c", "exit"], stdin=subprocess.DEVNULL, + stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=timeout) + except subprocess.TimeoutExpired: + return "timeout" + except OSError: + return "failed" + return "created" if reg.is_file() else "failed" + + CLOUD_TIMEOUT = 15.0 CLOUD_STORES = ("gog", "epic") STORE_GAME = 10 @@ -502,6 +519,10 @@ def main(argv): 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", "") + if launch_dir and cloud_on(sidecar): + made = create_prefix(compat_data, os.environ.get("BL_STORE_PROTON", "")) + if made != "present": + log("cloud %s %s prefix=%s" % (store, game, made)) if store == "gog": prepare_gog(sidecar, compat_data, launch_dir) log("gog registry: " + apply_gog_registry(folder, compat_data, os.environ.get("BL_STORE_PROTON", ""))) diff --git a/tools/tests/test_store_launch.py b/tools/tests/test_store_launch.py index 1c4ac4bba..5da2972ed 100644 --- a/tools/tests/test_store_launch.py +++ b/tools/tests/test_store_launch.py @@ -226,6 +226,43 @@ class CloudHooks(unittest.TestCase): self.assertEqual(store.CLOUD_TIMEOUT, asked[1][1]) self.assertEqual('cloud-up', asked[2][0]['op']) + def test_a_first_launch_creates_the_prefix_before_the_cloud_download(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='epic', ident='fa4240e5') + sidecar = json.loads((folder / store.SIDECAR).read_text()) + sidecar['epic'] = {'eos': False, 'offline': True} + (folder / store.SIDECAR).write_text(json.dumps(sidecar)) + proton = Path(root) / 'proton' + proton.write_text('selected Proton') + compat = Path(root) / 'compatdata/1' + order = [] + + def run(argv, **kwargs): + order.append(argv) + (compat / 'pfx').mkdir(parents=True) + (compat / 'pfx/user.reg').write_text('WINE REGISTRY Version 2\n') + return __import__('subprocess').CompletedProcess(argv, 0) + + env = {'BL_LAUNCH_DIR': root, 'STEAM_COMPAT_DATA_PATH': str(compat), 'BL_STORE_PROTON': str(proton)} + with patch.dict(os.environ, env), patch.object(store.subprocess, 'run', side_effect=run), \ + patch.object(store, 'ask', side_effect=lambda channel, request, timeout=5.0: order.append(request) or {'result': 'ok'}): + self.assertEqual(store.STORE_GAME, store.main([str(folder / store.LAUNCHER)])) + self.assertEqual([str(proton), 'run', 'cmd.exe', '/d', '/c', 'exit'], order[0]) + self.assertEqual({'op': 'cloud-down', 'store': 'epic', 'id': 'fa4240e5'}, order[-1]) + self.assertEqual('present', store.create_prefix(str(compat), str(proton))) + self.assertEqual(2, len(order)) + + def test_a_prefix_that_is_not_made_leaves_the_deferred_download(self): + with tempfile.TemporaryDirectory() as root: + proton = Path(root) / 'proton' + proton.write_text('selected Proton') + with patch.object(store.subprocess, 'run', return_value=__import__('subprocess').CompletedProcess([], 1)): + self.assertEqual('failed', store.create_prefix(root + '/compatdata/1', str(proton))) + with patch.object(store.subprocess, 'run', side_effect=__import__('subprocess').TimeoutExpired('proton', 1)): + self.assertEqual('timeout', store.create_prefix(root + '/compatdata/1', str(proton))) + self.assertEqual('no-proton', store.create_prefix(root + '/compatdata/1', root + '/missing')) + self.assertEqual('no-proton', store.create_prefix('', str(proton))) + def test_cloud_off_or_amazon_runs_proton_as_before(self): with tempfile.TemporaryDirectory() as root: folder = game(root, store_id='gog', ident='1')