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

Added Subject to JSON sidecar to match info Photo exports in XMP

Browse Source
This commit is contained in:
Rhet Turnbull
2020-01-26 08:09:17 -08:00
parent 4a1adaa156
commit ba224af3fb
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
osxphotos/photoinfo.py
View File

@@ -614,10 +614,17 @@ class PhotoInfo:
exif["Title"] = self.title exif["Title"] = self.title
if self.keywords: if self.keywords:
exif["TagsList"] = exif["Keywords"] = self.keywords exif["TagsList"] = exif["Keywords"] = list(self.keywords)
# Photos puts both keywords and persons in Subject when using "Export IPTC as XMP"
exif["Subject"] = list(self.keywords)
if self.persons: if self.persons:
exif["PersonInImage"] = self.persons exif["PersonInImage"] = self.persons
# Photos puts both keywords and persons in Subject when using "Export IPTC as XMP"
if "Subject" in exif:
exif["Subject"].extend(self.persons)
else:
exif["Subject"] = self.persons
# if self.favorite(): # if self.favorite():
# exif["Rating"] = 5 # exif["Rating"] = 5

1
tests/test_export_catalina_10_15_1.py
View File

@@ -451,6 +451,7 @@ def test_exiftool_json_sidecar():
"Title": "St. James\'s Park", "Title": "St. James\'s Park",
"TagsList": ["London 2018", "St. James\'s Park", "England", "United Kingdom", "UK", "London"], "TagsList": ["London 2018", "St. James\'s Park", "England", "United Kingdom", "UK", "London"],
"Keywords": ["London 2018", "St. James\'s Park", "England", "United Kingdom", "UK", "London"], "Keywords": ["London 2018", "St. James\'s Park", "England", "United Kingdom", "UK", "London"],
"Subject": ["London 2018", "St. James\'s Park", "England", "United Kingdom", "UK", "London"],
"GPSLatitude": "51 deg 30\' 12.86\\" N", "GPSLatitude": "51 deg 30\' 12.86\\" N",
"GPSLongitude": "0 deg 7\' 54.50\\" W", "GPSLongitude": "0 deg 7\' 54.50\\" W",
"GPSPosition": "51 deg 30\' 12.86\\" N, 0 deg 7\' 54.50\\" W", "GPSPosition": "51 deg 30\' 12.86\\" N, 0 deg 7\' 54.50\\" W",

1
tests/test_export_mojave_10_14_6.py
View File

@@ -393,6 +393,7 @@ def test_exiftool_json_sidecar():
"Title": "St. James\'s Park", "Title": "St. James\'s Park",
"TagsList": ["London 2018", "St. James\'s Park", "England", "United Kingdom", "UK", "London"], "TagsList": ["London 2018", "St. James\'s Park", "England", "United Kingdom", "UK", "London"],
"Keywords": ["London 2018", "St. James\'s Park", "England", "United Kingdom", "UK", "London"], "Keywords": ["London 2018", "St. James\'s Park", "England", "United Kingdom", "UK", "London"],
"Subject": ["London 2018", "St. James\'s Park", "England", "United Kingdom", "UK", "London"],
"GPSLatitude": "51 deg 30\' 12.86\\" N", "GPSLatitude": "51 deg 30\' 12.86\\" N",
"GPSLongitude": "0 deg 7\' 54.50\\" W", "GPSLongitude": "0 deg 7\' 54.50\\" W",
"GPSPosition": "51 deg 30\' 12.86\\" N, 0 deg 7\' 54.50\\" W", "GPSPosition": "51 deg 30\' 12.86\\" N, 0 deg 7\' 54.50\\" W",