1.9.19 update SerializedType & SerializedFile writers (K0lb3#147)

* update SerializedType writing/saving

* add test_save

* bump version to 1.9.19

* add file type check for test_save

* format test

Author: K0lb3

UnityPy/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.9.18"
+__version__ = "1.9.19"
 
 from .environment import Environment
 

UnityPy/files/SerializedFile.py

@@ -134,11 +134,11 @@ def __init__(self, reader, serialized_file, is_ref_type: bool):
                 if is_ref_type:
                     self.m_ClassName = reader.read_string_to_null()
                     self.m_NameSpace = reader.read_string_to_null()
-                    self.m_AsmName = reader.read_string_to_null()
+                    self.m_AssemblyName = reader.read_string_to_null()
                 else:
                     self.type_dependencies = reader.read_int_array()
 
-    def write(self, serialized_file, writer):
+    def write(self, serialized_file, writer, is_ref_type):
         version = serialized_file.header.version
         writer.write_int(self.class_id)
 
@@ -149,8 +149,10 @@ def write(self, serialized_file, writer):
             writer.write_short(self.script_type_index)
 
         if version >= 13:
-            if (version < 16 and self.class_id < 0) or (
-                version >= 16 and self.class_id == 114
+            if (
+                (is_ref_type and self.script_type_index >= 0)
+                or (version < 16 and self.class_id < 0)
+                or (version >= 16 and self.class_id == 114)
             ):
                 writer.write_bytes(self.script_id)  # Hash128
             writer.write_bytes(self.old_type_hash)  # Hash128
@@ -161,6 +163,14 @@ def write(self, serialized_file, writer):
             else:
                 serialized_file.save_type_tree(self.nodes, writer)
 
+            if version >= 21:
+                if is_ref_type:
+                    writer.write_string_to_null(self.m_ClassName)
+                    writer.write_string_to_null(self.m_NameSpace)
+                    writer.write_string_to_null(self.m_AssemblyName)
+                else:
+                    writer.write_int_array(self.type_dependencies)
+
 
 class SerializedFile(File.File):
     reader: EndianBinaryReader
@@ -243,8 +253,6 @@ def __init__(self, reader: EndianBinaryReader, parent=None, name=None):
         # ReadTypes
         type_count = reader.read_int()
         self.types = [SerializedType(reader, self, False) for _ in range(type_count)]
-        if config.SERIALIZED_FILE_PARSE_TYPETREE is False:
-            self._enable_type_tree = False
 
         self.big_id_enabled = 0
         if 7 <= header.version < 14:
@@ -277,6 +285,9 @@ def __init__(self, reader: EndianBinaryReader, parent=None, name=None):
                 SerializedType(reader, self, True) for _ in range(ref_type_count)
             ]
 
+        if config.SERIALIZED_FILE_PARSE_TYPETREE is False:
+            self._enable_type_tree = False
+
         if header.version >= 5:
             self.userInformation = reader.read_string_to_null()
 
@@ -439,7 +450,7 @@ def save(self, packer: str = None) -> bytes:
         # ReadTypes
         meta_writer.write_int(len(self.types))
         for typ in self.types:
-            typ.write(self, meta_writer)
+            typ.write(self, meta_writer, False)
 
         if 7 <= header.version < 14:
             meta_writer.write_int(self.big_id_enabled)
@@ -464,7 +475,7 @@ def save(self, packer: str = None) -> bytes:
         if header.version >= 20:
             meta_writer.write_int(len(self.ref_types))
             for ref_type in self.ref_types:
-                ref_type.write(self, meta_writer)
+                ref_type.write(self, meta_writer, True)
 
         if header.version >= 5:
             meta_writer.write_string_to_null(self.userInformation)

tests/test_main.py

@@ -79,6 +79,19 @@ def test_read_typetree():
         obj.read_typetree()
 
 
+def test_save():
+    env = UnityPy.load(SAMPLES)
+    # TODO - check against original
+    # this only makes sure
+    # that the save function still produces a readable file
+    for name, file in env.files.items():
+        if isinstance(file, UnityPy.streams.EndianBinaryReader):
+            continue
+        save1 = file.save()
+        save2 = UnityPy.load(save1).file.save()
+        assert save1 == save2
+
+
 if __name__ == "__main__":
     for x in list(locals()):
         if str(x)[:4] == "test":