Free fork of NotProton: Windows Steam games in Mac Steam, on CodeWeavers' Wine and Apple's Game Porting Toolkit
Swift apple-silicond3dmetaldxmtdxvkgame-porting-toolkitgptkmac-gamingmacosmetalfxrosetta-2steamsteam-playwinewinecx
fix(compat): ignore invalid manifests before deduplicating installed games (#1108)
A Hazy Reign Is Fluid7ebd72df6da3
diff --git a/scripts/np-inventory.py b/scripts/np-inventory.pyindex bcbbde4..3a20e8b 100755--- a/scripts/np-inventory.py+++ b/scripts/np-inventory.py@@ -33,26 +33,32 @@ def installed_manifests():library = re.sub(r'\\(["\\])', r'\1', raw)libraries.append(os.path.join(library, "steamapps"))- seen = set()for steamapps in dict.fromkeys(os.path.realpath(p) for p in libraries):for manifest in sorted(glob.glob(os.path.join(steamapps, "appmanifest_*.acf"))):- appid = os.path.basename(manifest)[len("appmanifest_"):-len(".acf")]- if appid not in seen:- seen.add(appid)- yield manifest+ yield manifestdef main():rows = []+ seen = set()for f in installed_manifests():with open(f, encoding="utf-8", errors="replace") as manifest_file:txt = manifest_file.read()g = lambda k: (re.search(r'"%s"\s+"(.*)"' % k, txt) or [None, ""])[1]- appid = int(g("appid"))+ appid_text = g("appid")+ installdir = g("installdir")+ filename_id = os.path.basename(f)[len("appmanifest_"):-len(".acf")]+ if not re.fullmatch(r"[0-9]+", appid_text) or appid_text != filename_id or not installdir:+ print(f" skipping incomplete or inconsistent manifest: {f}", file=sys.stderr)+ continue+ appid = int(appid_text)+ if appid in seen:+ continue+ seen.add(appid)if appid in SKIP:continuename = g("name")- idir = os.path.join(os.path.dirname(f), "common", g("installdir"))+ idir = os.path.join(os.path.dirname(f), "common", installdir)skip = re.compile(r"unins|crash|redist|vcredist|dxsetup|dotnet|installer|setup|eac|battleye|helper|touchup|cleanup|overlayinjector|bugsplat|bssndrpt|repair|crs-|activationui", re.I)exes = sorted({os.path.relpath(os.path.join(d, x), idir) for d, _, fs in os.walk(idir) for x in fsif x.lower().endswith(".exe") and not skip.search(x) and d[len(idir):].count(os.sep) <= 4})diff --git a/scripts/tests/np-inventory.py b/scripts/tests/np-inventory.pyindex 05d1bdd..35764b4 100644--- a/scripts/tests/np-inventory.py+++ b/scripts/tests/np-inventory.py@@ -41,6 +41,33 @@ class InventoryTests(unittest.TestCase):self.assertEqual(["game.exe"], external["exes"])+ def test_invalid_manifest_does_not_hide_valid_copy_in_other_library(self):+ with tempfile.TemporaryDirectory() as tmp:+ root = Path(tmp)+ primary = root / "Steam" / "steamapps"+ external = root / "External Library" / "steamapps"+ primary.mkdir(parents=True)+ (external / "common" / "Valid Game").mkdir(parents=True)+ (primary / "libraryfolders.vdf").write_text(+ '"libraryfolders"\n{\n "1"\n {\n "path" "' ++ str(external.parent) + '"\n }\n}\n')+ (primary / "appmanifest_101.acf").write_text(+ '"AppState"\n{\n "name" "Incomplete"\n}\n')+ (external / "appmanifest_101.acf").write_text(+ '"AppState"\n{\n "appid" "101"\n "name" "Valid Game"\n'+ ' "installdir" "Valid Game"\n}\n')+ (external / "common" / "Valid Game" / "game.exe").write_text("")+ with patch.object(module, "STEAMAPPS", str(primary)), \+ patch.object(module, "ROOT", str(root)), \+ patch.object(module.L, "store", return_value={"mac": False, "windows": True}), \+ patch.object(module.L, "pcgw", return_value=None), \+ patch.object(module.L, "awacy", return_value=(None, [])):+ module.main()+ rows = json.loads((root / "compat" / "installed.json").read_text())+ self.assertEqual([101], [r["appid"] for r in rows])+ self.assertEqual(["game.exe"], rows[0]["exes"])++def test_legacy_config_index(self):with tempfile.TemporaryDirectory() as tmp:root = Path(tmp)