Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
52 changes: 22 additions & 30 deletions UnityPy/classes/PPtr.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from ..streams import EndianBinaryReader, EndianBinaryWriter

from ..helpers import ImportHelper
from .. import files
from ..enums import FileType

def save_ptr(obj, writer: EndianBinaryWriter, version):
if isinstance(obj, PPtr):
Expand All @@ -11,6 +13,7 @@ def save_ptr(obj, writer: EndianBinaryWriter, version):
else:
writer.write_long(obj.path_id)

cached_managers = dict()

class PPtr:
def __init__(self, reader: EndianBinaryReader):
Expand All @@ -34,44 +37,33 @@ def get_obj(self):
elif self.file_id > 0 and self.file_id - 1 < len(self.assets_file.externals):
if self.index == -2:
external_name = self.assets_file.externals[self.file_id - 1].name
parent = self.assets_file.parent
if parent is not None:
if external_name not in parent.files:
external_name = external_name.upper()
if external_name in parent.files:
manager = parent.files[external_name]
else:
if external_name not in cached_managers:
typ, reader = ImportHelper.check_file_type(external_name)
if typ == FileType.AssetsFile:
cached_managers[external_name] = files.SerializedFile(reader)
if external_name in cached_managers:
manager = cached_managers[external_name]

files = self.assets_file.parent.files
if external_name not in files:
external_name = external_name.upper()
manager = self.assets_file.parent.files[external_name]

"""
for sharedFile in assets_file.externals:
shared_file_path = os.path.join(
os.path.dirname(full_name), sharedFile.name
)
shared_file_name = sharedFile.name

if shared_file_name not in self.import_files:
if not os.path.exists(shared_file_path):
find_files = [
f
for f in ImportHelper.list_all_files(
os.path.dirname(full_name)
)
if shared_file_name in f
]
if find_files:
shared_file_path = find_files[0]

if os.path.exists(shared_file_path):
self.import_files[shared_file_name] = shared_file_path
"""

if manager and self.path_id in manager.objects:
self._obj = manager.objects[self.path_id]
else:
self._obj = False
self._obj = None

return self._obj

def __getattr__(self, key):
return getattr(self.get_obj(), key)
obj = self.get_obj()
if obj is None:
raise AttributeError(key)
return getattr(obj, key)

def __repr__(self):
return "<%s %s>" % (self.__class__.__name__, self._obj.__class__.__repr__(self.get_obj()) if self.get_obj() else "Not Found")
Expand Down
3 changes: 2 additions & 1 deletion UnityPy/files/SerializedFile.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,8 @@ def __init__(self, reader: EndianBinaryReader, environment=None, parent=None):
self.container[container] = asset
if hasattr(asset, "path_id"):
self._container[asset.path_id] = container
environment.container = {**environment.container, **self.container}
if environment is not None:
environment.container = {**environment.container, **self.container}

def set_version(self, string_version):
self.unity_version = string_version
Expand Down