Skip to content

Commit b7d2c15

Browse files
committed
merge TypeTreeNode and FakeNode
fix .type issue of FakeNode
1 parent b783409 commit b7d2c15

2 files changed

Lines changed: 162 additions & 123 deletions

File tree

‎UnityPy/files/SerializedFile.py‎

Lines changed: 22 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from . import File, ObjectReader
66
from ..enums import BuildTarget, ClassIDType, CommonString
77
from ..streams import EndianBinaryReader, EndianBinaryWriter
8+
from ..helpers.TypeTreeHelper import TypeTreeNode
89

910
RECURSION_LIMIT = sys.getrecursionlimit()
1011

@@ -75,22 +76,6 @@ def write(self, header: SerializedFileHeader, writer: EndianBinaryWriter):
7576
writer.write_string_to_null(self.path)
7677

7778

78-
class TypeTreeNode(dict):
79-
type: str
80-
name: str
81-
byte_size: int
82-
index: int
83-
is_array: int
84-
version: int
85-
meta_flag: int
86-
level: int
87-
type_str_offset: int
88-
name_str_offset: int
89-
90-
def __repr__(self):
91-
return f"<TypeTreeNode({self.level} {self.type} {self.name})>"
92-
93-
9479
class BuildType:
9580
build_type: str
9681

@@ -126,16 +111,15 @@ def __init__(self, reader, serialized_file):
126111

127112
if version >= 13:
128113
if (version < 16 and self.class_id < 0) or (
129-
version >= 16 and self.class_id == 114
114+
version >= 16 and self.class_id == 114
130115
):
131116
self.script_id = reader.read_bytes(16) # Hash128
132117
self.old_type_hash = reader.read_bytes(16) # Hash128
133118

134119
if serialized_file._enable_type_tree:
135120
type_tree = []
136121
if version >= 12 or version == 10:
137-
self.string_data = serialized_file.read_type_tree_blob(
138-
type_tree)
122+
self.string_data = serialized_file.read_type_tree_blob(type_tree)
139123
else:
140124
serialized_file.read_type_tree(type_tree)
141125

@@ -156,15 +140,14 @@ def write(self, serialized_file, writer):
156140

157141
if version >= 13:
158142
if (version < 16 and self.class_id < 0) or (
159-
version >= 16 and self.class_id == 114
143+
version >= 16 and self.class_id == 114
160144
):
161145
writer.write_bytes(self.script_id) # Hash128
162146
writer.write_bytes(self.old_type_hash) # Hash128
163147

164148
if serialized_file._enable_type_tree:
165149
if version >= 12 or version == 10:
166-
serialized_file.save_type_tree5(
167-
self.nodes, writer, self.string_data)
150+
serialized_file.save_type_tree5(self.nodes, writer, self.string_data)
168151
else:
169152
serialized_file.save_type_tree(self.nodes, writer)
170153

@@ -309,7 +292,7 @@ def set_version(self, string_version):
309292
self.version = tuple(int(x) for x in version_split)
310293

311294
def read_type_tree(self, type_tree):
312-
level_stack = [[0,1]]
295+
level_stack = [[0, 1]]
313296
while level_stack:
314297
level, count = level_stack[-1]
315298
if count == 1:
@@ -336,10 +319,9 @@ def read_type_tree(self, type_tree):
336319

337320
children_count = self.reader.read_int()
338321
if children_count:
339-
level_stack.append([level+1, children_count])
322+
level_stack.append([level + 1, children_count])
340323
return type_tree
341324

342-
343325
def read_type_tree_blob(self, type_tree):
344326
reader = self.reader
345327
number_of_nodes = self.reader.read_int()
@@ -361,7 +343,8 @@ def read_type_tree_blob(self, type_tree):
361343
node.ref_type_hash = reader.read_u_long()
362344

363345
string_buffer_reader = EndianBinaryReader(
364-
reader.read(string_buffer_size), reader.endian)
346+
reader.read(string_buffer_size), reader.endian
347+
)
365348
for node in type_tree:
366349
node.type = read_string(string_buffer_reader, node.type_str_offset)
367350
node.name = read_string(string_buffer_reader, node.name_str_offset)
@@ -373,7 +356,9 @@ def get_writeable_cab(self, name: str = "CAB-UnityPy_Mod.resS"):
373356
Creates a new cab file in the bundle that contains the given data.
374357
This is usefull for asset types that use resource files.
375358
"""
376-
if not isinstance(self.parent, (File.BundleFile.BundleFile, File.WebFile.WebFile)):
359+
if not isinstance(
360+
self.parent, (File.BundleFile.BundleFile, File.WebFile.WebFile)
361+
):
377362
return None
378363
cab = self.parent.get_writeable_cab(name)
379364

@@ -382,20 +367,20 @@ def get_writeable_cab(self, name: str = "CAB-UnityPy_Mod.resS"):
382367
# register as external
383368
class FileIdentifierFake:
384369
pass
370+
385371
file_identifier = FileIdentifierFake()
386372
file_identifier.__class__ = FileIdentifier
387373
file_identifier.temp_empty = ""
388374
import uuid
375+
389376
file_identifier.guid = uuid.uuid1().urn[-16:].encode("ascii")
390377
file_identifier.path = cab.path
391378
file_identifier.type = 0
392-
self.externals.append(
393-
file_identifier
394-
)
379+
self.externals.append(file_identifier)
395380

396381
return cab
397382

398-
def save(self, packer: str=None) -> bytes:
383+
def save(self, packer: str = None) -> bytes:
399384
# 1. header -> has to be delayed until the very end
400385
# 2. data -> types, objects, scripts, ...
401386

@@ -499,10 +484,10 @@ def save(self, packer: str=None) -> bytes:
499484
return writer.bytes
500485

501486
def save_serialized_type(
502-
self,
503-
typ: SerializedType,
504-
header: SerializedFileHeader,
505-
writer: EndianBinaryWriter,
487+
self,
488+
typ: SerializedType,
489+
header: SerializedFileHeader,
490+
writer: EndianBinaryWriter,
506491
):
507492
writer.write_int(typ.class_id)
508493

@@ -514,7 +499,7 @@ def save_serialized_type(
514499

515500
if header.version >= 13:
516501
if (header.version < 16 and typ.class_id < 0) or (
517-
header.version >= 16 and typ.class_id == 114
502+
header.version >= 16 and typ.class_id == 114
518503
):
519504
writer.write_bytes(typ.script_id) # Hash128
520505
writer.write_bytes(typ.old_type_hash) # Hash128
@@ -543,7 +528,7 @@ def save_type_tree(self, nodes: list, writer: EndianBinaryWriter):
543528

544529
# calc children count
545530
children_count = 0
546-
for node2 in nodes[i + 1:]:
531+
for node2 in nodes[i + 1 :]:
547532
if node2.level == node.level:
548533
break
549534
if node2.level == node.level - 1:

0 commit comments

Comments
 (0)