@@ -48,7 +48,6 @@ def read_web_raw(self, reader: EndianBinaryReader):
4848
4949 compressedSize = reader .read_u_int ()
5050 uncompressedSize = reader .read_u_int ()
51- flags = True
5251
5352 if version >= 2 :
5453 completeFileSize = reader .read_u_int ()
@@ -58,9 +57,9 @@ def read_web_raw(self, reader: EndianBinaryReader):
5857
5958 reader .Position = headerSize
6059
61- uncompressedBytes = reader . read_bytes ( compressedSize )
62- if flags :
63- uncompressedBytes = CompressionHelper . decompress_lzma ( uncompressedBytes )
60+ uncompressedBytes = CompressionHelper . decompress_lzma (
61+ reader . read_bytes ( compressedSize )
62+ )
6463
6564 blocksReader = EndianBinaryReader (uncompressedBytes , offset = headerSize )
6665 nodesCount = blocksReader .read_int ()
@@ -82,20 +81,20 @@ def read_fs(self, reader: EndianBinaryReader):
8281 # header
8382 compressedSize = reader .read_u_int ()
8483 uncompressedSize = reader .read_u_int ()
85- flags = reader .read_u_int ()
84+ self . _data_flags = reader .read_u_int ()
8685
8786 if self .version >= 7 :
8887 reader .align_stream (16 )
8988
9089 _position = reader .Position
91- if flags & 0x80 != 0 : # kArchiveBlocksInfoAtTheEnd
90+ if self . _data_flags & 0x80 != 0 : # kArchiveBlocksInfoAtTheEnd
9291 reader .Position = reader .Length - compressedSize
9392 blocksInfoBytes = reader .read_bytes (compressedSize )
9493 reader .Position = _position
9594 else : # 0x40 kArchiveBlocksAndDirectoryInfoCombined
9695 blocksInfoBytes = reader .read_bytes (compressedSize )
9796
98- switch = flags & 0x3F
97+ switch = self . _data_flags & 0x3F
9998
10099 if switch == 1 : # LZMA
101100 blocksInfoBytes = CompressionHelper .decompress_lzma (blocksInfoBytes )
@@ -146,14 +145,29 @@ def decompress_block(blockInfo):
146145 else : # no compression
147146 return reader .read_bytes (blockInfo .uncompressedSize )
148147
148+ if m_BlocksInfo :
149+ self ._block_info_flags = m_BlocksInfo [0 ].flags
150+
149151 blocksReader = EndianBinaryReader (
150152 b"" .join (decompress_block (blockInfo ) for blockInfo in m_BlocksInfo ),
151153 offset = (blocksInfoReader .real_offset ())
152154 )
153-
155+
154156 return m_DirectoryInfo , blocksReader
155157
156- def save (self , packer = "none" ):
158+
159+ def save (self , packer = None ):
160+ """
161+ Rewrites the BundleFile and returns it as bytes object.
162+
163+ packer:
164+ can be either one of the following strings
165+ or tuple consisting of (block_info_flag, data_flag)
166+ allowed strings:
167+ none - no compression, default, safest bet
168+ lz4 - lz4 compression
169+ original - uses the original flags
170+ """
157171 # file_header
158172 # signature (string_to_null)
159173 # format (int)
@@ -173,14 +187,18 @@ def save(self, packer="none"):
173187 # self.save_web_raw(writer)
174188 elif self .signature == "UnityFS" :
175189 if not packer or packer == "none" :
176- self .save_fs (writer )
190+ self .save_fs (writer , 64 , 64 )
191+ elif packer == "original" :
192+ self .save_fs (writer , block_info_flag = self ._block_info_flags , data_flag = self ._data_flags )
177193 elif packer == "lz4" :
178194 self .save_fs (writer , block_info_flag = 194 , data_flag = 2 )
195+ elif isinstance (packer , tuple ):
196+ self .save_fs (writer , * packer )
179197 else :
180198 raise NotImplemented ("UnityFS - Packer:" , packer )
181199 return writer .bytes
182200
183- def save_fs (self , writer : EndianBinaryWriter , block_info_flag = 64 , data_flag = 64 ):
201+ def save_fs (self , writer : EndianBinaryWriter , block_info_flag : int , data_flag : int ):
184202 # header
185203 # compressed blockinfo (block details & directionary)
186204 # compressed assets
0 commit comments