Apple-2-Tools
/
atrcopy
mirror of https://github.com/robmcmullen/atrcopy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changed find_diskimage to take verbose param so it can be called outside this module and not depend on options.verbose

This commit is contained in:
Rob McMullen 2018-10-25 19:50:50 -07:00
parent 5e2fbc70a0
commit b717edb8de
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
atrcopy/__init__.py
View File

@ -54,29 +54,29 @@ def process(image, dirent, options):
print(dirent) print(dirent)
def find_diskimage(filename): def find_diskimage(filename, verbose=False):
if filename == ".": if filename == ".":
parser = LocalFilesystem() parser = LocalFilesystem()
else: else:
with open(filename, "rb") as fh: with open(filename, "rb") as fh:
if options.verbose: if verbose:
print("Loading file %s" % filename) print("Loading file %s" % filename)
data = to_numpy(fh.read()) data = to_numpy(fh.read())
parser = None parser = None
container = guess_container(data, options.verbose) container = guess_container(data, verbose)
if container is not None: if container is not None:
data = container.unpacked data = container.unpacked
rawdata = SegmentData(data) rawdata = SegmentData(data)
for mime in mime_parse_order: for mime in mime_parse_order:
if options.verbose: if verbose:
print("Trying MIME type %s" % mime) print("Trying MIME type %s" % mime)
parser = guess_parser_for_mime(mime, rawdata, options.verbose) parser = guess_parser_for_mime(mime, rawdata, verbose)
if parser is None: if parser is None:
continue continue
if options.verbose: if verbose:
print("Found parser %s" % parser.menu_name) print("Found parser %s" % parser.menu_name)
mime2 = guess_detail_for_mime(mime, rawdata, parser) mime2 = guess_detail_for_mime(mime, rawdata, parser)
if mime != mime2 and options.verbose: if mime != mime2 and verbose:
print("Signature match: %s" % mime2) print("Signature match: %s" % mime2)
break break
if parser is None: if parser is None:
@ -227,7 +227,7 @@ def assemble_segments(source_files, data_files, obj_files, run_addr=""):
log.debug("read data for %s" % s.name) log.debug("read data for %s" % s.name)
for name in obj_files: for name in obj_files:
try: try:
parser = find_diskimage(name) parser = find_diskimage(name, options.verbose)
except errors.AtrError as e: except errors.AtrError as e:
print(f"skipping {name}: {e}") print(f"skipping {name}: {e}")
else: else:
@ -381,7 +381,7 @@ def create_image(template, name):
else: else:
with open(name, "wb") as fh: with open(name, "wb") as fh:
fh.write(data) fh.write(data)
parser = find_diskimage(name) parser = find_diskimage(name, options.verbose)
print("created %s: %s" % (name, str(parser.image))) print("created %s: %s" % (name, str(parser.image)))
list_files(parser.image, []) list_files(parser.image, [])
else: else:
@ -587,7 +587,7 @@ def run():
boot_image(disk_image_name, asm, data, obj, options.run_addr) boot_image(disk_image_name, asm, data, obj, options.run_addr)
else: else:
try: try:
parser = find_diskimage(disk_image_name) parser = find_diskimage(disk_image_name, options.verbose)
except (errors.UnsupportedContainer, errors.UnsupportedDiskImage, IOError) as e: except (errors.UnsupportedContainer, errors.UnsupportedDiskImage, IOError) as e:
print(f"{disk_image_name}: {e}") print(f"{disk_image_name}: {e}")
else: else: