Skip to content

Commit ea7181f

Browse files
authored
Merge pull request K0lb3#28 from UserUnknownFactor/master
Make PPTr work for bare assets by keeping cache
2 parents 9694d1a + 237ebf5 commit ea7181f

2 files changed

Lines changed: 24 additions & 31 deletions

File tree

‎UnityPy/classes/PPtr.py‎

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
from ..streams import EndianBinaryReader, EndianBinaryWriter
2-
2+
from ..helpers import ImportHelper
3+
from .. import files
4+
from ..enums import FileType
35

46
def save_ptr(obj, writer: EndianBinaryWriter, version):
57
if isinstance(obj, PPtr):
@@ -11,6 +13,7 @@ def save_ptr(obj, writer: EndianBinaryWriter, version):
1113
else:
1214
writer.write_long(obj.path_id)
1315

16+
cached_managers = dict()
1417

1518
class PPtr:
1619
def __init__(self, reader: EndianBinaryReader):
@@ -34,44 +37,33 @@ def get_obj(self):
3437
elif self.file_id > 0 and self.file_id - 1 < len(self.assets_file.externals):
3538
if self.index == -2:
3639
external_name = self.assets_file.externals[self.file_id - 1].name
40+
parent = self.assets_file.parent
41+
if parent is not None:
42+
if external_name not in parent.files:
43+
external_name = external_name.upper()
44+
if external_name in parent.files:
45+
manager = parent.files[external_name]
46+
else:
47+
if external_name not in cached_managers:
48+
typ, reader = ImportHelper.check_file_type(external_name)
49+
if typ == FileType.AssetsFile:
50+
cached_managers[external_name] = files.SerializedFile(reader)
51+
if external_name in cached_managers:
52+
manager = cached_managers[external_name]
3753

38-
files = self.assets_file.parent.files
39-
if external_name not in files:
40-
external_name = external_name.upper()
41-
manager = self.assets_file.parent.files[external_name]
42-
43-
"""
44-
for sharedFile in assets_file.externals:
45-
shared_file_path = os.path.join(
46-
os.path.dirname(full_name), sharedFile.name
47-
)
48-
shared_file_name = sharedFile.name
49-
50-
if shared_file_name not in self.import_files:
51-
if not os.path.exists(shared_file_path):
52-
find_files = [
53-
f
54-
for f in ImportHelper.list_all_files(
55-
os.path.dirname(full_name)
56-
)
57-
if shared_file_name in f
58-
]
59-
if find_files:
60-
shared_file_path = find_files[0]
61-
62-
if os.path.exists(shared_file_path):
63-
self.import_files[shared_file_name] = shared_file_path
64-
"""
6554

6655
if manager and self.path_id in manager.objects:
6756
self._obj = manager.objects[self.path_id]
6857
else:
69-
self._obj = False
58+
self._obj = None
7059

7160
return self._obj
7261

7362
def __getattr__(self, key):
74-
return getattr(self.get_obj(), key)
63+
obj = self.get_obj()
64+
if obj is None:
65+
raise AttributeError(key)
66+
return getattr(obj, key)
7567

7668
def __repr__(self):
7769
return "<%s %s>" % (self.__class__.__name__, self._obj.__class__.__repr__(self.get_obj()) if self.get_obj() else "Not Found")

‎UnityPy/files/SerializedFile.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,8 @@ def __init__(self, reader: EndianBinaryReader, environment=None, parent=None):
233233
self.container[container] = asset
234234
if hasattr(asset, "path_id"):
235235
self._container[asset.path_id] = container
236-
environment.container = {**environment.container, **self.container}
236+
if environment is not None:
237+
environment.container = {**environment.container, **self.container}
237238

238239
def set_version(self, string_version):
239240
self.unity_version = string_version

0 commit comments

Comments
 (0)