Skip to content

Commit 573ccbc

Browse files
Keep file names for convenience (K0lb3#70)
FakeNode can be used externally Add some convenience functions
1 parent 607fcc5 commit 573ccbc

13 files changed

Lines changed: 189 additions & 104 deletions

File tree

‎.github/workflows/python-package.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
4545
- name: Install module
4646
run: |
47-
python setup.py install
47+
pip install . --use-feature=in-tree-build
4848
4949
- name: Test with pytest
5050
run: |
@@ -69,3 +69,4 @@ jobs:
6969
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
7070
run: |
7171
twine upload dist/* --skip-existing
72+

‎UnityPy/classes/MonoBehaviour.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from .Behaviour import Behaviour
22
from .PPtr import PPtr, save_ptr
33
from ..streams import EndianBinaryReader, EndianBinaryWriter
4-
4+
from ..exceptions import TypeTreeError as TypeTreeError
55

66
class MonoBehaviour(Behaviour):
77
def __init__(self, reader: EndianBinaryReader):
@@ -11,7 +11,11 @@ def __init__(self, reader: EndianBinaryReader):
1111

1212
self._raw_offset = reader.Position
1313
if self.assets_file._enable_type_tree:
14-
self.read_typetree()
14+
try:
15+
self.read_typetree()
16+
except TypeTreeError as e:
17+
print("Failed to read TypeTree:\n", e.message)
18+
self.assets_file._enable_type_tree = False
1519

1620
def save(self, writer: EndianBinaryWriter = None, raw_data: bytes = None):
1721
if writer is None:
@@ -35,3 +39,4 @@ def raw_data(self) -> bytes:
3539
reader = self.reader
3640
reader.Position = self._raw_offset
3741
return reader.read_bytes(reader.byte_size - (self._raw_offset - reader.byte_start))
42+

‎UnityPy/classes/Object.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from ..streams import EndianBinaryWriter
55
from ..files import ObjectReader
66
import types
7-
7+
from ..exceptions import TypeTreeError as TypeTreeError
88

99
class Object(object):
1010
type_tree: dict
@@ -46,7 +46,11 @@ def dump_typetree_structure(self) -> str:
4646
return self.reader.dump_typetree_structure()
4747

4848
def read_typetree(self, nodes: list = None) -> dict:
49-
tree = self.reader.read_typetree(nodes)
49+
try:
50+
tree = self.reader.read_typetree(nodes)
51+
except TypeTreeError as e:
52+
print("Failed to read TypeTree:\n", e.message)
53+
return {}
5054
self.type_tree = NodeHelper(tree, self.assets_file)
5155
return tree
5256

@@ -173,3 +177,4 @@ def keys(self):
173177

174178
def __repr__(self):
175179
return "<NodeHelper - %s>" % self.__dict__.__repr__()
180+

‎UnityPy/environment.py‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class Environment:
1616
def __init__(self, *args):
1717
self.files = {}
1818
self.path = "."
19+
self.out_path = os.path.join(os.getcwd(), "output")
1920

2021
if args:
2122
for arg in args:
@@ -62,18 +63,19 @@ def load_file(self, stream, parent=None):
6263
typ, reader = ImportHelper.check_file_type(stream)
6364
try:
6465
if typ == FileType.AssetsFile:
65-
return files.SerializedFile(reader, parent)
66+
return files.SerializedFile(reader, parent, name=stream.name)
6667
elif typ == FileType.BundleFile:
67-
return files.BundleFile(reader, parent)
68+
return files.BundleFile(reader, parent, name=stream.name)
6869
elif typ == FileType.WebFile:
69-
return files.WebFile(reader, parent)
70+
return files.WebFile(reader, parent, name=stream.name)
7071
elif typ == FileType.ZIP:
7172
self.load_zip_file(stream)
7273
elif typ == FileType.ResourceFile:
7374
return EndianBinaryReader(stream)
74-
except:
75+
except Exception as e:
7576
# just to be sure
7677
# cuz the SerializedFile detection isn't perfect
78+
print("Error loading, reverting to EndianBinaryReader:\n", e.message)
7779
return EndianBinaryReader(stream)
7880

7981
def load_zip_file(self, value):
@@ -88,7 +90,7 @@ def load_zip_file(self, value):
8890
z = ZipFile(buffer)
8991
splits = {}
9092
for path in z.namelist():
91-
93+
9294
if path[-7:-1] == ".split":
9395
name = path[:-7]
9496
if name not in splits:
@@ -106,7 +108,7 @@ def load_zip_file(self, value):
106108
cur.files[d] = files.File(self)
107109
cur = cur.files[d]
108110
cur.files[name] = self.load_file(stream, cur)
109-
111+
110112
# merge splits
111113
for path, items in splits.items():
112114
# merge data
@@ -124,6 +126,16 @@ def load_zip_file(self, value):
124126

125127
z.close()
126128

129+
def save(self, pack="none"):
130+
""" Saves all changed assets.
131+
Mark assets as changed using `.mark_changed()`.
132+
pack = "none" (default) or "lz4"
133+
"""
134+
for f in self.files:
135+
if self.files[f].is_changed:
136+
with open(os.path.join(self.out_path, os.path.basename(f)), 'wb') as out:
137+
out.write(self.files[f].save(packer=pack))
138+
127139
@property
128140
def objects(self):
129141
def search(item):
@@ -167,3 +179,4 @@ def gen_all_asset_files(file, ret = []):
167179

168180
def get(self, key, default=None):
169181
return getattr(self, key, default)
182+

‎UnityPy/exceptions.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
class TypeTreeError(Exception):
2+
def __init__(self, message, nodes):
3+
# Call the base class constructor with the parameters it needs
4+
super().__init__(message)
5+
self.nodes = nodes

0 commit comments

Comments
 (0)