Skip to content

Commit d5bfdc1

Browse files
committed
1.6.6 - writeable cab interface
1 parent 704d3ab commit d5bfdc1

5 files changed

Lines changed: 98 additions & 26 deletions

File tree

‎UnityPy/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = "1.6.5.8"
1+
__version__ = "1.6.6"
22

33
from .environment import Environment
44

‎UnityPy/classes/Texture2D.py‎

Lines changed: 51 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,30 @@ def image(self, img):
1919
raise Exception("No image provided")
2020

2121
self.image_data = img_data
22-
self.m_CompleteImageSize = len(self.image_data)
22+
# width * height * channel count
23+
self.m_CompleteImageSize = img.width * img.height * len(img.getbands())
2324
self.m_TextureFormat = tex_format
24-
25+
26+
@property
27+
def image_data(self):
28+
return self._image_data
29+
30+
@image_data.setter
31+
def image_data(self, data):
32+
self._image_data = data
33+
# prefer writing to cab if possible
2534
if self.m_StreamData:
26-
self.m_StreamData.offset = 0
27-
self.m_StreamData.size = 0
28-
self.m_StreamData.path = ''
35+
cab = self.assets_file.get_writeable_cab()
36+
if cab:
37+
self.m_StreamData.offset = cab.Position
38+
cab.write(data)
39+
self.m_StreamData.size = len(data)
40+
self.m_StreamData.path = cab.name
41+
else:
42+
self.m_StreamData.offset = 0
43+
self.m_StreamData.size = 0
44+
self.m_StreamData.path = ''
45+
2946

3047
def __init__(self, reader):
3148
super().__init__(reader=reader)
@@ -35,7 +52,7 @@ def __init__(self, reader):
3552
self.m_Height = reader.read_int()
3653
self.m_CompleteImageSize = reader.read_int()
3754
if version >= (2020,): # 2020.1 and up
38-
self.mips_stripped = reader.read_int()
55+
self.m_MipsStripped = reader.read_int()
3956
self.m_TextureFormat = TextureFormat(reader.read_int())
4057
if version[:2] < (5, 2): # 5.2 down
4158
self.m_MipMap = reader.read_boolean()
@@ -45,13 +62,13 @@ def __init__(self, reader):
4562
if version >= (2, 6): # 2.6 and up
4663
self.m_IsReadable = reader.read_boolean() # 2.6 and up
4764
if version >= (2020,): # 2020.1 and up
48-
self.is_pre_processed = reader.read_boolean()
65+
self.IsPreProcessed = reader.read_boolean()
4966
if version >= (2019, 3): # 2019.3 and up
50-
self.ignore_master_texture_limit = reader.read_boolean()
67+
self.m_IgnoreMasterTextureLimit = reader.read_boolean()
5168
if (3,) <= version[:2] <= (5, 4): # 3.0 - 5.4
5269
self.m_ReadAllowed = reader.read_boolean()
5370
if version >= (2018, 2): # 2018.2 and up
54-
self.m_streaming_mipmaps = reader.read_boolean()
71+
self.m_StreamingMipmaps = reader.read_boolean()
5572

5673
reader.align_stream()
5774
if version >= (2018, 2): # 2018.2 and up
@@ -68,19 +85,22 @@ def __init__(self, reader):
6885
reader.align_stream()
6986

7087
image_data_size = reader.read_int()
71-
self.image_data = b""
88+
self._image_data = b""
7289

