Skip to content

Commit 5b7e94b

Browse files
committed
PPtr - eq, hash, fix external resolving
1 parent 4859a47 commit 5b7e94b

1 file changed

Lines changed: 31 additions & 10 deletions

File tree

‎UnityPy/classes/PPtr.py‎

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
from __future__ import annotations
2-
from typing import TypeVar, Generic, TYPE_CHECKING, Optional, Any, cast
2+
3+
from typing import TYPE_CHECKING, Any, Generic, Optional, TypeVar, cast
34

45
from attr import define
56

67
if TYPE_CHECKING:
8+
from ..enums.ClassIDType import ClassIDType
79
from ..files.ObjectReader import ObjectReader
810
from ..files.SerializedFile import SerializedFile
9-
from ..enums.ClassIDType import ClassIDType
1011

1112
T = TypeVar("T")
1213

@@ -48,9 +49,9 @@ def deref(self, assetsfile: Optional[SerializedFile] = None) -> ObjectReader[T]:
4849
else:
4950
# resolve file id to external name
5051
external_id = self.m_FileID - 1
51-
if external_id >= len(assetsfile.m_Externals):
52+
if external_id >= len(assetsfile.externals):
5253
raise FileNotFoundError("Failed to resolve pointer - invalid m_FileID!")
53-
external = assetsfile.m_Externals[external_id]
54+
external = assetsfile.externals[external_id]
5455

5556
# resolve external name to assetsfile
5657
container = assetsfile.parent
@@ -60,14 +61,26 @@ def deref(self, assetsfile: Optional[SerializedFile] = None) -> ObjectReader[T]:
6061
f"PPtr points to {external.path} but no container is set!"
6162
)
6263

63-
for child in container.childs:
64-
if isinstance(child, SerializedFile) and child.name == external.path:
65-
assetsfile = child
64+
external_clean_path = external.path
65+
if external_clean_path.startswith("archive:/"):
66+
external_clean_path = external_clean_path[9:]
67+
if external_clean_path.startswith("assets/"):
68+
external_clean_path = external_clean_path[7:]
69+
external_clean_path = external_clean_path.rsplit("/")[-1].lower()
70+
71+
for key, file in container.files.items():
72+
if key.lower() == external_clean_path:
73+
assetsfile = file
6674
break
6775
else:
68-
raise FileNotFoundError(
69-
f"Failed to resolve pointer - {external.path} not found!"
70-
)
76+
env = assetsfile.environment
77+
cab = env.find_file(external_clean_path)
78+
if cab:
79+
assetsfile = cab
80+
else:
81+
raise FileNotFoundError(
82+
f"Failed to resolve pointer - {external.path} not found!"
83+
)
7184

7285
return cast("ObjectReader[T]", assetsfile.objects[self.m_PathID])
7386

@@ -83,3 +96,11 @@ def deref_parse_as_dict(
8396

8497
def __bool__(self):
8598
return self.m_PathID != 0
99+
100+
def __hash__(self) -> int:
101+
return hash((self.m_FileID, self.m_PathID))
102+
103+
def __eq__(self, other: object) -> bool:
104+
if not isinstance(other, PPtr):
105+
return False
106+
return self.m_FileID == other.m_FileID and self.m_PathID == other.m_PathID

0 commit comments

Comments
 (0)