Macintosh-Tools/macresources
1
0
Fork 0
mirror of https://github.com/elliotnunn/macresources.git synced 2024-06-30 09:29:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix Rez codegen

Browse Source
This commit is contained in:
Elliot Nunn 2018-12-11 12:39:30 +08:00
parent bbc88c54a9
commit 3e2f151b6e
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/SimpleDeRez
View File

@ -16,7 +16,7 @@ parser = argparse.ArgumentParser(description='''
parser.add_argument('resourceFile', help='file to be decompiled')
parser.add_argument('-ascii', action='store_true', help='[!] guarantee ASCII output')
parser.add_argument('-fakehdr', action='store_true', help='[!] save 225b file header as fake resource')
parser.add_argument('-compcmt', action='store_true', help='[!] helpfully comment compressed resources')
parser.add_argument('-extract', action='store_true', help='[!] extract Sys7-style compressed resources')
parser.add_argument('-useDF', action='store_true', help='ignored: data fork is always used')
args = parser.parse_args()
@ -25,7 +25,6 @@ with open(args.resourceFile, 'rb') as f:
resources = macresources.parse_file(f.read(), fake_header_rsrc=args.fakehdr)
try:
rez = macresources.make_rez_code(resources, ascii_clean=args.ascii, cmt_unsupported_attrib=args.compcmt)
sys.stdout.buffer.write(rez)
except BrokenPipeError:
pass # like we get when we pipe into head

14
macresources/main.py
View File

@ -168,10 +168,10 @@ class Resource:
self._cache = CompressResource(self.data, self.compression_format)
self._cache_hash = hash_mutable(self.data)
def _rez_repr(self, compression_savvy=False):
def _rez_repr(self, extract=False):
# decide now: what raw data will we slap down?
if self.compression_format:
if compression_savvy:
if extract:
attribs = self.attribs - ResourceAttrs._compressed # will this work??
data = self.data
compression_cmt = self.compression_format
@ -407,7 +407,7 @@ def make_file(from_iter, align=1):
return bytes(accum)
def make_rez_code(from_iter, ascii_clean=False, cmt_unsupported_attrib=False):
def make_rez_code(from_iter, ascii_clean=False, extract=False):
"""Express an iterator of Resource objects as Rez code (bytes).
This will match the output of the deprecated Rez utility, unless the
@ -421,15 +421,19 @@ def make_rez_code(from_iter, ascii_clean=False, cmt_unsupported_attrib=False):
lines = []
for resource in from_iter:
data, attribs, compression_cmt = resource._rez_repr(extract=extract)
args = []
args.append(str(resource.id).encode('ascii'))
if resource.name is not None:
args.append(_rez_escape(resource.name.encode('mac_roman'), singlequote=False, ascii_clean=ascii_clean))
args.extend(x.encode('ascii') for x in resource.attribs._for_derez(cmt_unsupported=cmt_unsupported_attrib))
args.extend(x.encode('ascii') for x in attribs._for_derez())
args = b', '.join(args)
fourcc = _rez_escape(resource.type, singlequote=True, ascii_clean=ascii_clean)
if compression_cmt: lines.append(b'/* Compression: %s */' % compression_cmt.encode('mac_roman'))
if resource.type == FAKE_HEADER_RSRC_TYPE:
lines.append(b'#if 0')
lines.append(b'data %s (%s) {' % (fourcc, args))
@ -437,7 +441,7 @@ def make_rez_code(from_iter, ascii_clean=False, cmt_unsupported_attrib=False):
step = 16
star, slash, dot, space = b'*/. '
whole_preview = bytearray(resource.data)
whole_preview = bytearray(data)
for i in range(len(whole_preview)):
if not i % step: mode = False
thisone = whole_preview[i]