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

Merge pull request #272 from jstrine/fix_xml_escaping

Browse Source 
Add XML escaping to XMP sidecar export, thanks to @jstrine for the fix!
This commit is contained in:
Rhet Turnbull
2020-11-25 17:52:22 -08:00
committed by GitHub
parent 0633814ab2 cec266bba4
commit dbbbbf10a8
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osxphotos/templates/xmp_sidecar.mako
View File

@@ -12,7 +12,7 @@
% if desc is None: % if desc is None:
<dc:description></dc:description> <dc:description></dc:description>
% else: % else:
<dc:description>${desc}</dc:description> <dc:description>${desc | x}</dc:description>
% endif % endif
</%def> </%def>
@@ -20,7 +20,7 @@
% if title is None: % if title is None:
<dc:title></dc:title> <dc:title></dc:title>
% else: % else:
<dc:title>${title}</dc:title> <dc:title>${title | x}</dc:title>
% endif % endif
</%def> </%def>
@@ -30,7 +30,7 @@
<dc:subject> <dc:subject>
<rdf:Seq> <rdf:Seq>
% for subj in subject: % for subj in subject:
<rdf:li>${subj}</rdf:li> <rdf:li>${subj | x}</rdf:li>
% endfor % endfor
</rdf:Seq> </rdf:Seq>
</dc:subject> </dc:subject>
@@ -48,7 +48,7 @@
<Iptc4xmpExt:PersonInImage> <Iptc4xmpExt:PersonInImage>
<rdf:Bag> <rdf:Bag>
% for person in persons: % for person in persons:
<rdf:li>${person}</rdf:li> <rdf:li>${person | x}</rdf:li>
% endfor % endfor
</rdf:Bag> </rdf:Bag>
</Iptc4xmpExt:PersonInImage> </Iptc4xmpExt:PersonInImage>
@@ -60,7 +60,7 @@
<digiKam:TagsList> <digiKam:TagsList>
<rdf:Seq> <rdf:Seq>
% for keyword in keywords: % for keyword in keywords:
<rdf:li>${keyword}</rdf:li> <rdf:li>${keyword | x}</rdf:li>
% endfor % endfor
</rdf:Seq> </rdf:Seq>
</digiKam:TagsList> </digiKam:TagsList>

6
tests/test_export_catalina_10_15_7.py
View File

@@ -1029,7 +1029,7 @@ def test_xmp_sidecar_gps():
xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/"> xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/">
<photoshop:SidecarForExtension>jpg</photoshop:SidecarForExtension> <photoshop:SidecarForExtension>jpg</photoshop:SidecarForExtension>
<dc:description></dc:description> <dc:description></dc:description>
<dc:title>St. James's Park</dc:title> <dc:title>St. James&#39;s Park</dc:title>
<!-- keywords and persons listed in <dc:subject> as Photos does --> <!-- keywords and persons listed in <dc:subject> as Photos does -->
<dc:subject> <dc:subject>
<rdf:Seq> <rdf:Seq>
@@ -1038,7 +1038,7 @@ def test_xmp_sidecar_gps():
<rdf:li>London</rdf:li> <rdf:li>London</rdf:li>
<rdf:li>United Kingdom</rdf:li> <rdf:li>United Kingdom</rdf:li>
<rdf:li>London 2018</rdf:li> <rdf:li>London 2018</rdf:li>
<rdf:li>St. James's Park</rdf:li> <rdf:li>St. James&#39;s Park</rdf:li>
</rdf:Seq> </rdf:Seq>
</dc:subject> </dc:subject>
<photoshop:DateCreated>2018-10-13T09:18:12.501000-04:00</photoshop:DateCreated> <photoshop:DateCreated>2018-10-13T09:18:12.501000-04:00</photoshop:DateCreated>
@@ -1055,7 +1055,7 @@ def test_xmp_sidecar_gps():
<rdf:li>London</rdf:li> <rdf:li>London</rdf:li>
<rdf:li>United Kingdom</rdf:li> <rdf:li>United Kingdom</rdf:li>
<rdf:li>London 2018</rdf:li> <rdf:li>London 2018</rdf:li>
<rdf:li>St. James's Park</rdf:li> <rdf:li>St. James&#39;s Park</rdf:li>
</rdf:Seq> </rdf:Seq>
</digiKam:TagsList> </digiKam:TagsList>
</rdf:Description> </rdf:Description>