Fixed --exiftool-option, #369

Updated CHANGELOG.md, [skip ci]
Fix for issue #366
2021-02-08 21:21:30 -08:00 · 2021-02-07 09:34:00 -08:00 · 2021-02-07 09:26:19 -08:00 · 2021-02-07 09:05:59 -08:00 · 2021-02-07 05:40:41 -08:00 · 2021-02-04 06:40:49 -08:00
85 changed files with 401 additions and 102 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,16 @@
+.metrics
+.DS_store
+__pycache__
+.coverage
+.condaauto
+t.out
+.vscode/
+.tox/
+dist/
+build/
+working/
+osxphotos.egg-info/
+.mypy_cache/
+cli.spec
+*.pyc
+docsrc/_build/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,52 @@ All notable changes to this project will be documented in this file. Dates are d

 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

+#### [v0.40.10](https://github.com/RhetTbull/osxphotos/compare/v0.40.9...v0.40.10)
+
+> 7 February 2021
+
+- Fix for issue #366 [`5c3360f`](https://github.com/RhetTbull/osxphotos/commit/5c3360f29d52df2f804c70f37a2ca9a3f102d93c)
+
+#### [v0.40.9](https://github.com/RhetTbull/osxphotos/compare/v0.40.8...v0.40.9)
+
+> 7 February 2021
+
+- Fixed unnecessary warning for long keywords, issue #365 [`f8616ac`](https://github.com/RhetTbull/osxphotos/commit/f8616acf167b5e73ab3e4b68dcfbf578230c330d)
+
+#### [v0.40.8](https://github.com/RhetTbull/osxphotos/compare/v0.40.7...v0.40.8)
+
+> 4 February 2021
+
+- Implemented --in-album, --not-in-album, issue #364 [`addd952`](https://github.com/RhetTbull/osxphotos/commit/addd952aa315007852945a352b2c7c451ba5f21a)
+- Updated docs [`7fa5fba`](https://github.com/RhetTbull/osxphotos/commit/7fa5fbaa5b7c9aa1412eceef56e068dc044c91e0)
+- Updated docs Makefile [skip ci] [`683dfe7`](https://github.com/RhetTbull/osxphotos/commit/683dfe7f3ffd235659b58f403562ce2d51123cfb)
+
+#### [v0.40.7](https://github.com/RhetTbull/osxphotos/compare/v0.40.6...v0.40.7)
+
+> 3 February 2021
+
+- Bump bleach from 3.1.4 to 3.3.0 [`#362`](https://github.com/RhetTbull/osxphotos/pull/362)
+- Fixed XMP template for issue #361 [`43af4d2`](https://github.com/RhetTbull/osxphotos/commit/43af4d205a7264e530bc2b2789d297be633391e1)
+- Updated sidecar test data [`591f9bc`](https://github.com/RhetTbull/osxphotos/commit/591f9bcc62720f7eddebba3b3dcff265907550dd)
+- Added tests for --only-new, #358 [`adc4b05`](https://github.com/RhetTbull/osxphotos/commit/adc4b056029794faddd464d22022a2a17298a924)
+- Updated tests for ExportDB, #358 [`48d2223`](https://github.com/RhetTbull/osxphotos/commit/48d2223edde4850830cc6a3f9776ce08f81a6636)
+- Added 11.2 to tested versions, #360 [`2284598`](https://github.com/RhetTbull/osxphotos/commit/2284598a24f63232c01dcf27b9982002123834ca)
+
+#### [v0.40.6](https://github.com/RhetTbull/osxphotos/compare/v0.40.5...v0.40.6)
+
+> 2 February 2021
+
+-  Add @davidjroos  as a contributor [`8dbedef`](https://github.com/RhetTbull/osxphotos/commit/8dbedef1874882815afb4a885184249aae73bf9f)
+- Fixed documentation, #359 [`77371b6`](https://github.com/RhetTbull/osxphotos/commit/77371b6e5d8a9b8662b7b7d540378beb897f6988)
+
+#### [v0.40.5](https://github.com/RhetTbull/osxphotos/compare/v0.40.3...v0.40.5)
+
+> 1 February 2021
+
+- Restructured docs [`3a4a8bd`](https://github.com/RhetTbull/osxphotos/commit/3a4a8bdb0bdd995c937e0a15f5d8f1685b73407f)
+- Refactored __main__, added sphinx docs [`51f6958`](https://github.com/RhetTbull/osxphotos/commit/51f69585be60d12f912ba08f138b9c1f74481dbd)
+- Implemented --only-new, #358 [`5c093c4`](https://github.com/RhetTbull/osxphotos/commit/5c093c43528193ed1704ed4ef1b8d841a95a81cf)
+
 #### [v0.40.3](https://github.com/RhetTbull/osxphotos/compare/v0.40.2...v0.40.3)

 > 23 January 2021
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ Only works on macOS (aka Mac OS X). Tested on macOS Sierra (10.12.6) until macOS

 | macOS Version     | macOS name | Photos.app version |
 | ----------------- |------------|:-------------------|
-| 10.16             | Big Sur    | 6.0 ✅             |
+| 10.16, 11.0-11.2  | Big Sur    | 6.0 ✅             |
 | 10.15.1 - 10.15.7 | Catalina   | 5.0 ✅             |
 | 10.14.5, 10.14.6  | Mojave     | 4.0 ✅             |
 | 10.13.6           | High Sierra| 3.0 ✅             |
@@ -273,6 +273,9 @@ Options:
  --is-reference                  Search for photos that were imported as
                                  referenced files (not copied into Photos
                                  library).
+  --in-album                      Search for photos that are in one or more
+                                  albums.
+  --not-in-album                  Search for photos that are not in any albums.
  --missing                       Export only photos missing from the Photos
                                  library; must be used with --download-missing.
  --deleted                       Include photos from the 'Recently Deleted'
--- a/docs/.buildinfo
+++ b/docs/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 547179dc83846d861e5f79c600fa9301
+config: 17bac89a05164f8fa737ad20fcd95f80
 tags: 645f666f9bcd5a90fca523b33c5a78b7
--- a/docs/_modules/index.html
+++ b/docs/_modules/index.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Overview: module code &#8212; osxphotos 0.40.4 documentation</title>
+    <title>Overview: module code &#8212; osxphotos 0.40.8 documentation</title>
    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="../_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="../" src="../_static/documentation_options.js"></script>
--- a/docs/_modules/osxphotos/photoinfo/_photoinfo_exifinfo.html
+++ b/docs/_modules/osxphotos/photoinfo/_photoinfo_exifinfo.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos.photoinfo._photoinfo_exifinfo &#8212; osxphotos 0.40.4 documentation</title>
+    <title>osxphotos.photoinfo._photoinfo_exifinfo &#8212; osxphotos 0.40.8 documentation</title>
    <link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="../../../_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="../../../" src="../../../_static/documentation_options.js"></script>
--- a/docs/_modules/osxphotos/photoinfo/_photoinfo_export.html
+++ b/docs/_modules/osxphotos/photoinfo/_photoinfo_export.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos.photoinfo._photoinfo_export &#8212; osxphotos 0.40.4 documentation</title>
+    <title>osxphotos.photoinfo._photoinfo_export &#8212; osxphotos 0.40.8 documentation</title>
    <link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="../../../_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="../../../" src="../../../_static/documentation_options.js"></script>
--- a/docs/_modules/osxphotos/photoinfo/_photoinfo_scoreinfo.html
+++ b/docs/_modules/osxphotos/photoinfo/_photoinfo_scoreinfo.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos.photoinfo._photoinfo_scoreinfo &#8212; osxphotos 0.40.4 documentation</title>
+    <title>osxphotos.photoinfo._photoinfo_scoreinfo &#8212; osxphotos 0.40.8 documentation</title>
    <link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="../../../_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="../../../" src="../../../_static/documentation_options.js"></script>
--- a/docs/_modules/osxphotos/photoinfo/_photoinfo_searchinfo.html
+++ b/docs/_modules/osxphotos/photoinfo/_photoinfo_searchinfo.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos.photoinfo._photoinfo_searchinfo &#8212; osxphotos 0.40.4 documentation</title>
+    <title>osxphotos.photoinfo._photoinfo_searchinfo &#8212; osxphotos 0.40.8 documentation</title>
    <link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="../../../_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="../../../" src="../../../_static/documentation_options.js"></script>
--- a/docs/_modules/osxphotos/photoinfo/photoinfo.html
+++ b/docs/_modules/osxphotos/photoinfo/photoinfo.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos.photoinfo.photoinfo &#8212; osxphotos 0.40.4 documentation</title>
+    <title>osxphotos.photoinfo.photoinfo &#8212; osxphotos 0.40.8 documentation</title>
    <link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="../../../_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="../../../" src="../../../_static/documentation_options.js"></script>
--- a/docs/_modules/osxphotos/photosdb/photosdb.html
+++ b/docs/_modules/osxphotos/photosdb/photosdb.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos.photosdb.photosdb &#8212; osxphotos 0.40.4 documentation</title>
+    <title>osxphotos.photosdb.photosdb &#8212; osxphotos 0.40.8 documentation</title>
    <link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="../../../_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="../../../" src="../../../_static/documentation_options.js"></script>
--- a/docs/_static/documentation_options.js
+++ b/docs/_static/documentation_options.js
@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
    URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '0.40.4',
+    VERSION: '0.40.8',
    LANGUAGE: 'None',
    COLLAPSE_INDEX: false,
    BUILDER: 'html',
--- a/docs/cli.html
+++ b/docs/cli.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos command line interface (CLI) &#8212; osxphotos 0.40.4 documentation</title>
+    <title>osxphotos command line interface (CLI) &#8212; osxphotos 0.40.8 documentation</title>
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@@ -465,6 +465,18 @@ to modify this behavior.</p>
 <dd><p>Search for photos that were imported as referenced files (not copied into Photos library).</p>
 </dd></dl>

+<dl class="std option">
+<dt id="cmdoption-osxphotos-export-in-album">
+<code class="sig-name descname">--in-album</code><code class="sig-prename descclassname"></code><a class="headerlink" href="#cmdoption-osxphotos-export-in-album" title="Permalink to this definition">¶</a></dt>
+<dd><p>Search for photos that are in one or more albums.</p>
+</dd></dl>
+
+<dl class="std option">
+<dt id="cmdoption-osxphotos-export-not-in-album">
+<code class="sig-name descname">--not-in-album</code><code class="sig-prename descclassname"></code><a class="headerlink" href="#cmdoption-osxphotos-export-not-in-album" title="Permalink to this definition">¶</a></dt>
+<dd><p>Search for photos that are not in any albums.</p>
+</dd></dl>
+
 <dl class="std option">
 <dt id="cmdoption-osxphotos-export-missing">
 <code class="sig-name descname">--missing</code><code class="sig-prename descclassname"></code><a class="headerlink" href="#cmdoption-osxphotos-export-missing" title="Permalink to this definition">¶</a></dt>
@@ -495,6 +507,12 @@ to modify this behavior.</p>
 <dd><p>When used with –update, ignores file signature when updating files. This is useful if you have processed or edited exported photos changing the file signature (size &amp; modification date). In this case, –update would normally re-export the processed files but with –ignore-signature, files which exist in the export directory will not be re-exported.</p>
 </dd></dl>

+<dl class="std option">
+<dt id="cmdoption-osxphotos-export-only-new">
+<code class="sig-name descname">--only-new</code><code class="sig-prename descclassname"></code><a class="headerlink" href="#cmdoption-osxphotos-export-only-new" title="Permalink to this definition">¶</a></dt>
+<dd><p>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.</p>
+</dd></dl>
+
 <dl class="std option">
 <dt id="cmdoption-osxphotos-export-dry-run">
 <code class="sig-name descname">--dry-run</code><code class="sig-prename descclassname"></code><a class="headerlink" href="#cmdoption-osxphotos-export-dry-run" title="Permalink to this definition">¶</a></dt>
@@ -691,7 +709,7 @@ to modify this behavior.</p>
 <dl class="std option">
 <dt id="cmdoption-osxphotos-export-jpeg-ext">
 <code class="sig-name descname">--jpeg-ext</code><code class="sig-prename descclassname"> &lt;EXTENSION&gt;</code><a class="headerlink" href="#cmdoption-osxphotos-export-jpeg-ext" title="Permalink to this definition">¶</a></dt>
-<dd><p>Specify file extension for JPEG files. Photos uses .jpeg for edited images but many images are imported with .jpg or .JPG which can result in multiple different extensions used for JPEG files upon export.  Use –jpg-ext to specify a single extension to use for all exported JPEG images. Valid values are jpeg, jpg, JPEG, JPG; e.g. ‘–jpg-ext jpg’ to use ‘.jpg’ for all JPEGs.</p>
+<dd><p>Specify file extension for JPEG files. Photos uses .jpeg for edited images but many images are imported with .jpg or .JPG which can result in multiple different extensions used for JPEG files upon export.  Use –jpeg-ext to specify a single extension to use for all exported JPEG images. Valid values are jpeg, jpg, JPEG, JPG; e.g. ‘–jpeg-ext jpg’ to use ‘.jpg’ for all JPEGs.</p>
 <dl class="field-list simple">
 <dt class="field-odd">Options</dt>
 <dd class="field-odd"><p>jpeg|jpg|JPEG|JPG</p>
@@ -1263,6 +1281,18 @@ if more than one option is provided, they are treated as “AND”
 <dd><p>Search for photos that were imported as referenced files (not copied into Photos library).</p>
 </dd></dl>

+<dl class="std option">
+<dt id="cmdoption-osxphotos-query-in-album">
+<code class="sig-name descname">--in-album</code><code class="sig-prename descclassname"></code><a class="headerlink" href="#cmdoption-osxphotos-query-in-album" title="Permalink to this definition">¶</a></dt>
+<dd><p>Search for photos that are in one or more albums.</p>
+</dd></dl>
+
+<dl class="std option">
+<dt id="cmdoption-osxphotos-query-not-in-album">
+<code class="sig-name descname">--not-in-album</code><code class="sig-prename descclassname"></code><a class="headerlink" href="#cmdoption-osxphotos-query-not-in-album" title="Permalink to this definition">¶</a></dt>
+<dd><p>Search for photos that are not in any albums.</p>
+</dd></dl>
+
 <dl class="std option">
 <dt id="cmdoption-osxphotos-query-deleted">
 <code class="sig-name descname">--deleted</code><code class="sig-prename descclassname"></code><a class="headerlink" href="#cmdoption-osxphotos-query-deleted" title="Permalink to this definition">¶</a></dt>
--- a/docs/genindex.html
+++ b/docs/genindex.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Index &#8212; osxphotos 0.40.4 documentation</title>
+    <title>Index &#8212; osxphotos 0.40.8 documentation</title>
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@@ -395,6 +395,15 @@

      <ul>
        <li><a href="cli.html#cmdoption-osxphotos-export-ignore-signature">osxphotos-export command line option</a>
+</li>
+      </ul></li>
+      <li>
+    --in-album
+
+      <ul>
+        <li><a href="cli.html#cmdoption-osxphotos-export-in-album">osxphotos-export command line option</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-query-in-album">osxphotos-query command line option</a>
 </li>
      </ul></li>
      <li>
@@ -590,6 +599,15 @@
        <li><a href="cli.html#cmdoption-osxphotos-export-not-hidden">osxphotos-export command line option</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-query-not-hidden">osxphotos-query command line option</a>
+</li>
+      </ul></li>
+      <li>
+    --not-in-album
+
+      <ul>
+        <li><a href="cli.html#cmdoption-osxphotos-export-not-in-album">osxphotos-export command line option</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-query-not-in-album">osxphotos-query command line option</a>
 </li>
      </ul></li>
      <li>
@@ -685,6 +703,13 @@
        <li><a href="cli.html#cmdoption-osxphotos-export-only-movies">osxphotos-export command line option</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-query-only-movies">osxphotos-query command line option</a>
+</li>
+      </ul></li>
+      <li>
+    --only-new
+
+      <ul>
+        <li><a href="cli.html#cmdoption-osxphotos-export-only-new">osxphotos-export command line option</a>
 </li>
      </ul></li>
      <li>
@@ -1452,6 +1477,8 @@
        <li><a href="cli.html#cmdoption-osxphotos-export-ignore-date-modified">--ignore-date-modified</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-export-ignore-signature">--ignore-signature</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-export-in-album">--in-album</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-export-is-reference">--is-reference</a>
 </li>
@@ -1488,6 +1515,8 @@
        <li><a href="cli.html#cmdoption-osxphotos-export-not-hdr">--not-hdr</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-export-not-hidden">--not-hidden</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-export-not-in-album">--not-in-album</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-export-not-live">--not-live</a>
 </li>
@@ -1506,6 +1535,8 @@
        <li><a href="cli.html#cmdoption-osxphotos-export-not-time-lapse">--not-time-lapse</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-export-only-movies">--only-movies</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-export-only-new">--only-new</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-export-only-photos">--only-photos</a>
 </li>
@@ -1694,6 +1725,8 @@
        <li><a href="cli.html#cmdoption-osxphotos-query-hidden">--hidden</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-query-i">--ignore-case</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-query-in-album">--in-album</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-query-incloud">--incloud</a>
 </li>
@@ -1728,6 +1761,8 @@
        <li><a href="cli.html#cmdoption-osxphotos-query-not-hdr">--not-hdr</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-query-not-hidden">--not-hidden</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-query-not-in-album">--not-in-album</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-query-not-incloud">--not-incloud</a>
 </li>
--- a/docs/index.html
+++ b/docs/index.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Welcome to osxphotos’s documentation! &#8212; osxphotos 0.40.4 documentation</title>
+    <title>Welcome to osxphotos’s documentation! &#8212; osxphotos 0.40.8 documentation</title>
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
--- a/docs/modules.html
+++ b/docs/modules.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos &#8212; osxphotos 0.40.4 documentation</title>
+    <title>osxphotos &#8212; osxphotos 0.40.8 documentation</title>
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
--- a/docs/objects.inv
+++ b/docs/objects.inv
--- a/docs/osxphotos.pdf
+++ b/docs/osxphotos.pdf
--- a/docs/reference.html
+++ b/docs/reference.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos package &#8212; osxphotos 0.40.4 documentation</title>
+    <title>osxphotos package &#8212; osxphotos 0.40.8 documentation</title>
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
--- a/docs/search.html
+++ b/docs/search.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Search &#8212; osxphotos 0.40.4 documentation</title>
+    <title>Search &#8212; osxphotos 0.40.8 documentation</title>
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
    
--- a/docs/searchindex.js
+++ b/docs/searchindex.js
--- a/docsrc/Makefile
+++ b/docsrc/Makefile
@@ -16,6 +16,10 @@ github:
 	@make html
 	@cp -a _build/html/. ../docs

+pdf:
+	@make latexpdf
+	@cp -a _build/latex/osxphotos.pdf ../docs
+
 .PHONY: help Makefile

 # Catch-all target: route all unknown targets to Sphinx using the new
--- a/osxphotos/_constants.py
+++ b/osxphotos/_constants.py
@@ -69,6 +69,7 @@ _TESTED_OS_VERSIONS = [
    ("10", "16"),
    ("11", "0"),
    ("11", "1"),
+    ("11", "2"),
 ]

 # Photos 5 has persons who are empty string if unidentified face
--- a/osxphotos/_version.py
+++ b/osxphotos/_version.py
@@ -1,3 +1,3 @@
 """ version info """

-__version__ = "0.40.6"
+__version__ = "0.40.11"
--- a/osxphotos/cli.py
+++ b/osxphotos/cli.py
@@ -403,6 +403,16 @@ def query_options(f):
            is_flag=True,
            help="Search for photos that were imported as referenced files (not copied into Photos library).",
        ),
+        o(
+            "--in-album",
+            is_flag=True,
+            help="Search for photos that are in one or more albums.",
+        ),
+        o(
+            "--not-in-album",
+            is_flag=True,
+            help="Search for photos that are not in any albums.",
+        ),
    ]
    for o in options[::-1]:
        f = o(f)
@@ -907,6 +917,8 @@ def export(
    save_config,
    is_reference,
    beta,
+    in_album,
+    not_in_album,
 ):
    """Export photos from the Photos database.
    Export path DEST is required.
@@ -1047,6 +1059,8 @@ def export(
        exportdb = cfg.exportdb
        beta = cfg.beta
        only_new = cfg.only_new
+        in_album = cfg.in_album
+        not_in_album = cfg.not_in_album

        # config file might have changed verbose
        VERBOSE = bool(verbose)
@@ -1080,6 +1094,7 @@ def export(
        ("shared", "not_shared"),
        ("has_comment", "no_comment"),
        ("has_likes", "no_likes"),
+        ("in_album", "not_in_album"),
    ]
    dependent_options = [
        ("missing", ("download_missing", "use_photos_export")),
@@ -1339,6 +1354,8 @@ def export(
        has_likes=has_likes,
        no_likes=no_likes,
        is_reference=is_reference,
+        in_album=in_album,
+        not_in_album=not_in_album,
    )

    if photos:
@@ -1620,6 +1637,8 @@ def query(
    has_likes,
    no_likes,
    is_reference,
+    in_album,
+    not_in_album,
 ):
    """Query the Photos database using 1 or more search options;
    if more than one option is provided, they are treated as "AND"
@@ -1667,6 +1686,7 @@ def query(
        (shared, not_shared),
        (has_comment, no_comment),
        (has_likes, no_likes),
+        (in_album, not_in_album),
    ]
    # print help if no non-exclusive term or a double exclusive term is given
    if any(all(bb) for bb in exclusive) or not any(
@@ -1759,6 +1779,8 @@ def query(
        has_likes=has_likes,
        no_likes=no_likes,
        is_reference=is_reference,
+        in_album=in_album,
+        not_in_album=not_in_album,
    )

    # below needed for to make CliRunner work for testing
@@ -1930,6 +1952,8 @@ def _query(
    has_likes=False,
    no_likes=False,
    is_reference=False,
+    in_album=False,
+    not_in_album=False,
 ):
    """Run a query against PhotosDB to extract the photos based on user supply criteria used by query and export commands

@@ -2162,6 +2186,11 @@ def _query(
    if is_reference:
        photos = [p for p in photos if p.isreference]

+    if in_album:
+        photos = [p for p in photos if p.albums]
+    elif not_in_album:
+        photos = [p for p in photos if not p.albums]
+
    return photos


@@ -2352,13 +2381,16 @@ def export_photo(
            rendered_suffix = rendered_suffix[0]

        original_filename = pathlib.Path(filename)
-        file_ext = (
-            "." + jpeg_ext
-            if jpeg_ext and (photo.uti == "public.jpeg" or convert_to_jpeg)
-            else ".jpeg"
-            if convert_to_jpeg and photo.uti != "public.jpeg"
-            else original_filename.suffix
-        )
+        file_ext = original_filename.suffix
+        if photo.isphoto and (jpeg_ext or convert_to_jpeg):
+            # change the file extension to correct jpeg extension if needed
+            file_ext = (
+                "." + jpeg_ext
+                if jpeg_ext and (photo.uti == "public.jpeg" or convert_to_jpeg)
+                else ".jpeg"
+                if convert_to_jpeg and photo.uti != "public.jpeg"
+                else original_filename.suffix
+            )
        original_filename = (
            original_filename.parent
            / f"{original_filename.stem}{rendered_suffix}{file_ext}"
--- a/osxphotos/exiftool.py
+++ b/osxphotos/exiftool.py
@@ -254,7 +254,11 @@ class ExifTool:
        filename = os.fsencode(self.file) if not no_file else b""

        if self.flags:
-            command_str = b"\n".join([f.encode("utf-8") for f in self.flags])
+            # need to split flags, e.g. so "--ext AVI" becomes ["--ext", "AVI"]
+            flags = []
+            for f in self.flags:
+                flags.extend(f.split())
+            command_str = b"\n".join([f.encode("utf-8") for f in flags])
            command_str += b"\n"
        else:
            command_str = b""
--- a/osxphotos/photoinfo/_photoinfo_export.py
+++ b/osxphotos/photoinfo/_photoinfo_export.py
@@ -562,11 +562,11 @@ def export2(
    if export_db is None:
        export_db = ExportDBNoOp()

-    if verbose is None:
-        verbose = noop
-    elif not callable(verbose):
+    if verbose and not callable(verbose):
        raise TypeError("verbose must be callable")
-    self._verbose = verbose
+
+    if verbose is None:
+        verbose = self._verbose

    # suffix to add to edited files
    # e.g. name will be filename_edited.jpg
@@ -1501,8 +1501,8 @@ def _exiftool_dict(
            if len(long_str) > _MAX_IPTC_KEYWORD_LEN
        ]
        if long_keywords:
-            logging.warning(
-                f"Some keywords exceed max IPTC Keyword length of {_MAX_IPTC_KEYWORD_LEN}: {long_keywords}"
+            self._verbose(
+                f"Warning: some keywords exceed max IPTC Keyword length of {_MAX_IPTC_KEYWORD_LEN} (exiftool will truncate these): {long_keywords}"
            )

        keyword_list.extend(rendered_keywords)
@@ -1781,17 +1781,6 @@ def _xmp_sidecar(
            if _OSXPHOTOS_NONE_SENTINEL not in keyword
        ]

-        # check to see if any keywords too long
-        long_keywords = [
-            long_str
-            for long_str in rendered_keywords
-            if len(long_str) > _MAX_IPTC_KEYWORD_LEN
-        ]
-        if long_keywords:
-            logging.warning(
-                f"Some keywords exceed max IPTC Keyword length of {_MAX_IPTC_KEYWORD_LEN}: {long_keywords}"
-            )
-
        keyword_list.extend(rendered_keywords)

    # remove duplicates
--- a/osxphotos/photoinfo/photoinfo.py
+++ b/osxphotos/photoinfo/photoinfo.py
@@ -70,6 +70,7 @@ class PhotoInfo:
        self._uuid = uuid
        self._info = info
        self._db = db
+        self._verbose = self._db._verbose

    @property
    def filename(self):
--- a/osxphotos/templates/xmp_sidecar.mako
+++ b/osxphotos/templates/xmp_sidecar.mako
@@ -152,7 +152,7 @@


 <?xpacket begin="${"\uFEFF"}" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos ${version}">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/osxphotos/templates/xmp_sidecar_beta.mako
+++ b/osxphotos/templates/xmp_sidecar_beta.mako
@@ -152,7 +152,7 @@


 <?xpacket begin="${"\uFEFF"}" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos ${version}">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,8 +9,7 @@ atomicwrites==1.3.0
 attrs==19.1.0
 backcall==0.1.0
 better-exceptions-fork==0.2.1.post6
-black==19.10b0
-bleach==3.1.4
+bleach==3.3.0
 bpylist2==3.0.2
 certifi==2020.4.5.1
 cffi==1.14.0
--- a/tests/search_info_test_data_10_15_7.json
+++ b/tests/search_info_test_data_10_15_7.json
--- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ext.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA.xmp
+++ b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_albums_as_keywords.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_ext.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_keyword_template.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_persons_as_keywords.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_albums_as_keywords.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_ext.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_keyword_template.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_persons_as_keywords.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.xmp
+++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_albums_as_keywords.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_ext.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_keyword_template.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_persons_as_keywords.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng.xmp
+++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng.xmp
@@ -1,5 +1,5 @@
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos 0.40.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_albums_as_keywords.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_ext.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_keyword_template.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_persons_as_keywords.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_albums_as_keywords.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_ext.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_keyword_template.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_persons_as_keywords.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_albums_as_keywords.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_ext.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_keyword_template.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_persons_as_keywords.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_albums_as_keywords.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_ext.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_keyword_template.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_persons_as_keywords.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_albums_as_keywords.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_ext.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_keyword_template.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_persons_as_keywords.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_albums_as_keywords.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_ext.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_keyword_template.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_persons_as_keywords.xmp
+++ b/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.5">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="osxphotos">
 <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/" 
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -578,6 +578,29 @@ UUID_IS_REFERENCE = [
    "A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C",
 ]

+UUID_IN_ALBUM = [
+    "F12384F6-CD17-4151-ACBA-AE0E3688539E",
+    "8E1D7BC9-9321-44F9-8CFB-4083F6B9232A",
+    "1EB2B765-0765-43BA-A90C-0D0580E6172C",
+    "E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51",
+    "A92D9C26-3A50-4197-9388-CB5F7DB9FA91",
+    "D79B8D77-BFFC-460B-9312-034F2877D35B",
+    "4D521201-92AC-43E5-8F7C-59BC41C37A96",
+    "D05A5FE3-15FB-49A1-A15D-AB3DA6F8B068",
+    "3DD2C897-F19E-4CA6-8C22-B027D5A71907",
+]
+
+UUID_NOT_IN_ALBUM = [
+    "A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C",
+    "7783E8E6-9CAC-40F3-BE22-81FB7051C266",
+    "DC99FBDD-7A52-4100-A5BB-344131646C30",
+    "D1359D09-1373-4F3B-B0E3-1A4DE573E4A3",
+    "E2078879-A29C-4D6F-BACB-E3BBE6C3EB91",
+    "6191423D-8DB8-4D4C-92BE-9BBBA308AAC4",
+    "35329C57-B963-48D6-BB75-6AFF9370CBBC",
+    "8846E3E6-8AC8-4857-8448-E3D025784410",
+]
+

 def modify_file(filename):
    """ appends data to a file to modify it """
@@ -882,6 +905,46 @@ def test_query_is_reference():
    assert sorted(uuid_got) == sorted(UUID_IS_REFERENCE)


+def test_query_in_album():
+    """ Test query with --in-album """
+    import json
+    import os
+    import os.path
+    from osxphotos.cli import query
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    result = runner.invoke(
+        query, ["--json", "--db", os.path.join(cwd, PHOTOS_DB_15_7), "--in-album"]
+    )
+    assert result.exit_code == 0
+
+    # build list of uuids we got from the output JSON
+    json_got = json.loads(result.output)
+    uuid_got = [photo["uuid"] for photo in json_got]
+    assert sorted(uuid_got) == sorted(UUID_IN_ALBUM)
+
+
+def test_query_not_in_album():
+    """ Test query with --not-in-album """
+    import json
+    import os
+    import os.path
+    from osxphotos.cli import query
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    result = runner.invoke(
+        query, ["--json", "--db", os.path.join(cwd, PHOTOS_DB_15_7), "--not-in-album"]
+    )
+    assert result.exit_code == 0
+
+    # build list of uuids we got from the output JSON
+    json_got = json.loads(result.output)
+    uuid_got = [photo["uuid"] for photo in json_got]
+    assert sorted(uuid_got) == sorted(UUID_NOT_IN_ALBUM)
+
+
 def test_export():
    import glob
    import os
@@ -3839,6 +3902,68 @@ def test_export_update_edits():
        )


+def test_export_update_only_new():
+    """ test --update --only-new """
+    import glob
+    import os
+    import os.path
+    import time
+
+    import osxphotos
+    from osxphotos.cli import export, OSXPHOTOS_EXPORT_DB
+
+    os.environ["TZ"] = "US/Pacific"
+    time.tzset()
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        # basic export
+        result = runner.invoke(
+            export,
+            [
+                os.path.join(cwd, PHOTOS_DB_15_7),
+                ".",
+                "-V",
+                "--to-date",
+                "2020-12-20T18:33:41.766684-08:00",
+            ],
+        )
+        assert result.exit_code == 0
+
+        # --update with --only-new --dry-run
+        result = runner.invoke(
+            export,
+            [
+                os.path.join(cwd, PHOTOS_DB_15_7),
+                ".",
+                "-V",
+                "--dry-run",
+                "--update",
+                "--only-new",
+            ],
+        )
+        assert result.exit_code == 0
+        assert "exported: 1" in result.output
+
+        # --update with --only-new
+        result = runner.invoke(
+            export,
+            [os.path.join(cwd, PHOTOS_DB_15_7), ".", "-V", "--update", "--only-new"],
+        )
+        assert result.exit_code == 0
+        assert "exported: 1" in result.output
+
+        # --update with --only-new, should export nothing
+        result = runner.invoke(
+            export,
+            [os.path.join(cwd, PHOTOS_DB_15_7), ".", "-V", "--update", "--only-new"],
+        )
+        assert result.exit_code == 0
+        assert "exported: 0" in result.output
+
+
 def test_export_update_no_db():
    """ test export then update after db has been deleted """
    import glob
--- a/tests/test_export_catalina_10_15_7.py
+++ b/tests/test_export_catalina_10_15_7.py
@@ -429,7 +429,7 @@ def test_exiftool_json_sidecar_ignore_date_modified(photosdb):
    assert json_got == json_expected


-def test_exiftool_json_sidecar_keyword_template_long(caplog, photosdb):
+def test_exiftool_json_sidecar_keyword_template_long(capsys, photosdb):
    from osxphotos._constants import _MAX_IPTC_KEYWORD_LEN

    photos = photosdb.photos(uuid=[EXIF_JSON_UUID])
@@ -452,10 +452,13 @@ def test_exiftool_json_sidecar_keyword_template_long(caplog, photosdb):
    )[0]

    long_str = "x" * (_MAX_IPTC_KEYWORD_LEN + 1)
+    photos[0]._verbose = print
    json_got = photos[0]._exiftool_json_sidecar(keyword_template=[long_str])
    json_got = json.loads(json_got)[0]

-    assert "Some keywords exceed max IPTC Keyword length" in caplog.text
+    captured = capsys.readouterr()
+    assert "some keywords exceed max IPTC Keyword length" in captured.out
+
    # some gymnastics to account for different sort order in different pythons
    for k, v in json_got.items():
        if type(v) in (list, tuple):
--- a/tests/test_export_db.py
+++ b/tests/test_export_db.py
@@ -45,6 +45,7 @@ def test_export_db():
    assert db.get_stat_converted_for_file(filepath) == (7, 8, 9)
    db.set_sidecar_for_file(filepath, SIDECAR_DATA, (13, 14, 15))
    assert db.get_sidecar_for_file(filepath) == (SIDECAR_DATA, (13, 14, 15))
+    assert db.get_previous_uuids() == ["FOO-BAR"]

    # test set_data which sets all at the same time
    filepath2 = os.path.join(tempdir.name, "test2.jpg")
@@ -65,6 +66,7 @@ def test_export_db():
    assert db.get_stat_exif_for_file(filepath2) == (4, 5, 6)
    assert db.get_stat_converted_for_file(filepath2) == (7, 8, 9)
    assert db.get_stat_edited_for_file(filepath2) == (10, 11, 12)
+    assert sorted(db.get_previous_uuids()) == (["BAR-FOO", "FOO-BAR"])

    # close and re-open
    db.close()
@@ -77,10 +79,12 @@ def test_export_db():
    assert db.get_stat_exif_for_file(filepath2) == (4, 5, 6)
    assert db.get_stat_converted_for_file(filepath2) == (7, 8, 9)
    assert db.get_stat_edited_for_file(filepath2) == (10, 11, 12)
+    assert sorted(db.get_previous_uuids()) == (["BAR-FOO", "FOO-BAR"])

    # update data
    db.set_uuid_for_file(filepath, "FUBAR")
    assert db.get_uuid_for_file(filepath) == "FUBAR"
+    assert sorted(db.get_previous_uuids()) == (["BAR-FOO", "FUBAR"])


 def test_export_db_no_op():
@@ -115,6 +119,7 @@ def test_export_db_no_op():
    assert db.get_stat_edited_for_file(filepath) is None
    db.set_sidecar_for_file(filepath, SIDECAR_DATA, (13, 14, 15))
    assert db.get_sidecar_for_file(filepath) == (None, (None, None, None))
+    assert db.get_previous_uuids() == []

    # test set_data which sets all at the same time
    filepath2 = os.path.join(tempdir.name, "test2.jpg")
@@ -135,6 +140,7 @@ def test_export_db_no_op():
    assert db.get_stat_exif_for_file(filepath2) is None
    assert db.get_stat_converted_for_file(filepath) is None
    assert db.get_stat_edited_for_file(filepath) is None
+    assert db.get_previous_uuids() == []

    # update data
    db.set_uuid_for_file(filepath, "FUBAR")
@@ -167,6 +173,7 @@ def test_export_db_in_memory():
    db.set_stat_converted_for_file(filepath, (7, 8, 9))
    db.set_stat_edited_for_file(filepath, (10, 11, 12))
    db.set_sidecar_for_file(filepath, SIDECAR_DATA, (13, 14, 15))
+    assert db.get_previous_uuids() == ["FOO-BAR"]

    db.close()

@@ -184,6 +191,7 @@ def test_export_db_in_memory():
    assert dbram.get_stat_converted_for_file(filepath) == (7, 8, 9)
    assert dbram.get_stat_edited_for_file(filepath) == (10, 11, 12)
    assert dbram.get_sidecar_for_file(filepath) == (SIDECAR_DATA, (13, 14, 15))
+    assert dbram.get_previous_uuids() == ["FOO-BAR"]

    # change a value
    dbram.set_uuid_for_file(filepath, "FUBAR")
@@ -203,6 +211,7 @@ def test_export_db_in_memory():
    assert dbram.get_stat_converted_for_file(filepath) == (1, 2, 3)
    assert dbram.get_stat_edited_for_file(filepath) == (4, 5, 6)
    assert dbram.get_sidecar_for_file(filepath) == ("FUBAR", (20, 21, 22))
+    assert dbram.get_previous_uuids() == ["FUBAR"]

    dbram.close()

@@ -216,6 +225,7 @@ def test_export_db_in_memory():
    assert db.get_stat_converted_for_file(filepath) == (7, 8, 9)
    assert db.get_stat_edited_for_file(filepath) == (10, 11, 12)
    assert db.get_sidecar_for_file(filepath) == (SIDECAR_DATA, (13, 14, 15))
+    assert db.get_previous_uuids() == ["FOO-BAR"]

    assert db.get_info_for_uuid("FUBAR") is None

@@ -253,5 +263,6 @@ def test_export_db_in_memory_nofile():
    assert dbram.get_stat_converted_for_file(filepath) == (1, 2, 3)
    assert dbram.get_stat_edited_for_file(filepath) == (4, 5, 6)
    assert dbram.get_sidecar_for_file(filepath) == ("FUBAR", (20, 21, 22))
-
+    assert dbram.get_previous_uuids() == ["FUBAR"]
+    
    dbram.close()
Author	SHA1	Message	Date
Rhet Turnbull	198addaa07	Fixed --exiftool-option, #369	2021-02-08 21:21:30 -08:00
Rhet Turnbull	d91fc93737	Updated CHANGELOG.md, [skip ci]	2021-02-07 09:34:00 -08:00
Rhet Turnbull	5c3360f29d	Fix for issue #366	2021-02-07 09:26:19 -08:00
Rhet Turnbull	d4513832a6	Updated CHANGELOG.md, [skip ci]	2021-02-07 09:05:59 -08:00
Rhet Turnbull	f8616acf16	Fixed unnecessary warning for long keywords, issue #365	2021-02-07 05:40:41 -08:00
Rhet Turnbull	addd952aa3	Implemented --in-album, --not-in-album, issue #364	2021-02-04 06:40:49 -08:00
Rhet Turnbull	773b619e24	Updated requirements.txt	2021-02-03 06:42:46 -08:00
Rhet Turnbull	683dfe7f3f	Updated docs Makefile [skip ci]	2021-02-03 06:27:09 -08:00
Rhet Turnbull	7fa5fbaa5b	Updated docs	2021-02-03 06:06:32 -08:00
Rhet Turnbull	e075868281	Updated CHANGELOG.md, [skip ci]	2021-02-02 22:14:41 -08:00
Rhet Turnbull	bf0589118b	Version bump	2021-02-02 22:02:20 -08:00
Rhet Turnbull	adc4b05602	Added tests for --only-new, #358	2021-02-02 22:01:53 -08:00
Rhet Turnbull	a740d82e7f	Updated XMP beta template	2021-02-02 21:18:00 -08:00
Rhet Turnbull	43af4d205a	Fixed XMP template for issue #361	2021-02-02 21:16:12 -08:00
Rhet Turnbull	4d98fa9279	Merge pull request #362 from RhetTbull/dependabot/pip/bleach-3.3.0 Bump bleach from 3.1.4 to 3.3.0	2021-02-02 21:05:02 -08:00
dependabot[bot]	67e579be4c	Bump bleach from 3.1.4 to 3.3.0 Bumps [bleach](https://github.com/mozilla/bleach) from 3.1.4 to 3.3.0. - [Release notes](https://github.com/mozilla/bleach/releases) - [Changelog](https://github.com/mozilla/bleach/blob/master/CHANGES) - [Commits](https://github.com/mozilla/bleach/compare/v3.1.4...v3.3.0) Signed-off-by: dependabot[bot] <support@github.com>	2021-02-02 22:57:26 +00:00
Rhet Turnbull	48d2223edd	Updated tests for ExportDB, #358	2021-02-02 06:53:32 -08:00
Rhet Turnbull	591f9bcc62	Updated sidecar test data	2021-02-02 06:39:34 -08:00
Rhet Turnbull	2284598a24	Added 11.2 to tested versions, #360	2021-02-02 06:33:50 -08:00