From c42050a10cac40b0b5ac70c587e07f257a9b50dd Mon Sep 17 00:00:00 2001
From: Jonathan Strine <jostrine@cisco.com>
Date: Wed, 25 Nov 2020 19:31:51 -0500
Subject: [PATCH 1/4] Escape characters which cause XML parsing issues

---
 osxphotos/templates/xmp_sidecar.mako | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osxphotos/templates/xmp_sidecar.mako b/osxphotos/templates/xmp_sidecar.mako
index f34c1b9b..16ebc651 100644
--- a/osxphotos/templates/xmp_sidecar.mako
+++ b/osxphotos/templates/xmp_sidecar.mako
@@ -12,7 +12,7 @@
     % if desc is None:
         <dc:description></dc:description>
     % else:
-        <dc:description>${desc}</dc:description>
+        <dc:description>${desc | x}</dc:description>
     % endif
 </%def>
 
@@ -20,7 +20,7 @@
     % if title is None:
         <dc:title></dc:title>
     % else:
-        <dc:title>${title}</dc:title>
+        <dc:title>${title | x}</dc:title>
     % endif
 </%def>
 
@@ -30,7 +30,7 @@
         <dc:subject>
             <rdf:Seq>
             % for subj in subject:
-                <rdf:li>${subj}</rdf:li>
+                <rdf:li>${subj | x}</rdf:li>
             % endfor
             </rdf:Seq>
         </dc:subject>
@@ -48,7 +48,7 @@
         <Iptc4xmpExt:PersonInImage>
             <rdf:Bag>
                 % for person in persons:
-                    <rdf:li>${person}</rdf:li>
+                    <rdf:li>${person | x}</rdf:li>
                 % endfor
             </rdf:Bag>
         </Iptc4xmpExt:PersonInImage>
@@ -60,7 +60,7 @@
         <digiKam:TagsList>
             <rdf:Seq>
             % for keyword in keywords:
-                <rdf:li>${keyword}</rdf:li>
+                <rdf:li>${keyword | x}</rdf:li>
             % endfor
             </rdf:Seq>
         </digiKam:TagsList>

From aafdbea5645819bb8e62dd1dfa267f28a6ee6e94 Mon Sep 17 00:00:00 2001
From: Jonathan Strine <jostrine@cisco.com>
Date: Wed, 25 Nov 2020 19:36:09 -0500
Subject: [PATCH 2/4] Fix test to accomodate for escaped apostrophe

---
 tests/test_export_catalina_10_15_7.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_export_catalina_10_15_7.py b/tests/test_export_catalina_10_15_7.py
index 2d9c2e7a..391b09bc 100644
--- a/tests/test_export_catalina_10_15_7.py
+++ b/tests/test_export_catalina_10_15_7.py
@@ -1055,7 +1055,7 @@ def test_xmp_sidecar_gps():
                 <rdf:li>London</rdf:li>
                 <rdf:li>United Kingdom</rdf:li>
                 <rdf:li>London 2018</rdf:li>
-                <rdf:li>St. James's Park</rdf:li>
+                <dc:title>St. James&#39;s Park</dc:title>
             </rdf:Seq>
         </digiKam:TagsList>
         </rdf:Description>

From d0d2e8080096bf66f93a830386800ce713680c51 Mon Sep 17 00:00:00 2001
From: Jonathan Strine <jostrine@cisco.com>
Date: Wed, 25 Nov 2020 19:45:21 -0500
Subject: [PATCH 3/4] Fix tests for apostrophe Previous commit didn't reflect
 all locations and had a copy/paste error.

---
 tests/test_export_catalina_10_15_7.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/test_export_catalina_10_15_7.py b/tests/test_export_catalina_10_15_7.py
index 391b09bc..5ad2d558 100644
--- a/tests/test_export_catalina_10_15_7.py
+++ b/tests/test_export_catalina_10_15_7.py
@@ -1029,7 +1029,7 @@ def test_xmp_sidecar_gps():
             xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/">
         <photoshop:SidecarForExtension>jpg</photoshop:SidecarForExtension>
         <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 -->
         <dc:subject>
             <rdf:Seq>
@@ -1038,7 +1038,7 @@ def test_xmp_sidecar_gps():
                 <rdf:li>London</rdf:li>
                 <rdf:li>United Kingdom</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>
         </dc:subject>
         <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>United Kingdom</rdf:li>
                 <rdf:li>London 2018</rdf:li>
-                <dc:title>St. James&#39;s Park</dc:title>
+                <rdf:li>St. James&#39&#39;s Park</rdf:li>
             </rdf:Seq>
         </digiKam:TagsList>
         </rdf:Description>

From cec266bba4072a1921d499660fedaaa0bd4b763a Mon Sep 17 00:00:00 2001
From: Jonathan Strine <jostrine@cisco.com>
Date: Wed, 25 Nov 2020 19:51:09 -0500
Subject: [PATCH 4/4] Fix tests again Third times the charm to fix a
 find-replace error this time.

---
 tests/test_export_catalina_10_15_7.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_export_catalina_10_15_7.py b/tests/test_export_catalina_10_15_7.py
index 5ad2d558..92222c4e 100644
--- a/tests/test_export_catalina_10_15_7.py
+++ b/tests/test_export_catalina_10_15_7.py
@@ -1055,7 +1055,7 @@ def test_xmp_sidecar_gps():
                 <rdf:li>London</rdf:li>
                 <rdf:li>United Kingdom</rdf:li>
                 <rdf:li>London 2018</rdf:li>
-                <rdf:li>St. James&#39&#39;s Park</rdf:li>
+                <rdf:li>St. James&#39;s Park</rdf:li>
             </rdf:Seq>
         </digiKam:TagsList>
         </rdf:Description>