Added --from-time, --to-time, closes #400

Bumps [pillow](https://github.com/python-pillow/Pillow) from 7.2.0 to 8.1.1.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/7.2.0...8.1.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.all-contributorsrc

@@ -175,6 +175,24 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "neilpa",
+      "name": "Neil Pankey",
+      "avatar_url": "https://avatars.githubusercontent.com/u/42419?v=4",
+      "profile": "https://neilpa.me",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "AaronVanGeffen",
+      "name": "Aaron van Geffen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/604665?v=4",
+      "profile": "https://aaronweb.net/",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.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/

CHANGELOG.md

@@ -4,6 +4,135 @@ 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.41.3](https://github.com/RhetTbull/osxphotos/compare/v0.41.2...v0.41.3)
+
+> 14 March 2021
+
+- docs: add AaronVanGeffen as a contributor [`#398`](https://github.com/RhetTbull/osxphotos/pull/398)
+- Use original filename to export photos by default [`#396`](https://github.com/RhetTbull/osxphotos/pull/396)
+- Updated docs for --cleanup, #394 [`17ac594`](https://github.com/RhetTbull/osxphotos/commit/17ac5949e15057379eb13b979d4d7498bbb94d67)
+- Add --cleanup files to report, #395 [`5b95476`](https://github.com/RhetTbull/osxphotos/commit/5b9547669ed6622ae06607e024315e383c0b2d98)
+
+#### [v0.41.2](https://github.com/RhetTbull/osxphotos/compare/v0.41.1...v0.41.2)
+
+> 14 March 2021
+
+- Fix for long descriptions with exiftool, #393 [`ffb9af1`](https://github.com/RhetTbull/osxphotos/commit/ffb9af1965668bcfc2422f08b2462964a7dae3e2)
+
+#### [v0.41.1](https://github.com/RhetTbull/osxphotos/compare/v0.41.0...v0.41.1)
+
+> 5 March 2021
+
+- Bug fix, convert PosixPath to str, #392 [`595307a`](https://github.com/RhetTbull/osxphotos/commit/595307a003c8ae5d3bee3ad161bb880d884b3cc3)
+
+#### [v0.41.0](https://github.com/RhetTbull/osxphotos/compare/v0.40.19...v0.41.0)
+
+> 22 February 2021
+
+- Template refactor [`#385`](https://github.com/RhetTbull/osxphotos/pull/385)
+
+#### [v0.40.19](https://github.com/RhetTbull/osxphotos/compare/v0.40.18...v0.40.19)
+
+> 20 February 2021
+
+- Better exception handling for AdjustmentsInfo [`44a1e3e`](https://github.com/RhetTbull/osxphotos/commit/44a1e3e7a7f765bf91c2341e423ec9e5a9e3c1bd)
+
+#### [v0.40.18](https://github.com/RhetTbull/osxphotos/compare/v0.40.17...v0.40.18)
+
+> 20 February 2021
+
+- docs: add neilpa as a contributor [`#383`](https://github.com/RhetTbull/osxphotos/pull/383)
+- Added AdjustmentsInfo, #150, #379 [`5ee6aff`](https://github.com/RhetTbull/osxphotos/commit/5ee6affc0525db1975cb5095f62494ef10d92f7e)
+- docs: update .all-contributorsrc [skip ci] [`ebac9d0`](https://github.com/RhetTbull/osxphotos/commit/ebac9d0bfb43f59f046aacdd0290d1fcd29a3b5e)
+- docs: update README.md [skip ci] [`29716c5`](https://github.com/RhetTbull/osxphotos/commit/29716c52726a4e699c03d43ecc67db57f55b36f8)
+- Version bump [`fbe8229`](https://github.com/RhetTbull/osxphotos/commit/fbe822910370652975ab83b82344169df4c3027c)
+
+#### [v0.40.17](https://github.com/RhetTbull/osxphotos/compare/v0.40.16...v0.40.17)
+
+> 18 February 2021
+
+- Updated docs for --ignore-signature, #286 [`e5f1c29`](https://github.com/RhetTbull/osxphotos/commit/e5f1c299742fcfa0a855a33df7b266aa2c39e48b)
+- Added depth_state to _info [`b3a7869`](https://github.com/RhetTbull/osxphotos/commit/b3a7869bd3cc13e40cb3f68ff8caf12edda9a49c)
+
+#### [v0.40.16](https://github.com/RhetTbull/osxphotos/compare/v0.40.14...v0.40.16)
+
+> 14 February 2021
+
+- Write description to ITPC:CaptionAbstract (#380) [`4b7a53f`](https://github.com/RhetTbull/osxphotos/commit/4b7a53faa8d7ff2e941e7653554f61bcbd416fc9)
+- Removed orientation from XMP, #378 [`70848e1`](https://github.com/RhetTbull/osxphotos/commit/70848e1ff6def928b052271b47c1697c23a8c73f)
+- Added image orientation bug to Known Bugs [`1316866`](https://github.com/RhetTbull/osxphotos/commit/1316866dc47486ac61db8903d2d7d006f2598a77)
+
+#### [v0.40.14](https://github.com/RhetTbull/osxphotos/compare/v0.40.13...v0.40.14)
+
+> 12 February 2021
+
+- Fix for issue #366, --jpeg-ext, --convert-to-jpeg bug [`3027350`](https://github.com/RhetTbull/osxphotos/commit/30273509d40a270d2610b662ed9238449350064c)
+- Added test for #374 [`2691902`](https://github.com/RhetTbull/osxphotos/commit/2691902d5c7a4f4f81e3a9b36fd560ff0a07aec1)
+
+#### [v0.40.13](https://github.com/RhetTbull/osxphotos/compare/v0.40.12...v0.40.13)
+
+> 10 February 2021
+
+- Bug fix for --jpeg-ext, #374 [`da47821`](https://github.com/RhetTbull/osxphotos/commit/da47821fae7ee7b2d6d89f5542e729e01d3338df)
+
+#### [v0.40.12](https://github.com/RhetTbull/osxphotos/compare/v0.40.11...v0.40.12)
+
+> 9 February 2021
+
+- Fixed --exiftool-option, #369, for real this time [`857e3db`](https://github.com/RhetTbull/osxphotos/commit/857e3db6ccce810d682cd4632ac9bc8448c4f86b)
+
+#### [v0.40.11](https://github.com/RhetTbull/osxphotos/compare/v0.40.10...v0.40.11)
+
+> 9 February 2021
+
+- Fixed --exiftool-option, #369 [`198adda`](https://github.com/RhetTbull/osxphotos/commit/198addaa07a86ac5b0fd82787fdffff0a0fc19c6)
+
+#### [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

MANIFEST.in

@@ -1,2 +1,5 @@
 include README.md
+include README.rst
 include osxphotos/templates/*
+include osxphotos/phototemplate.tx
+include osxphotos/phototemplate.md

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: c43f566654ff6a66a64cd55da2e67fef
 tags: 645f666f9bcd5a90fca523b33c5a78b7

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.41.4 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>
@@ -93,7 +93,7 @@
       &copy;2021, Rhet Turnbull.
       
       |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.4.3</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.5.2</a>
       &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
       
     </div>

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.41.4 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>
@@ -183,7 +183,7 @@
       &copy;2021, Rhet Turnbull.
       
       |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.4.3</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.5.2</a>
       &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
       
     </div>

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.41.4 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>
@@ -120,6 +120,8 @@
         <span class="n">exiftool_error</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
         <span class="n">xattr_written</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
         <span class="n">xattr_skipped</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
+        <span class="n">deleted_files</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
+        <span class="n">deleted_directories</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
     <span class="p">):</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">exported</span> <span class="o">=</span> <span class="n">exported</span> <span class="ow">or</span> <span class="p">[]</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">new</span> <span class="o">=</span> <span class="n">new</span> <span class="ow">or</span> <span class="p">[]</span>
@@ -140,6 +142,8 @@
         <span class="bp">self</span><span class="o">.</span><span class="n">exiftool_error</span> <span class="o">=</span> <span class="n">exiftool_error</span> <span class="ow">or</span> <span class="p">[]</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">xattr_written</span> <span class="o">=</span> <span class="n">xattr_written</span> <span class="ow">or</span> <span class="p">[]</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">xattr_skipped</span> <span class="o">=</span> <span class="n">xattr_skipped</span> <span class="ow">or</span> <span class="p">[]</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">deleted_files</span> <span class="o">=</span> <span class="n">deleted_files</span> <span class="ow">or</span> <span class="p">[]</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">deleted_directories</span> <span class="o">=</span> <span class="n">deleted_directories</span> <span class="ow">or</span> <span class="p">[]</span>
 
     <span class="k">def</span> <span class="nf">all_files</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; return all filenames contained in results &quot;&quot;&quot;</span>
@@ -184,6 +188,8 @@
         <span class="bp">self</span><span class="o">.</span><span class="n">error</span> <span class="o">+=</span> <span class="n">other</span><span class="o">.</span><span class="n">error</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">exiftool_warning</span> <span class="o">+=</span> <span class="n">other</span><span class="o">.</span><span class="n">exiftool_warning</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">exiftool_error</span> <span class="o">+=</span> <span class="n">other</span><span class="o">.</span><span class="n">exiftool_error</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">deleted_files</span> <span class="o">+=</span> <span class="n">other</span><span class="o">.</span><span class="n">deleted_files</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">deleted_directories</span> <span class="o">+=</span> <span class="n">other</span><span class="o">.</span><span class="n">deleted_directories</span>
         <span class="k">return</span> <span class="bp">self</span>
 
     <span class="k">def</span> <span class="fm">__str__</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
@@ -206,6 +212,8 @@
             <span class="o">+</span> <span class="sa">f</span><span class="s2">&quot;,error=</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">error</span><span class="si">}</span><span class="s2">&quot;</span>
             <span class="o">+</span> <span class="sa">f</span><span class="s2">&quot;,exiftool_warning=</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">exiftool_warning</span><span class="si">}</span><span class="s2">&quot;</span>
             <span class="o">+</span> <span class="sa">f</span><span class="s2">&quot;,exiftool_error=</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">exiftool_error</span><span class="si">}</span><span class="s2">&quot;</span>
+            <span class="o">+</span> <span class="sa">f</span><span class="s2">&quot;,deleted_files=</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">deleted_files</span><span class="si">}</span><span class="s2">&quot;</span>
+            <span class="o">+</span> <span class="sa">f</span><span class="s2">&quot;,deleted_directories=</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">deleted_directories</span><span class="si">}</span><span class="s2">&quot;</span>
             <span class="o">+</span> <span class="s2">&quot;)&quot;</span>
         <span class="p">)</span>
 
@@ -508,6 +516,9 @@
     <span class="n">merge_exif_keywords</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
     <span class="n">merge_exif_persons</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
     <span class="n">jpeg_ext</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
+    <span class="n">persons</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
+    <span class="n">location</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
+    <span class="n">replace_keywords</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
 <span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;export photo, like export but with update and dry_run options</span>
 <span class="sd">    dest: must be valid destination path or exception raised</span>
@@ -560,6 +571,9 @@
 <span class="sd">    merge_exif_keywords: boolean; if True, merged keywords found in file&#39;s exif data (requires exiftool)</span>
 <span class="sd">    merge_exif_persons: boolean; if True, merged persons found in file&#39;s exif data (requires exiftool)</span>
 <span class="sd">    jpeg_ext: if set, will use this value for extension on jpegs converted to jpeg with convert_to_jpeg; if not set, uses jpeg; do not include the leading &quot;.&quot;</span>
+<span class="sd">    persons: if True, include persons in exported metadata</span>
+<span class="sd">    location: if True, include location in exported metadata</span>
+<span class="sd">    replace_keywords: if True, keyword_template replaces any keywords, otherwise it&#39;s additive</span>
 
 <span class="sd">    Returns: ExportResults class </span>
 <span class="sd">        ExportResults has attributes: </span>
@@ -595,11 +609,11 @@
     <span class="k">if</span> <span class="n">export_db</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
         <span class="n">export_db</span> <span class="o">=</span> <span class="n">ExportDBNoOp</span><span class="p">()</span>
 
-    <span class="k">if</span> <span class="n">verbose</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
+    <span class="k">if</span> <span class="n">verbose</span> <span class="ow">and</span> <span class="ow">not</span> <span class="n">callable</span><span class="p">(</span><span class="n">verbose</span><span class="p">):</span>
-        <span class="n">verbose</span> <span class="o">=</span> <span class="n">noop</span>
-    <span class="k">elif</span> <span class="ow">not</span> <span class="n">callable</span><span class="p">(</span><span class="n">verbose</span><span class="p">):</span>
         <span class="k">raise</span> <span class="ne">TypeError</span><span class="p">(</span><span class="s2">&quot;verbose must be callable&quot;</span><span class="p">)</span>
-    <span class="bp">self</span><span class="o">.</span><span class="n">_verbose</span> <span class="o">=</span> <span class="n">verbose</span>
+
+    <span class="k">if</span> <span class="n">verbose</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
+        <span class="n">verbose</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_verbose</span>
 
     <span class="c1"># suffix to add to edited files</span>
     <span class="c1"># e.g. name will be filename_edited.jpg</span>
@@ -640,9 +654,9 @@
                 <span class="p">)</span>
             <span class="n">edited_name</span> <span class="o">=</span> <span class="n">pathlib</span><span class="o">.</span><span class="n">Path</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">path_edited</span><span class="p">)</span><span class="o">.</span><span class="n">name</span>
             <span class="n">edited_suffix</span> <span class="o">=</span> <span class="n">pathlib</span><span class="o">.</span><span class="n">Path</span><span class="p">(</span><span class="n">edited_name</span><span class="p">)</span><span class="o">.</span><span class="n">suffix</span>
-            <span class="n">fname</span> <span class="o">=</span> <span class="n">pathlib</span><span class="o">.</span><span class="n">Path</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">filename</span><span class="p">)</span><span class="o">.</span><span class="n">stem</span> <span class="o">+</span> <span class="n">edited_identifier</span> <span class="o">+</span> <span class="n">edited_suffix</span>
+            <span class="n">fname</span> <span class="o">=</span> <span class="n">pathlib</span><span class="o">.</span><span class="n">Path</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">original_filename</span><span class="p">)</span><span class="o">.</span><span class="n">stem</span> <span class="o">+</span> <span class="n">edited_identifier</span> <span class="o">+</span> <span class="n">edited_suffix</span>
         <span class="k">else</span><span class="p">:</span>
-            <span class="n">fname</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">filename</span>
+            <span class="n">fname</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">original_filename</span>
 
     <span class="n">uti</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">uti</span> <span class="k">if</span> <span class="n">edited</span> <span class="k">else</span> <span class="bp">self</span><span class="o">.</span><span class="n">uti_original</span>
     <span class="k">if</span> <span class="n">convert_to_jpeg</span> <span class="ow">and</span> <span class="bp">self</span><span class="o">.</span><span class="n">isphoto</span> <span class="ow">and</span> <span class="n">uti</span> <span class="o">!=</span> <span class="s2">&quot;public.jpeg&quot;</span><span class="p">:</span>
@@ -974,6 +988,9 @@
             <span class="n">merge_exif_keywords</span><span class="o">=</span><span class="n">merge_exif_keywords</span><span class="p">,</span>
             <span class="n">merge_exif_persons</span><span class="o">=</span><span class="n">merge_exif_persons</span><span class="p">,</span>
             <span class="n">filename</span><span class="o">=</span><span class="n">dest</span><span class="o">.</span><span class="n">name</span><span class="p">,</span>
+            <span class="n">persons</span><span class="o">=</span><span class="n">persons</span><span class="p">,</span>
+            <span class="n">location</span><span class="o">=</span><span class="n">location</span><span class="p">,</span>
+            <span class="n">replace_keywords</span><span class="o">=</span><span class="n">replace_keywords</span><span class="p">,</span>
         <span class="p">)</span>
         <span class="n">sidecars</span><span class="o">.</span><span class="n">append</span><span class="p">(</span>
             <span class="p">(</span>
@@ -997,6 +1014,9 @@
             <span class="n">merge_exif_keywords</span><span class="o">=</span><span class="n">merge_exif_keywords</span><span class="p">,</span>
             <span class="n">merge_exif_persons</span><span class="o">=</span><span class="n">merge_exif_persons</span><span class="p">,</span>
             <span class="n">filename</span><span class="o">=</span><span class="n">dest</span><span class="o">.</span><span class="n">name</span><span class="p">,</span>
+            <span class="n">persons</span><span class="o">=</span><span class="n">persons</span><span class="p">,</span>
+            <span class="n">location</span><span class="o">=</span><span class="n">location</span><span class="p">,</span>
+            <span class="n">replace_keywords</span><span class="o">=</span><span class="n">replace_keywords</span><span class="p">,</span>
         <span class="p">)</span>
         <span class="n">sidecars</span><span class="o">.</span><span class="n">append</span><span class="p">(</span>
             <span class="p">(</span>
@@ -1016,6 +1036,9 @@
             <span class="n">keyword_template</span><span class="o">=</span><span class="n">keyword_template</span><span class="p">,</span>
             <span class="n">description_template</span><span class="o">=</span><span class="n">description_template</span><span class="p">,</span>
             <span class="n">extension</span><span class="o">=</span><span class="n">dest</span><span class="o">.</span><span class="n">suffix</span><span class="p">[</span><span class="mi">1</span><span class="p">:]</span> <span class="k">if</span> <span class="n">dest</span><span class="o">.</span><span class="n">suffix</span> <span class="k">else</span> <span class="kc">None</span><span class="p">,</span>
+            <span class="n">persons</span><span class="o">=</span><span class="n">persons</span><span class="p">,</span>
+            <span class="n">location</span><span class="o">=</span><span class="n">location</span><span class="p">,</span>
+            <span class="n">replace_keywords</span><span class="o">=</span><span class="n">replace_keywords</span><span class="p">,</span>
         <span class="p">)</span>
         <span class="n">sidecars</span><span class="o">.</span><span class="n">append</span><span class="p">(</span>
             <span class="p">(</span>
@@ -1083,6 +1106,9 @@
                         <span class="n">ignore_date_modified</span><span class="o">=</span><span class="n">ignore_date_modified</span><span class="p">,</span>
                         <span class="n">merge_exif_keywords</span><span class="o">=</span><span class="n">merge_exif_keywords</span><span class="p">,</span>
                         <span class="n">merge_exif_persons</span><span class="o">=</span><span class="n">merge_exif_persons</span><span class="p">,</span>
+                        <span class="n">persons</span><span class="o">=</span><span class="n">persons</span><span class="p">,</span>
+                        <span class="n">location</span><span class="o">=</span><span class="n">location</span><span class="p">,</span>
+                        <span class="n">replace_keywords</span><span class="o">=</span><span class="n">replace_keywords</span><span class="p">,</span>
                     <span class="p">)</span>
                 <span class="p">)[</span><span class="mi">0</span><span class="p">]</span>
                 <span class="k">if</span> <span class="n">old_data</span> <span class="o">!=</span> <span class="n">current_data</span><span class="p">:</span>
@@ -1103,6 +1129,9 @@
                         <span class="n">flags</span><span class="o">=</span><span class="n">exiftool_flags</span><span class="p">,</span>
                         <span class="n">merge_exif_keywords</span><span class="o">=</span><span class="n">merge_exif_keywords</span><span class="p">,</span>
                         <span class="n">merge_exif_persons</span><span class="o">=</span><span class="n">merge_exif_persons</span><span class="p">,</span>
+                        <span class="n">persons</span><span class="o">=</span><span class="n">persons</span><span class="p">,</span>
+                        <span class="n">location</span><span class="o">=</span><span class="n">location</span><span class="p">,</span>
+                        <span class="n">replace_keywords</span><span class="o">=</span><span class="n">replace_keywords</span><span class="p">,</span>
                     <span class="p">)</span>
                     <span class="k">if</span> <span class="n">warning_</span><span class="p">:</span>
                         <span class="n">all_results</span><span class="o">.</span><span class="n">exiftool_warning</span><span class="o">.</span><span class="n">append</span><span class="p">((</span><span class="n">exported_file</span><span class="p">,</span> <span class="n">warning_</span><span class="p">))</span>
@@ -1120,6 +1149,9 @@
                         <span class="n">ignore_date_modified</span><span class="o">=</span><span class="n">ignore_date_modified</span><span class="p">,</span>
                         <span class="n">merge_exif_keywords</span><span class="o">=</span><span class="n">merge_exif_keywords</span><span class="p">,</span>
                         <span class="n">merge_exif_persons</span><span class="o">=</span><span class="n">merge_exif_persons</span><span class="p">,</span>
+                        <span class="n">persons</span><span class="o">=</span><span class="n">persons</span><span class="p">,</span>
+                        <span class="n">location</span><span class="o">=</span><span class="n">location</span><span class="p">,</span>
+                        <span class="n">replace_keywords</span><span class="o">=</span><span class="n">replace_keywords</span><span class="p">,</span>
                     <span class="p">),</span>
                 <span class="p">)</span>
                 <span class="n">export_db</span><span class="o">.</span><span class="n">set_stat_exif_for_file</span><span class="p">(</span>
@@ -1142,6 +1174,9 @@
                     <span class="n">flags</span><span class="o">=</span><span class="n">exiftool_flags</span><span class="p">,</span>
                     <span class="n">merge_exif_keywords</span><span class="o">=</span><span class="n">merge_exif_keywords</span><span class="p">,</span>
                     <span class="n">merge_exif_persons</span><span class="o">=</span><span class="n">merge_exif_persons</span><span class="p">,</span>
+                    <span class="n">persons</span><span class="o">=</span><span class="n">persons</span><span class="p">,</span>
+                    <span class="n">location</span><span class="o">=</span><span class="n">location</span><span class="p">,</span>
+                    <span class="n">replace_keywords</span><span class="o">=</span><span class="n">replace_keywords</span><span class="p">,</span>
                 <span class="p">)</span>
                 <span class="k">if</span> <span class="n">warning_</span><span class="p">:</span>
                     <span class="n">all_results</span><span class="o">.</span><span class="n">exiftool_warning</span><span class="o">.</span><span class="n">append</span><span class="p">((</span><span class="n">exported_file</span><span class="p">,</span> <span class="n">warning_</span><span class="p">))</span>
@@ -1159,6 +1194,9 @@
                     <span class="n">ignore_date_modified</span><span class="o">=</span><span class="n">ignore_date_modified</span><span class="p">,</span>
                     <span class="n">merge_exif_keywords</span><span class="o">=</span><span class="n">merge_exif_keywords</span><span class="p">,</span>
                     <span class="n">merge_exif_persons</span><span class="o">=</span><span class="n">merge_exif_persons</span><span class="p">,</span>
+                    <span class="n">persons</span><span class="o">=</span><span class="n">persons</span><span class="p">,</span>
+                    <span class="n">location</span><span class="o">=</span><span class="n">location</span><span class="p">,</span>
+                    <span class="n">replace_keywords</span><span class="o">=</span><span class="n">replace_keywords</span><span class="p">,</span>
                 <span class="p">),</span>
             <span class="p">)</span>
             <span class="n">export_db</span><span class="o">.</span><span class="n">set_stat_exif_for_file</span><span class="p">(</span>
@@ -1378,6 +1416,9 @@
     <span class="n">flags</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
     <span class="n">merge_exif_keywords</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
     <span class="n">merge_exif_persons</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
+    <span class="n">persons</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
+    <span class="n">location</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
+    <span class="n">replace_keywords</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
 <span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;write exif data to image file at filepath</span>
 
@@ -1388,6 +1429,9 @@
 <span class="sd">        keyword_template: (list of strings); list of template strings to render as keywords</span>
 <span class="sd">        ignore_date_modified: if True, sets EXIF:ModifyDate to EXIF:DateTimeOriginal even if date_modified is set</span>
 <span class="sd">        flags: optional list of exiftool flags to prepend to exiftool command when writing metadata (e.g. -m or -F)</span>
+<span class="sd">        persons: if True, write person data to metadata</span>
+<span class="sd">        location: if True, write location data to metadata</span>
+<span class="sd">        replace_keywords: if True, keyword_template replaces any keywords, otherwise it&#39;s additive</span>
 
 <span class="sd">    Returns:</span>
 <span class="sd">        (warning, error) of warning and error strings if exiftool produces warnings or errors</span>
@@ -1402,6 +1446,9 @@
         <span class="n">ignore_date_modified</span><span class="o">=</span><span class="n">ignore_date_modified</span><span class="p">,</span>
         <span class="n">merge_exif_keywords</span><span class="o">=</span><span class="n">merge_exif_keywords</span><span class="p">,</span>
         <span class="n">merge_exif_persons</span><span class="o">=</span><span class="n">merge_exif_persons</span><span class="p">,</span>
+        <span class="n">persons</span><span class="o">=</span><span class="n">persons</span><span class="p">,</span>
+        <span class="n">location</span><span class="o">=</span><span class="n">location</span><span class="p">,</span>
+        <span class="n">replace_keywords</span><span class="o">=</span><span class="n">replace_keywords</span><span class="p">,</span>
     <span class="p">)</span>
 
     <span class="k">with</span> <span class="n">ExifTool</span><span class="p">(</span><span class="n">filepath</span><span class="p">,</span> <span class="n">flags</span><span class="o">=</span><span class="n">flags</span><span class="p">,</span> <span class="n">exiftool</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">_db</span><span class="o">.</span><span class="n">_exiftool_path</span><span class="p">)</span> <span class="k">as</span> <span class="n">exiftool</span><span class="p">:</span>
@@ -1424,6 +1471,9 @@
     <span class="n">merge_exif_keywords</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
     <span class="n">merge_exif_persons</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
     <span class="n">filename</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
+    <span class="n">persons</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
+    <span class="n">location</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
+    <span class="n">replace_keywords</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
 <span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;Return dict of EXIF details for building exiftool JSON sidecar or sending commands to ExifTool.</span>
 <span class="sd">        Does not include all the EXIF fields as those are likely already in the image.</span>
@@ -1437,6 +1487,9 @@
 <span class="sd">        ignore_date_modified: if True, sets EXIF:ModifyDate to EXIF:DateTimeOriginal even if date_modified is set</span>
 <span class="sd">        merge_exif_keywords: merge keywords in the file&#39;s exif metadata (requires exiftool)</span>
 <span class="sd">        merge_exif_persons: merge persons in the file&#39;s exif metadata (requires exiftool)</span>
+<span class="sd">        persons: if True, include person data</span>
+<span class="sd">        location: if True, include location data</span>
+<span class="sd">        replace_keywords: if True, keyword_template replaces any keywords, otherwise it&#39;s additive</span>
 
 <span class="sd">    Returns: dict with exiftool tags / values</span>
 
@@ -1444,8 +1497,10 @@
 <span class="sd">        EXIF:ImageDescription (may include template)</span>
 <span class="sd">        XMP:Description (may include template)</span>
 <span class="sd">        XMP:Title</span>
+<span class="sd">        IPTC:ObjectName</span>
 <span class="sd">        XMP:TagsList (may include album name, person name, or template)</span>
 <span class="sd">        IPTC:Keywords (may include album name, person name, or template)</span>
+<span class="sd">        IPTC:Caption-Abstract</span>
 <span class="sd">        XMP:Subject (set to keywords + persons)</span>
 <span class="sd">        XMP:PersonInImage</span>
 <span class="sd">        EXIF:GPSLatitudeRef, EXIF:GPSLongitudeRef</span>
@@ -1461,6 +1516,9 @@
 <span class="sd">        QuickTime:ModifyDate (UTC)</span>
 <span class="sd">        QuickTime:GPSCoordinates</span>
 <span class="sd">        UserData:GPSCoordinates</span>
+
+<span class="sd">    Reference: </span>
+<span class="sd">        https://iptc.org/std/photometadata/specification/IPTC-PhotoMetadata-201610_1.pdf</span>
 <span class="sd">    &quot;&quot;&quot;</span>
 
     <span class="n">exif</span> <span class="o">=</span> <span class="p">(</span>
@@ -1480,30 +1538,34 @@
         <span class="n">description</span> <span class="o">=</span> <span class="s2">&quot; &quot;</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">rendered</span><span class="p">)</span> <span class="k">if</span> <span class="n">rendered</span> <span class="k">else</span> <span class="s2">&quot;&quot;</span>
         <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;EXIF:ImageDescription&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">description</span>
         <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;XMP:Description&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">description</span>
+        <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;IPTC:Caption-Abstract&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">description</span>
     <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">description</span><span class="p">:</span>
         <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;EXIF:ImageDescription&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">description</span>
         <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;XMP:Description&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">description</span>
+        <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;IPTC:Caption-Abstract&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">description</span>
 
     <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">title</span><span class="p">:</span>
         <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;XMP:Title&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">title</span>
+        <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;IPTC:ObjectName&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">title</span>
 
     <span class="n">keyword_list</span> <span class="o">=</span> <span class="p">[]</span>
     <span class="k">if</span> <span class="n">merge_exif_keywords</span><span class="p">:</span>
         <span class="n">keyword_list</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_get_exif_keywords</span><span class="p">())</span>
 
-    <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">keywords</span><span class="p">:</span>
+    <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">keywords</span> <span class="ow">and</span> <span class="ow">not</span> <span class="n">replace_keywords</span><span class="p">:</span>
         <span class="n">keyword_list</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">keywords</span><span class="p">)</span>
 
     <span class="n">person_list</span> <span class="o">=</span> <span class="p">[]</span>
-    <span class="k">if</span> <span class="n">merge_exif_persons</span><span class="p">:</span>
+    <span class="k">if</span> <span class="n">persons</span><span class="p">:</span>
-        <span class="n">person_list</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_get_exif_persons</span><span class="p">())</span>
+        <span class="k">if</span> <span class="n">merge_exif_persons</span><span class="p">:</span>
+            <span class="n">person_list</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_get_exif_persons</span><span class="p">())</span>
 
-    <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">persons</span><span class="p">:</span>
+        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">persons</span><span class="p">:</span>
-        <span class="c1"># filter out _UNKNOWN_PERSON</span>
+            <span class="c1"># filter out _UNKNOWN_PERSON</span>
-        <span class="n">person_list</span><span class="o">.</span><span class="n">extend</span><span class="p">([</span><span class="n">p</span> <span class="k">for</span> <span class="n">p</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">persons</span> <span class="k">if</span> <span class="n">p</span> <span class="o">!=</span> <span class="n">_UNKNOWN_PERSON</span><span class="p">])</span>
+            <span class="n">person_list</span><span class="o">.</span><span class="n">extend</span><span class="p">([</span><span class="n">p</span> <span class="k">for</span> <span class="n">p</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">persons</span> <span class="k">if</span> <span class="n">p</span> <span class="o">!=</span> <span class="n">_UNKNOWN_PERSON</span><span class="p">])</span>
 
-    <span class="k">if</span> <span class="n">use_persons_as_keywords</span> <span class="ow">and</span> <span class="n">person_list</span><span class="p">:</span>
+        <span class="k">if</span> <span class="n">use_persons_as_keywords</span> <span class="ow">and</span> <span class="n">person_list</span><span class="p">:</span>
-        <span class="n">keyword_list</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="n">person_list</span><span class="p">)</span>
+            <span class="n">keyword_list</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="n">person_list</span><span class="p">)</span>
 
     <span class="k">if</span> <span class="n">use_albums_as_keywords</span> <span class="ow">and</span> <span class="bp">self</span><span class="o">.</span><span class="n">albums</span><span class="p">:</span>
         <span class="n">keyword_list</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">albums</span><span class="p">)</span>
@@ -1534,8 +1596,8 @@
             <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">long_str</span><span class="p">)</span> <span class="o">&gt;</span> <span class="n">_MAX_IPTC_KEYWORD_LEN</span>
         <span class="p">]</span>
         <span class="k">if</span> <span class="n">long_keywords</span><span class="p">:</span>
-            <span class="n">logging</span><span class="o">.</span><span class="n">warning</span><span class="p">(</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">_verbose</span><span class="p">(</span>
-                <span class="sa">f</span><span class="s2">&quot;Some keywords exceed max IPTC Keyword length of </span><span class="si">{</span><span class="n">_MAX_IPTC_KEYWORD_LEN</span><span class="si">}</span><span class="s2">: </span><span class="si">{</span><span class="n">long_keywords</span><span class="si">}</span><span class="s2">&quot;</span>
+                <span class="sa">f</span><span class="s2">&quot;Warning: some keywords exceed max IPTC Keyword length of </span><span class="si">{</span><span class="n">_MAX_IPTC_KEYWORD_LEN</span><span class="si">}</span><span class="s2"> (exiftool will truncate these): </span><span class="si">{</span><span class="n">long_keywords</span><span class="si">}</span><span class="s2">&quot;</span>
             <span class="p">)</span>
 
         <span class="n">keyword_list</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="n">rendered_keywords</span><span class="p">)</span>
@@ -1547,25 +1609,26 @@
         <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;XMP:Subject&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">keyword_list</span><span class="o">.</span><span class="n">copy</span><span class="p">()</span>
         <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;XMP:TagsList&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">keyword_list</span><span class="o">.</span><span class="n">copy</span><span class="p">()</span>
 
-    <span class="k">if</span> <span class="n">person_list</span><span class="p">:</span>
+    <span class="k">if</span> <span class="n">persons</span> <span class="ow">and</span> <span class="n">person_list</span><span class="p">:</span>
         <span class="n">person_list</span> <span class="o">=</span> <span class="nb">sorted</span><span class="p">(</span><span class="nb">list</span><span class="p">(</span><span class="nb">set</span><span class="p">(</span><span class="n">person_list</span><span class="p">)))</span>
         <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;XMP:PersonInImage&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">person_list</span><span class="o">.</span><span class="n">copy</span><span class="p">()</span>
 
     <span class="c1"># if self.favorite():</span>
     <span class="c1">#     exif[&quot;Rating&quot;] = 5</span>
 
-    <span class="p">(</span><span class="n">lat</span><span class="p">,</span> <span class="n">lon</span><span class="p">)</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">location</span>
+    <span class="k">if</span> <span class="n">location</span><span class="p">:</span>
-    <span class="k">if</span> <span class="n">lat</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span> <span class="ow">and</span> <span class="n">lon</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
+        <span class="p">(</span><span class="n">lat</span><span class="p">,</span> <span class="n">lon</span><span class="p">)</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">location</span>
-        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">isphoto</span><span class="p">:</span>
+        <span class="k">if</span> <span class="n">lat</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span> <span class="ow">and</span> <span class="n">lon</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
-            <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;EXIF:GPSLatitude&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">lat</span>
+            <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">isphoto</span><span class="p">:</span>
-            <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;EXIF:GPSLongitude&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">lon</span>
+                <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;EXIF:GPSLatitude&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">lat</span>
-            <span class="n">lat_ref</span> <span class="o">=</span> <span class="s2">&quot;N&quot;</span> <span class="k">if</span> <span class="n">lat</span> <span class="o">&gt;=</span> <span class="mi">0</span> <span class="k">else</span> <span class="s2">&quot;S&quot;</span>
+                <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;EXIF:GPSLongitude&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">lon</span>
-            <span class="n">lon_ref</span> <span class="o">=</span> <span class="s2">&quot;E&quot;</span> <span class="k">if</span> <span class="n">lon</span> <span class="o">&gt;=</span> <span class="mi">0</span> <span class="k">else</span> <span class="s2">&quot;W&quot;</span>
+                <span class="n">lat_ref</span> <span class="o">=</span> <span class="s2">&quot;N&quot;</span> <span class="k">if</span> <span class="n">lat</span> <span class="o">&gt;=</span> <span class="mi">0</span> <span class="k">else</span> <span class="s2">&quot;S&quot;</span>
-            <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;EXIF:GPSLatitudeRef&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">lat_ref</span>
+                <span class="n">lon_ref</span> <span class="o">=</span> <span class="s2">&quot;E&quot;</span> <span class="k">if</span> <span class="n">lon</span> <span class="o">&gt;=</span> <span class="mi">0</span> <span class="k">else</span> <span class="s2">&quot;W&quot;</span>
-            <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;EXIF:GPSLongitudeRef&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">lon_ref</span>
+                <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;EXIF:GPSLatitudeRef&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">lat_ref</span>
-        <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">ismovie</span><span class="p">:</span>
+                <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;EXIF:GPSLongitudeRef&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">lon_ref</span>
-            <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;Keys:GPSCoordinates&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">lat</span><span class="si">}</span><span class="s2"> </span><span class="si">{</span><span class="n">lon</span><span class="si">}</span><span class="s2">&quot;</span>
+            <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">ismovie</span><span class="p">:</span>
-            <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;UserData:GPSCoordinates&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">lat</span><span class="si">}</span><span class="s2"> </span><span class="si">{</span><span class="n">lon</span><span class="si">}</span><span class="s2">&quot;</span>
+                <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;Keys:GPSCoordinates&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">lat</span><span class="si">}</span><span class="s2"> </span><span class="si">{</span><span class="n">lon</span><span class="si">}</span><span class="s2">&quot;</span>
+                <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;UserData:GPSCoordinates&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">lat</span><span class="si">}</span><span class="s2"> </span><span class="si">{</span><span class="n">lon</span><span class="si">}</span><span class="s2">&quot;</span>
 
     <span class="c1"># process date/time and timezone offset</span>
     <span class="c1"># Photos exports the following fields and sets modify date to creation date</span>
@@ -1624,6 +1687,13 @@
             <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;QuickTime:ModifyDate&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">datetime_tz_to_utc</span><span class="p">(</span>
                 <span class="bp">self</span><span class="o">.</span><span class="n">date_modified</span>
             <span class="p">)</span><span class="o">.</span><span class="n">strftime</span><span class="p">(</span><span class="s2">&quot;%Y:%m:</span><span class="si">%d</span><span class="s2"> %H:%M:%S&quot;</span><span class="p">)</span>
+    
+    <span class="c1"># remove any new lines in any fields</span>
+    <span class="k">for</span> <span class="n">field</span><span class="p">,</span> <span class="n">val</span> <span class="ow">in</span> <span class="n">exif</span><span class="o">.</span><span class="n">items</span><span class="p">():</span>
+        <span class="k">if</span> <span class="nb">type</span><span class="p">(</span><span class="n">val</span><span class="p">)</span> <span class="o">==</span> <span class="nb">str</span><span class="p">:</span>
+            <span class="n">exif</span><span class="p">[</span><span class="n">field</span><span class="p">]</span> <span class="o">=</span> <span class="n">val</span><span class="o">.</span><span class="n">replace</span><span class="p">(</span><span class="s2">&quot;</span><span class="se">\n</span><span class="s2">&quot;</span><span class="p">,</span> <span class="s2">&quot; &quot;</span><span class="p">)</span>
+        <span class="k">elif</span> <span class="nb">type</span><span class="p">(</span><span class="n">val</span><span class="p">)</span> <span class="o">==</span> <span class="nb">list</span><span class="p">:</span>
+            <span class="n">exif</span><span class="p">[</span><span class="n">field</span><span class="p">]</span> <span class="o">=</span> <span class="p">[</span><span class="n">v</span><span class="o">.</span><span class="n">replace</span><span class="p">(</span><span class="s2">&quot;</span><span class="se">\n</span><span class="s2">&quot;</span><span class="p">,</span> <span class="s2">&quot; &quot;</span><span class="p">)</span> <span class="k">for</span> <span class="n">v</span> <span class="ow">in</span> <span class="n">val</span><span class="p">]</span>
     <span class="k">return</span> <span class="n">exif</span>
 
 
@@ -1673,6 +1743,9 @@
     <span class="n">merge_exif_keywords</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
     <span class="n">merge_exif_persons</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
     <span class="n">filename</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
+    <span class="n">persons</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
+    <span class="n">location</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
+    <span class="n">replace_keywords</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
 <span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;Return dict of EXIF details for building exiftool JSON sidecar or sending commands to ExifTool.</span>
 <span class="sd">        Does not include all the EXIF fields as those are likely already in the image.</span>
@@ -1687,13 +1760,18 @@
 <span class="sd">        merge_exif_keywords: boolean; if True, merged keywords found in file&#39;s exif data (requires exiftool)</span>
 <span class="sd">        merge_exif_persons: boolean; if True, merged persons found in file&#39;s exif data (requires exiftool)</span>
 <span class="sd">        filename: filename of the destination image file for including in exiftool signature in JSON sidecar</span>
+<span class="sd">        persons: if True, include person data</span>
+<span class="sd">        location: if True, include location data</span>
+<span class="sd">        replace_keywords: if True, keyword_template replaces any keywords, otherwise it&#39;s additive</span>
 
 <span class="sd">    Returns: dict with exiftool tags / values</span>
 
 <span class="sd">    Exports the following:</span>
 <span class="sd">        EXIF:ImageDescription</span>
 <span class="sd">        XMP:Description (may include template)</span>
+<span class="sd">        IPTC:CaptionAbstract</span>
 <span class="sd">        XMP:Title</span>
+<span class="sd">        IPTC:ObjectName</span>
 <span class="sd">        XMP:TagsList</span>
 <span class="sd">        IPTC:Keywords (may include album name, person name, or template)</span>
 <span class="sd">        XMP:Subject (set to keywords + person)</span>
@@ -1721,6 +1799,9 @@
         <span class="n">merge_exif_keywords</span><span class="o">=</span><span class="n">merge_exif_keywords</span><span class="p">,</span>
         <span class="n">merge_exif_persons</span><span class="o">=</span><span class="n">merge_exif_persons</span><span class="p">,</span>
         <span class="n">filename</span><span class="o">=</span><span class="n">filename</span><span class="p">,</span>
+        <span class="n">persons</span><span class="o">=</span><span class="n">persons</span><span class="p">,</span>
+        <span class="n">location</span><span class="o">=</span><span class="n">location</span><span class="p">,</span>
+        <span class="n">replace_keywords</span><span class="o">=</span><span class="n">replace_keywords</span><span class="p">,</span>
     <span class="p">)</span>
 
     <span class="k">if</span> <span class="ow">not</span> <span class="n">tag_groups</span><span class="p">:</span>
@@ -1743,6 +1824,9 @@
     <span class="n">extension</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
     <span class="n">merge_exif_keywords</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
     <span class="n">merge_exif_persons</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
+    <span class="n">persons</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
+    <span class="n">location</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
+    <span class="n">replace_keywords</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
 <span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;returns string for XMP sidecar</span>
 <span class="sd">    use_albums_as_keywords: treat album names as keywords</span>
@@ -1752,6 +1836,9 @@
 <span class="sd">    extension: which extension to use for SidecarForExtension property</span>
 <span class="sd">    merge_exif_keywords: boolean; if True, merged keywords found in file&#39;s exif data (requires exiftool)</span>
 <span class="sd">    merge_exif_persons: boolean; if True, merged persons found in file&#39;s exif data (requires exiftool)</span>
+<span class="sd">    persons: if True, include person data</span>
+<span class="sd">    location: if True, include location data</span>
+<span class="sd">    replace_keywords: if True, keyword_template replaces any keywords, otherwise it&#39;s additive</span>
 <span class="sd">    &quot;&quot;&quot;</span>
 
     <span class="n">xmp_template_file</span> <span class="o">=</span> <span class="p">(</span>
@@ -1775,22 +1862,23 @@
     <span class="k">if</span> <span class="n">merge_exif_keywords</span><span class="p">:</span>
         <span class="n">keyword_list</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_get_exif_keywords</span><span class="p">())</span>
 
-    <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">keywords</span><span class="p">:</span>
+    <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">keywords</span> <span class="ow">and</span> <span class="ow">not</span> <span class="n">replace_keywords</span><span class="p">:</span>
         <span class="n">keyword_list</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">keywords</span><span class="p">)</span>
 
     <span class="c1"># TODO: keyword handling in this and _exiftool_json_sidecar is</span>
     <span class="c1"># good candidate for pulling out in a function</span>
 
     <span class="n">person_list</span> <span class="o">=</span> <span class="p">[]</span>
-    <span class="k">if</span> <span class="n">merge_exif_persons</span><span class="p">:</span>
+    <span class="k">if</span> <span class="n">persons</span><span class="p">:</span>
-        <span class="n">person_list</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_get_exif_persons</span><span class="p">())</span>
+        <span class="k">if</span> <span class="n">merge_exif_persons</span><span class="p">:</span>
+            <span class="n">person_list</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_get_exif_persons</span><span class="p">())</span>
 
-    <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">persons</span><span class="p">:</span>
+        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">persons</span><span class="p">:</span>
-        <span class="c1"># filter out _UNKNOWN_PERSON</span>
+            <span class="c1"># filter out _UNKNOWN_PERSON</span>
-        <span class="n">person_list</span><span class="o">.</span><span class="n">extend</span><span class="p">([</span><span class="n">p</span> <span class="k">for</span> <span class="n">p</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">persons</span> <span class="k">if</span> <span class="n">p</span> <span class="o">!=</span> <span class="n">_UNKNOWN_PERSON</span><span class="p">])</span>
+            <span class="n">person_list</span><span class="o">.</span><span class="n">extend</span><span class="p">([</span><span class="n">p</span> <span class="k">for</span> <span class="n">p</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">persons</span> <span class="k">if</span> <span class="n">p</span> <span class="o">!=</span> <span class="n">_UNKNOWN_PERSON</span><span class="p">])</span>
 
-    <span class="k">if</span> <span class="n">use_persons_as_keywords</span> <span class="ow">and</span> <span class="n">person_list</span><span class="p">:</span>
+        <span class="k">if</span> <span class="n">use_persons_as_keywords</span> <span class="ow">and</span> <span class="n">person_list</span><span class="p">:</span>
-        <span class="n">keyword_list</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="n">person_list</span><span class="p">)</span>
+            <span class="n">keyword_list</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="n">person_list</span><span class="p">)</span>
 
     <span class="k">if</span> <span class="n">use_albums_as_keywords</span> <span class="ow">and</span> <span class="bp">self</span><span class="o">.</span><span class="n">albums</span><span class="p">:</span>
         <span class="n">keyword_list</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">albums</span><span class="p">)</span>
@@ -1814,28 +1902,20 @@
             <span class="k">if</span> <span class="n">_OSXPHOTOS_NONE_SENTINEL</span> <span class="ow">not</span> <span class="ow">in</span> <span class="n">keyword</span>
         <span class="p">]</span>
 
-        <span class="c1"># check to see if any keywords too long</span>
-        <span class="n">long_keywords</span> <span class="o">=</span> <span class="p">[</span>
-            <span class="n">long_str</span>
-            <span class="k">for</span> <span class="n">long_str</span> <span class="ow">in</span> <span class="n">rendered_keywords</span>
-            <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">long_str</span><span class="p">)</span> <span class="o">&gt;</span> <span class="n">_MAX_IPTC_KEYWORD_LEN</span>
-        <span class="p">]</span>
-        <span class="k">if</span> <span class="n">long_keywords</span><span class="p">:</span>
-            <span class="n">logging</span><span class="o">.</span><span class="n">warning</span><span class="p">(</span>
-                <span class="sa">f</span><span class="s2">&quot;Some keywords exceed max IPTC Keyword length of </span><span class="si">{</span><span class="n">_MAX_IPTC_KEYWORD_LEN</span><span class="si">}</span><span class="s2">: </span><span class="si">{</span><span class="n">long_keywords</span><span class="si">}</span><span class="s2">&quot;</span>
-            <span class="p">)</span>
-
         <span class="n">keyword_list</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="n">rendered_keywords</span><span class="p">)</span>
 
     <span class="c1"># remove duplicates</span>
     <span class="c1"># sorted mainly to make testing the XMP file easier</span>
     <span class="k">if</span> <span class="n">keyword_list</span><span class="p">:</span>
         <span class="n">keyword_list</span> <span class="o">=</span> <span class="nb">sorted</span><span class="p">(</span><span class="nb">list</span><span class="p">(</span><span class="nb">set</span><span class="p">(</span><span class="n">keyword_list</span><span class="p">)))</span>
-    <span class="k">if</span> <span class="n">person_list</span><span class="p">:</span>
+    <span class="k">if</span> <span class="n">persons</span> <span class="ow">and</span> <span class="n">person_list</span><span class="p">:</span>
         <span class="n">person_list</span> <span class="o">=</span> <span class="nb">sorted</span><span class="p">(</span><span class="nb">list</span><span class="p">(</span><span class="nb">set</span><span class="p">(</span><span class="n">person_list</span><span class="p">)))</span>
 
     <span class="n">subject_list</span> <span class="o">=</span> <span class="n">keyword_list</span>
 
+    <span class="k">if</span> <span class="n">location</span><span class="p">:</span>
+        <span class="n">latlon</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">location</span>
+
     <span class="n">xmp_str</span> <span class="o">=</span> <span class="n">xmp_template</span><span class="o">.</span><span class="n">render</span><span class="p">(</span>
         <span class="n">photo</span><span class="o">=</span><span class="bp">self</span><span class="p">,</span>
         <span class="n">description</span><span class="o">=</span><span class="n">description</span><span class="p">,</span>
@@ -1843,6 +1923,7 @@
         <span class="n">persons</span><span class="o">=</span><span class="n">person_list</span><span class="p">,</span>
         <span class="n">subjects</span><span class="o">=</span><span class="n">subject_list</span><span class="p">,</span>
         <span class="n">extension</span><span class="o">=</span><span class="n">extension</span><span class="p">,</span>
+        <span class="n">location</span><span class="o">=</span><span class="n">latlon</span><span class="p">,</span>
         <span class="n">version</span><span class="o">=</span><span class="n">__version__</span><span class="p">,</span>
     <span class="p">)</span>
 
@@ -1923,7 +2004,7 @@
       &copy;2021, Rhet Turnbull.
       
       |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.4.3</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.5.2</a>
       &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
       
     </div>

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.41.4 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>
@@ -208,7 +208,7 @@
       &copy;2021, Rhet Turnbull.
       
       |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.4.3</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.5.2</a>
       &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
       
     </div>

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.41.4 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>
@@ -366,7 +366,7 @@
       &copy;2021, Rhet Turnbull.
       
       |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.4.3</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.5.2</a>
       &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
       
     </div>

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.41.4 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>
@@ -60,6 +60,7 @@
     <span class="n">_PHOTOS_5_SHARED_PHOTO_PATH</span><span class="p">,</span>
     <span class="n">_PHOTOS_5_VERSION</span><span class="p">,</span>
 <span class="p">)</span>
+<span class="kn">from</span> <span class="nn">..adjustmentsinfo</span> <span class="kn">import</span> <span class="n">AdjustmentsInfo</span>
 <span class="kn">from</span> <span class="nn">..albuminfo</span> <span class="kn">import</span> <span class="n">AlbumInfo</span><span class="p">,</span> <span class="n">ImportInfo</span>
 <span class="kn">from</span> <span class="nn">..personinfo</span> <span class="kn">import</span> <span class="n">FaceInfo</span><span class="p">,</span> <span class="n">PersonInfo</span>
 <span class="kn">from</span> <span class="nn">..phototemplate</span> <span class="kn">import</span> <span class="n">PhotoTemplate</span>
@@ -103,6 +104,7 @@
         <span class="bp">self</span><span class="o">.</span><span class="n">_uuid</span> <span class="o">=</span> <span class="n">uuid</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">_info</span> <span class="o">=</span> <span class="n">info</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">_db</span> <span class="o">=</span> <span class="n">db</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">_verbose</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_db</span><span class="o">.</span><span class="n">_verbose</span>
 
     <span class="nd">@property</span>
     <span class="k">def</span> <span class="nf">filename</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
@@ -542,6 +544,30 @@
         <span class="sd">&quot;&quot;&quot; True if picture has adjustments / edits &quot;&quot;&quot;</span>
         <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_info</span><span class="p">[</span><span class="s2">&quot;hasAdjustments&quot;</span><span class="p">]</span> <span class="o">==</span> <span class="mi">1</span>
 
+    <span class="nd">@property</span>
+    <span class="k">def</span> <span class="nf">adjustments</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot; Returns AdjustmentsInfo class for adjustment data or None if no adjustments; Photos 5+ only &quot;&quot;&quot;</span>
+        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">_db</span><span class="o">.</span><span class="n">_db_version</span> <span class="o">&lt;=</span> <span class="n">_PHOTOS_4_VERSION</span><span class="p">:</span>
+            <span class="k">return</span> <span class="kc">None</span>
+
+        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">hasadjustments</span><span class="p">:</span>
+            <span class="k">try</span><span class="p">:</span>
+                <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_adjustmentinfo</span>
+            <span class="k">except</span> <span class="ne">AttributeError</span><span class="p">:</span>
+                <span class="n">library</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_db</span><span class="o">.</span><span class="n">_library_path</span>
+                <span class="n">directory</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_uuid</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>  <span class="c1"># first char of uuid</span>
+                <span class="n">plist_file</span> <span class="o">=</span> <span class="p">(</span>
+                    <span class="n">pathlib</span><span class="o">.</span><span class="n">Path</span><span class="p">(</span><span class="n">library</span><span class="p">)</span>
+                    <span class="o">/</span> <span class="s2">&quot;resources&quot;</span>
+                    <span class="o">/</span> <span class="s2">&quot;renders&quot;</span>
+                    <span class="o">/</span> <span class="n">directory</span>
+                    <span class="o">/</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">_uuid</span><span class="si">}</span><span class="s2">.plist&quot;</span>
+                <span class="p">)</span>
+                <span class="k">if</span> <span class="ow">not</span> <span class="n">plist_file</span><span class="o">.</span><span class="n">is_file</span><span class="p">():</span>
+                    <span class="k">return</span> <span class="kc">None</span>
+                <span class="bp">self</span><span class="o">.</span><span class="n">_adjustmentinfo</span> <span class="o">=</span> <span class="n">AdjustmentsInfo</span><span class="p">(</span><span class="n">plist_file</span><span class="p">)</span>
+                <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_adjustmentinfo</span>
+
     <span class="nd">@property</span>
     <span class="k">def</span> <span class="nf">external_edit</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Returns True if picture was edited outside of Photos using external editor &quot;&quot;&quot;</span>
@@ -855,8 +881,19 @@
 
     <span class="nd">@property</span>
     <span class="k">def</span> <span class="nf">orientation</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-        <span class="sd">&quot;&quot;&quot; returns EXIF orientation of the current photo version as int &quot;&quot;&quot;</span>
+        <span class="sd">&quot;&quot;&quot; returns EXIF orientation of the current photo version as int or 0 if current orientation cannot be determined &quot;&quot;&quot;</span>
-        <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_info</span><span class="p">[</span><span class="s2">&quot;orientation&quot;</span><span class="p">]</span>
+        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">_db</span><span class="o">.</span><span class="n">_db_version</span> <span class="o">&lt;=</span> <span class="n">_PHOTOS_4_VERSION</span><span class="p">:</span>
+            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_info</span><span class="p">[</span><span class="s2">&quot;orientation&quot;</span><span class="p">]</span>
+
+        <span class="c1"># For Photos 5+, try to get the adjusted orientation</span>
+        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">hasadjustments</span><span class="p">:</span>
+            <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">adjustments</span><span class="p">:</span>
+                <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">adjustments</span><span class="o">.</span><span class="n">adj_orientation</span>
+            <span class="k">else</span><span class="p">:</span>
+                <span class="c1"># can&#39;t reliably determine orientation for edited photo if adjustmentinfo not available</span>
+                <span class="k">return</span> <span class="mi">0</span>
+        <span class="k">else</span><span class="p">:</span>
+            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_info</span><span class="p">[</span><span class="s2">&quot;orientation&quot;</span><span class="p">]</span>
 
     <span class="nd">@property</span>
     <span class="k">def</span> <span class="nf">original_height</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
@@ -1184,7 +1221,7 @@
       &copy;2021, Rhet Turnbull.
       
       |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.4.3</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.5.2</a>
       &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
       
     </div>

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.41.4 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>
@@ -2074,6 +2074,7 @@
             <span class="c1"># &gt; 6 = portrait (sometimes, see ZDEPTHSTATE/ZDEPTHTYPE)</span>
             <span class="n">info</span><span class="p">[</span><span class="s2">&quot;customRenderedValue&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">22</span><span class="p">]</span>
             <span class="n">info</span><span class="p">[</span><span class="s2">&quot;hdr&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">True</span> <span class="k">if</span> <span class="n">row</span><span class="p">[</span><span class="mi">22</span><span class="p">]</span> <span class="o">==</span> <span class="mi">3</span> <span class="k">else</span> <span class="kc">False</span>
+            <span class="n">info</span><span class="p">[</span><span class="s2">&quot;depth_state&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">36</span><span class="p">]</span>
             <span class="n">info</span><span class="p">[</span><span class="s2">&quot;portrait&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">True</span> <span class="k">if</span> <span class="n">row</span><span class="p">[</span><span class="mi">36</span><span class="p">]</span> <span class="o">!=</span> <span class="mi">0</span> <span class="k">else</span> <span class="kc">False</span>
 
             <span class="c1"># Set panorama from either KindSubType or RenderedValue</span>
@@ -2951,7 +2952,7 @@
       &copy;2021, Rhet Turnbull.
       
       |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.4.3</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.5.2</a>
       &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
       
     </div>

docs/_static/doctools.js

@@ -29,9 +29,14 @@ if (!window.console || !console.firebug) {
 
 /**
  * small helper function to urldecode strings
+ *
+ * See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/decodeURIComponent#Decoding_query_parameters_from_a_URL
  */
 jQuery.urldecode = function(x) {
-  return decodeURIComponent(x).replace(/\+/g, ' ');
+  if (!x) {
+    return x
+  }
+  return decodeURIComponent(x.replace(/\+/g, ' '));
 };
 
 /**

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.41.4',
     LANGUAGE: 'None',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

docs/_static/language_data.js

@@ -13,7 +13,8 @@
 var stopwords = ["a","and","are","as","at","be","but","by","for","if","in","into","is","it","near","no","not","of","on","or","such","that","the","their","then","there","these","they","this","to","was","will","with"];
 
 
-/* Non-minified version JS is _stemmer.js if file is provided */ 
+/* Non-minified version is copied as a separate JS file, is available */
+
 /**
  * Porter Stemmer
  */
@@ -199,7 +200,6 @@ var Stemmer = function() {
 
 
 
-
 var splitChars = (function() {
     var result = {};
     var singles = [96, 180, 187, 191, 215, 247, 749, 885, 903, 907, 909, 930, 1014, 1648,

docs/_static/pygments.css

@@ -1,7 +1,7 @@
 pre { line-height: 125%; }
-td.linenos pre { color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px; }
+td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
-span.linenos { color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px; }
+span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
-td.linenos pre.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
+td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
 span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
 .highlight .hll { background-color: #ffffcc }
 .highlight { background: #f8f8f8; }

docs/_static/searchtools.js

@@ -248,7 +248,7 @@ var Search = {
       // results left, load the summary and display it
       if (results.length) {
         var item = results.pop();
-        var listItem = $('<li style="display:none"></li>');
+        var listItem = $('<li></li>');
         var requestUrl = "";
         var linkUrl = "";
         if (DOCUMENTATION_OPTIONS.BUILDER === 'dirhtml') {
@@ -273,9 +273,9 @@ var Search = {
         if (item[3]) {
           listItem.append($('<span> (' + item[3] + ')</span>'));
           Search.output.append(listItem);
-          listItem.slideDown(5, function() {
+          setTimeout(function() {
             displayNextItem();
-          });
+          }, 5);
         } else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) {
           $.ajax({url: requestUrl,
                   dataType: "text",
@@ -285,16 +285,16 @@ var Search = {
                       listItem.append(Search.makeSearchSummary(data, searchterms, hlterms));
                     }
                     Search.output.append(listItem);
-                    listItem.slideDown(5, function() {
+                    setTimeout(function() {
                       displayNextItem();
-                    });
+                    }, 5);
                   }});
         } else {
           // no source available, just display title
           Search.output.append(listItem);
-          listItem.slideDown(5, function() {
+          setTimeout(function() {
             displayNextItem();
-          });
+          }, 5);
         }
       }
       // search finished, update title and status message
@@ -379,6 +379,13 @@ var Search = {
     return results;
   },
 
+  /**
+   * See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions
+   */
+  escapeRegExp : function(string) {
+    return string.replace(/[.*+\-?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
+  },
+
   /**
    * search for full-text terms in the index
    */
@@ -402,13 +409,14 @@ var Search = {
       ];
       // add support for partial matches
       if (word.length > 2) {
+        var word_regex = this.escapeRegExp(word);
         for (var w in terms) {
-          if (w.match(word) && !terms[word]) {
+          if (w.match(word_regex) && !terms[word]) {
             _o.push({files: terms[w], score: Scorer.partialTerm})
           }
         }
         for (var w in titleterms) {
-          if (w.match(word) && !titleterms[word]) {
+          if (w.match(word_regex) && !titleterms[word]) {
               _o.push({files: titleterms[w], score: Scorer.partialTitle})
           }
         }

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.41.4 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>
@@ -327,6 +327,15 @@
         <li><a href="cli.html#cmdoption-osxphotos-export-from-date">osxphotos-export command line option</a>
 </li>
         <li><a href="cli.html#cmdoption-osxphotos-query-from-date">osxphotos-query command line option</a>
+</li>
+      </ul></li>
+      <li>
+    --from-time &lt;from_time&gt;
+
+      <ul>
+        <li><a href="cli.html#cmdoption-osxphotos-export-from-time">osxphotos-export command line option</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-query-from-time">osxphotos-query command line option</a>
 </li>
       </ul></li>
       <li>
@@ -395,6 +404,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 +608,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 +712,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>
@@ -751,6 +785,13 @@
         <li><a href="cli.html#cmdoption-osxphotos-export-portrait">osxphotos-export command line option</a>
 </li>
         <li><a href="cli.html#cmdoption-osxphotos-query-portrait">osxphotos-query command line option</a>
+</li>
+      </ul></li>
+      <li>
+    --replace-keywords
+
+      <ul>
+        <li><a href="cli.html#cmdoption-osxphotos-export-replace-keywords">osxphotos-export command line option</a>
 </li>
       </ul></li>
       <li>
@@ -884,6 +925,15 @@
         <li><a href="cli.html#cmdoption-osxphotos-export-to-date">osxphotos-export command line option</a>
 </li>
         <li><a href="cli.html#cmdoption-osxphotos-query-to-date">osxphotos-query command line option</a>
+</li>
+      </ul></li>
+      <li>
+    --to-time &lt;to_time&gt;
+
+      <ul>
+        <li><a href="cli.html#cmdoption-osxphotos-export-to-time">osxphotos-export command line option</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-query-to-time">osxphotos-query command line option</a>
 </li>
       </ul></li>
       <li>
@@ -992,6 +1042,8 @@
 <table style="width: 100%" class="indextable genindextable"><tr>
   <td style="width: 33%; vertical-align: top;"><ul>
       <li><a href="reference.html#osxphotos.PhotoInfo.SearchInfo.activities">activities() (osxphotos.PhotoInfo.SearchInfo property)</a>
+</li>
+      <li><a href="reference.html#osxphotos.PhotoInfo.adjustments">adjustments() (osxphotos.PhotoInfo property)</a>
 </li>
       <li><a href="reference.html#osxphotos.PhotoInfo.album_info">album_info() (osxphotos.PhotoInfo property)</a>
 
@@ -1007,10 +1059,10 @@
         <li><a href="reference.html#osxphotos.PhotosDB.albums">(osxphotos.PhotosDB property)</a>
 </li>
       </ul></li>
-      <li><a href="reference.html#osxphotos.PhotosDB.albums_as_dict">albums_as_dict() (osxphotos.PhotosDB property)</a>
-</li>
   </ul></td>
   <td style="width: 33%; vertical-align: top;"><ul>
+      <li><a href="reference.html#osxphotos.PhotosDB.albums_as_dict">albums_as_dict() (osxphotos.PhotosDB property)</a>
+</li>
       <li><a href="reference.html#osxphotos.PhotosDB.albums_shared">albums_shared() (osxphotos.PhotosDB property)</a>
 </li>
       <li><a href="reference.html#osxphotos.PhotosDB.albums_shared_as_dict">albums_shared_as_dict() (osxphotos.PhotosDB property)</a>
@@ -1436,6 +1488,8 @@
         <li><a href="cli.html#cmdoption-osxphotos-export-folder">--folder &lt;FOLDER&gt;</a>
 </li>
         <li><a href="cli.html#cmdoption-osxphotos-export-from-date">--from-date &lt;from_date&gt;</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-export-from-time">--from-time &lt;from_time&gt;</a>
 </li>
         <li><a href="cli.html#cmdoption-osxphotos-export-has-comment">--has-comment</a>
 </li>
@@ -1452,6 +1506,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 +1544,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 +1564,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>
@@ -1522,6 +1582,8 @@
         <li><a href="cli.html#cmdoption-osxphotos-export-place">--place &lt;PLACE&gt;</a>
 </li>
         <li><a href="cli.html#cmdoption-osxphotos-export-portrait">--portrait</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-export-replace-keywords">--replace-keywords</a>
 </li>
         <li><a href="cli.html#cmdoption-osxphotos-export-report">--report &lt;path to export report&gt;</a>
 </li>
@@ -1556,6 +1618,8 @@
         <li><a href="cli.html#cmdoption-osxphotos-export-title">--title &lt;TITLE&gt;</a>
 </li>
         <li><a href="cli.html#cmdoption-osxphotos-export-to-date">--to-date &lt;to_date&gt;</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-export-to-time">--to-time &lt;to_time&gt;</a>
 </li>
         <li><a href="cli.html#cmdoption-osxphotos-export-touch-file">--touch-file</a>
 </li>
@@ -1682,6 +1746,8 @@
         <li><a href="cli.html#cmdoption-osxphotos-query-folder">--folder &lt;FOLDER&gt;</a>
 </li>
         <li><a href="cli.html#cmdoption-osxphotos-query-from-date">--from-date &lt;from_date&gt;</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-query-from-time">--from-time &lt;from_time&gt;</a>
 </li>
         <li><a href="cli.html#cmdoption-osxphotos-query-has-comment">--has-comment</a>
 </li>
@@ -1694,6 +1760,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 +1796,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>
@@ -1774,6 +1844,8 @@
         <li><a href="cli.html#cmdoption-osxphotos-query-title">--title &lt;TITLE&gt;</a>
 </li>
         <li><a href="cli.html#cmdoption-osxphotos-query-to-date">--to-date &lt;to_date&gt;</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-query-to-time">--to-time &lt;to_time&gt;</a>
 </li>
         <li><a href="cli.html#cmdoption-osxphotos-query-uti">--uti &lt;UTI&gt;</a>
 </li>
@@ -2073,7 +2145,7 @@
       &copy;2021, Rhet Turnbull.
       
       |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.4.3</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.5.2</a>
       &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
       
     </div>

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.41.4 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>
@@ -365,7 +365,7 @@ Alternatively, you can also run the command line utility like this: <code class=
       &copy;2021, Rhet Turnbull.
       
       |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.4.3</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.5.2</a>
       &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
       
       |

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.41.4 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>
@@ -91,7 +91,7 @@
       &copy;2021, Rhet Turnbull.
       
       |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.4.3</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.5.2</a>
       &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
       
       |

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.41.4 documentation</title>
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     
@@ -102,7 +102,7 @@
       &copy;2021, Rhet Turnbull.
       
       |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.4.3</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 3.5.2</a>
       &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
       
     </div>

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

osxphotos.spec

@@ -8,7 +8,7 @@ import importlib
 pathex = os.getcwd()
 
 # include necessary data files
-datas=[('osxphotos/templates/xmp_sidecar.mako', 'osxphotos/templates'), ('osxphotos/templates/xmp_sidecar_beta.mako', 'osxphotos/templates')]
+datas=[('osxphotos/templates/xmp_sidecar.mako', 'osxphotos/templates'), ('osxphotos/templates/xmp_sidecar_beta.mako', 'osxphotos/templates'), ('osxphotos/phototemplate.tx', 'osxphotos'), ('osxphotos/phototemplate.md', 'osxphotos')]
 package_imports = [['photoscript', ['photoscript.applescript']]]
 for package, files in package_imports:
     proot = os.path.dirname(importlib.import_module(package).__file__)

osxphotos/_version.py

@@ -1,3 +1,3 @@
 """ version info """
 
-__version__ = "0.40.7"
+__version__ = "0.41.4"

osxphotos/adjustmentsinfo.py

@@ -0,0 +1,174 @@
+""" AdjustmentsInfo class to read adjustments data for photos edited in Apple's Photos.app
+    In Catalina and Big Sur, the adjustments data (data about edits done to the photo)
+    is stored in a plist file in 
+    ~/Pictures/Photos Library.photoslibrary/resources/renders/X/UUID.plist
+    where X is first character of the photo's UUID string and UUID is the full UUID, 
+    e.g.: ~/Pictures/Photos Library.photoslibrary/resources/renders/3/30362C1D-192F-4CCD-9A2A-968F436DC0DE.plist
+
+    Thanks to @neilpa who figured out how to decode this information:
+    Reference: https://github.com/neilpa/photohack/issues/4
+"""
+
+import datetime
+import json
+import plistlib
+import zlib
+
+from .datetime_utils import datetime_naive_to_utc
+
+
+class AdjustmentsDecodeError(Exception):
+    """Could not decode adjustments plist file"""
+
+    def __init__(self, message):
+        self.message = message
+        super().__init__(self.message)
+
+
+class AdjustmentsInfo:
+    def __init__(self, plist_file):
+        self._plist_file = plist_file
+        self._plist = self._load_plist_file(plist_file)
+
+        self._base_version = self._plist.get("adjustmentBaseVersion", None)
+        self._data = self._plist.get("adjustmentData", None)
+        self._editor_bundle_id = self._plist.get("adjustmentEditorBundleID", None)
+        self._format_identifier = self._plist.get("adjustmentFormatIdentifier", None)
+        self._format_version = self._plist.get("adjustmentFormatVersion")
+        self._timestamp = self._plist.get("adjustmentTimestamp", None)
+        if self._timestamp and type(self._timestamp) == datetime.datetime:
+            self._timestamp = datetime_naive_to_utc(self._timestamp)
+
+        try:
+            self._adjustments = self._decode_adjustments_from_plist(self._plist)
+        except Exception as e:
+            self._adjustments = None
+
+    def _decode_adjustments_from_plist(self, plist):
+        """decode adjustmentData from Apple Photos adjustments
+
+        Args:
+            plist: a plist dict as loaded by plistlib
+
+        Returns:
+            decoded adjustmentsData as dict
+        """
+
+        return json.loads(
+            zlib.decompress(plist["adjustmentData"], -zlib.MAX_WBITS).decode()
+        )
+
+    def _load_plist_file(self, plist_file):
+        """Load plist file from disk
+
+        Args:
+            plist_file: full path to plist file
+
+        Returns:
+            plist as dict
+        """
+        with open(str(plist_file), "rb") as fd:
+            plist_dict = plistlib.load(fd)
+        return plist_dict
+
+    @property
+    def plist(self):
+        """The actual adjustments plist content as a dict """
+        return self._plist
+
+    @property
+    def data(self):
+        """The raw adjustments data as a binary blob """
+        return self._data
+
+    @property
+    def editor(self):
+        """The editor bundle ID for app/plug-in which made the adjustments """
+        return self._editor_bundle_id
+
+    @property
+    def format_id(self):
+        """The value of the adjustmentFormatIdentifier field in the plist """
+        return self._format_identifier
+
+    @property
+    def base_version(self):
+        """Value of adjustmentBaseVersion field """
+        return self._base_version
+
+    @property
+    def format_version(self):
+        """The value of the adjustmentFormatVersion in the plist """
+        return self._format_version
+
+    @property
+    def timestamp(self):
+        """The time stamp of the adjustment as timezone aware datetime.datetime object or None if no timestamp """
+        return self._timestamp
+
+    @property
+    def adjustments(self):
+        """List of adjustment dictionaries (or empty list if none or could not be decoded)"""
+        try:
+            return self._adjustments["adjustments"] if self._adjustments else []
+        except KeyError:
+            return []
+
+    @property
+    def adj_metadata(self):
+        """Metadata dictionary or None if adjustment data could not be decoded"""
+        try:
+            return self._adjustments["metadata"] if self._adjustments else None
+        except KeyError:
+            return None
+
+    @property
+    def adj_orientation(self):
+        """EXIF orientation of image or 0 if none specified or None if adjustments could not be decoded"""
+        try:
+            return self._adjustments["metadata"]["orientation"]
+        except KeyError:
+            # no orientation field
+            return 0
+        except TypeError:
+            # adjustments is None
+            return 0
+
+    @property
+    def adj_format_version(self):
+        """Format version for adjustments data (formatVersion field from adjustmentData) or None if adjustments could not be decoded"""
+        try:
+            return self._adjustments["formatVersion"] if self._adjustments else None
+        except KeyError:
+            return None
+
+    @property
+    def adj_version_info(self):
+        """version info for adjustments data or None if adjustments data could not be decoded"""
+        try:
+            return self._adjustments["versionInfo"] if self._adjustments else None
+        except KeyError:
+            return None
+
+    def asdict(self):
+        """Returns all adjustments info as dictionary"""
+        timestamp = self.timestamp
+        if type(timestamp) == datetime.datetime:
+            timestamp = timestamp.isoformat()
+
+        return {
+            "data": self.data,
+            "editor": self.editor,
+            "format_id": self.format_id,
+            "base_version": self.base_version,
+            "format_version": self.format_version,
+            "adjustments": self.adjustments,
+            "metadata": self.adj_metadata,
+            "orientation": self.adj_orientation,
+            "adjustment_format_version": self.adj_format_version,
+            "version_info": self.adj_version_info,
+            "timestamp": timestamp,
+        }
+
+    def __repr__(self):
+        return f"AdjustmentsInfo(plist_file='{self._plist_file}')"

osxphotos/cli.py

@@ -131,6 +131,21 @@ class DateTimeISO8601(click.ParamType):
             )
 
 
+class TimeISO8601(click.ParamType):
+
+    name = "TIME"
+
+    def convert(self, value, param, ctx):
+        try:
+            return datetime.time.fromisoformat(value).replace(tzinfo=None)
+        except Exception:
+            self.fail(
+                f"Invalid value for --{param.name}: invalid time format {value}. "
+                "Valid format: HH[:MM[:SS[.fff[fff]]]][+HH:MM[:SS[.ffffff]]] "
+                "however, note that timezone will be ignored."
+            )
+
+
 # Click CLI object & context settings
 class CLI_Obj:
     def __init__(self, db=None, json=False, debug=False):
@@ -236,7 +251,7 @@ def query_options(f):
             default=None,
             multiple=False,
             help="Search for photos with UUID(s) loaded from FILE. "
-            "Format is a single UUID per line.  Lines preceeded with # are ignored.",
+            "Format is a single UUID per line.  Lines preceded with # are ignored.",
             type=click.Path(exists=True),
         ),
         o(
@@ -386,14 +401,24 @@ def query_options(f):
         ),
         o(
             "--from-date",
-            help="Search by start item date, e.g. 2000-01-12T12:00:00, 2001-01-12T12:00:00-07:00, or 2000-12-31 (ISO 8601).",
+            help="Search by item start date, e.g. 2000-01-12T12:00:00, 2001-01-12T12:00:00-07:00, or 2000-12-31 (ISO 8601 with/without timezone).",
             type=DateTimeISO8601(),
         ),
         o(
             "--to-date",
-            help="Search by end item date, e.g. 2000-01-12T12:00:00, 2001-01-12T12:00:00-07:00, or 2000-12-31 (ISO 8601).",
+            help="Search by item end date, e.g. 2000-01-12T12:00:00, 2001-01-12T12:00:00-07:00, or 2000-12-31 (ISO 8601 with/without timezone).",
             type=DateTimeISO8601(),
         ),
+        o(
+            "--from-time",
+            help="Search by item start time of day, e.g. 12:00, or 12:00:00.",
+            type=TimeISO8601(),
+        ),
+        o(
+            "--to-time",
+            help="Search by item end time of day, e.g. 12:00 or 12:00:00.",
+            type=TimeISO8601(),
+        ),
         o("--has-comment", is_flag=True, help="Search for photos that have comments."),
         o("--no-comment", is_flag=True, help="Search for photos with no comments."),
         o("--has-likes", is_flag=True, help="Search for photos that have likes."),
@@ -403,6 +428,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)
@@ -437,11 +472,18 @@ def cli(ctx, db, json_, debug):
 @click.option(
     "--ignore-signature",
     is_flag=True,
-    help="When used with --update, ignores file signature when updating files. "
+    help="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 & modification date). In this case, --update would normally "
+    "file signature (size & modification date). In this case, '--update' would normally "
-    "re-export the processed files but with --ignore-signature, files which exist "
+    "re-export the processed files but with '--ignore-signature', files which exist "
-    "in the export directory will not be re-exported.",
+    "in the export directory will not be re-exported. "
+    "If used with '--sidecar', '--ignore-signature' has the following behavior: "
+    "1) if the metadata (in Photos) that went into the sidecar did not change, "
+    "the sidecar will not be updated; "
+    "2) if the metadata (in Photos) that went into the sidecar did change, "
+    "a new sidecar is written but a new image file is not; "
+    "3) if a sidecar does not exist for the photo, a sidecar will be written "
+    "whether or not the photo file was written or updated.",
 )
 @click.option(
     "--only-new",
@@ -559,7 +601,8 @@ def cli(ctx, db, json_, debug):
     "\n--sidecar exiftool: create JSON sidecar compatible with output of 'exiftool -j'. "
     "Unlike '--sidecar json', '--sidecar exiftool' does not export tag groups. "
     "Sidecar filename is in format photoname.ext.json; "
-    "For a list of tags exported in the JSON and exiftool sidecar, see '--exiftool'.",
+    "For a list of tags exported in the JSON and exiftool sidecar, see '--exiftool'. "
+    "See also '--ignore-signature'.",
 )
 @click.option(
     "--sidecar-drop-ext",
@@ -642,8 +685,16 @@ def cli(ctx, db, json_, debug):
     "the full path to the folder and album photo is contained in as a keyword when exporting "
     'you could specify --keyword-template "{folder_album}" '
     'You may specify more than one template, for example --keyword-template "{folder_album}" '
-    '--keyword-template "{created.year}" '
+    '--keyword-template "{created.year}". '
-    "See Templating System below.",
+    "See '--replace-keywords' and Templating System below.",
+)
+@click.option(
+    "--replace-keywords",
+    is_flag=True,
+    help="Replace keywords with any values specified with --keyword-template. "
+    "By default, --keyword-template will add keywords to any keywords already associated "
+    "with the photo.  If --replace-keywords is specified, values from --keyword-template "
+    "will replace any existing keywords instead of adding additional keywords.",
 )
 @click.option(
     "--description-template",
@@ -756,7 +807,10 @@ def cli(ctx, db, json_, debug):
     "--cleanup",
     is_flag=True,
     help="Cleanup export directory by deleting any files which were not included in this export set. "
-    "For example, photos which had previously been exported and were subsequently deleted in Photos.",
+    "For example, photos which had previously been exported and were subsequently deleted in Photos. "
+    "WARNING: --cleanup will delete *any* files in the export directory that were not exported by osxphotos, "
+    "for example, your own scripts or other files.  Be sure this is what you intend before using "
+    "--cleanup.  Use --dry-run with --cleanup first if you're not certain.",
 )
 @click.option(
     "--exportdb",
@@ -827,6 +881,8 @@ def export(
     not_shared,
     from_date,
     to_date,
+    from_time,
+    to_time,
     verbose,
     missing,
     update,
@@ -845,6 +901,7 @@ def export(
     person_keyword,
     album_keyword,
     keyword_template,
+    replace_keywords,
     description_template,
     finder_tag_template,
     finder_tag_keywords,
@@ -907,6 +964,8 @@ def export(
     save_config,
     is_reference,
     beta,
+    in_album,
+    not_in_album,
 ):
     """Export photos from the Photos database.
     Export path DEST is required.
@@ -971,6 +1030,8 @@ def export(
         not_shared = cfg.not_shared
         from_date = cfg.from_date
         to_date = cfg.to_date
+        from_time = cfg.from_time
+        to_time = cfg.to_time
         verbose = cfg.verbose
         missing = cfg.missing
         update = cfg.update
@@ -988,6 +1049,7 @@ def export(
         person_keyword = cfg.person_keyword
         album_keyword = cfg.album_keyword
         keyword_template = cfg.keyword_template
+        replace_keywords = cfg.replace_keywords
         description_template = cfg.description_template
         finder_tag_template = cfg.finder_tag_template
         finder_tag_keywords = cfg.finder_tag_keywords
@@ -1047,6 +1109,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 +1144,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")),
@@ -1314,6 +1379,8 @@ def export(
         not_incloud=False,
         from_date=from_date,
         to_date=to_date,
+        from_time=from_time,
+        to_time=to_time,
         portrait=portrait,
         not_portrait=not_portrait,
         screenshot=screenshot,
@@ -1339,6 +1406,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:
@@ -1409,6 +1478,7 @@ def export(
                     exiftool_option=exiftool_option,
                     strip=strip,
                     jpeg_ext=jpeg_ext,
+                    replace_keywords=replace_keywords,
                 )
                 results += export_results
 
@@ -1470,10 +1540,14 @@ def export(
                 + [str(pathlib.Path(export_db_path).resolve())]
             )
             click.echo(f"Cleaning up {dest}")
-            (cleaned_files, cleaned_dirs) = cleanup_files(dest, all_files, fileutil)
+            cleaned_files, cleaned_dirs = cleanup_files(dest, all_files, fileutil)
-            file_str = "files" if cleaned_files != 1 else "file"
+            file_str = "files" if len(cleaned_files) != 1 else "file"
-            dir_str = "directories" if cleaned_dirs != 1 else "directory"
+            dir_str = "directories" if len(cleaned_dirs) != 1 else "directory"
-            click.echo(f"Deleted: {cleaned_files} {file_str}, {cleaned_dirs} {dir_str}")
+            click.echo(
+                f"Deleted: {len(cleaned_files)} {file_str}, {len(cleaned_dirs)} {dir_str}"
+            )
+            results.deleted_files = cleaned_files
+            results.deleted_directories = cleaned_dirs
 
         if report:
             verbose_(f"Writing export report to {report}")
@@ -1595,6 +1669,8 @@ def query(
     not_incloud,
     from_date,
     to_date,
+    from_time,
+    to_time,
     portrait,
     not_portrait,
     screenshot,
@@ -1620,6 +1696,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"
@@ -1641,6 +1719,8 @@ def query(
         has_raw,
         from_date,
         to_date,
+        from_time,
+        to_time,
         label,
         is_reference,
     ]
@@ -1667,6 +1747,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(
@@ -1734,6 +1815,8 @@ def query(
         not_incloud=not_incloud,
         from_date=from_date,
         to_date=to_date,
+        from_time=from_time,
+        to_time=to_time,
         portrait=portrait,
         not_portrait=not_portrait,
         screenshot=screenshot,
@@ -1759,6 +1842,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
@@ -1905,6 +1990,8 @@ def _query(
     not_incloud=None,
     from_date=None,
     to_date=None,
+    from_time=None,
+    to_time=None,
     portrait=None,
     not_portrait=None,
     screenshot=None,
@@ -1930,6 +2017,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 +2251,17 @@ 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]
+
+    if from_time:
+        photos = [p for p in photos if p.date.time() >= from_time]
+
+    if to_time:
+        photos = [p for p in photos if p.date.time() <= to_time]
+
     return photos
 
 
@@ -2233,6 +2333,7 @@ def export_photo(
     exiftool_option=None,
     strip=False,
     jpeg_ext=None,
+    replace_keywords=False,
 ):
     """Helper function for export that does the actual export
 
@@ -2271,6 +2372,7 @@ def export_photo(
         exiftool_merge_keywords: boolean; if True, merged keywords found in file's exif data (requires exiftool)
         exiftool_merge_persons: boolean; if True, merged persons found in file's exif data (requires exiftool)
         jpeg_ext: if not None, specify the extension to use for all JPEG images on export
+        replace_keywords: if True, --keyword-template replaces keywords instead of adding keywords
 
     Returns:
         list of path(s) of exported photo or None if photo was missing
@@ -2334,15 +2436,15 @@ def export_photo(
                 rendered_suffix, unmatched = photo.render_template(
                     original_suffix, filename=True, strip=strip
                 )
-            except ValueError:
+            except ValueError as e:
                 raise click.BadOptionUsage(
                     "original_suffix",
-                    f"Invalid template for --original-suffix '{original_suffix}'",
+                    f"Invalid template for --original-suffix '{original_suffix}': {e}",
                 )
             if not rendered_suffix or unmatched:
                 raise click.BadOptionUsage(
                     "original_suffix",
-                    f"Invalid template for --original-suffix '{original_suffix}': results={rendered_suffix} unmatched={unmatched}",
+                    f"Invalid template for --original-suffix '{original_suffix}': results={rendered_suffix} unknown field={unmatched}",
                 )
             if len(rendered_suffix) > 1:
                 raise click.BadOptionUsage(
@@ -2352,13 +2454,16 @@ def export_photo(
             rendered_suffix = rendered_suffix[0]
 
         original_filename = pathlib.Path(filename)
-        file_ext = (
+        file_ext = original_filename.suffix
-            "." + jpeg_ext
+        if photo.isphoto and (jpeg_ext or convert_to_jpeg):
-            if jpeg_ext and (photo.uti == "public.jpeg" or convert_to_jpeg)
+            # change the file extension to correct jpeg extension if needed
-            else ".jpeg"
+            file_ext = (
-            if convert_to_jpeg and photo.uti != "public.jpeg"
+                "." + jpeg_ext
-            else original_filename.suffix
+                if jpeg_ext and (photo.uti_original == "public.jpeg" or convert_to_jpeg)
-        )
+                else ".jpeg"
+                if convert_to_jpeg and photo.uti_original != "public.jpeg"
+                else original_filename.suffix
+            )
         original_filename = (
             original_filename.parent
             / f"{original_filename.stem}{rendered_suffix}{file_ext}"
@@ -2448,6 +2553,7 @@ def export_photo(
                             verbose=verbose_,
                             exiftool_flags=exiftool_option,
                             jpeg_ext=jpeg_ext,
+                            replace_keywords=replace_keywords,
                         )
                         results += export_results
                         for warning_ in export_results.exiftool_warning:
@@ -2490,17 +2596,28 @@ def export_photo(
             if export_edited and photo.hasadjustments:
                 edited_filename = pathlib.Path(filename)
                 edited_ext = (
-                    "." + jpeg_ext
+                    # rare cases on Photos <= 4 that uti_edited is None
-                    if jpeg_ext and photo.uti_edited == "public.jpeg"
+                    "." + get_preferred_uti_extension(photo.uti_edited)
-                    else "." + get_preferred_uti_extension(photo.uti_edited)
                     if photo.uti_edited
                     else pathlib.Path(photo.path_edited).suffix
                     if photo.path_edited
                     else pathlib.Path(photo.filename).suffix
                 )
+
+                if (
+                    photo.isphoto
+                    and jpeg_ext
+                    and edited_ext.lower() in [".jpg", ".jpeg"]
+                ):
+                    edited_ext = "." + jpeg_ext
+
                 # Big Sur uses .heic for some edited photos so need to check
                 # if extension isn't jpeg/jpg and using --convert-to-jpeg
-                if convert_to_jpeg and edited_ext.lower() not in [".jpg", ".jpeg"]:
+                if (
+                    photo.isphoto
+                    and convert_to_jpeg
+                    and edited_ext.lower() not in [".jpg", ".jpeg"]
+                ):
                     edited_ext = "." + jpeg_ext if jpeg_ext else ".jpeg"
 
                 if edited_suffix:
@@ -2508,15 +2625,15 @@ def export_photo(
                         rendered_suffix, unmatched = photo.render_template(
                             edited_suffix, filename=True, strip=strip
                         )
-                    except ValueError:
+                    except ValueError as e:
                         raise click.BadOptionUsage(
                             "edited_suffix",
-                            f"Invalid template for --edited-suffix '{edited_suffix}'",
+                            f"Invalid template for --edited-suffix '{edited_suffix}': {e}",
                         )
                     if not rendered_suffix or unmatched:
                         raise click.BadOptionUsage(
                             "edited_suffix",
-                            f"Invalid template for --edited-suffix '{edited_suffix}': results={rendered_suffix} unmatched={unmatched}",
+                            f"Invalid template for --edited-suffix '{edited_suffix}': unknown field={unmatched}",
                         )
                     if len(rendered_suffix) > 1:
                         raise click.BadOptionUsage(
@@ -2584,6 +2701,7 @@ def export_photo(
                             verbose=verbose_,
                             exiftool_flags=exiftool_option,
                             jpeg_ext=jpeg_ext,
+                            replace_keywords=replace_keywords,
                         )
                         results += export_results_edited
                         for warning_ in export_results_edited.exiftool_warning:
@@ -2655,14 +2773,14 @@ def get_filenames_from_template(photo, filename_template, original_name, strip=F
             filenames, unmatched = photo.render_template(
                 filename_template, path_sep="_", filename=True, strip=strip
             )
-        except ValueError:
+        except ValueError as e:
             raise click.BadOptionUsage(
-                "filename_template", f"Invalid template '{filename_template}'"
+                "filename_template", f"Invalid template '{filename_template}': {e}"
             )
         if not filenames or unmatched:
             raise click.BadOptionUsage(
                 "filename_template",
-                f"Invalid template '{filename_template}': results={filenames} unmatched={unmatched}",
+                f"Invalid template '{filename_template}': unknown field={unmatched}",
             )
         filenames = [f"{file_}{photo_ext}" for file_ in filenames]
     else:
@@ -2709,12 +2827,14 @@ def get_dirnames_from_template(
             dirnames, unmatched = photo.render_template(
                 directory, dirname=True, strip=strip
             )
-        except ValueError:
+        except ValueError as e:
-            raise click.BadOptionUsage("directory", f"Invalid template '{directory}'")
+            raise click.BadOptionUsage(
+                "directory", f"Invalid template '{directory}': {e}"
+            )
         if not dirnames or unmatched:
             raise click.BadOptionUsage(
                 "directory",
-                f"Invalid template '{directory}': results={dirnames} unmatched={unmatched}",
+                f"Invalid template '{directory}': unknown field={unmatched}",
             )
 
         dest_paths = []
@@ -2825,8 +2945,12 @@ def write_export_report(report_file, results):
             "exiftool_error": "",
             "extended_attributes_written": 0,
             "extended_attributes_skipped": 0,
+            "cleanup_deleted_file": 0,
+            "cleanup_deleted_directory": 0,
         }
         for result in results.all_files()
+        + results.deleted_files
+        + results.deleted_directories
     }
 
     for result in results.exported:
@@ -2892,6 +3016,12 @@ def write_export_report(report_file, results):
     for result in results.xattr_skipped:
         all_results[result]["extended_attributes_skipped"] = 1
 
+    for result in results.deleted_files:
+        all_results[result]["cleanup_deleted_file"] = 1
+
+    for result in results.deleted_directories:
+        all_results[result]["cleanup_deleted_directory"] = 1
+
     report_columns = [
         "filename",
         "exported",
@@ -2910,6 +3040,8 @@ def write_export_report(report_file, results):
         "exiftool_error",
         "extended_attributes_written",
         "extended_attributes_skipped",
+        "cleanup_deleted_file",
+        "cleanup_deleted_directory",
     ]
 
     try:
@@ -2936,27 +3068,27 @@ def cleanup_files(dest_path, files_to_keep, fileutil):
         fileutile: FileUtil object
 
     Returns:
-        tuple of (number of files deleted, number of directories deleted)
+        tuple of (list of files deleted, list of directories deleted)
     """
-    keepers = {filename.lower(): 1 for filename in files_to_keep}
+    keepers = {str(filename).lower(): 1 for filename in files_to_keep}
 
-    deleted_files = 0
+    deleted_files = []
     for p in pathlib.Path(dest_path).rglob("*"):
         path = str(p).lower()
         if p.is_file() and path not in keepers:
             verbose_(f"Deleting {p}")
             fileutil.unlink(p)
-            deleted_files += 1
+            deleted_files.append(str(p))
 
     # delete empty directories
-    deleted_dirs = 0
+    deleted_dirs = []
     for p in pathlib.Path(dest_path).rglob("*"):
         path = str(p).lower()
         # if directory and directory is empty
         if p.is_dir() and not next(p.iterdir(), False):
             verbose_(f"Deleting empty directory {p}")
             fileutil.rmdir(p)
-            deleted_dirs += 1
+            deleted_dirs.append(str(p))
 
     return (deleted_files, deleted_dirs)
 
@@ -3015,16 +3147,16 @@ def write_finder_tags(
                     path_sep="/",
                     strip=strip,
                 )
-            except ValueError:
+            except ValueError as e:
                 raise click.BadOptionUsage(
                     "finder_tag_template",
-                    f"Invalid template for --finder-tag-template': {template_str}",
+                    f"Invalid template for --finder-tag-template '{template_str}': {e}",
                 )
 
             if unmatched:
                 click.echo(
                     click.style(
-                        f"Warning: unmatched template substitution for template: {template_str} {unmatched}",
+                        f"Warning: unknown field for template: {template_str} unknown field = {unmatched}",
                         fg=CLI_COLOR_WARNING,
                     ),
                     err=True,
@@ -3071,15 +3203,15 @@ def write_extended_attributes(photo, files, xattr_template, strip=False):
                 path_sep="/",
                 strip=strip,
             )
-        except ValueError:
+        except ValueError as e:
             raise click.BadOptionUsage(
                 "xattr_template",
-                f"Invalid template for --xattr-template': {template_str}",
+                f"Invalid template for --xattr-template '{template_str}': {e}",
             )
         if unmatched:
             click.echo(
                 click.style(
-                    f"Warning: unmatched template substitution for template: {template_str} {unmatched}",
+                    f"Warning: unmatched template substitution for template: {template_str} unknown field={unmatched}",
                     fg=CLI_COLOR_WARNING,
                 ),
                 err=True,

osxphotos/cli_help.py

@@ -1,14 +1,23 @@
 """Help text helper class for osxphotos CLI """
 
+import io
+import re
+
 import click
 import osxmetadata
+from rich.console import Console
+from rich.markdown import Markdown
 
 from ._constants import (
     EXTENDED_ATTRIBUTE_NAMES,
     EXTENDED_ATTRIBUTE_NAMES_QUOTED,
     OSXPHOTOS_EXPORT_DB,
 )
-from .phototemplate import TEMPLATE_SUBSTITUTIONS, TEMPLATE_SUBSTITUTIONS_MULTI_VALUED
+from .phototemplate import (
+    TEMPLATE_SUBSTITUTIONS,
+    TEMPLATE_SUBSTITUTIONS_MULTI_VALUED,
+    get_template_help,
+)
 
 
 class ExportCommand(click.Command):
@@ -17,11 +26,11 @@ class ExportCommand(click.Command):
     def get_help(self, ctx):
         help_text = super().get_help(ctx)
         formatter = click.HelpFormatter()
-
         # passed to click.HelpFormatter.write_dl for formatting
 
         formatter.write("\n\n")
-        formatter.write_text("** Export **")
+        formatter.write(rich_text("[bold]** Export **[/bold]", width=formatter.width))
+        formatter.write("\n")
         formatter.write_text(
             "When exporting photos, osxphotos creates a database in the top-level "
             + f"export folder called '{OSXPHOTOS_EXPORT_DB}'.  This database preserves state information "
@@ -56,7 +65,7 @@ class ExportCommand(click.Command):
             + f"rebuilding the '{OSXPHOTOS_EXPORT_DB}' database."
         )
         formatter.write("\n\n")
-        formatter.write_text("** Extended Attributes **")
+        formatter.write(rich_text("[bold]** Extended Attributes **[/bold]", width=formatter.width))
         formatter.write("\n")
         formatter.write_text(
             """
@@ -90,124 +99,9 @@ The following attributes may be used with '--xattr-template':
             "For additional information on extended attributes see: https://developer.apple.com/documentation/coreservices/file_metadata/mditem/common_metadata_attribute_keys"
         )
         formatter.write("\n\n")
-        formatter.write_text("** Templating System **")
+        formatter.write(rich_text("[bold]** Templating System **[/bold]", width=formatter.width))
         formatter.write("\n")
-        formatter.write_text(
+        formatter.write(template_help(width=formatter.width))
-            """
-Several options, such as --directory, allow you to specify a template  which
-will be rendered to substitute template fields with values from the photo.
-For example, '{created.month}' would be replaced with the month name of the
-photo creation date.  e.g. 'November'.
-
-Some options supporting templates may be repeated e.g., --keyword-template
-'{label}'  --keyword-template '{media_type}' to add both labels and media
-types to the  keywords.
-
-The general format for a template is '{TEMPLATE_FIELD,DEFAULT}'. The full template format is: 
-'{DELIM+TEMPLATE_FIELD(PATH_SEP)[OLD,NEW]?VALUE_IF_TRUE,DEFAULT}'
-
-With a few exceptions (like '{created.strftime}') everything but the TEMPLATE_FIELD
-is optional.
-
-- 'DELIM+' Multi-value template fields such as '{keyword}' may be expanded 'in place'
-with an optional delimiter using the template form '{DELIM+TEMPLATE_FIELD}'.
-For example, a photo with  keywords 'foo' and 'bar':
-
-'{keyword}' renders to 'foo' and 'bar'
-
-'{,+keyword}' renders to: 'foo,bar'
-
-'{; +keyword}' renders to: 'foo; bar'
-
-'{+keyword}' renders to 'foobar'
-
-- 'TEMPLATE_FIELD' The name of the template field, for example 'keyword'
-
-- '(PATH_SEP)' Some template fields such as '{folder_album}' are "path-like" in 
-that they join multiple elements into a single path-like string. For example, 
-if photo is in album Album1 in folder Folder1, '{folder_album}' results in
-'Folder1/Album1'. This is so these template fields may be used as paths in
---directory. If you intend to use such a field as a string, e.g. in the
-filename, you may specify a different path separator using the form:
-'{TEMPLATE_FIELD(PATH_SEP)}'. For example, using the example above,
-'{folder_album(-)}' would result in 'Folder1-Album1' and '{folder_album()}'
-would result in  'Folder1Album1'.
-
-- '[OLD,NEW]' Use the [OLD,NEW] option to replace text "OLD" in the template value
-with text "NEW". For example, if you have album names with '/' in the album name you
-could replace '/' with "-" using the template '{album[/,-]}'. This would replace
-any occurence of "/" in the album name with "-"; album "Vacation/2019" would thus
-become "Vacation-2019".  You may specify more than one pair of OLD,NEW values by
-listing them delimited by '|'. For example: '{album[/,-|:,-]}' to replace both
-'/' and ':' by '-'. You can also use the [OLD,NEW] syntax to delete a character by
-omitting the NEW value as in '{album[/,]}'.
-
-- '?' Some template fields such as 'hdr' are boolean and resolve to True or False.
-These take the form: '{TEMPLATE_FIELD?VALUE_IF_TRUE,VALUE_IF_FALSE}', e.g.
-{hdr?is_hdr,not_hdr} which would result in 'is_hdr' if photo is an HDR  image
-and 'not_hdr' otherwise.
-
-- ',DEFAULT' The ',' and DEFAULT value are optional.  If TEMPLATE_FIELD results
-in a null (empty) value, the template will result in default value of '_'.
-You may specify an alternate default value by appending ',DEFAULT' after
-template_field. Example: '{title,no_title}' would result in 'no_title' if the photo
-had no title. Example: '{created.year}/{place.address,NO_ADDRESS}' but there was 
-no address associated with the photo, the resulting output would be:
-'2020/NO_ADDRESS/photoname.jpg'. If specified, the default value may not
-contain a brace symbol ('{' or '}').
-
-Again, if you do not specify a default value and the template substitution has no
-value, '_' (underscore) will be used as the default value. For example, in the
-above example, this would result in '2020/_/photoname.jpg' if address was
-null.
-
-You may specify a null default (e.g. "" or empty string) by omitting the value
-after the comma, e.g. {title,} which would render to "" if title had no value thus
-effectively deleting the template from the resulting string.
-
-You may include other text in the template string outside the {}
-and use more than one template field in a single string, 
-e.g. '{created.year} - {created.month}' (e.g. '2020 - November').
-
-Some templates may resolve to more than one value.  For example, a photo can
-have multiple keywords so '{keyword}' can result in multiple values.  If used
-in a filename  or directory, these templates may result in more than one copy
-of the photo being exported.  For example, if photo has keywords "foo" and
-"bar", --directory '{keyword}' will result in  copies of the photo being
-exported to 'foo/image_name.jpeg' and 'bar/image_name.jpeg'.
-
-Some template fields such as '{media_type}' use the 'DEFAULT' value to allow
-customization  of the output. For example, '{media_type}' resolves to the
-special media type of the  photo such as 'panorama' or 'selfie'.  You may use
-the 'DEFAULT' value to override  these in form:
-'{media_type,video=vidéo;time_lapse=vidéo_accélérée}'.  In this example, if
-photo is a time_lapse photo, 'media_type' would resolve to  'vidéo_accélérée'
-instead of 'time_lapse' and video would resolve to 'vidéo' if photo is an
-ordinary video.
-
-With the --directory and --filename options you may specify a template for the
-export directory or filename, respectively. The directory will be appended to
-the export path specified in the export DEST argument to export. For example,
-if template is '{created.year}/{created.month}', and export destination DEST
-is '/Users/maria/Pictures/export', the actual export directory for a photo
-would be '/Users/maria/Pictures/export/2020/March' if the photo was created in
-March 2020.
-
-The templating system may also be used with the --keyword-template option to
-set keywords on export (with --exiftool or --sidecar), for example, to set a
-new keyword in format 'folder/subfolder/album' to preserve the folder/album
-structure, you can use --keyword-template "{folder_album}"
-
-In the template, valid template substitutions will be replaced by the
-corresponding value from the table below.  Invalid substitutions will result
-in an error.
-
-If you want the actual text of the template substition to appear in the
-rendered name, use double braces, e.g. '{{' or '}}', thus using
-'{created.year}/{{name}}' for --directory would result in output of
-2020/{name}/photoname.jpg
-"""
-        )
         formatter.write("\n")
         formatter.write_text(
             "With the --directory and --filename options you may specify a template for the "
@@ -224,7 +118,8 @@ rendered name, use double braces, e.g. '{{' or '}}', thus using
             "The templating system may also be used with the --keyword-template option "
             + "to set keywords on export (with --exiftool or --sidecar), "
             + "for example, to set a new keyword in format 'folder/subfolder/album' to "
-            + 'preserve the folder/album structure, you can use --keyword-template "{folder_album}"'
+            + 'preserve the folder/album structure, you can use --keyword-template "{folder_album}" '
+            + "or in the 'folder>subfolder>album' format used in Lightroom Classic, --keyword-template \"{folder_album(>)}\"."
         )
         formatter.write("\n")
         formatter.write_text(
@@ -233,33 +128,7 @@ rendered name, use double braces, e.g. '{{' or '}}', thus using
             + "an error and the script will abort."
         )
         formatter.write("\n")
-        formatter.write_text(
+        formatter.write(rich_text("[bold]** Template Substitutions **[/bold]", width=formatter.width))
-            "If you want the actual text of the template substition to appear "
-            + "in the rendered name, use double braces, e.g. '{{' or '}}', thus "
-            + "using '{created.year}/{{name}}' for --directory "
-            + "would result in output of 2020/{name}/photoname.jpg"
-        )
-        formatter.write("\n")
-        formatter.write_text(
-            "You may specify an optional default value to use if the substitution does not contain a value "
-            + "(e.g. the value is null) "
-            + "by specifying the default value after a ',' in the template string: "
-            + "for example, if template is '{created.year}/{place.address,NO_ADDRESS}' "
-            + "but there was no address associated with the photo, the resulting output would be: "
-            + "'2020/NO_ADDRESS/photoname.jpg'. "
-            + "If specified, the default value may not contain a brace symbol ('{' or '}')."
-        )
-        formatter.write("\n")
-        formatter.write_text(
-            "If you do not specify a default value and the template substitution "
-            + "has no value, '_' (underscore) will be used as the default value. For example, in the "
-            + "above example, this would result in '2020/_/photoname.jpg' if address was null."
-        )
-        formatter.write("\n")
-        formatter.write_text(
-            'You may specify a null default (e.g. "" or empty string) by omitting the value after '
-            + 'the comma, e.g. {title,} which would render to "" if title had no value.'
-        )
         formatter.write("\n")
         templ_tuples = [("Substitution", "Description")]
         templ_tuples.extend((k, v) for k, v in TEMPLATE_SUBSTITUTIONS.items())
@@ -284,3 +153,45 @@ rendered name, use double braces, e.g. '{{' or '}}', thus using
         formatter.write_dl(templ_tuples)
         help_text += formatter.getvalue()
         return help_text
+
+
+def template_help(width=78):
+    """Return formatted string for template system """
+    sio = io.StringIO()
+    console = Console(file=sio, force_terminal=True, width=width)
+    template_help_md = strip_md_links(get_template_help())
+    console.print(Markdown(template_help_md))
+    help_str = sio.getvalue()
+    sio.close()
+    return help_str
+
+
+def rich_text(text, width=78):
+    """Return rich formatted text"""
+    sio = io.StringIO()
+    console = Console(file=sio, force_terminal=True, width=width)
+    console.print(text)
+    rich_text = sio.getvalue()
+    sio.close()
+    return rich_text
+
+
+def strip_md_links(md):
+    """strip markdown links from markdown text md
+    
+    Args:
+        md: str, markdown text
+    
+    Returns:
+        str with markdown links removed
+
+    Note: This uses a very basic regex that likely fails on all sorts of edge cases 
+    but works for the links in the osxphotos docs
+    """
+    links = r"(?:[*#])|\[(.*?)\]\(.+?\)"
+
+    def subfn(match):
+        return match.group(1)
+
+    return re.sub(links, subfn, md)
+

osxphotos/exiftool.py

@@ -176,6 +176,10 @@ class ExifTool:
         command = [f"-{tag}={value}"]
         if self.overwrite and not self._context_mgr:
             command.append("-overwrite_original")
+
+        # avoid "Warning: Some character(s) could not be encoded in Latin" warning
+        command.append("-iptc:codedcharacterset=utf8")
+
         if self._context_mgr:
             self._commands.extend(command)
             return True
@@ -254,7 +258,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""
@@ -311,7 +319,13 @@ class ExifTool:
         if not json_str:
             return dict()
 
-        exifdict = json.loads(json_str)
+        try:
+            exifdict = json.loads(json_str)
+        except Exception as e:
+            # will fail with some commands, e.g --ext AVI which produces
+            # 'No file with specified extension' instead of json
+            return dict()
+
         exifdict = exifdict[0]
         if not tag_groups:
             # strip tag groups

osxphotos/personinfo.py

@@ -11,11 +11,10 @@ MPRI_Reg_Rect = namedtuple("MPRI_Reg_Rect", ["x", "y", "h", "w"])
 
 
 class PersonInfo:
-    """ Info about a person in the Photos library
+    """Info about a person in the Photos library"""
-    """
 
     def __init__(self, db=None, pk=None):
-        """ Creates a new PersonInfo instance
+        """Creates a new PersonInfo instance
 
         Arguments:
             db: instance of PhotosDB object
@@ -57,8 +56,8 @@ class PersonInfo:
 
     @property
     def face_info(self):
-        """ Returns a list of FaceInfo objects associated with this person sorted by quality score
+        """Returns a list of FaceInfo objects associated with this person sorted by quality score
-            Highest quality face is result[0] and lowest quality face is result[n] 
+        Highest quality face is result[0] and lowest quality face is result[n]
         """
         try:
             faces = self._db._db_faceinfo_person[self._pk]
@@ -103,11 +102,10 @@ class PersonInfo:
 
 
 class FaceInfo:
-    """ Info about a face in the Photos library
+    """Info about a face in the Photos library"""
-    """
 
     def __init__(self, db=None, pk=None):
-        """ Creates a new FaceInfo instance
+        """Creates a new FaceInfo instance
 
         Arguments:
             db: instance of PhotosDB object
@@ -156,7 +154,7 @@ class FaceInfo:
 
     @property
     def center(self):
-        """ Coordinates, in PIL format, for center of face 
+        """Coordinates, in PIL format, for center of face
 
         Returns:
             tuple of coordinates in form (x, y)
@@ -165,7 +163,7 @@ class FaceInfo:
 
     @property
     def size_pixels(self):
-        """ Size of face in pixels (centered around center_x, center_y)
+        """Size of face in pixels (centered around center_x, center_y)
 
         Returns:
             size, in int pixels, of a circle drawn around the center of the face
@@ -176,7 +174,7 @@ class FaceInfo:
 
     @property
     def mouth(self):
-        """ Coordinates, in PIL format, for mouth position
+        """Coordinates, in PIL format, for mouth position
 
         Returns:
             tuple of coordinates in form (x, y)
@@ -185,7 +183,7 @@ class FaceInfo:
 
     @property
     def left_eye(self):
-        """ Coordinates, in PIL format, for left eye position
+        """Coordinates, in PIL format, for left eye position
 
         Returns:
             tuple of coordinates in form (x, y)
@@ -194,7 +192,7 @@ class FaceInfo:
 
     @property
     def right_eye(self):
-        """ Coordinates, in PIL format, for right eye position
+        """Coordinates, in PIL format, for right eye position
 
         Returns:
             tuple of coordinates in form (x, y)
@@ -223,7 +221,7 @@ class FaceInfo:
 
     @property
     def mwg_rs_area(self):
-        """ Get coordinates for Metadata Working Group Region Area. 
+        """Get coordinates for Metadata Working Group Region Area.
 
         Returns:
             MWG_RS_Area named tuple with x, y, h, w where:
@@ -249,7 +247,7 @@ class FaceInfo:
 
     @property
     def mpri_reg_rect(self):
-        """ Get coordinates for Microsoft Photo Region Rectangle.
+        """Get coordinates for Microsoft Photo Region Rectangle.
 
         Returns:
             MPRI_Reg_Rect named tuple with x, y, h, w where:
@@ -278,7 +276,7 @@ class FaceInfo:
         return MPRI_Reg_Rect(x, y, h, w)
 
     def face_rect(self):
-        """ Get face rectangle coordinates for current version of the associated image
+        """Get face rectangle coordinates for current version of the associated image
             If image has been edited, rectangle applies to edited version, otherwise original version
             Coordinates in format and reference frame used by PIL
 
@@ -321,7 +319,7 @@ class FaceInfo:
         return yaw
 
     def _fix_orientation(self, xy):
-        """ Translate an (x, y) tuple based on image orientation
+        """Translate an (x, y) tuple based on image orientation
 
         Arguments:
             xy: tuple of (x, y) coordinates for point to translate
@@ -350,15 +348,18 @@ class FaceInfo:
         elif orientation == 7:
             x, y = y, x
             y = 1.0 - y
-        elif orientation ==8:
+        elif orientation == 8:
             x, y = y, x
+        elif orientation == 0:
+            # set by osxphotos if adjusted orientation cannot be read, assume it's 1
+            y = 1.0 - y
         else:
             logging.warning(f"Unhandled orientation: {orientation}")
 
         return (x, y)
 
     def _make_point(self, xy):
-        """ Translate an (x, y) tuple based on image orientation
+        """Translate an (x, y) tuple based on image orientation
             and convert to image coordinates
 
         Arguments:
@@ -379,7 +380,7 @@ class FaceInfo:
         return (int(x * dx), int(y * dy))
 
     def _make_point_with_rotation(self, xy):
-        """ Translate an (x, y) tuple based on image orientation and rotation
+        """Translate an (x, y) tuple based on image orientation and rotation
             and convert to image coordinates
 
         Arguments:
@@ -472,7 +473,7 @@ class FaceInfo:
 
 
 def rotate_image_point(x, y, xmid, ymid, angle):
-    """ rotate image point about xm, ym by angle in radians
+    """rotate image point about xm, ym by angle in radians
 
     Arguments:
         x: x coordinate of point to rotate

osxphotos/photoinfo/_photoinfo_export.py

@@ -87,6 +87,8 @@ class ExportResults:
         exiftool_error=None,
         xattr_written=None,
         xattr_skipped=None,
+        deleted_files=None,
+        deleted_directories=None,
     ):
         self.exported = exported or []
         self.new = new or []
@@ -107,6 +109,8 @@ class ExportResults:
         self.exiftool_error = exiftool_error or []
         self.xattr_written = xattr_written or []
         self.xattr_skipped = xattr_skipped or []
+        self.deleted_files = deleted_files or []
+        self.deleted_directories = deleted_directories or []
 
     def all_files(self):
         """ return all filenames contained in results """
@@ -151,6 +155,8 @@ class ExportResults:
         self.error += other.error
         self.exiftool_warning += other.exiftool_warning
         self.exiftool_error += other.exiftool_error
+        self.deleted_files += other.deleted_files
+        self.deleted_directories += other.deleted_directories
         return self
 
     def __str__(self):
@@ -173,6 +179,8 @@ class ExportResults:
             + f",error={self.error}"
             + f",exiftool_warning={self.exiftool_warning}"
             + f",exiftool_error={self.exiftool_error}"
+            + f",deleted_files={self.deleted_files}"
+            + f",deleted_directories={self.deleted_directories}"
             + ")"
         )
 
@@ -475,6 +483,9 @@ def export2(
     merge_exif_keywords=False,
     merge_exif_persons=False,
     jpeg_ext=None,
+    persons=True,
+    location=True,
+    replace_keywords=False,
 ):
     """export photo, like export but with update and dry_run options
     dest: must be valid destination path or exception raised
@@ -527,6 +538,9 @@ def export2(
     merge_exif_keywords: boolean; if True, merged keywords found in file's exif data (requires exiftool)
     merge_exif_persons: boolean; if True, merged persons found in file's exif data (requires exiftool)
     jpeg_ext: if set, will use this value for extension on jpegs converted to jpeg with convert_to_jpeg; if not set, uses jpeg; do not include the leading "."
+    persons: if True, include persons in exported metadata
+    location: if True, include location in exported metadata
+    replace_keywords: if True, keyword_template replaces any keywords, otherwise it's additive
 
     Returns: ExportResults class 
         ExportResults has attributes: 
@@ -562,11 +576,11 @@ def export2(
     if export_db is None:
         export_db = ExportDBNoOp()
 
-    if verbose is None:
+    if verbose and not callable(verbose):
-        verbose = noop
-    elif 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
@@ -607,9 +621,9 @@ def export2(
                 )
             edited_name = pathlib.Path(self.path_edited).name
             edited_suffix = pathlib.Path(edited_name).suffix
-            fname = pathlib.Path(self.filename).stem + edited_identifier + edited_suffix
+            fname = pathlib.Path(self.original_filename).stem + edited_identifier + edited_suffix
         else:
-            fname = self.filename
+            fname = self.original_filename
 
     uti = self.uti if edited else self.uti_original
     if convert_to_jpeg and self.isphoto and uti != "public.jpeg":
@@ -941,6 +955,9 @@ def export2(
             merge_exif_keywords=merge_exif_keywords,
             merge_exif_persons=merge_exif_persons,
             filename=dest.name,
+            persons=persons,
+            location=location,
+            replace_keywords=replace_keywords,
         )
         sidecars.append(
             (
@@ -964,6 +981,9 @@ def export2(
             merge_exif_keywords=merge_exif_keywords,
             merge_exif_persons=merge_exif_persons,
             filename=dest.name,
+            persons=persons,
+            location=location,
+            replace_keywords=replace_keywords,
         )
         sidecars.append(
             (
@@ -983,6 +1003,9 @@ def export2(
             keyword_template=keyword_template,
             description_template=description_template,
             extension=dest.suffix[1:] if dest.suffix else None,
+            persons=persons,
+            location=location,
+            replace_keywords=replace_keywords,
         )
         sidecars.append(
             (
@@ -1050,6 +1073,9 @@ def export2(
                         ignore_date_modified=ignore_date_modified,
                         merge_exif_keywords=merge_exif_keywords,
                         merge_exif_persons=merge_exif_persons,
+                        persons=persons,
+                        location=location,
+                        replace_keywords=replace_keywords,
                     )
                 )[0]
                 if old_data != current_data:
@@ -1070,6 +1096,9 @@ def export2(
                         flags=exiftool_flags,
                         merge_exif_keywords=merge_exif_keywords,
                         merge_exif_persons=merge_exif_persons,
+                        persons=persons,
+                        location=location,
+                        replace_keywords=replace_keywords,
                     )
                     if warning_:
                         all_results.exiftool_warning.append((exported_file, warning_))
@@ -1087,6 +1116,9 @@ def export2(
                         ignore_date_modified=ignore_date_modified,
                         merge_exif_keywords=merge_exif_keywords,
                         merge_exif_persons=merge_exif_persons,
+                        persons=persons,
+                        location=location,
+                        replace_keywords=replace_keywords,
                     ),
                 )
                 export_db.set_stat_exif_for_file(
@@ -1109,6 +1141,9 @@ def export2(
                     flags=exiftool_flags,
                     merge_exif_keywords=merge_exif_keywords,
                     merge_exif_persons=merge_exif_persons,
+                    persons=persons,
+                    location=location,
+                    replace_keywords=replace_keywords,
                 )
                 if warning_:
                     all_results.exiftool_warning.append((exported_file, warning_))
@@ -1126,6 +1161,9 @@ def export2(
                     ignore_date_modified=ignore_date_modified,
                     merge_exif_keywords=merge_exif_keywords,
                     merge_exif_persons=merge_exif_persons,
+                    persons=persons,
+                    location=location,
+                    replace_keywords=replace_keywords,
                 ),
             )
             export_db.set_stat_exif_for_file(
@@ -1345,6 +1383,9 @@ def _write_exif_data(
     flags=None,
     merge_exif_keywords=False,
     merge_exif_persons=False,
+    persons=True,
+    location=True,
+    replace_keywords=False,
 ):
     """write exif data to image file at filepath
 
@@ -1355,6 +1396,9 @@ def _write_exif_data(
         keyword_template: (list of strings); list of template strings to render as keywords
         ignore_date_modified: if True, sets EXIF:ModifyDate to EXIF:DateTimeOriginal even if date_modified is set
         flags: optional list of exiftool flags to prepend to exiftool command when writing metadata (e.g. -m or -F)
+        persons: if True, write person data to metadata
+        location: if True, write location data to metadata
+        replace_keywords: if True, keyword_template replaces any keywords, otherwise it's additive
 
     Returns:
         (warning, error) of warning and error strings if exiftool produces warnings or errors
@@ -1369,6 +1413,9 @@ def _write_exif_data(
         ignore_date_modified=ignore_date_modified,
         merge_exif_keywords=merge_exif_keywords,
         merge_exif_persons=merge_exif_persons,
+        persons=persons,
+        location=location,
+        replace_keywords=replace_keywords,
     )
 
     with ExifTool(filepath, flags=flags, exiftool=self._db._exiftool_path) as exiftool:
@@ -1391,6 +1438,9 @@ def _exiftool_dict(
     merge_exif_keywords=False,
     merge_exif_persons=False,
     filename=None,
+    persons=True,
+    location=True,
+    replace_keywords=False,
 ):
     """Return dict of EXIF details for building exiftool JSON sidecar or sending commands to ExifTool.
         Does not include all the EXIF fields as those are likely already in the image.
@@ -1404,6 +1454,9 @@ def _exiftool_dict(
         ignore_date_modified: if True, sets EXIF:ModifyDate to EXIF:DateTimeOriginal even if date_modified is set
         merge_exif_keywords: merge keywords in the file's exif metadata (requires exiftool)
         merge_exif_persons: merge persons in the file's exif metadata (requires exiftool)
+        persons: if True, include person data
+        location: if True, include location data
+        replace_keywords: if True, keyword_template replaces any keywords, otherwise it's additive
 
     Returns: dict with exiftool tags / values
 
@@ -1411,8 +1464,10 @@ def _exiftool_dict(
         EXIF:ImageDescription (may include template)
         XMP:Description (may include template)
         XMP:Title
+        IPTC:ObjectName
         XMP:TagsList (may include album name, person name, or template)
         IPTC:Keywords (may include album name, person name, or template)
+        IPTC:Caption-Abstract
         XMP:Subject (set to keywords + persons)
         XMP:PersonInImage
         EXIF:GPSLatitudeRef, EXIF:GPSLongitudeRef
@@ -1428,6 +1483,9 @@ def _exiftool_dict(
         QuickTime:ModifyDate (UTC)
         QuickTime:GPSCoordinates
         UserData:GPSCoordinates
+
+    Reference: 
+        https://iptc.org/std/photometadata/specification/IPTC-PhotoMetadata-201610_1.pdf
     """
 
     exif = (
@@ -1447,30 +1505,34 @@ def _exiftool_dict(
         description = " ".join(rendered) if rendered else ""
         exif["EXIF:ImageDescription"] = description
         exif["XMP:Description"] = description
+        exif["IPTC:Caption-Abstract"] = description
     elif self.description:
         exif["EXIF:ImageDescription"] = self.description
         exif["XMP:Description"] = self.description
+        exif["IPTC:Caption-Abstract"] = self.description
 
     if self.title:
         exif["XMP:Title"] = self.title
+        exif["IPTC:ObjectName"] = self.title
 
     keyword_list = []
     if merge_exif_keywords:
         keyword_list.extend(self._get_exif_keywords())
 
-    if self.keywords:
+    if self.keywords and not replace_keywords:
         keyword_list.extend(self.keywords)
 
     person_list = []
-    if merge_exif_persons:
+    if persons:
-        person_list.extend(self._get_exif_persons())
+        if merge_exif_persons:
+            person_list.extend(self._get_exif_persons())
 
-    if self.persons:
+        if self.persons:
-        # filter out _UNKNOWN_PERSON
+            # filter out _UNKNOWN_PERSON
-        person_list.extend([p for p in self.persons if p != _UNKNOWN_PERSON])
+            person_list.extend([p for p in self.persons if p != _UNKNOWN_PERSON])
 
-    if use_persons_as_keywords and person_list:
+        if use_persons_as_keywords and person_list:
-        keyword_list.extend(person_list)
+            keyword_list.extend(person_list)
 
     if use_albums_as_keywords and self.albums:
         keyword_list.extend(self.albums)
@@ -1501,8 +1563,8 @@ def _exiftool_dict(
             if len(long_str) > _MAX_IPTC_KEYWORD_LEN
         ]
         if long_keywords:
-            logging.warning(
+            self._verbose(
-                f"Some keywords exceed max IPTC Keyword length of {_MAX_IPTC_KEYWORD_LEN}: {long_keywords}"
+                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)
@@ -1514,25 +1576,26 @@ def _exiftool_dict(
         exif["XMP:Subject"] = keyword_list.copy()
         exif["XMP:TagsList"] = keyword_list.copy()
 
-    if person_list:
+    if persons and person_list:
         person_list = sorted(list(set(person_list)))
         exif["XMP:PersonInImage"] = person_list.copy()
 
     # if self.favorite():
     #     exif["Rating"] = 5
 
-    (lat, lon) = self.location
+    if location:
-    if lat is not None and lon is not None:
+        (lat, lon) = self.location
-        if self.isphoto:
+        if lat is not None and lon is not None:
-            exif["EXIF:GPSLatitude"] = lat
+            if self.isphoto:
-            exif["EXIF:GPSLongitude"] = lon
+                exif["EXIF:GPSLatitude"] = lat
-            lat_ref = "N" if lat >= 0 else "S"
+                exif["EXIF:GPSLongitude"] = lon
-            lon_ref = "E" if lon >= 0 else "W"
+                lat_ref = "N" if lat >= 0 else "S"
-            exif["EXIF:GPSLatitudeRef"] = lat_ref
+                lon_ref = "E" if lon >= 0 else "W"
-            exif["EXIF:GPSLongitudeRef"] = lon_ref
+                exif["EXIF:GPSLatitudeRef"] = lat_ref
-        elif self.ismovie:
+                exif["EXIF:GPSLongitudeRef"] = lon_ref
-            exif["Keys:GPSCoordinates"] = f"{lat} {lon}"
+            elif self.ismovie:
-            exif["UserData:GPSCoordinates"] = f"{lat} {lon}"
+                exif["Keys:GPSCoordinates"] = f"{lat} {lon}"
+                exif["UserData:GPSCoordinates"] = f"{lat} {lon}"
 
     # process date/time and timezone offset
     # Photos exports the following fields and sets modify date to creation date
@@ -1591,6 +1654,13 @@ def _exiftool_dict(
             exif["QuickTime:ModifyDate"] = datetime_tz_to_utc(
                 self.date_modified
             ).strftime("%Y:%m:%d %H:%M:%S")
+    
+    # remove any new lines in any fields
+    for field, val in exif.items():
+        if type(val) == str:
+            exif[field] = val.replace("\n", " ")
+        elif type(val) == list:
+            exif[field] = [v.replace("\n", " ") for v in val]
     return exif
 
 
@@ -1640,6 +1710,9 @@ def _exiftool_json_sidecar(
     merge_exif_keywords=False,
     merge_exif_persons=False,
     filename=None,
+    persons=True,
+    location=True,
+    replace_keywords=False,
 ):
     """Return dict of EXIF details for building exiftool JSON sidecar or sending commands to ExifTool.
         Does not include all the EXIF fields as those are likely already in the image.
@@ -1654,13 +1727,18 @@ def _exiftool_json_sidecar(
         merge_exif_keywords: boolean; if True, merged keywords found in file's exif data (requires exiftool)
         merge_exif_persons: boolean; if True, merged persons found in file's exif data (requires exiftool)
         filename: filename of the destination image file for including in exiftool signature in JSON sidecar
+        persons: if True, include person data
+        location: if True, include location data
+        replace_keywords: if True, keyword_template replaces any keywords, otherwise it's additive
 
     Returns: dict with exiftool tags / values
 
     Exports the following:
         EXIF:ImageDescription
         XMP:Description (may include template)
+        IPTC:CaptionAbstract
         XMP:Title
+        IPTC:ObjectName
         XMP:TagsList
         IPTC:Keywords (may include album name, person name, or template)
         XMP:Subject (set to keywords + person)
@@ -1688,6 +1766,9 @@ def _exiftool_json_sidecar(
         merge_exif_keywords=merge_exif_keywords,
         merge_exif_persons=merge_exif_persons,
         filename=filename,
+        persons=persons,
+        location=location,
+        replace_keywords=replace_keywords,
     )
 
     if not tag_groups:
@@ -1710,6 +1791,9 @@ def _xmp_sidecar(
     extension=None,
     merge_exif_keywords=False,
     merge_exif_persons=False,
+    persons=True,
+    location=True,
+    replace_keywords=False,
 ):
     """returns string for XMP sidecar
     use_albums_as_keywords: treat album names as keywords
@@ -1719,6 +1803,9 @@ def _xmp_sidecar(
     extension: which extension to use for SidecarForExtension property
     merge_exif_keywords: boolean; if True, merged keywords found in file's exif data (requires exiftool)
     merge_exif_persons: boolean; if True, merged persons found in file's exif data (requires exiftool)
+    persons: if True, include person data
+    location: if True, include location data
+    replace_keywords: if True, keyword_template replaces any keywords, otherwise it's additive
     """
 
     xmp_template_file = (
@@ -1742,22 +1829,23 @@ def _xmp_sidecar(
     if merge_exif_keywords:
         keyword_list.extend(self._get_exif_keywords())
 
-    if self.keywords:
+    if self.keywords and not replace_keywords:
         keyword_list.extend(self.keywords)
 
     # TODO: keyword handling in this and _exiftool_json_sidecar is
     # good candidate for pulling out in a function
 
     person_list = []
-    if merge_exif_persons:
+    if persons:
-        person_list.extend(self._get_exif_persons())
+        if merge_exif_persons:
+            person_list.extend(self._get_exif_persons())
 
-    if self.persons:
+        if self.persons:
-        # filter out _UNKNOWN_PERSON
+            # filter out _UNKNOWN_PERSON
-        person_list.extend([p for p in self.persons if p != _UNKNOWN_PERSON])
+            person_list.extend([p for p in self.persons if p != _UNKNOWN_PERSON])
 
-    if use_persons_as_keywords and person_list:
+        if use_persons_as_keywords and person_list:
-        keyword_list.extend(person_list)
+            keyword_list.extend(person_list)
 
     if use_albums_as_keywords and self.albums:
         keyword_list.extend(self.albums)
@@ -1781,28 +1869,20 @@ 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
     # sorted mainly to make testing the XMP file easier
     if keyword_list:
         keyword_list = sorted(list(set(keyword_list)))
-    if person_list:
+    if persons and person_list:
         person_list = sorted(list(set(person_list)))
 
     subject_list = keyword_list
 
+    if location:
+        latlon = self.location
+
     xmp_str = xmp_template.render(
         photo=self,
         description=description,
@@ -1810,6 +1890,7 @@ def _xmp_sidecar(
         persons=person_list,
         subjects=subject_list,
         extension=extension,
+        location=latlon,
         version=__version__,
     )
 

osxphotos/photoinfo/photoinfo.py

@@ -27,6 +27,7 @@ from .._constants import (
     _PHOTOS_5_SHARED_PHOTO_PATH,
     _PHOTOS_5_VERSION,
 )
+from ..adjustmentsinfo import AdjustmentsInfo
 from ..albuminfo import AlbumInfo, ImportInfo
 from ..personinfo import FaceInfo, PersonInfo
 from ..phototemplate import PhotoTemplate
@@ -70,6 +71,7 @@ class PhotoInfo:
         self._uuid = uuid
         self._info = info
         self._db = db
+        self._verbose = self._db._verbose
 
     @property
     def filename(self):
@@ -509,6 +511,30 @@ class PhotoInfo:
         """ True if picture has adjustments / edits """
         return self._info["hasAdjustments"] == 1
 
+    @property
+    def adjustments(self):
+        """ Returns AdjustmentsInfo class for adjustment data or None if no adjustments; Photos 5+ only """
+        if self._db._db_version <= _PHOTOS_4_VERSION:
+            return None
+
+        if self.hasadjustments:
+            try:
+                return self._adjustmentinfo
+            except AttributeError:
+                library = self._db._library_path
+                directory = self._uuid[0]  # first char of uuid
+                plist_file = (
+                    pathlib.Path(library)
+                    / "resources"
+                    / "renders"
+                    / directory
+                    / f"{self._uuid}.plist"
+                )
+                if not plist_file.is_file():
+                    return None
+                self._adjustmentinfo = AdjustmentsInfo(plist_file)
+                return self._adjustmentinfo
+
     @property
     def external_edit(self):
         """ Returns True if picture was edited outside of Photos using external editor """
@@ -822,8 +848,19 @@ class PhotoInfo:
 
     @property
     def orientation(self):
-        """ returns EXIF orientation of the current photo version as int """
+        """ returns EXIF orientation of the current photo version as int or 0 if current orientation cannot be determined """
-        return self._info["orientation"]
+        if self._db._db_version <= _PHOTOS_4_VERSION:
+            return self._info["orientation"]
+
+        # For Photos 5+, try to get the adjusted orientation
+        if self.hasadjustments:
+            if self.adjustments:
+                return self.adjustments.adj_orientation
+            else:
+                # can't reliably determine orientation for edited photo if adjustmentinfo not available
+                return 0
+        else:
+            return self._info["orientation"]
 
     @property
     def original_height(self):

osxphotos/photosdb/photosdb.py

@@ -2041,6 +2041,7 @@ class PhotosDB:
             # > 6 = portrait (sometimes, see ZDEPTHSTATE/ZDEPTHTYPE)
             info["customRenderedValue"] = row[22]
             info["hdr"] = True if row[22] == 3 else False
+            info["depth_state"] = row[36]
             info["portrait"] = True if row[36] != 0 else False
 
             # Set panorama from either KindSubType or RenderedValue

osxphotos/phototemplate.md

@@ -0,0 +1,94 @@
+The templating system converts one or template statements, written in osxphotos templating language, to one or more rendered values using information from the photo being processed. 
+
+In its simplest form, a template statement has the form: `"{template_field}"`, for example `"{title}"` which would resolve to the title of the photo.
+
+Template statements may contain one or more modifiers.  The full syntax is:
+
+`"pretext{delim+template_field:subfield|filter(path_sep)[find,replace]?bool_value,default}posttext"`
+
+Template statements are white-space sensitive meaning that white space (spaces, tabs) changes the meaning of the template statement.
+
+`pretext` and `posttext` are free form text.  For example, if a photo has title "My Photo Title". the template statement `"The title of the photo is {title}"`, resolves to `"The title of the photo is My Photo Title"`.  The `pretext` in this example is `"The title if the photo is "` and the template_field is `{title}`.  
+
+
+`delim`: optional delimiter string to use when expanding multi-valued template values in-place
+
+`+`: If present before template `name`, expands the template in place.  If `delim` not provided, values are joined with no delimiter.
+
+e.g. if Photo keywords are `["foo","bar"]`:
+
+- `"{keyword}"` renders to `"foo", "bar"`
+- `"{,+keyword}"` renders to: `"foo,bar"`
+- `"{; +keyword}"` renders to: `"foo; bar"`
+- `"{+keyword}"` renders to `"foobar"`
+
+`template_field`: The template field to resolve.  See [Template Substitutions](#template-substitutions) for full list of template fields. 
+
+`:subfield`: Some templates have sub-fields, For example, `{exiftool:IPTC:Make}`; the template_field is `exiftool` and the sub-field is `IPTC:Make`.
+
+`|filter`: You may optionally append one or more filter commands to the end of the template field using the vertical pipe ('|') symbol.  Filters may be combined, separated by '|' as in: `{keyword|capitalize|parens}`.
+
+Valid filters are:
+
+<!-- OSXPHOTOS-FILTER-TABLE:START - Do not remove or modify this section -->
+- lower: Convert value to lower case, e.g. 'Value' => 'value'.
+- upper: Convert value to upper case, e.g. 'Value' => 'VALUE'.
+- strip: Strip whitespace from beginning/end of value, e.g. ' Value ' => 'Value'.
+- titlecase: Convert value to title case, e.g. 'my value' => 'My Value'.
+- capitalize: Capitalize first word of value and convert other words to lower case, e.g. 'MY VALUE' => 'My value'.
+- braces: Enclose value in curly braces, e.g. 'value => '{value}'.
+- parens: Enclose value in parentheses, e.g. 'value' => '(value')
+- brackets: Enclose value in brackets, e.g. 'value' => '[value]'
+<!-- OSXPHOTOS-FILTER-TABLE:END -->
+
+e.g. if Photo keywords are `["FOO","bar"]`:
+
+- `"{keyword|lower}"` renders to `"foo", "bar"`
+- `"{keyword|upper}"` renders to: `"FOO", "BAR"`
+- `"{keyword|capitalize}"` renders to: `"Foo", "Bar"`
+- `"{keyword|lower|parens}"` renders to: `"(foo)", "(bar)"`
+
+e.g. if Photo description is "my description":
+
+- `"{descr|titlecase}"` renders to: `"My Description"`
+
+`(path_sep)`: optional path separator to use when joining path-like fields, for example `{folder_album}`.  Default is "/".
+
+e.g. If Photo is in `Album1` in `Folder1`:
+
+- `"{folder_album}"` renders to `["Folder1/Album1"]`
+- `"{folder_album(>)}"` renders to `["Folder1>Album1"]`
+- `"{folder_album()}"` renders to `["Folder1Album1"]`
+
+`[find|replace]`: optional text replacement to perform on rendered template value.  For example, to replace "/" in an album name, you could use the template `"{album[/,-]}"`.  Multiple replacements can be made by appending "|" and adding another find|replace pair.  e.g. to replace both "/" and ":" in album name: `"{album[/,-|:,-]}"`.  find/replace pairs are not limited to single characters.  The "|" character cannot be used in a find/replace pair.
+
+`?bool_value`: Template fields may be evaluated as boolean by appending "?" after the field name (and following "(path_sep)" or "[find/replace]".  If a field is True (e.g. photo is HDR and field is `"{hdr}"`) or has any value, the value following the "?" will be used to render the template instead of the actual field value.  If the template field evaluates to False (e.g. in above example, photo is not HDR) or has no value (e.g. photo has no title and field is `"{title}"`) then the default value following a "," will be used.  
+
+e.g. if photo is an HDR image,
+
+- `"{hdr?ISHDR,NOTHDR}"` renders to `"ISHDR"`
+
+and if it is not an HDR image,
+
+- `"{hdr?ISHDR,NOTHDR}"` renders to `"NOTHDR"`
+
+`,default`: optional default value to use if the template name has no value.  This modifier is also used for the value if False for boolean-type fields (see above) as well as to hold a sub-template for values like `{created.strftime}`.  If no default value provided, "_" is used. 
+
+e.g., if photo has no title set,
+
+- `"{title}"` renders to "_"
+- `"{title,I have no title}"` renders to `"I have no title"`
+
+Template fields such as `created.strftime` use the default value to pass the template to use for `strftime`.  
+
+e.g., if photo date is 4 February 2020, 19:07:38,
+
+- `"{created.strftime,%Y-%m-%d-%H%M%S}"` renders to `"2020-02-04-190738"`
+
+Some template fields such as `"{media_type}"` use the default value to allow customization of the output. For example, `"{media_type}"` resolves to the special media type of the photo such as `panorama` or `selfie`.  You may use the default value to override these in form: `"{media_type,video=vidéo;time_lapse=vidéo_accélérée}"`. In this example, if photo was a time_lapse photo, `media_type` would resolve to `vidéo_accélérée` instead of `time_lapse`. 
+
+Either or both bool_value or default (False value) may be empty which would result in empty string `""` when rendered.
+
+If you want to include "{" or "}" in the output, use "{openbrace}" or "{closebrace}" template substitution.
+
+e.g. `"{created.year}/{openbrace}{title}{closebrace}"` would result in `"2020/{Photo Title}"`.

osxphotos/phototemplate.py

@@ -1,20 +1,11 @@
-""" Custom template system for osxphotos (implemented in PhotoInfo.render_template) """
+""" Custom template system for osxphotos, implements osxphotos template language (OTL) """
-
-
-# Rolled my own template system because:
-# 1. Needed to handle multiple values (e.g. album, keyword)
-# 2. Needed to handle default values if template not found
-# 3. Didn't want user to need to know python (e.g. by using Mako which is
-#    already used elsewhere in this project)
-#
-# This code isn't elegant and is prime for refactoring but it seems to work well.  PRs gladly accepted.
 
 import datetime
 import locale
 import os
 import pathlib
-import re
+
-from functools import partial
+from textx import TextXSyntaxError, metamodel_from_file
 
 from ._constants import _UNKNOWN_PERSON
 from .datetime_formatter import DateTimeFormatter
@@ -24,6 +15,10 @@ from .path_utils import sanitize_dirname, sanitize_filename, sanitize_pathpart
 # ensure locale set to user's locale
 locale.setlocale(locale.LC_ALL, "")
 
+OTL_GRAMMAR_MODEL = str(pathlib.Path(__file__).parent / "phototemplate.tx")
+
+"""TextX metamodel for osxphotos template language """
+
 PHOTO_VIDEO_TYPE_DEFAULTS = {"photo": "photo", "video": "video"}
 
 MEDIA_TYPE_DEFAULTS = {
@@ -122,6 +117,15 @@ TEMPLATE_SUBSTITUTIONS = {
     "{exif.camera_model}": "Camera model from original photo's EXIF information as imported by Photos, e.g. 'iPhone 6s'",
     "{exif.lens_model}": "Lens model from original photo's EXIF information as imported by Photos, e.g. 'iPhone 6s back camera 4.15mm f/2.2'",
     "{uuid}": "Photo's internal universally unique identifier (UUID) for the photo, a 36-character string unique to the photo, e.g. '128FB4C6-0B16-4E7D-9108-FB2E90DA1546'",
+    "{comma}": "A comma: ','",
+    "{semicolon}": "A semicolon: ';'",
+    "{pipe}": "A vertical pipe: '|'",
+    "{openbrace}": "An open brace: '{'",
+    "{closebrace}": "A close brace: '}'",
+    "{openparens}": "An open parentheses: '('",
+    "{closeparens}": "A close parentheses: ')'",
+    "{openbracket}": "An open bracket: '['",
+    "{closebracket}": "A close bracket: ']'",
 }
 
 # Permitted multi-value substitutions (each of these returns None or 1 or more values)
@@ -133,7 +137,7 @@ TEMPLATE_SUBSTITUTIONS_MULTI_VALUED = {
     "{label}": "Image categorization label associated with a photo (Photos 5+ only)",
     "{label_normalized}": "All lower case version of 'label' (Photos 5+ only)",
     "{comment}": "Comment(s) on shared Photos; format is 'Person name: comment text' (Photos 5+ only)",
-    "{exiftool:GROUP:TAGNAME}": "Use exiftool (https://exiftool.org) to extract metadata, in form GROUP:TAGNAME, from image.  "
+    "{exiftool}": "Format: '{exiftool:GROUP:TAGNAME}'; use exiftool (https://exiftool.org) to extract metadata, in form GROUP:TAGNAME, from image.  "
     "E.g. '{exiftool:EXIF:Make}' to get camera make, or {exiftool:IPTC:Keywords} to extract keywords. "
     "See https://exiftool.org/TagNames/ for list of valid tag names.  You must specify group (e.g. EXIF, IPTC, etc) "
     "as used in `exiftool -G`. exiftool must be installed in the path to use this template.",
@@ -143,35 +147,71 @@ TEMPLATE_SUBSTITUTIONS_MULTI_VALUED = {
     "{searchinfo.venue_type}": "Venue types associated with a photo, e.g. 'Restaurant'; (Photos 5+ only, applied automatically by Photos' image categorization algorithms).",
 }
 
+FILTER_VALUES = {
+    "lower": "Convert value to lower case, e.g. 'Value' => 'value'.",
+    "upper": "Convert value to upper case, e.g. 'Value' => 'VALUE'.",
+    "strip": "Strip whitespace from beginning/end of value, e.g. ' Value ' => 'Value'.",
+    "titlecase": "Convert value to title case, e.g. 'my value' => 'My Value'.",
+    "capitalize": "Capitalize first word of value and convert other words to lower case, e.g. 'MY VALUE' => 'My value'.",
+    "braces": "Enclose value in curly braces, e.g. 'value => '{value}'.",
+    "parens": "Enclose value in parentheses, e.g. 'value' => '(value')",
+    "brackets": "Enclose value in brackets, e.g. 'value' => '[value]'",
+}
+
+# Just the substitutions without the braces
+SINGLE_VALUE_SUBSTITUTIONS = [
+    field.replace("{", "").replace("}", "") for field in TEMPLATE_SUBSTITUTIONS
+]
+
 # Just the multi-valued substitution names without the braces
 MULTI_VALUE_SUBSTITUTIONS = [
     field.replace("{", "").replace("}", "")
     for field in TEMPLATE_SUBSTITUTIONS_MULTI_VALUED
 ]
 
-# regular expressions for matching template syntax
+FIELD_NAMES = SINGLE_VALUE_SUBSTITUTIONS + MULTI_VALUE_SUBSTITUTIONS
-RE_OPENING_BRACE = r"(?<!\{)\{"  # match { but not {{
-RE_DELIM = r"([^}]*\+)?"  # group 1: optional DELIM+
-RE_FIELD_NAME = r"([^\\,}+\?]+)"  # group 2: field name
-RE_PATH_SEP = r"(\([^{}\)]*\))?"  # group 3: optional (PATH_SEP)
-# + r"(\[[^{}\)]*\])?"  # group 4: optional [REPLACE]
-RE_REPLACE = r"(\[[^{}]*\])?"  # group 4: optional [REPLACE]
-RE_BOOL_VAL = r"(\?[^\\,}]*)?"  # group 5: optional ?TRUE_VALUE for boolean fields
-RE_DEFAULT_VAL = r"(,[\w\=\;\-\%. ]*)?"  # group 6: optional ,DEFAULT
-RE_CLOSING_BRACE = r"(?=\}(?!\}))\}"  # match } but not }}
-
-MATCH_GROUPS_TOTAL = 6
-MATCH_GROUPS_DELIM = 1
-MATCH_GROUPS_FIELD = 2
-MATCH_GROUPS_PATH_SEP = 3
-MATCH_GROUPS_REPLACE = 4
-MATCH_GROUPS_BOOL_VAL = 5
-MATCH_GROUPS_DEFAULT = 6
 
 # default values for string manipulation template options
 INPLACE_DEFAULT = ","
 PATH_SEP_DEFAULT = os.path.sep
 
+PUNCTUATION = {
+    "comma": ",",
+    "semicolon": ";",
+    "pipe": "|",
+    "openbrace": "{",
+    "closebrace": "}",
+    "openparens": "(",
+    "closeparens": ")",
+    "openbracket": "[",
+    "closebracket": "]",
+}
+
+
+class PhotoTemplateParser:
+    """Parser for PhotoTemplate """
+
+    # implemented as Singleton
+
+    def __new__(cls, *args, **kwargs):
+        """ create new object or return instance of already created singleton """
+        if not hasattr(cls, "instance") or not cls.instance:
+            cls.instance = super().__new__(cls)
+
+        return cls.instance
+
+    def __init__(self):
+        """ return existing singleton or create a new one """
+
+        if hasattr(self, "metamodel"):
+            return
+
+        self.metamodel = metamodel_from_file(OTL_GRAMMAR_MODEL, skipws=False)
+
+    def parse(self, template_statement):
+        """Parse a template_statement string """
+        return self.metamodel.model_from_str(template_statement)
+
 
 class PhotoTemplate:
     """ PhotoTemplate class to render a template string from a PhotoInfo object """
@@ -190,61 +230,8 @@ class PhotoTemplate:
         # gets initialized in get_template_value
         self.today = None
 
-    def make_subst_function(self, none_str, filename, dirname, get_func=None):
+        # get parser singleton
-        """ returns: substitution function for use in re.sub 
+        self.parser = PhotoTemplateParser()
-            none_str: value to use if substitution lookup is None and no default provided
-            get_func: function that gets the substitution value for a given template field
-                    default is get_template_value which handles the single-value fields """
-
-        if get_func is None:
-            # used by make_subst_function to get the value for a template substitution
-            get_func = partial(
-                self.get_template_value, filename=filename, dirname=dirname
-            )
-
-        # closure to capture photo, none_str, filename, dirname in subst
-        def subst(matchobj):
-            groups = len(matchobj.groups())
-            if groups != MATCH_GROUPS_TOTAL:
-                raise ValueError(
-                    f"Unexpected number of groups: expected {MATCH_GROUPS_TOTAL}, got {groups}"
-                )
-
-            delim = matchobj.group(MATCH_GROUPS_DELIM)
-            field = matchobj.group(MATCH_GROUPS_FIELD)
-            path_sep = matchobj.group(MATCH_GROUPS_PATH_SEP)
-            replace = matchobj.group(MATCH_GROUPS_REPLACE)
-            bool_val = matchobj.group(MATCH_GROUPS_BOOL_VAL)
-            default = matchobj.group(MATCH_GROUPS_DEFAULT)
-
-            # drop the '+' on delim
-            delim = delim[:-1] if delim is not None else None
-            # drop () from path_sep
-            path_sep = path_sep.strip("()") if path_sep is not None else None
-            # drop [] from replace
-            replace = replace[1:-1] if replace is not None else None
-            # drop the ? on bool_val
-            bool_val = bool_val[1:] if bool_val is not None else None
-            # drop the comma on default
-            default_val = default[1:] if default is not None else None
-
-            try:
-                val = get_func(
-                    field, default_val, bool_val, delim, path_sep, replacement=replace
-                )
-            except ValueError:
-                return matchobj.group(0)
-
-            if val is None:
-                # field valid but didn't match a value
-                if default == ",":
-                    val = ""
-                else:
-                    val = default_val if default_val is not None else none_str
-
-            return val
-
-        return subst
 
     def render(
         self,
@@ -281,89 +268,67 @@ class PhotoTemplate:
         if inplace_sep is None:
             inplace_sep = INPLACE_DEFAULT
 
-        # the rendering happens in two phases:
-        # phase 1: handle all the single-value template substitutions
-        #          results in a single string with all the template fields replaced
-        # phase 2: loop through all the multi-value template substitutions
-        #          could result in multiple strings
-        #          e.g. if template is "{album}/{person}" and there are 2 albums and 3 persons in the photo
-        #          there would be 6 possible renderings (2 albums x 3 persons)
-
-        # regex to find {template_field,optional_default} in strings
-        # pylint: disable=anomalous-backslash-in-string
-        regex = (
-            RE_OPENING_BRACE
-            + RE_DELIM
-            + RE_FIELD_NAME
-            + RE_PATH_SEP
-            + RE_REPLACE
-            + RE_BOOL_VAL
-            + RE_DEFAULT_VAL
-            + RE_CLOSING_BRACE
-        )
-
         if type(template) is not str:
             raise TypeError(f"template must be type str, not {type(template)}")
 
-        subst_func = self.make_subst_function(none_str, filename, dirname)
+        try:
+            model = self.parser.parse(template)
+        except TextXSyntaxError as e:
+            raise ValueError(f"SyntaxError: {e}")
 
-        # do the replacements
+        if not model:
-        rendered = re.sub(regex, subst_func, template)
+            # empty string
+            return [], []
 
-        # do multi-valued placements
+        return self._render_statement(
-        # start with the single string from phase 1 above then loop through all
+            model,
-        # multi-valued fields and all values for each of those fields
+            none_str=none_str,
-        # rendered_strings will be updated as each field is processed
+            path_sep=path_sep,
-        # for example: if two albums, two keywords, and one person and template is:
+            expand_inplace=expand_inplace,
-        # "{created.year}/{album}/{keyword}/{person}"
+            inplace_sep=inplace_sep,
-        # rendered strings would do the following:
+            filename=filename,
-        # start (created.year filled in phase 1)
+            dirname=dirname,
-        #   ['2011/{album}/{keyword}/{person}']
+            strip=strip,
-        # after processing albums:
-        #   ['2011/Album1/{keyword}/{person}',
-        #    '2011/Album2/{keyword}/{person}',]
-        # after processing keywords:
-        #   ['2011/Album1/keyword1/{person}',
-        #    '2011/Album1/keyword2/{person}',
-        #    '2011/Album2/keyword1/{person}',
-        #    '2011/Album2/keyword2/{person}',]
-        # after processing person:
-        #   ['2011/Album1/keyword1/person1',
-        #    '2011/Album1/keyword2/person1',
-        #    '2011/Album2/keyword1/person1',
-        #    '2011/Album2/keyword2/person1',]
-
-        rendered_strings = self._render_multi_valued_templates(
-            rendered, none_str, path_sep, expand_inplace, inplace_sep, filename, dirname
         )
 
-        # process exiftool: templates
+    def _render_statement(
-        rendered_strings = self._render_exiftool_template(
+        self,
-            rendered_strings,
+        statement,
-            none_str,
+        none_str="_",
-            path_sep,
+        path_sep=None,
-            expand_inplace,
+        expand_inplace=False,
-            inplace_sep,
+        inplace_sep=None,
-            filename,
+        filename=False,
-            dirname,
+        dirname=False,
-        )
+        strip=False,
-
+    ):
-        # find any {fields} that weren't replaced
+        results = []
         unmatched = []
-        for rendered_str in rendered_strings:
+        for ts in statement.template_strings:
-            unmatched.extend(
+            results, unmatched = self._render_template_string(
-                [
+                ts,
-                    no_match[1]
+                none_str=none_str,
-                    for no_match in re.findall(regex, rendered_str)
+                path_sep=path_sep,
-                    if no_match[1] not in unmatched
+                expand_inplace=expand_inplace,
-                ]
+                inplace_sep=inplace_sep,
+                filename=filename,
+                dirname=dirname,
+                results=results,
+                unmatched=unmatched,
             )
 
-        # fix any escaped curly braces
+            # process find/replace
-        rendered_strings = [
+            if ts.template and ts.template.findreplace:
-            rendered_str.replace("{{", "{").replace("}}", "}")
+                new_results = []
-            for rendered_str in rendered_strings
+                for result in results:
-        ]
+                    for pair in ts.template.findreplace.pairs:
+                        find = pair.find or ""
+                        repl = pair.replace or ""
+                        result = result.replace(find, repl)
+                    new_results.append(result)
+                results = new_results
+
+        rendered_strings = results
 
         if filename:
             rendered_strings = [
@@ -377,268 +342,149 @@ class PhotoTemplate:
 
         return rendered_strings, unmatched
 
-    def _render_multi_valued_templates(
+    def _render_template_string(
         self,
-        rendered,
+        ts,
-        none_str,
+        none_str="_",
-        path_sep,
+        path_sep=None,
-        expand_inplace,
+        expand_inplace=False,
-        inplace_sep,
+        inplace_sep=None,
-        filename,
+        filename=False,
-        dirname,
+        dirname=False,
+        results=None,
+        unmatched=None,
     ):
-        rendered_strings = [rendered]
+        """Render a TemplateString object """
-        new_rendered_strings = []
+
-        while new_rendered_strings != rendered_strings:
+        results = results or [""]
-            new_rendered_strings = rendered_strings
+        unmatched = unmatched or []
-            for field in MULTI_VALUE_SUBSTITUTIONS:
+
-                # Build a regex that matches only the field being processed
+        if ts.template:
-                re_str = (
+            # have a template field to process
-                    RE_OPENING_BRACE
+            field = ts.template.field
-                    + RE_DELIM
+            if field not in FIELD_NAMES:
-                    + r"("
+                unmatched.append(field)
-                    + field  # group 2: field name
+                return [], unmatched
-                    + r")"
+
-                    + RE_PATH_SEP
+            subfield = ts.template.subfield
-                    + RE_REPLACE
+
-                    + RE_BOOL_VAL
+            # process filters
-                    + RE_DEFAULT_VAL
+            filters = []
-                    + RE_CLOSING_BRACE
+            if ts.template.filter is not None:
+                filters = ts.template.filter.value
+
+            # process path_sep
+            if ts.template.pathsep is not None:
+                path_sep = ts.template.pathsep.value
+
+            # process delim
+            if ts.template.delim is not None:
+                # if value is None, means format was {+field}
+                delim = ts.template.delim.value or ""
+            else:
+                delim = None
+
+            if ts.template.bool is not None:
+                is_bool = True
+                if ts.template.bool.value is not None:
+                    bool_val, u = self._render_statement(
+                        ts.template.bool.value,
+                        none_str=none_str,
+                        path_sep=path_sep,
+                        expand_inplace=expand_inplace,
+                        inplace_sep=inplace_sep,
+                        filename=filename,
+                        dirname=dirname,
+                    )
+                    unmatched.extend(u)
+                else:
+                    # blank bool value
+                    bool_val = [""]
+            else:
+                is_bool = False
+                bool_val = None
+
+            # process default
+            if ts.template.default is not None:
+                # default is also a TemplateString
+                if ts.template.default.value is not None:
+                    default, u = self._render_statement(
+                        ts.template.default.value,
+                        none_str=none_str,
+                        path_sep=path_sep,
+                        expand_inplace=expand_inplace,
+                        inplace_sep=inplace_sep,
+                        filename=filename,
+                        dirname=dirname,
+                    )
+                    unmatched.extend(u)
+                else:
+                    # blank default value
+                    default = [""]
+            else:
+                default = []
+
+            vals = []
+            if field in SINGLE_VALUE_SUBSTITUTIONS:
+                vals = self.get_template_value(
+                    field,
+                    default=default,
+                    delim=delim or inplace_sep,
+                    path_sep=path_sep,
+                    filename=filename,
+                    dirname=dirname,
                 )
-                regex_multi = re.compile(re_str)
+            elif field == "exiftool":
-
+                if subfield is None:
-                # holds each of the new rendered_strings, dict to avoid repeats (dict.keys())
+                    raise ValueError(
-                new_strings = {}
+                        "SyntaxError: GROUP:NAME subfield must not be null with {exiftool:GROUP:NAME}'"
-
-                for str_template in rendered_strings:
-                    matches = regex_multi.search(str_template)
-                    if matches:
-                        path_sep = (
-                            matches.group(MATCH_GROUPS_PATH_SEP).strip("()")
-                            if matches.group(MATCH_GROUPS_PATH_SEP) is not None
-                            else path_sep
-                        )
-                        replace = (
-                            matches.group(MATCH_GROUPS_REPLACE)[1:-1]
-                            if matches.group(MATCH_GROUPS_REPLACE) is not None
-                            else None
-                        )
-                        values = self.get_template_value_multi(
-                            field,
-                            path_sep,
-                            filename=filename,
-                            dirname=dirname,
-                            replacement=replace,
-                        )
-                        if (
-                            expand_inplace
-                            or matches.group(MATCH_GROUPS_DELIM) is not None
-                        ):
-                            delim = (
-                                matches.group(MATCH_GROUPS_DELIM)[:-1]
-                                if matches.group(MATCH_GROUPS_DELIM) is not None
-                                else inplace_sep
-                            )
-                            # instead of returning multiple strings, join values into a single string
-                            val = (
-                                delim.join(sorted(values))
-                                if values and values[0]
-                                else None
-                            )
-
-                            def lookup_template_value_multi(
-                                lookup_value, *args, **kwargs
-                            ):
-                                """ Closure passed to make_subst_function get_func 
-                                        Capture val and field in the closure 
-                                        Allows make_subst_function to be re-used w/o modification
-                                        _ is not used but required so signature matches get_template_value """
-                                if lookup_value == field:
-                                    return val
-                                else:
-                                    raise ValueError(
-                                        f"Unexpected value: {lookup_value}"
-                                    )
-
-                            subst = self.make_subst_function(
-                                none_str,
-                                filename,
-                                dirname,
-                                get_func=lookup_template_value_multi,
-                            )
-                            new_string = regex_multi.sub(subst, str_template)
-
-                            # update rendered_strings for the next field to process
-                            rendered_strings = list({new_string})
-                        else:
-                            # create a new template string for each value
-                            for val in values:
-
-                                def lookup_template_value_multi(
-                                    lookup_value, *args, **kwargs
-                                ):
-                                    """ Closure passed to make_subst_function get_func 
-                                        Capture val and field in the closure 
-                                        Allows make_subst_function to be re-used w/o modification
-                                        _ is not used but required so signature matches get_template_value """
-                                    if lookup_value == field:
-                                        return val
-                                    else:
-                                        raise ValueError(
-                                            f"Unexpected value: {lookup_value}"
-                                        )
-
-                                subst = self.make_subst_function(
-                                    none_str,
-                                    filename,
-                                    dirname,
-                                    get_func=lookup_template_value_multi,
-                                )
-                                new_string = regex_multi.sub(subst, str_template)
-                                new_strings[new_string] = 1
-
-                            # update rendered_strings for the next field to process
-                            rendered_strings = sorted(list(new_strings.keys()))
-        return rendered_strings
-
-    def _render_exiftool_template(
-        self,
-        rendered_strings,
-        none_str,
-        path_sep,
-        expand_inplace,
-        inplace_sep,
-        filename,
-        dirname,
-    ):
-        # TODO: lots of code commonality with render_multi_valued_templates -- combine or pull out
-        # TODO: put these in globals
-        if path_sep is None:
-            path_sep = os.path.sep
-
-        if inplace_sep is None:
-            inplace_sep = ","
-
-        # Build a regex that matches only the field being processed
-        re_str = (
-            RE_OPENING_BRACE
-            + RE_DELIM
-            + r"(exiftool:[^\\,}+\?\[\]]+)"  # group 3 field name
-            + RE_PATH_SEP
-            + RE_REPLACE
-            + RE_BOOL_VAL
-            + RE_DEFAULT_VAL
-            + RE_CLOSING_BRACE
-        )
-        regex_multi = re.compile(re_str)
-
-        # holds each of the new rendered_strings, dict to avoid repeats (dict.keys())
-        new_rendered_strings = []
-        while new_rendered_strings != rendered_strings:
-            new_rendered_strings = rendered_strings
-            new_strings = {}
-            for str_template in rendered_strings:
-                matches = regex_multi.search(str_template)
-                if matches:
-                    # allmatches = regex_multi.finditer(str_template)
-                    # for matches in allmatches:
-                    path_sep = (
-                        matches.group(MATCH_GROUPS_PATH_SEP).strip("()")
-                        if matches.group(MATCH_GROUPS_PATH_SEP) is not None
-                        else path_sep
                     )
-                    replace = (
+                vals = self.get_template_value_exiftool(
-                        matches.group(MATCH_GROUPS_REPLACE)[1:-1]
+                    subfield, filename=filename, dirname=dirname
-                        if matches.group(MATCH_GROUPS_REPLACE) is not None
+                )
-                        else None
+            elif field in MULTI_VALUE_SUBSTITUTIONS:
-                    )
+                vals = self.get_template_value_multi(
-                    field = matches.group(MATCH_GROUPS_FIELD)
+                    field, path_sep=path_sep, filename=filename, dirname=dirname
-                    subfield = field[9:]
+                )
-                    if not self.photo.path:
+            else:
-                        values = [None]
+                unmatched.append(field)
-                    else:
+                return [], unmatched
-                        exif = ExifTool(self.photo.path, exiftool=self.exiftool_path)
-                        exifdict = exif.asdict()
-                        exifdict = {k.lower(): v for (k, v) in exifdict.items()}
-                        subfield = subfield.lower()
-                        if subfield in exifdict:
-                            values = exifdict[subfield]
-                            values = (
-                                [values] if not isinstance(values, list) else values
-                            )
-                            if replace and values:
-                                new_values = []
-                                for value in values:
-                                    new_values.append(self.replace(value, replace))
-                                values = new_values
 
-                            # sanitize directory names if needed
+            vals = [val for val in vals if val is not None]
-                            if filename:
-                                values = [sanitize_pathpart(value) for value in values]
-                            elif dirname:
-                                values = [sanitize_dirname(value) for value in values]
 
-                        else:
+            if is_bool:
-                            values = [None]
+                if not vals:
-                    if expand_inplace or matches.group(MATCH_GROUPS_DELIM) is not None:
+                    vals = default
-                        delim = (
+                else:
-                            matches.group(MATCH_GROUPS_DELIM)[:-1]
+                    vals = bool_val
-                            if matches.group(MATCH_GROUPS_DELIM) is not None
+            elif not vals:
-                            else inplace_sep
+                vals = default or [none_str]
-                        )
-                        # instead of returning multiple strings, join values into a single string
-                        val = (
-                            delim.join(sorted(values)) if values and values[0] else None
-                        )
 
-                        def lookup_template_value_exif(lookup_value, *args, **kwargs):
+            if expand_inplace or delim is not None:
-                            """ Closure passed to make_subst_function get_func 
+                sep = delim if delim is not None else inplace_sep
-                                    Capture val and field in the closure 
+                vals = [sep.join(sorted(vals))]
-                                    Allows make_subst_function to be re-used w/o modification
-                                    _ is not used but required so signature matches get_template_value """
-                            if lookup_value == field:
-                                return val
-                            else:
-                                raise ValueError(f"Unexpected value: {lookup_value}")
 
-                        subst = self.make_subst_function(
+            for filter_ in filters:
-                            none_str,
+                vals = self.get_template_value_filter(filter_, vals)
-                            filename,
-                            dirname,
-                            get_func=lookup_template_value_exif,
-                        )
-                        new_string = regex_multi.sub(subst, str_template)
-                        # update rendered_strings for the next field to process
-                        rendered_strings = list({new_string})
-                    else:
-                        # create a new template string for each value
-                        for val in values:
 
-                            def lookup_template_value_exif(
+            pre = ts.pre or ""
-                                lookup_value, *args, **kwargs
+            post = ts.post or ""
-                            ):
-                                """ Closure passed to make_subst_function get_func 
-                                    Capture val and field in the closure 
-                                    Allows make_subst_function to be re-used w/o modification
-                                    _ is not used but required so signature matches get_template_value """
-                                if lookup_value == field:
-                                    return val
-                                else:
-                                    raise ValueError(
-                                        f"Unexpected value: {lookup_value}"
-                                    )
 
-                            subst = self.make_subst_function(
+            rendered = [pre + val + post for val in vals]
-                                none_str,
+            results_new = []
-                                filename,
+            for ren in rendered:
-                                dirname,
+                for res in results:
-                                get_func=lookup_template_value_exif,
+                    res_new = res + ren
-                            )
+                    results_new.append(res_new)
-                            new_string = regex_multi.sub(subst, str_template)
+            results = results_new
-                            new_strings[new_string] = 1
+
-                        # update rendered_strings for the next field to process
+        else:
-                        rendered_strings = sorted(list(new_strings.keys()))
+            # no template
-        return rendered_strings
+            pre = ts.pre or ""
+            post = ts.post or ""
+            results = [r + pre + post for r in results]
+
+        return results, unmatched
 
     def get_template_value(
         self,
@@ -649,7 +495,6 @@ class PhotoTemplate:
         path_sep=None,
         filename=False,
         dirname=False,
-        replacement=None,
     ):
         """lookup value for template field (single-value template substitutions)
 
@@ -661,7 +506,6 @@ class PhotoTemplate:
             path_sep: path separator for fields that are path-like
             filename: if True, template output will be sanitized to produce valid file name
             dirname: if True, template output will be sanitized to produce valid directory name 
-            replacement: str, value to replace any illegal file path characters with; default = ":"
         
         Returns:
             The matching template value (which may be None).
@@ -669,6 +513,8 @@ class PhotoTemplate:
         Raises:
             ValueError if no rule exists for field.
         """
+        if field not in FIELD_NAMES:
+            raise ValueError(f"SyntaxError: Unknown field: {field}")
 
         # initialize today with current date/time if needed
         if self.today is None:
@@ -690,9 +536,9 @@ class PhotoTemplate:
         elif field == "photo_or_video":
             value = self.get_photo_video_type(default)
         elif field == "hdr":
-            value = self.get_photo_bool_attribute("hdr", default, bool_val)
+            value = "hdr" if self.photo.hdr else None
         elif field == "edited":
-            value = self.get_photo_bool_attribute("hasadjustments", default, bool_val)
+            value = "edited" if self.photo.hasadjustments else None
         elif field == "created.date":
             value = DateTimeFormatter(self.photo.date).date
         elif field == "created.year":
@@ -720,7 +566,7 @@ class PhotoTemplate:
         elif field == "created.strftime":
             if default:
                 try:
-                    value = self.photo.date.strftime(default)
+                    value = self.photo.date.strftime(default[0])
                 except:
                     raise ValueError(f"Invalid strftime template: '{default}'")
             else:
@@ -801,7 +647,7 @@ class PhotoTemplate:
             if default:
                 try:
                     date = self.photo.date_modified or self.photo.date
-                    value = date.strftime(default)
+                    value = date.strftime(default[0])
                 except:
                     raise ValueError(f"Invalid strftime template: '{default}'")
             else:
@@ -833,7 +679,7 @@ class PhotoTemplate:
         elif field == "today.strftime":
             if default:
                 try:
-                    value = self.today.strftime(default)
+                    value = self.today.strftime(default[0])
                 except:
                     raise ValueError(f"Invalid strftime template: '{default}'")
             else:
@@ -918,49 +764,65 @@ class PhotoTemplate:
             value = self.photo.exif_info.lens_model if self.photo.exif_info else None
         elif field == "uuid":
             value = self.photo.uuid
+        elif field in PUNCTUATION:
+            value = PUNCTUATION[field]
         else:
             # if here, didn't get a match
             raise ValueError(f"Unhandled template value: {field}")
 
-        if value and replacement:
-            value = self.replace(value, replacement)
-            # process character replacements
-
         if filename:
             value = sanitize_pathpart(value)
         elif dirname:
             value = sanitize_dirname(value)
 
+        return [value]
+
+    def get_template_value_filter(self, filter_, values):
+        if filter_ == "lower":
+            if values and type(values) == list:
+                value = [v.lower() for v in values]
+            else:
+                value = [values.lower()]
+        elif filter_ == "upper":
+            if values and type(values) == list:
+                value = [v.upper() for v in values]
+            else:
+                value = [values.upper()]
+        elif filter_ == "strip":
+            if values and type(values) == list:
+                value = [v.strip() for v in values]
+            else:
+                value = [values.strip()]
+        elif filter_ == "capitalize":
+            if values and type(values) == list:
+                value = [v.capitalize() for v in values]
+            else:
+                value = [values.capitalize()]
+        elif filter_ == "titlecase":
+            if values and type(values) == list:
+                value = [v.title() for v in values]
+            else:
+                value = [values.title()]
+        elif filter_ == "braces":
+            if values and type(values) == list:
+                value = ["{" + v + "}" for v in values]
+            else:
+                value = ["{" + values + "}"]
+        elif filter_ == "parens":
+            if values and type(values) == list:
+                value = ["(" + v + ")" for v in values]
+            else:
+                value = ["(" + values + ")"]
+        elif filter_ == "brackets":
+            if values and type(values) == list:
+                value = ["[" + v + "]" for v in values]
+            else:
+                value = ["[" + values + "]"]
+        else:
+            value = []
         return value
 
-    def replace(self, value, replacement):
+    def get_template_value_multi(self, field, path_sep, filename=False, dirname=False):
-        """ process REPLACE template option
-
-        Args:
-            value: str value to process
-            replacement: str in form OLD,NEW|OLD,NEW... with old and new values for replacement
-        
-        Returns:
-            value with all replacements done
-        
-        Raises:
-            ValueError if replacement string is in wrong format
-        """
-        if not value:
-            return value
-
-        replacements = replacement.split("|")
-        for r in replacements:
-            try:
-                old, new = r.split(",")
-            except ValueError:
-                raise ValueError(f"Invalid template REPLACE value: {replacement}")
-            value = value.replace(old, new)
-        return value
-
-    def get_template_value_multi(
-        self, field, path_sep, filename=False, dirname=False, replacement=None
-    ):
         """lookup value for template field (multi-value template substitutions)
 
         Args:
@@ -969,7 +831,7 @@ class PhotoTemplate:
             dirname: if True, values will be sanitized to be valid directory names; default = False
         
         Returns:
-            List of the matching template values or [None].
+            List of the matching template values or [].
 
         Raises:
             ValueError if no rule exists for field.
@@ -1025,18 +887,9 @@ class PhotoTemplate:
             values = (
                 self.photo.search_info.venue_types if self.photo.search_info else []
             )
-        elif not field.startswith("exiftool:"):
+        else:
-            # exiftool: templates handled by _render_exiftool_template
             raise ValueError(f"Unhandled template value: {field}")
 
-        # do any replacements needs
-        if replacement:
-            new_values = []
-            for value in values:
-                # process replacements
-                new_values.append(self.replace(value, replacement))
-            values = new_values
-
         # sanitize directory names if needed, folder_album handled differently above
         if filename:
             values = [sanitize_pathpart(value) for value in values]
@@ -1044,8 +897,32 @@ class PhotoTemplate:
             # skip folder_album because it would have been handled above
             values = [sanitize_dirname(value) for value in values]
 
-        # If no values, insert None so code below will substite none_str for None
+        # If no values, insert None so code below will substitute none_str for None
-        values = values or [None]
+        values = values or []
+        return values
+
+    def get_template_value_exiftool(self, subfield, filename=None, dirname=None):
+        """Get template value for format "{exiftool:EXIF:Model}" """
+
+        if not self.photo.path:
+            return []
+
+        exif = ExifTool(self.photo.path, exiftool=self.exiftool_path)
+        exifdict = exif.asdict()
+        exifdict = {k.lower(): v for (k, v) in exifdict.items()}
+        subfield = subfield.lower()
+        if subfield in exifdict:
+            values = exifdict[subfield]
+            values = [values] if not isinstance(values, list) else values
+
+            # sanitize directory names if needed
+            if filename:
+                values = [sanitize_pathpart(value) for value in values]
+            elif dirname:
+                values = [sanitize_dirname(value) for value in values]
+        else:
+            values = []
+
         return values
 
     def get_photo_video_type(self, default):
@@ -1103,7 +980,7 @@ def parse_default_kv(default, default_dict):
 
     default_dict_ = default_dict.copy()
     if default:
-        defaults = default.split(";")
+        defaults = default[0].split(";")
         for kv in defaults:
             try:
                 k, v = kv.split("=")
@@ -1113,3 +990,12 @@ def parse_default_kv(default, default_dict):
             except ValueError:
                 pass
     return default_dict_
+
+
+def get_template_help():
+    """Return help for template system as markdown string """
+    # TODO: would be better to use importlib.abc.ResourceReader but I can't find a single example of how to do this
+    help_file = pathlib.Path(__file__).parent / "phototemplate.md"
+    with open(help_file, "r") as fd:
+        md = fd.read()
+    return md

osxphotos/phototemplate.tx

@@ -0,0 +1,122 @@
+// OSXPhotos Template Language (OTL)
+// a TemplateString has format:
+// pre{delim+template_field:subfield|filter(path_sep)[find,replace]?bool_value,default}post
+// a TemplateStatement may contain zero or more TemplateStrings
+// The pre and post are optional strings
+// The template itself (inside the {}) is also optional but if present
+// everything but template_field is also optional
+
+Statement:
+    (template_strings+=TemplateString)?
+;
+
+TemplateString:
+    pre=NON_TEMPLATE_STRING?
+    template=Template?
+    post=NON_TEMPLATE_STRING?
+;
+
+Template:
+    (
+    "{"
+    delim=Delim
+    field=Field
+    subfield=SubField
+    filter=Filter
+    pathsep=PathSep
+    findreplace=FindReplace
+    bool=Boolean
+    default=Default
+    "}"
+    )?
+;
+
+NON_TEMPLATE_STRING:
+    /[^\{\},]*/
+;
+
+Delim:
+    (
+    (value=DELIM_WORD)?
+    '+'
+    )?
+;
+
+DELIM_WORD:
+    /[^\{\}]*(?=\+\w)/
+;
+
+Field:
+    FIELD_WORD+
+;
+
+SubField:
+    (
+    ":"-
+    SUBFIELD_WORD+
+    )?
+;
+
+FIELD_WORD:
+    /[\.\w]+/
+;
+
+SUBFIELD_WORD:
+    /[\.\w:]+/
+;
+
+Filter:
+    (
+    "|"-
+    (value+=FILTER_WORD['|'])?
+    )?
+;
+
+FILTER_WORD:
+    /[\.\w]+/
+;
+
+PathSep:
+    (
+    "("
+    (value=/[^\(\)\{\}]{0,1}/)?
+    ")"
+    )?
+;
+
+FindReplace:
+    (
+    "["
+    (pairs+=FindReplacePair['|'])?
+    "]"
+    )?
+;
+
+FindReplacePair:
+    find=FIND_WORD
+    ","
+    (replace=REPLACE_WORD)?
+;
+
+FIND_WORD:
+    /[^\[\]\|]*(?=\,)/
+;
+
+REPLACE_WORD:
+    /[^\[\]\|]*/
+;
+
+
+Boolean:
+    (
+    "?"
+    (value=Statement)?
+    )?
+;
+
+Default:
+    (
+    ","
+    (value=Statement)?
+    )?
+;

osxphotos/templates/xmp_sidecar.mako

@@ -99,12 +99,6 @@
     % endif
 </%def>
 
-<%def name="orientation(orientation)">
-    % if orientation is not None:
-        <tiff:Orientation>${orientation}</tiff:Orientation>
-    % endif
-</%def>
-
 <%def name="mwg_face_regions(photo)">
     % if photo.face_info:
     <mwg-rs:Regions rdf:parseType="Resource">
@@ -182,12 +176,7 @@
 
 <rdf:Description rdf:about=""
  xmlns:exif='http://ns.adobe.com/exif/1.0/'>
- ${gps_info(*photo.location)}
+ ${gps_info(*location)}
-</rdf:Description>
-
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
- ${orientation(photo.orientation)}
 </rdf:Description>
 
 <rdf:Description rdf:about=""

osxphotos/templates/xmp_sidecar_beta.mako

@@ -99,12 +99,6 @@
     % endif
 </%def>
 
-<%def name="orientation(orientation)">
-    % if orientation is not None:
-        <tiff:Orientation>${orientation}</tiff:Orientation>
-    % endif
-</%def>
-
 <%def name="mwg_face_regions(photo)">
     % if photo.face_info:
     <mwg-rs:Regions rdf:parseType="Resource">
@@ -182,12 +176,7 @@
 
 <rdf:Description rdf:about=""
  xmlns:exif='http://ns.adobe.com/exif/1.0/'>
- ${gps_info(*photo.location)}
+ ${gps_info(*location)}
-</rdf:Description>
-
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
- ${orientation(photo.orientation)}
 </rdf:Description>
 
 <rdf:Description rdf:about=""

requirements.txt

@@ -9,7 +9,6 @@ atomicwrites==1.3.0
 attrs==19.1.0
 backcall==0.1.0
 better-exceptions-fork==0.2.1.post6
-black==19.10b0
 bleach==3.3.0
 bpylist2==3.0.2
 certifi==2020.4.5.1
@@ -50,7 +49,7 @@ pathvalidate==2.2.1
 pexpect==4.8.0
 photoscript==0.1.0
 pickleshare==0.7.5
-Pillow==7.2.0
+Pillow==8.1.1
 pkginfo==1.5.0.1
 pluggy==0.12.0
 prompt-toolkit==3.0.4
@@ -188,8 +187,10 @@ readme-renderer==25.0
 regex==2020.2.20
 requests==2.23.0
 requests-toolbelt==0.9.1
+rich==9.11.1
 six==1.14.0
 termcolor==1.1.0
+textx==2.3.0
 toml==0.10.0
 tornado==6.0.4
 tox==3.19.0

setup.py

@@ -84,6 +84,8 @@ setup(
         "photoscript>=0.1.0",
         "toml>=0.10.0",
         "osxmetadata>=0.99.13",
+        "textx==2.3.0",
+        "rich>=9.11.1",
     ],
     entry_points={"console_scripts": ["osxphotos=osxphotos.__main__:cli"]},
     include_package_data=True,

tests/Test-10.15.7.photoslibrary/database/Photos.sqlite.lock

@@ -7,7 +7,7 @@
 	<key>hostuuid</key>
 	<string>9575E48B-8D5F-5654-ABAC-4431B1167324</string>
 	<key>pid</key>
-	<integer>55247</integer>
+	<integer>86501</integer>
 	<key>processname</key>
 	<string>photolibraryd</string>
 	<key>uid</key>

tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist

@@ -3,24 +3,24 @@
 <plist version="1.0">
 <dict>
 	<key>BackgroundHighlightCollection</key>
-	<date>2020-12-16T05:41:43Z</date>
+	<date>2021-03-13T16:38:25Z</date>
 	<key>BackgroundHighlightEnrichment</key>
-	<date>2020-12-16T05:41:42Z</date>
+	<date>2021-03-13T16:38:24Z</date>
 	<key>BackgroundJobAssetRevGeocode</key>
-	<date>2020-12-16T05:41:43Z</date>
+	<date>2021-03-13T16:38:25Z</date>
 	<key>BackgroundJobSearch</key>
-	<date>2020-12-16T05:41:43Z</date>
+	<date>2021-03-13T16:38:25Z</date>
 	<key>BackgroundPeopleSuggestion</key>
-	<date>2020-12-16T05:41:41Z</date>
+	<date>2021-03-13T16:38:23Z</date>
 	<key>BackgroundUserBehaviorProcessor</key>
-	<date>2020-12-16T05:41:43Z</date>
+	<date>2021-03-13T16:38:25Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundGraphConsistencyUpdateJobDateKey</key>
 	<date>2020-10-17T23:45:33Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate</key>
 	<date>2020-10-17T23:45:24Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate</key>
-	<date>2020-12-16T05:41:44Z</date>
+	<date>2021-03-13T16:38:25Z</date>
 	<key>SiriPortraitDonation</key>
-	<date>2020-12-16T05:41:43Z</date>
+	<date>2021-03-13T16:38:25Z</date>
 </dict>
 </plist>

tests/photoinfo_mock.py

@@ -0,0 +1,48 @@
+"""Selectively mock a PhotoInfo object"""
+
+from osxphotos import PhotoInfo
+
+
+class PhotoInfoMock(PhotoInfo):
+    def __init__(self, photo, **kwargs):
+        self._photo = photo
+        self._db = photo._db
+        self._info = photo._info
+
+        for kw in kwargs:
+            if hasattr(photo, kw):
+                setattr(self, f"_mock_{kw}", kwargs[kw])
+            else:
+                raise ValueError(f"Not a PhotoInfo attribute: {kw}")
+
+    @property
+    def hdr(self):
+        return (
+            self._mock_hdr
+            if getattr(self, "_mock_hdr", None) is not None
+            else self._photo.hdr
+        )
+
+    @property
+    def hasadjustments(self):
+        return (
+            self._mock_hasadjustments
+            if getattr(self, "_mock_hasadjustments", None) is not None
+            else self._photo.hasadjustments
+        )
+
+    @property
+    def keywords(self):
+        return (
+            self._mock_keywords
+            if getattr(self, "_mock_keywords", None) is not None
+            else self._photo.keywords
+        )
+
+    @property
+    def title(self):
+        return (
+            self._mock_title
+            if getattr(self, "_mock_title", None) is not None
+            else self._photo.title
+        )

tests/sidecars/15uNd7%8RguTEgNPKHfTWw.json

@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}]
+[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}]

tests/sidecars/15uNd7%8RguTEgNPKHfTWw.xmp

@@ -46,10 +46,6 @@
 <rdf:Description rdf:about=""
  xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
  xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
  xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"

tests/sidecars/15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.json

@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:Keywords": ["AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:Subject": ["AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:TagsList": ["AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}]
+[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:Subject": ["AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:TagsList": ["AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}]

tests/sidecars/15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.xmp

@@ -52,10 +52,6 @@
 <rdf:Description rdf:about=""
  xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
  xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
  xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"

tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ext.xmp

@@ -46,10 +46,6 @@
 <rdf:Description rdf:about=""
  xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
  xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
  xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"

tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ignore_date_modified.json

@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}]
+[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Kids"], "XMP:Subject": ["Kids"], "XMP:TagsList": ["Kids"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}]

tests/sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.json

@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:Keywords": ["Folder1/SubFolder2/AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:Subject": ["Folder1/SubFolder2/AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:TagsList": ["Folder1/SubFolder2/AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}]
+[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Folder1/SubFolder2/AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:Subject": ["Folder1/SubFolder2/AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:TagsList": ["Folder1/SubFolder2/AlbumInFolder", "Kids", "Pumpkin Farm", "Test Album (1)"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}]

tests/sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.xmp

@@ -54,10 +54,6 @@
 <rdf:Description rdf:about=""
  xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
  xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
  xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"

tests/sidecars/15uNd7%8RguTEgNPKHfTWw_no_tag_groups.json

@@ -1 +1 @@
-[{"ImageDescription": "Girl holding pumpkin", "Description": "Girl holding pumpkin", "Title": "I found one!", "Keywords": ["Kids"], "Subject": ["Kids"], "TagsList": ["Kids"], "PersonInImage": ["Katie"], "DateTimeOriginal": "2018:09:28 16:07:07", "CreateDate": "2018:09:28 16:07:07", "OffsetTimeOriginal": "-04:00", "DateCreated": "2018:09:28", "TimeCreated": "16:07:07-04:00", "ModifyDate": "2018:09:28 16:07:07"}]
+[{"ImageDescription": "Girl holding pumpkin", "Description": "Girl holding pumpkin", "Caption-Abstract": "Girl holding pumpkin", "Title": "I found one!", "ObjectName": "I found one!", "Keywords": ["Kids"], "Subject": ["Kids"], "TagsList": ["Kids"], "PersonInImage": ["Katie"], "DateTimeOriginal": "2018:09:28 16:07:07", "CreateDate": "2018:09:28 16:07:07", "OffsetTimeOriginal": "-04:00", "DateCreated": "2018:09:28", "TimeCreated": "16:07:07-04:00", "ModifyDate": "2018:09:28 16:07:07"}]

tests/sidecars/15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.json

@@ -1 +1 @@
-[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:Keywords": ["Katie", "Kids"], "XMP:Subject": ["Katie", "Kids"], "XMP:TagsList": ["Katie", "Kids"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}]
+[{"EXIF:ImageDescription": "Girl holding pumpkin", "XMP:Description": "Girl holding pumpkin", "IPTC:Caption-Abstract": "Girl holding pumpkin", "XMP:Title": "I found one!", "IPTC:ObjectName": "I found one!", "IPTC:Keywords": ["Katie", "Kids"], "XMP:Subject": ["Katie", "Kids"], "XMP:TagsList": ["Katie", "Kids"], "XMP:PersonInImage": ["Katie"], "EXIF:DateTimeOriginal": "2018:09:28 16:07:07", "EXIF:CreateDate": "2018:09:28 16:07:07", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:09:28", "IPTC:TimeCreated": "16:07:07-04:00", "EXIF:ModifyDate": "2018:09:28 16:07:07"}]

tests/sidecars/15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.xmp

@@ -48,10 +48,6 @@
 <rdf:Description rdf:about=""
  xmlns:exif='http://ns.adobe.com/exif/1.0/'>
 </rdf:Description>
-<rdf:Description rdf:about=''
- xmlns:tiff='http://ns.adobe.com/tiff/1.0/'>
-        <tiff:Orientation>1</tiff:Orientation>
-</rdf:Description>
 <rdf:Description rdf:about=""
  xmlns:mwg-rs="http://www.metadataworkinggroup.com/schemas/regions/"
  xmlns:stArea="http://ns.adobe.com/xmp/sType/Area#"

tests/sidecars/3Jn73XpSQQCluzRBMWRsMA.json

@@ -1 +1 @@
-[{"XMP:Title": "St. James's Park", "IPTC:Keywords": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:Subject": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:TagsList": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "EXIF:GPSLatitude": 51.50357167, "EXIF:GPSLongitude": -0.1318055, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:10:13 09:18:12", "EXIF:CreateDate": "2018:10:13 09:18:12", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:10:13", "IPTC:TimeCreated": "09:18:12-04:00", "EXIF:ModifyDate": "2019:12:01 11:43:45"}]
+[{"XMP:Title": "St. James's Park", "IPTC:ObjectName": "St. James's Park", "IPTC:Keywords": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:Subject": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "XMP:TagsList": ["England", "London", "London 2018", "St. James's Park", "UK", "United Kingdom"], "EXIF:GPSLatitude": 51.50357167, "EXIF:GPSLongitude": -0.1318055, "EXIF:GPSLatitudeRef": "N", "EXIF:GPSLongitudeRef": "W", "EXIF:DateTimeOriginal": "2018:10:13 09:18:12", "EXIF:CreateDate": "2018:10:13 09:18:12", "EXIF:OffsetTimeOriginal": "-04:00", "IPTC:DateCreated": "2018:10:13", "IPTC:TimeCreated": "09:18:12-04:00", "EXIF:ModifyDate": "2019:12:01 11:43:45"}]