Skip to content

Fix broken --create (JSON repack) round-trip #13

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
grub-basket wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix broken --create (JSON repack) round-trip #13

Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions rsrcdump/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,7 @@ def do_pack():
json_blob,
converters=converters,
only_types=only_types,
skip_types=skip_types,
encoding=args.encoding)
skip_types=skip_types)

binary_fork = fork.pack()

Expand Down
13 changes: 10 additions & 3 deletions rsrcdump/jsonio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def default(self, o: Any):
if isinstance(o, bytes):
return base64.b16encode(o).decode('ascii')
else:
return JSONEncoderBase16Fallback(self, o)
return super().default(o)


def resource_fork_to_json(
Expand All @@ -39,7 +39,11 @@ def resource_fork_to_json(
errors = []

for res_type, res_dir in fork.tree.items():
res_type_key = res_type.decode(get_global_encoding(), 'backslashreplace')
# Use the same encoding as the resource sub-directory name so the key
# round-trips through parse_type_name() on repack. Decoding the raw
# bytes here instead would not survive parse_type_name()'s unquote step
# for FourCCs containing high bytes or trailing spaces.
res_type_key = sanitize_type_name(res_type)

if res_type in exclude_types:
continue
Expand Down Expand Up @@ -132,7 +136,10 @@ def json_to_resource_fork(
fork.junk_filerefnum = json_blob['_metadata']['junk2']

for type_name, type_records in json_blob.items():
if len(type_name) > 4: # probably metadata
# Skip the metadata block. (A plain length check would wrongly drop
# URL-encoded type keys such as "%A9icn", which are longer than 4
# characters yet decode back to a 4-byte FourCC.)
if type_name == "_metadata":
continue

res_type = parse_type_name(type_name)
Expand Down