de string block

Author: happyleavesaoc

mgz/cli.py

@@ -75,7 +75,7 @@ async def extract_rec(playback, path, select=None):
 def print_info(path):
     """Print basic info."""
     with open(path, 'rb') as handle:
-        summary = Summary(handle)
+        summary = Summary(handle, fallback=True)
         dataset = summary.get_dataset()
         print('-------------')
         print(tabulate([

mgz/fast/header.py

@@ -273,6 +273,17 @@ def parse_scenario(data, num_players, version, save):
     )
 
 
+def string_block(data):
+    """Parse DE header string block."""
+    strings = []
+    while True:
+        crc = unpack("<I", data)
+        if crc == 47:
+            break
+        strings.append(de_string(data).decode('utf-8').split(':'))
+    return strings
+
+
 def parse_de(data, version, save, skip=False):
     """Parse DE-specific header."""
     if version is not Version.DE:
@@ -335,13 +346,12 @@ def parse_de(data, version, save, skip=False):
     hidden_civs = unpack('b', data)
     data.read(1)
     spec_delay = unpack('<I', data)
-    data.read(5)
-    strings = []
-    for _ in range(23):
-        strings.append(de_string(data).decode('utf-8').split(':'))
-        c = unpack('<I', data)
-        while c in [3, 21, 23, 42, 44, 45, 46, 47]:
-            c = unpack('<I', data)
+    data.read(1)
+    strings = string_block(data)
+    data.read(8)
+    for _ in range(20):
+        strings += string_block(data)
+    data.read(4)
     if save < 25.22:
         data.read(236)
     if save >= 25.22:

mgz/header/de.py

@@ -43,6 +43,13 @@
     If(lambda ctx: find_save_version(ctx) >= 25.06, "handicap"/Bytes(8)),
 )
 
+string_block = Struct(
+    "strings"/RepeatUntil(lambda x, lst, ctx: lst[-1].crc == 47, Struct(
+        "crc"/Int32ul,
+        "string"/If(lambda ctx: ctx.crc != 47, de_string)
+    ))
+)
+
 de = "de"/Struct(
     "build"/If(lambda ctx: find_save_version(ctx) >= 25.22, Int32ul),
     "timestamp"/If(lambda ctx: find_save_version(ctx) >= 26.16, Int32ul),
@@ -107,15 +114,10 @@
     "matchmaking"/Flag,
     "spec_delay"/Int32ul,
     "scenario_civ"/If(lambda ctx: find_save_version(ctx) >= 13.13, Byte),
-    "rms_crc"/If(lambda ctx: find_save_version(ctx) >= 13.13, Bytes(4)),
-    "strings"/Array(23,
-        Struct(
-            "string"/de_string,
-            "nums"/RepeatUntil(lambda x, lst, ctx: lst[-1] not in [3, 21, 23, 42, 44, 45, 46, 47], Int32ul)
-        )
-    ),
-    # There's probably a right way to do this, but this is not it.
-    "num_sn"/Computed(lambda ctx: ctx.strings[22].nums[1]),
+    "rms_strings"/string_block,
+    Bytes(8),
+    "other_strings"/Array(20, string_block),
+    "num_sn"/Int32ul,
     "strategic_numbers"/Array(lambda ctx: ctx.num_sn if find_save_version(ctx) >= 25.22 else 59, Int32sl),
     "num_ai_files"/Int64ul,
     "ai_files"/Array(lambda ctx: ctx.num_ai_files, Struct(

mgz/summary/full.py

@@ -332,7 +332,7 @@ def get_map(self):
                 self.reference,
                 tiles,
                 de_seed=self._header.lobby.de.map_seed if self._header.lobby.de else None,
-                de_strings=self._header.de.strings if self._header.de else []
+                de_strings=self._header.de.rms_strings.strings if self._header.de else []
             )
         return self._cache['map']
 

setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name='mgz',
-    version='1.7.10',
+    version='1.7.11',
     description='Parse Age of Empires 2 recorded games.',
     url='https://github.com/happyleavesaoc/aoc-mgz/',
     license='MIT',