mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-21 05:46:03 +00:00
fix: read installed depots from completed manifest names too
This commit is contained in:
1 parent
be5f1560b2
commit
0cc187025f
5 files changed
+43
-4
No files matched your search
@@ -303,6 +303,8 @@ def installed_build(folder, appid, installdir):
|
||||
try:
|
||||
ids = json.loads((folder / ".DepotDownloader/depot.config").read_text())["installedManifestIDs"]
|
||||
depots = sorted((int(depot), int(gid)) for depot, gid in ids.items())
|
||||
except FileNotFoundError:
|
||||
depots = completed_depots(folder / ".DepotDownloader/completed")
|
||||
except (OSError, ValueError, KeyError, TypeError, AttributeError):
|
||||
return None
|
||||
if not depots or not all(0 < depot < 0x80000000 and 0 < gid < 0x7FFFFFFFFFFFFFFF for depot, gid in depots):
|
||||
@@ -310,6 +312,20 @@ def installed_build(folder, appid, installdir):
|
||||
return "".join(f' "{depot}"\n {{\n "manifest" "{gid}"\n }}\n' for depot, gid in depots)
|
||||
|
||||
|
||||
def completed_depots(completed):
|
||||
newest = {}
|
||||
try:
|
||||
for manifest in completed.iterdir():
|
||||
match = re.fullmatch(r"(\d+)_(\d+)\.manifest", manifest.name)
|
||||
if match and manifest.is_file():
|
||||
depot, gid, mtime = int(match[1]), int(match[2]), manifest.stat().st_mtime
|
||||
if depot not in newest or mtime > newest[depot][0]:
|
||||
newest[depot] = (mtime, gid)
|
||||
except OSError:
|
||||
return []
|
||||
return sorted((depot, gid) for depot, (_, gid) in newest.items())
|
||||
|
||||
|
||||
def update_not_started(text, steamapps, appid, installdir):
|
||||
fields = dict(re.findall(r'^\s*"(\w+)"\s*"([^"]*)"', text, re.M))
|
||||
return (fields.get("installdir") == installdir and fields.get("buildid", "0") == "0"
|
||||
|
||||
@@ -247,6 +247,20 @@ class ImportsTest(unittest.TestCase):
|
||||
config.write_text(json.dumps({'installedManifestIDs': {'43': 0x7FFFFFFFFFFFFFFF}}))
|
||||
self.assertIsNone(imports.installed_build(self.folder, 42, 'DroidDeck-42'))
|
||||
|
||||
def test_completed_manifests_record_installed_depots(self):
|
||||
completed = self.folder / '.DepotDownloader/completed'
|
||||
completed.mkdir(parents=True)
|
||||
(self.folder / '.download_complete').touch()
|
||||
self.assertIsNone(imports.installed_build(self.folder, 42, 'DroidDeck-42'))
|
||||
(completed / '43_98.manifest').write_bytes(b'old')
|
||||
(completed / '43_99.manifest').write_bytes(b'new')
|
||||
(completed / '44_7.manifest').write_bytes(b'x')
|
||||
os.utime(completed / '43_98.manifest', (1, 1))
|
||||
text = imports.installed_build(self.folder, 42, 'DroidDeck-42')
|
||||
self.assertIn('"43"\n {\n "manifest" "99"', text)
|
||||
self.assertIn('"44"\n {\n "manifest" "7"', text)
|
||||
self.assertNotIn('"98"', text)
|
||||
|
||||
def test_bare_import_manifest_gains_installed_build(self):
|
||||
self.snapshot()
|
||||
imports.route(self.steam, self.acct, [self.game])
|
||||
|
||||
Reference in new issue
Block a user