Apple-2-Tools/atrcopy
1
0
Fork 0
mirror of https://github.com/robmcmullen/atrcopy.git synced 2025-02-20 16:29:25 +00:00
Code Issues Projects Releases Wiki Activity

Removed duplicate error messages when disk image type isn't supported

Browse Source
This commit is contained in:
Rob McMullen 2018-06-25 11:35:38 -07:00
parent ca6076b1ad
commit f03517f0b0
1 changed files with 33 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
atrcopy/__init__.py
View File

@ -54,40 +54,29 @@ def process(image, dirent, options):
def find_diskimage(filename): def find_diskimage(filename):
try: with open(filename, "rb") as fh:
with open(filename, "rb") as fh: if options.verbose:
if options.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)
try: if container is not None:
container = guess_container(data, options.verbose) data = container.unpacked
if container is not None: rawdata = SegmentData(data)
data = container.unpacked for mime in mime_parse_order:
except errors.UnsupportedContainer as e: if options.verbose:
print(f"{filename}: {e}") print("Trying MIME type %s" % mime)
return None parser = guess_parser_for_mime(mime, rawdata, options.verbose)
rawdata = SegmentData(data) if parser is None:
for mime in mime_parse_order: continue
if options.verbose: if options.verbose:
print("Trying MIME type %s" % mime) print("Found parser %s" % parser.menu_name)
parser = guess_parser_for_mime(mime, rawdata, options.verbose) mime2 = guess_detail_for_mime(mime, rawdata, parser)
if parser is None: if mime != mime2 and options.verbose:
continue print("Signature match: %s" % mime2)
if options.verbose: break
print("Found parser %s" % parser.menu_name) if parser is None:
mime2 = guess_detail_for_mime(mime, rawdata, parser) raise errors.UnsupportedDiskImage("Unknown disk image type")
if mime != mime2 and options.verbose:
print("Signature match: %s" % mime2)
break
if parser is None:
print("%s: Unknown disk image type" % filename)
except errors.UnsupportedDiskImage as e:
print("%s: %s" % (filename, e))
return None
except IOError as e:
print("%s: %s" % (filename, e))
return None
else: else:
parser.image.filename = filename parser.image.filename = filename
parser.image.ext = "" parser.image.ext = ""
@ -233,8 +222,11 @@ def assemble_segments(source_files, data_files, obj_files, run_addr=""):
s = segments.add_segment(data, first) s = segments.add_segment(data, first)
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:
parser = find_diskimage(name) try:
if parser and parser.image: parser = find_diskimage(name)
except errors.AtrError as e:
print(f"skipping {name}: {e}")
else:
for s in parser.segments: for s in parser.segments:
if s.origin > 0: if s.origin > 0:
print("adding %s from %s" % (s, name)) print("adding %s from %s" % (s, name))
@ -581,8 +573,11 @@ def run():
obj = options.obj[0] if options.obj else [] obj = options.obj[0] if options.obj else []
boot_image(disk_image_name, asm, data, obj, options.run_addr) boot_image(disk_image_name, asm, data, obj, options.run_addr)
else: else:
parser = find_diskimage(disk_image_name) try:
if parser and parser.image: parser = find_diskimage(disk_image_name)
except (errors.UnsupportedContainer, errors.UnsupportedDiskImage, IOError) as e:
print(f"{disk_image_name}: {e}")
else:
if command not in skip_diskimage_summary: if command not in skip_diskimage_summary:
print("%s: %s" % (disk_image_name, parser.image)) print("%s: %s" % (disk_image_name, parser.image))
if command == "vtoc": if command == "vtoc":
@ -607,5 +602,3 @@ def run():
assemble(parser.image, asm, data, obj, options.run_addr) assemble(parser.image, asm, data, obj, options.run_addr)
elif command == "segments": elif command == "segments":
print("\n".join([str(a) for a in parser.segments])) print("\n".join([str(a) for a in parser.segments]))
else:
log.error("Invalid disk image: %s" % disk_image_name)