Added better exiftool error handling, closes #300

tests/test_exiftool.py

@@ -2,6 +2,7 @@ import pytest
 from osxphotos.exiftool import get_exiftool_path
 
 TEST_FILE_ONE_KEYWORD = "tests/test-images/wedding.jpg"
+TEST_FILE_BAD_IMAGE = "tests/test-images/badimage.jpeg"
 TEST_FILE_MULTI_KEYWORD = "tests/test-images/Tulips.jpg"
 TEST_MULTI_KEYWORDS = [
     "Top Shot",
@@ -109,8 +110,8 @@ def test_setvalue_1():
     assert exif.data["IPTC:Keywords"] == "test"
 
 
-def test_setvalue_error():
-    # test setting illegal tag value generates error
+def test_setvalue_warning():
+    # test setting illegal tag value generates warning
     import os.path
     import tempfile
     import osxphotos.exiftool
@@ -122,6 +123,22 @@ def test_setvalue_error():
 
     exif = osxphotos.exiftool.ExifTool(tempfile)
     exif.setvalue("IPTC:Foo", "test")
+    assert exif.warning
+
+
+def test_setvalue_error():
+    # test setting tag on bad image generates error
+    import os.path
+    import tempfile
+    import osxphotos.exiftool
+    from osxphotos.fileutil import FileUtil
+
+    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
+    tempfile = os.path.join(tempdir.name, os.path.basename(TEST_FILE_BAD_IMAGE))
+    FileUtil.copy(TEST_FILE_BAD_IMAGE, tempfile)
+
+    exif = osxphotos.exiftool.ExifTool(tempfile)
+    exif.setvalue("IPTC:Keywords", "test")
     assert exif.error
 
 
@@ -142,7 +159,7 @@ def test_setvalue_context_manager():
         exif.setvalue("XMP:Title", "title")
         exif.setvalue("XMP:Subject", "subject")
 
-    assert exif.error is None
+    assert not exif.error
 
     exif2 = osxphotos.exiftool.ExifTool(tempfile)
     exif2._read_exif()
@@ -151,8 +168,8 @@ def test_setvalue_context_manager():
     assert exif2.data["XMP:Subject"] == "subject"
 
 
-def test_setvalue_context_manager_error():
-    # test setting a tag value as context manager when error generated
+def test_setvalue_context_manager_warning():
+    # test setting a tag value as context manager when warning generated
     import os.path
     import tempfile
     import osxphotos.exiftool
@@ -164,6 +181,22 @@ def test_setvalue_context_manager_error():
 
     with osxphotos.exiftool.ExifTool(tempfile) as exif:
         exif.setvalue("Foo:Bar", "test1")
+    assert exif.warning
+
+
+def test_setvalue_context_manager_error():
+    # test setting a tag value as context manager when error generated
+    import os.path
+    import tempfile
+    import osxphotos.exiftool
+    from osxphotos.fileutil import FileUtil
+
+    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
+    tempfile = os.path.join(tempdir.name, os.path.basename(TEST_FILE_BAD_IMAGE))
+    FileUtil.copy(TEST_FILE_BAD_IMAGE, tempfile)
+
+    with osxphotos.exiftool.ExifTool(tempfile) as exif:
+        exif.setvalue("IPTC:Keywords", "test1")
     assert exif.error