From 3a988495e8fec4e44970c7673f981bbd650e02f2 Mon Sep 17 00:00:00 2001
From: Rob McMullen <feedback@playermissile.com>
Date: Sat, 1 Oct 2016 18:42:39 -0700
Subject: [PATCH] Added extra verbosity to show parsing error

---
 atrcopy/__init__.py |  2 +-
 atrcopy/ataridos.py |  4 ++--
 atrcopy/parsers.py  | 17 +++++++++++------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/atrcopy/__init__.py b/atrcopy/__init__.py
index f745fad..9a9eb7c 100644
--- a/atrcopy/__init__.py
+++ b/atrcopy/__init__.py
@@ -78,7 +78,7 @@ def run():
             for mime in mime_parse_order:
                 if options.verbose:
                     print "Trying MIME type %s" % mime
-                parser = guess_parser_for_mime(mime, rawdata)
+                parser = guess_parser_for_mime(mime, rawdata, options.verbose)
                 if parser is None:
                     continue
                 if options.verbose:
diff --git a/atrcopy/ataridos.py b/atrcopy/ataridos.py
index 288fc7f..d215d55 100644
--- a/atrcopy/ataridos.py
+++ b/atrcopy/ataridos.py
@@ -179,14 +179,14 @@ class AtariDosFile(object):
                 first = False
                 continue
             elif first:
-                raise InvalidBinaryFile
+                raise InvalidBinaryFile("Object file doesn't start with 0xffff")
             log.debug("header parsing: header=0x%x" % header)
             if len(b[pos:pos + 4]) < 4:
                 self.segments.append(ObjSegment(r[pos:pos + 4], 0, 0, 0, len(b[pos:pos + 4]), "Short Segment Header"))
                 break
             start, end = b[pos:pos + 4].view(dtype='<u2')
             if end < start:
-                raise InvalidBinaryFile
+                raise InvalidBinaryFile("Nonsensical start and end addresses")
             count = end - start + 1
             found = len(b[pos + 4:pos + 4 + count])
             if found < count:
diff --git a/atrcopy/parsers.py b/atrcopy/parsers.py
index c4cc5ed..11f4d17 100644
--- a/atrcopy/parsers.py
+++ b/atrcopy/parsers.py
@@ -10,6 +10,9 @@ from mame import MameZipImage
 from dos33 import Dos33DiskImage, ProdosDiskImage
 from errors import *
 
+import logging
+log = logging.getLogger(__name__)
+
 
 class SegmentParser(object):
     menu_name = ""
@@ -27,8 +30,8 @@ class SegmentParser(object):
             self.image = self.get_image(r)
             self.check_image()
             self.image.parse_segments()
-        except AtrError:
-            raise InvalidSegmentParser
+        except AtrError, e:
+            raise InvalidSegmentParser(e)
         self.segments.extend(self.image.segments)
 
     def get_image(self, r):
@@ -38,8 +41,8 @@ class SegmentParser(object):
         if self.strict:
             try:
                 self.image.strict_check()
-            except AtrError:
-                raise InvalidSegmentParser
+            except AtrError, e:
+                raise InvalidSegmentParser(e)
         else:
             self.image.relaxed_check()
 
@@ -101,14 +104,16 @@ class ProdosSegmentParser(SegmentParser):
     image_type = ProdosDiskImage
 
 
-def guess_parser_for_mime(mime, r):
+def guess_parser_for_mime(mime, r, verbose=False):
     parsers = mime_parsers[mime]
     found = None
     for parser in parsers:
         try:
             found = parser(r, True)
             break
-        except InvalidSegmentParser:
+        except InvalidSegmentParser, e:
+            if verbose:
+                log.info("parser isn't %s: %s" % (parser.__name__, str(e)))
             pass
     return found