More refactoring of export code, #462

osxphotos/photoexporter.py

@@ -714,11 +714,10 @@ class PhotoExporter:
         else:
             exif_files = all_results.exported
 
-        # TODO: remove duplicative code from below
+        if exiftool:
             for exported_file in exif_files:
                 results = self._write_exif_metadata_to_files(
                     exported_file=exported_file,
-                exiftool=exiftool,
                     update=update,
                     exiftool_flags=exiftool_flags,
                     use_albums_as_keywords=use_albums_as_keywords,
@@ -1355,7 +1354,6 @@ class PhotoExporter:
     def _write_exif_metadata_to_files(
         self,
         exported_file: str,
-        exiftool: bool,
         update: bool,
         exiftool_flags: Optional[List[str]],
         use_albums_as_keywords: bool,
@@ -1375,8 +1373,7 @@ class PhotoExporter:
         verbose: Optional[Callable],
     ) -> ExportResults:
         results = ExportResults()
-        if exiftool and update and exported_file:
-            for exported_file in [exported_file]:
+        if update:
             files_are_different = False
             old_data = export_db.get_exifdata_for_file(exported_file)
             if old_data is not None:
@@ -1447,8 +1444,7 @@ class PhotoExporter:
                 results.exif_updated.append(exported_file)
             else:
                 verbose(f"Skipped up to date exiftool metadata for {exported_file}")
-        elif exiftool and exported_file:
-            for exported_file in [exported_file]:
+        else:
             verbose(f"Writing metadata with exiftool for {exported_file}")
             if not dry_run:
                 warning_, error_ = self._write_exif_data(