Set XMP:Subject to match Keywords, issue #302

osxphotos/_version.py

@@ -1,5 +1,5 @@
 """ version info """
 
-__version__ = "0.38.12"
+__version__ = "0.38.13"
 
 

osxphotos/photoinfo/_photoinfo_export.py

@@ -1390,18 +1390,14 @@ def _exiftool_dict(
     if keyword_list:
         # remove duplicates
         keyword_list = sorted(list(set(keyword_list)))
-        exif["XMP:TagsList"] = keyword_list.copy()
         exif["IPTC:Keywords"] = keyword_list.copy()
+        exif["XMP:Subject"] = keyword_list.copy()
+        exif["XMP:TagsList"] = keyword_list.copy()
 
     if person_list:
         person_list = sorted(list(set(person_list)))
         exif["XMP:PersonInImage"] = person_list.copy()
 
-    if self.keywords or person_list:
-        # Photos puts both keywords and persons in Subject when using "Export IPTC as XMP"
-        # only use Photos' keywords for subject (e.g. don't include template values)
-        exif["XMP:Subject"] = sorted(list(set(self.keywords + person_list)))
-
     # if self.favorite():
     #     exif["Rating"] = 5
 
@@ -1607,20 +1603,15 @@ def _xmp_sidecar(
 
         keyword_list.extend(rendered_keywords)
 
-    subject_list = []
-    if self.keywords or person_list:
-        # Photos puts both keywords and persons in Subject when using "Export IPTC as XMP"
-        subject_list = list(self.keywords) + person_list
-
     # remove duplicates
     # sorted mainly to make testing the XMP file easier
     if keyword_list:
         keyword_list = sorted(list(set(keyword_list)))
-    if subject_list:
-        subject_list = sorted(list(set(subject_list)))
     if person_list:
         person_list = sorted(list(set(person_list)))
 
+    subject_list = keyword_list
+
     xmp_str = xmp_template.render(
         photo=self,
         description=description,

osxphotos/templates/xmp_sidecar.mako

@@ -26,7 +26,6 @@
 
 <%def name="dc_subject(subject)">
     % if subject:
-        <!-- keywords and persons listed in <dc:subject> as Photos does -->
         <dc:subject>
             <rdf:Seq>
             % for subj in subject: