Skip to content

Store directory and block info on bundle object #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Store directory and block info on bundle object #119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions UnityPy/files/BundleFile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ def __init__(self, reader: EndianBinaryReader, parent: File, name: str = None):
if signature == "UnityArchive":
raise NotImplemented("BundleFile - UnityArchive")
elif signature in ["UnityWeb", "UnityRaw"]:
m_DirectoryInfo, blocksReader = self.read_web_raw(reader)
blocksReader = self.read_web_raw(reader)
elif signature == "UnityFS":
m_DirectoryInfo, blocksReader = self.read_fs(reader)
blocksReader = self.read_fs(reader)
else:
raise NotImplemented(f"Unknown Bundle signature: {signature}")

self.read_files(blocksReader, m_DirectoryInfo)
self.read_files(blocksReader, self.m_DirectoryInfo)

def read_web_raw(self, reader: EndianBinaryReader):
# def read_header_and_blocks_info(self, reader:EndianBinaryReader):
Expand Down Expand Up @@ -63,7 +63,7 @@ def read_web_raw(self, reader: EndianBinaryReader):

blocksReader = EndianBinaryReader(uncompressedBytes, offset=headerSize)
nodesCount = blocksReader.read_int()
m_DirectoryInfo = [
self.m_DirectoryInfo = [
File.DirectoryInfo(
blocksReader.read_string_to_null(), # path
blocksReader.read_u_int(), # offset
Expand All @@ -72,7 +72,7 @@ def read_web_raw(self, reader: EndianBinaryReader):
for _ in range(nodesCount)
]

return m_DirectoryInfo, blocksReader
return blocksReader

def read_fs(self, reader: EndianBinaryReader):
version = self.version
Expand Down Expand Up @@ -102,7 +102,7 @@ def read_fs(self, reader: EndianBinaryReader):
uncompressedDataHash = blocksInfoReader.read_bytes(16)
blocksInfoCount = blocksInfoReader.read_int()

m_BlocksInfo = [
self.m_BlocksInfo = [
BlockInfo(
blocksInfoReader.read_u_int(), # uncompressedSize
blocksInfoReader.read_u_int(), # compressedSize
Expand All @@ -112,7 +112,7 @@ def read_fs(self, reader: EndianBinaryReader):
]

nodesCount = blocksInfoReader.read_int()
m_DirectoryInfo = [
self.m_DirectoryInfo = [
DirectoryInfoFS(
blocksInfoReader.read_long(), # offset
blocksInfoReader.read_long(), # size
Expand All @@ -122,8 +122,8 @@ def read_fs(self, reader: EndianBinaryReader):
for _ in range(nodesCount)
]

if m_BlocksInfo:
self._block_info_flags = m_BlocksInfo[0].flags
if self.m_BlocksInfo:
self._block_info_flags = self.m_BlocksInfo[0].flags

if self._data_flags & 0x200:
reader.align_stream(16)
Expand All @@ -135,12 +135,12 @@ def read_fs(self, reader: EndianBinaryReader):
blockInfo.uncompressedSize,
blockInfo.flags,
)
for blockInfo in m_BlocksInfo
for blockInfo in self.m_BlocksInfo
),
offset=(blocksInfoReader.real_offset()),
)

return m_DirectoryInfo, blocksReader
return blocksReader

def save(self, packer=None):
"""
Expand Down