Add --cleanup files to report, #395

tests/test_export_catalina_10_15_7_use_photos_export.py

@@ -29,7 +29,7 @@ def test_export_default_name(photosdb):
     # test basic export
     # get an unedited image and export it using default filename
     import os
-    import os.path
+    import pathlib
     import tempfile
 
     import osxphotos
@@ -38,11 +38,12 @@ def test_export_default_name(photosdb):
     dest = tempdir.name
     photos = photosdb.photos(uuid=[UUID_DICT["no_adjustments"]])
 
-    filename = photos[0].filename
-    expected_dest = os.path.join(dest, filename)
+    filename = photos[0].original_filename
+    expected_dest = pathlib.Path(dest) / filename
+    expected_dest = expected_dest.parent / f"{expected_dest.stem}.jpeg"
     got_dest = photos[0].export(dest, use_photos_export=True)[0]
 
-    assert got_dest == expected_dest
+    assert got_dest == str(expected_dest)
     assert os.path.isfile(got_dest)
 
 
@@ -82,7 +83,7 @@ def test_export_edited(photosdb):
     photos = photosdb.photos(uuid=[UUID_DICT["has_adjustments"]])
 
     suffix = pathlib.Path(photos[0].path_edited).suffix
-    filename = f"{pathlib.Path(photos[0].filename).stem}_edited{suffix}"
+    filename = f"{pathlib.Path(photos[0].original_filename).stem}_edited{suffix}"
     expected_dest = os.path.join(dest, filename)
     got_dest = photos[0].export(dest, use_photos_export=True, edited=True)[0]
 

tests/test_export_convert_to_jpeg.py

@@ -16,14 +16,14 @@ UUID_DICT = {
 }
 
 NAMES_DICT = {
-    "raw": "D05A5FE3-15FB-49A1-A15D-AB3DA6F8B068.jpeg",
-    "heic": "7783E8E6-9CAC-40F3-BE22-81FB7051C266.jpeg",
+    "raw": "DSC03584.jpeg",
+    "heic": "IMG_3092.jpeg"
 }
 
 UUID_LIVE_HEIC = "612CE30B-3D8F-417A-9B14-EC42CBA10ACC"
 NAMES_LIVE_HEIC = [
-    "612CE30B-3D8F-417A-9B14-EC42CBA10ACC.jpeg",
-    "612CE30B-3D8F-417A-9B14-EC42CBA10ACC.mov",
+    "IMG_3259.jpeg",
+    "IMG_3259.mov"
 ]
 
 

tests/test_exportresults.py

@@ -21,6 +21,8 @@ EXPORT_RESULT_ATTRIBUTES = [
     "error",
     "exiftool_warning",
     "exiftool_error",
+    "deleted_files",
+    "deleted_directories",
 ]
 
 
@@ -43,6 +45,8 @@ def test_exportresults_init():
     assert results.error == []
     assert results.exiftool_warning == []
     assert results.exiftool_error == []
+    assert results.deleted_files == []
+    assert results.deleted_directories == []
 
 
 def test_exportresults_iadd():
@@ -64,6 +68,12 @@ def test_exportresults_iadd():
     results1.exiftool_error = [("exiftool_error1", "foo")]
     results2.exiftool_error = [("exiftool_error2", "bar")]
 
+    results1.deleted_files = [("foo1")]
+    results2.deleted_files = [("foo2")]
+
+    results1.deleted_directories = [("bar1")]
+    results2.deleted_directories = [("bar2")]
+
     results1 += results2
 
     assert results1.exiftool_warning == [
@@ -75,6 +85,9 @@ def test_exportresults_iadd():
         ("exiftool_error2", "bar"),
     ]
 
+    assert results1.deleted_files == ["foo1", "foo2"]
+    assert results1.deleted_directories == ["bar1", "bar2"]
+
 
 def test_all_files():
     """ test ExportResults.all_files() """
@@ -84,10 +97,12 @@ def test_all_files():
     results.exiftool_warning = [("exiftool_warning1", "foo")]
     results.exiftool_error = [("exiftool_error1", "foo")]
     results.error = [("error1", "foo")]
+    results.deleted_files = ["deleted_files1"]
+    results.deleted_directories = ["deleted_directories1"]
 
-    assert sorted(results.all_files()) == sorted(
-        [f"{x}1" for x in EXPORT_RESULT_ATTRIBUTES]
-    )
+    assert sorted(
+        results.all_files() + results.deleted_files + results.deleted_directories
+    ) == sorted([f"{x}1" for x in EXPORT_RESULT_ATTRIBUTES])
 
 
 def test_str():
@@ -95,6 +110,6 @@ def test_str():
     results = ExportResults()
     assert (
         str(results)
-        == "ExportResults(exported=[],new=[],updated=[],skipped=[],exif_updated=[],touched=[],converted_to_jpeg=[],sidecar_json_written=[],sidecar_json_skipped=[],sidecar_exiftool_written=[],sidecar_exiftool_skipped=[],sidecar_xmp_written=[],sidecar_xmp_skipped=[],missing=[],error=[],exiftool_warning=[],exiftool_error=[])"
+        == "ExportResults(exported=[],new=[],updated=[],skipped=[],exif_updated=[],touched=[],converted_to_jpeg=[],sidecar_json_written=[],sidecar_json_skipped=[],sidecar_exiftool_written=[],sidecar_exiftool_skipped=[],sidecar_xmp_written=[],sidecar_xmp_skipped=[],missing=[],error=[],exiftool_warning=[],exiftool_error=[],deleted_files=[],deleted_directories=[])"
     )