fixes to make tests pass

Author: ianare

Makefile

@@ -20,7 +20,7 @@ endif
 EXIF_PY := $(if $(shell which EXIF.py),EXIF.py,./EXIF.py)
 
 # Find images, support multiple case insensitive extensions and file names with spaces
-FIND_IMAGES := find tests/resources -regextype posix-egrep -iregex ".*\.(bmp|gif|heic|heif|jpg|jpeg|png|tiff|webp|arw|avif|jxl)" -print0 | LC_COLLATE=C sort -fz | xargs -0
+FIND_IMAGES := find tests/resources -type f -regextype posix-egrep -not -iregex ".*\.(txt|rst)" -print0 | LC_COLLATE=C sort -fz | xargs -0
 
 
 .PHONY: help

exifread/__init__.py

@@ -18,6 +18,19 @@
 logger = get_logger()
 
 
+def _extract_xmp_data(hdr: ExifHeader, fh: BinaryIO):
+    # Easy we already have them
+    xmp_tag = hdr.tags.get("Image ApplicationNotes")
+    if xmp_tag:
+        logger.debug("XMP present in Exif")
+        xmp_bytes = bytes(xmp_tag.values)
+    # We need to look in the entire file for the XML
+    else:
+        xmp_bytes = find_xmp_data(fh)
+    if xmp_bytes:
+        hdr.parse_xmp(xmp_bytes)
+
+
 def process_file(
     fh: BinaryIO,
     stop_tag: str = DEFAULT_STOP_TAG,
@@ -93,10 +106,13 @@ def process_file(
         hdr.dump_ifd(ifd=exif_off.values[0], ifd_name="EXIF", stop_tag=stop_tag)
 
     # EXIF SubIFD
-    if details and "Image SubIFDs" in hdr.tags:
-        for subifd_id, subifd_offset in enumerate(hdr.tags.get("Image SubIFDs").values):
+    sub_ifds = hdr.tags.get("Image SubIFDs")
+    if details and sub_ifds:
+        for subifd_id, subifd_offset in enumerate(sub_ifds.values):
             logger.debug("Exif SubIFD%d at offset %d:", subifd_id, subifd_offset)
-            hdr.dump_ifd(ifd=subifd_offset, ifd_name=f"EXIF SubIFD{subifd_id}", stop_tag=stop_tag)
+            hdr.dump_ifd(
+                ifd=subifd_offset, ifd_name=f"EXIF SubIFD{subifd_id}", stop_tag=stop_tag
+            )
 
     # deal with MakerNote contained in EXIF IFD
     # (Some apps use MakerNote tags but do not use a format for which we
@@ -111,16 +127,7 @@ def process_file(
 
     # parse XMP tags (experimental)
     if debug and details:
-        # Easy we already have them
-        xmp_tag = hdr.tags.get("Image ApplicationNotes")
-        if xmp_tag:
-            logger.debug("XMP present in Exif")
-            xmp_bytes = bytes(xmp_tag.values)
-        # We need to look in the entire file for the XML
-        else:
-            xmp_bytes = find_xmp_data(fh)
-        if xmp_bytes:
-            hdr.parse_xmp(xmp_bytes)
+        _extract_xmp_data(hdr=hdr, fh=fh)
 
     if builtin_types:
         return convert_types(hdr.tags)

tests/resources/dump.txt

@@ -0,0 +1,3 @@
+Invalid / broken images.
+
+The script should not go into an endless loop trying to read these.