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

More refactoring of export code, #462

Browse Source
This commit is contained in:
Rhet Turnbull
2022-01-14 19:48:36 -08:00
parent 476c94407f
commit 9ada5dfea4
1 changed files with 94 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osxphotos/photoexporter.py
View File

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