morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core: make APContainer seek archipelago.json (#5261)

Browse Source
This commit is contained in:
Fabian Dill
2025-09-19 03:52:31 +02:00
committed by GitHub
parent 8f2b4a961f
commit 73718bbd61
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
worlds/Files.py
View File

@@ -92,7 +92,7 @@ class APContainer:
version: ClassVar[int] = container_version version: ClassVar[int] = container_version
compression_level: ClassVar[int] = 9 compression_level: ClassVar[int] = 9
compression_method: ClassVar[int] = zipfile.ZIP_DEFLATED compression_method: ClassVar[int] = zipfile.ZIP_DEFLATED
manifest_path: str = "archipelago.json"
path: Optional[str] path: Optional[str]
def __init__(self, path: Optional[str] = None): def __init__(self, path: Optional[str] = None):
@@ -116,7 +116,7 @@ class APContainer:
except Exception as e: except Exception as e:
raise Exception(f"Manifest {manifest} did not convert to json.") from e raise Exception(f"Manifest {manifest} did not convert to json.") from e
else: else:
opened_zipfile.writestr("archipelago.json", manifest_str) opened_zipfile.writestr(self.manifest_path, manifest_str)
def read(self, file: Optional[Union[str, BinaryIO]] = None) -> None: def read(self, file: Optional[Union[str, BinaryIO]] = None) -> None:
"""Read data into patch object. file can be file-like, such as an outer zip file's stream.""" """Read data into patch object. file can be file-like, such as an outer zip file's stream."""
@@ -137,7 +137,18 @@ class APContainer:
raise InvalidDataError(f"{message}This might be the incorrect world version for this file") from e raise InvalidDataError(f"{message}This might be the incorrect world version for this file") from e
def read_contents(self, opened_zipfile: zipfile.ZipFile) -> Dict[str, Any]: def read_contents(self, opened_zipfile: zipfile.ZipFile) -> Dict[str, Any]:
with opened_zipfile.open("archipelago.json", "r") as f: try:
assert self.manifest_path.endswith("archipelago.json"), "Filename should be archipelago.json"
manifest_info = opened_zipfile.getinfo(self.manifest_path)
except KeyError as e:
for info in opened_zipfile.infolist():
if info.filename.endswith("archipelago.json"):
manifest_info = info
self.manifest_path = info.filename
break
else:
raise e
with opened_zipfile.open(manifest_info, "r") as f:
manifest = json.load(f) manifest = json.load(f)
if manifest["compatible_version"] > self.version: if manifest["compatible_version"] > self.version:
raise Exception(f"File (version: {manifest['compatible_version']}) too new " raise Exception(f"File (version: {manifest['compatible_version']}) too new "
@@ -248,10 +259,8 @@ class APProcedurePatch(APAutoPatchInterface):
manifest["compatible_version"] = 5 manifest["compatible_version"] = 5
return manifest return manifest
def read_contents(self, opened_zipfile: zipfile.ZipFile) -> None: def read_contents(self, opened_zipfile: zipfile.ZipFile) -> Dict[str, Any]:
super(APProcedurePatch, self).read_contents(opened_zipfile) manifest = super(APProcedurePatch, self).read_contents(opened_zipfile)
with opened_zipfile.open("archipelago.json", "r") as f:
manifest = json.load(f)
if "procedure" not in manifest: if "procedure" not in manifest:
# support patching files made before moving to procedures # support patching files made before moving to procedures
self.procedure = [("apply_bsdiff4", ["delta.bsdiff4"])] self.procedure = [("apply_bsdiff4", ["delta.bsdiff4"])]
@@ -260,6 +269,7 @@ class APProcedurePatch(APAutoPatchInterface):
for file in opened_zipfile.namelist(): for file in opened_zipfile.namelist():
if file not in ["archipelago.json"]: if file not in ["archipelago.json"]:
self.files[file] = opened_zipfile.read(file) self.files[file] = opened_zipfile.read(file)
return manifest
def write_contents(self, opened_zipfile: zipfile.ZipFile) -> None: def write_contents(self, opened_zipfile: zipfile.ZipFile) -> None:
super(APProcedurePatch, self).write_contents(opened_zipfile) super(APProcedurePatch, self).write_contents(opened_zipfile)