73-
if image_data_size == 0 and version >= (5, 3): # 5.3 and up
90+
if image_data_size != 0:
91+
self._image_data = reader.read_bytes(image_data_size)
92+
93+
self.m_StreamData = None
94+
if version >= (5, 3): # 5.3 and up
95+
# always read the StreamingInfo for resaving
7496
self.m_StreamData = StreamingInfo(reader, version)
75-
if self.m_StreamData.size:
76-
self.image_data = get_resource_data(
97+
if image_data_size == 0 and self.m_StreamData.path:
98+
self._image_data = get_resource_data(
7799
self.m_StreamData.path,
78100
self.assets_file,
79101
self.m_StreamData.offset,
80102
self.m_StreamData.size,
81103
)
82-
else:
83-
self.image_data = reader.read_bytes(image_data_size)
84104

85105
def save(self, writer: EndianBinaryWriter = None):
86106
if writer is None:
@@ -124,21 +144,29 @@ def save(self, writer: EndianBinaryWriter = None):
124144
writer.write_byte_array(self.m_PlatformBlob)
125145
writer.align_stream()
126146

127-
if self.m_StreamData and self.m_StreamData.path:
128-
writer.write_int(0)
129-
else:
147+
148+
if version[:2] < (5,3):
149+
# version without m_StreamData
130150
writer.write_int(len(self.image_data))
131151
writer.write_bytes(self.image_data)
132-
133-
self.m_StreamData.save(writer, version)
152+
else:
153+
# decide if m_StreamData is used
154+
if self.m_StreamData.path:
155+
# used -> don't save the image_data
156+
writer.write_int(0)
157+
else:
158+
writer.write_int(len(self.image_data))
159+
writer.write_bytes(self.image_data)
160+
161+
self.m_StreamData.save(writer, version)
134162

135163
self.set_raw_data(writer.bytes)
136164

137165

138166
class StreamingInfo:
139-
offset: int = 0
140-
size: int = 0
141-
path: str = ""
167+
offset: int
168+
size: int
169+
path: str
142170

143171
def __init__(self, reader, version):
144172
if version >= (2020,): # 2020.1 and up

‎UnityPy/files/BundleFile.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ def save_fs(self, writer: EndianBinaryWriter, block_info_flag=64, data_flag=64):
236236
name,
237237
f.flags,
238238
data_writer.write_bytes(
239-
f.bytes if isinstance(f, EndianBinaryReader) else f.save()
239+
f.bytes if isinstance(f, (EndianBinaryReader, EndianBinaryWriter)) else f.save()
240240
),
241241
)
242242
for name, f in self.files.items()

‎UnityPy/files/File.py‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from ..enums import FileType
22
from ..helpers import ImportHelper
3-
from ..streams import EndianBinaryReader
3+
from ..streams import EndianBinaryReader, EndianBinaryWriter
44

55
from collections import namedtuple
66

@@ -56,6 +56,23 @@ def read_files(self, reader: EndianBinaryReader, files: list):
5656
f.flags = getattr(node, "flags", 0)
5757
self.files[name] = f
5858

59+
def get_writeable_cab(self, name : str = "CAB-UnityPy_Mod.resS"):
60+
"""
61+
Creates a new cab file in the bundle that contains the given data.
62+
This is usefull for asset types that use resource files.
63+
"""
64+
if name in self.files:
65+
if isinstance(self.files[name], EndianBinaryWriter):
66+
return self.files[name]
67+
else:
68+
raise ValueError("This cab already exists and isn't an EndianBinaryWriter")
69+
70+
writer = EndianBinaryWriter()
71+
writer.flags = 4
72+
writer.name = name
73+
self.files[name] = writer
74+
return writer
75+
5976
@property
6077
def container(self):
6178
return {

‎UnityPy/files/SerializedFile.py‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,33 @@ def read_type_tree_blob(self, type_tree):
358358

359359
return string_buffer_reader.bytes
360360

361+
def get_writeable_cab(self, name : str = "CAB-UnityPy_Mod.resS"):
362+
"""
363+
Creates a new cab file in the bundle that contains the given data.
364+
This is usefull for asset types that use resource files.
365+
"""
366+
if not isinstance(self.parent, (File.BundleFile.BundleFile, File.WebFile.WebFile)):
367+
return None
368+
cab = self.parent.get_writeable_cab(name)
369+
370+
cab_path = f"archive:/{name}"
371+
if not any(cab_path == x.path for x in self.externals):
372+
# register as external
373+
class FileIdentifierFake:
374+
pass
375+
file_identifier = FileIdentifierFake()
376+
file_identifier.__class__ = FileIdentifier
377+
file_identifier.temp_empty = ""
378+
import uuid
379+
file_identifier.guid = uuid.uuid1().urn[-16:].encode("ascii")
380+
file_identifier.path = f"archive:/{name}"
381+
file_identifier.type = 0
382+
self.externals.append(
383+
file_identifier
384+
)
385+
386+
return cab
387+
361388
def save(self) -> bytes:
362389
# 1. header -> has to be delayed until the very end
363390
# 2. data -> types, objects, scripts, ...

0 commit comments

Comments
 (0)