forked/osxphotos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored ExportResults

Browse Source
This commit is contained in:
Rhet Turnbull
2021-01-06 06:56:26 -08:00
parent d78097ccc0
commit 568d1b36a6
4 changed files with 115 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/search_info_test_data_10_15_7.json
View File

File diff suppressed because one or more lines are too long

9
tests/test_exportresults.py
View File

@@ -19,7 +19,6 @@ EXPORT_RESULT_ATTRIBUTES = [
"sidecar_xmp_skipped",
"missing",
"error",
"error_str",
"exiftool_warning",
"exiftool_error",
]
@@ -42,7 +41,6 @@ def test_exportresults_init():
assert results.sidecar_xmp_skipped == []
assert results.missing == []
assert results.error == []
assert results.error_str == []
assert results.exiftool_warning == []
assert results.exiftool_error == []
@@ -82,14 +80,13 @@ def test_all_files():
""" test ExportResults.all_files() """
results = ExportResults()
for x in EXPORT_RESULT_ATTRIBUTES:
if x == "error_str":
continue
setattr(results, x, [f"{x}1"])
results.exiftool_warning = [("exiftool_warning1", "foo")]
results.exiftool_error = [("exiftool_error1", "foo")]
results.error = [("error1", "foo")]
assert sorted(results.all_files()) == sorted(
[f"{x}1" for x in EXPORT_RESULT_ATTRIBUTES if x != "error_str"]
[f"{x}1" for x in EXPORT_RESULT_ATTRIBUTES]
)
@@ -98,6 +95,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=[],error_str=[],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=[])"
)