Implemented --only-new, #358

README.md

@@ -290,6 +290,10 @@ Options:
                                   but with --ignore-signature, files which exist
                                   in the export directory will not be re-
                                   exported.
+  --only-new                      If used with --update, ignores any previously
+                                  exported files, even if missing from the
+                                  export folder and only exports new files that
+                                  haven't previously been exported.
   --dry-run                       Dry run (test) the export but don't actually
                                   export any files; most useful with --verbose.
   --export-as-hardlink            Hardlink files instead of copying them. Cannot

osxphotos/_version.py

@@ -1,3 +1,3 @@
 """ version info """
 
-__version__ = "0.40.4"
+__version__ = "0.40.5"

osxphotos/cli.py

@@ -443,6 +443,12 @@ def cli(ctx, db, json_, debug):
     "re-export the processed files but with --ignore-signature, files which exist "
     "in the export directory will not be re-exported.",
 )
+@click.option(
+    "--only-new",
+    is_flag=True,
+    help="If used with --update, ignores any previously exported files, even if missing from "
+    "the export folder and only exports new files that haven't previously been exported.",
+)
 @click.option(
     "--dry-run",
     is_flag=True,
@@ -825,6 +831,7 @@ def export(
     missing,
     update,
     ignore_signature,
+    only_new,
     dry_run,
     export_as_hardlink,
     touch_file,
@@ -1039,6 +1046,7 @@ def export(
         cleanup = cfg.cleanup
         exportdb = cfg.exportdb
         beta = cfg.beta
+        only_new = cfg.only_new
 
         # config file might have changed verbose
         VERBOSE = bool(verbose)
@@ -1077,6 +1085,7 @@ def export(
         ("missing", ("download_missing", "use_photos_export")),
         ("jpeg_quality", ("convert_to_jpeg")),
         ("ignore_signature", ("update")),
+        ("only_new", ("update")),
         ("exiftool_option", ("exiftool")),
         ("exiftool_merge_keywords", ("exiftool", "sidecar")),
         ("exiftool_merge_persons", ("exiftool", "sidecar")),
@@ -1333,6 +1342,11 @@ def export(
     )
 
     if photos:
+        if only_new:
+            # ignore previously exported files
+            previous_uuids = {uuid: 1 for uuid in export_db.get_previous_uuids()}
+            photos = [p for p in photos if p.uuid not in previous_uuids]
+
         if export_bursts:
             # add the burst_photos to the export set
             photos_burst = [p for p in photos if p.burst]

osxphotos/export_db.py

@@ -84,6 +84,10 @@ class ExportDB_ABC(ABC):
     def get_sidecar_for_file(self, filename):
         pass
 
+    @abstractmethod
+    def get_previous_uuids(self):
+        pass
+
     @abstractmethod
     def set_data(
         self,
@@ -155,6 +159,9 @@ class ExportDBNoOp(ExportDB_ABC):
     def get_sidecar_for_file(self, filename):
         return None, (None, None, None)
 
+    def get_previous_uuids(self):
+        return []
+
     def set_data(
         self,
         filename,
@@ -435,6 +442,19 @@ class ExportDB(ExportDB_ABC):
         except Error as e:
             logging.warning(e)
 
+    def get_previous_uuids(self):
+        """returns list of UUIDs of previously exported photos found in export database """
+        conn = self._conn
+        previous_uuids = []
+        try:
+            c = conn.cursor()
+            c.execute("SELECT DISTINCT uuid FROM files")
+            results = c.fetchall()
+            previous_uuids = [row[0] for row in results]
+        except Error as e:
+            logging.warning(e)
+        return previous_uuids
+
     def set_data(
         self,
         filename,

tests/sidecars/15uNd7%8RguTEgNPKHfTWw.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ext.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/3Jn73XpSQQCluzRBMWRsMA.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_albums_as_keywords.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_ext.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_keyword_template.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_persons_as_keywords.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_albums_as_keywords.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_ext.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_keyword_template.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_persons_as_keywords.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_albums_as_keywords.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_ext.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_keyword_template.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_persons_as_keywords.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/8SOE9s0XQVGsuq4ONohTng.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/8SOE9s0XQVGsuq4ONohTng_albums_as_keywords.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/8SOE9s0XQVGsuq4ONohTng_ext.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/8SOE9s0XQVGsuq4ONohTng_keyword_template.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/8SOE9s0XQVGsuq4ONohTng_persons_as_keywords.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_albums_as_keywords.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_ext.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_keyword_template.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_persons_as_keywords.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_albums_as_keywords.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_ext.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_keyword_template.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_persons_as_keywords.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_albums_as_keywords.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_ext.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_keyword_template.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_persons_as_keywords.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_albums_as_keywords.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_ext.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_keyword_template.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_persons_as_keywords.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_albums_as_keywords.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_ext.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_keyword_template.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/" 

tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_persons_as_keywords.xmp

@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.4">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <rdf:Description rdf:about="" 
  xmlns:dc="http://purl.org/dc/elements/1.1/"