From b717edb8de517d231929a9cb2480f2cfaf90294e Mon Sep 17 00:00:00 2001
From: Rob McMullen <feedback@playermissile.com>
Date: Thu, 25 Oct 2018 19:50:50 -0700
Subject: [PATCH] Changed find_diskimage to take verbose param so it can be
 called outside this module and not depend on options.verbose

---
 atrcopy/__init__.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/atrcopy/__init__.py b/atrcopy/__init__.py
index f2b6d0c..4963486 100644
--- a/atrcopy/__init__.py
+++ b/atrcopy/__init__.py
@@ -54,29 +54,29 @@ def process(image, dirent, options):
         print(dirent)
 
 
-def find_diskimage(filename):
+def find_diskimage(filename, verbose=False):
     if filename == ".":
         parser = LocalFilesystem()
     else:
         with open(filename, "rb") as fh:
-            if options.verbose:
+            if verbose:
                 print("Loading file %s" % filename)
             data = to_numpy(fh.read())
         parser = None
-        container = guess_container(data, options.verbose)
+        container = guess_container(data, verbose)
         if container is not None:
             data = container.unpacked
         rawdata = SegmentData(data)
         for mime in mime_parse_order:
-            if options.verbose:
+            if verbose:
                 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:
                 continue
-            if options.verbose:
+            if verbose:
                 print("Found parser %s" % parser.menu_name)
             mime2 = guess_detail_for_mime(mime, rawdata, parser)
-            if mime != mime2 and options.verbose:
+            if mime != mime2 and verbose:
                 print("Signature match: %s" % mime2)
             break
     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)
     for name in obj_files:
         try:
-            parser = find_diskimage(name)
+            parser = find_diskimage(name, options.verbose)
         except errors.AtrError as e:
             print(f"skipping {name}: {e}")
         else:
@@ -381,7 +381,7 @@ def create_image(template, name):
         else:
             with open(name, "wb") as fh:
                 fh.write(data)
-            parser = find_diskimage(name)
+            parser = find_diskimage(name, options.verbose)
             print("created %s: %s" % (name, str(parser.image)))
             list_files(parser.image, [])
     else:
@@ -587,7 +587,7 @@ def run():
         boot_image(disk_image_name, asm, data, obj, options.run_addr)
     else:
         try:
-            parser = find_diskimage(disk_image_name)
+            parser = find_diskimage(disk_image_name, options.verbose)
         except (errors.UnsupportedContainer, errors.UnsupportedDiskImage, IOError) as e:
             print(f"{disk_image_name}: {e}")
         else: