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

Ensure merge_exif_keywords are str not int

Browse Source
This commit is contained in:
Rhet Turnbull
2021-01-08 06:23:17 -08:00
parent 193f26bec8
commit 123ebb2cb7
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
osxphotos/photoinfo/_photoinfo_export.py
View File

@@ -776,7 +776,12 @@ def export2(
photo = [p for p in bursts if p.uuid.startswith(self.uuid)] photo = [p for p in bursts if p.uuid.startswith(self.uuid)]
photo = photo[0] if photo else None photo = photo[0] if photo else None
if not photo: if not photo:
all_results.error.append((str(dest), f"PhotoKitFetchFailed exception exporting photo {self.uuid}: {e}")) all_results.error.append(
(
str(dest),
f"PhotoKitFetchFailed exception exporting photo {self.uuid}: {e}",
)
)
if photo: if photo:
try: try:
exported = photo.export( exported = photo.export(
@@ -821,7 +826,7 @@ def export2(
if photo: if photo:
try: try:
exported = photo.export( exported = photo.export(
dest.parent, dest.name, version=PHOTOS_VERSION_ORIGINAL dest.parent, dest.name, version=PHOTOS_VERSION_ORIGINAL
) )
all_results.exported.extend(exported) all_results.exported.extend(exported)
except Exception as e: except Exception as e:
@@ -829,15 +834,15 @@ def export2(
else: else:
try: try:
exported = _export_photo_uuid_applescript( exported = _export_photo_uuid_applescript(
self.uuid, self.uuid,
dest.parent, dest.parent,
filestem=filestem, filestem=filestem,
original=True, original=True,
edited=False, edited=False,
live_photo=live_photo, live_photo=live_photo,
timeout=timeout, timeout=timeout,
burst=self.burst, burst=self.burst,
dry_run=dry_run, dry_run=dry_run,
) )
all_results.exported.extend(exported) all_results.exported.extend(exported)
except ExportError as e: except ExportError as e:
@@ -852,7 +857,7 @@ def export2(
all_results.new.extend(all_results.exported) all_results.new.extend(all_results.exported)
# else: # else:
# all_results.error.append((str(dest), f"Error exporting photo {self.uuid} to {dest} with use_photos_export")) # all_results.error.append((str(dest), f"Error exporting photo {self.uuid} to {dest} with use_photos_export"))
# export metadata # export metadata
sidecars = [] sidecars = []
@@ -1539,6 +1544,7 @@ def _get_exif_keywords(self):
kw = exifdict[field] kw = exifdict[field]
if kw and type(kw) != list: if kw and type(kw) != list:
kw = [kw] kw = [kw]
kw = [str(k) for k in kw]
keywords.extend(kw) keywords.extend(kw)
except KeyError: except KeyError:
pass pass
@@ -1555,6 +1561,7 @@ def _get_exif_persons(self):
p = exifdict["XMP:PersonInImage"] p = exifdict["XMP:PersonInImage"]
if p and type(p) != list: if p and type(p) != list:
p = [p] p = [p]
p = [str(p_) for p_ in p]
persons.extend(p) persons.extend(p)
except KeyError: except KeyError:
pass pass