Updated README.md [skip ci]

Updated tested versions to 11.3
Fixes for #454
2021-05-28 09:05:00 -07:00 · 2021-05-28 09:02:37 -07:00 · 2021-05-28 08:48:21 -07:00 · 2021-05-23 14:26:01 -07:00 · 2021-05-23 14:21:13 -07:00 · 2021-05-23 14:14:22 -07:00
48 changed files with 1884 additions and 452 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -202,6 +202,26 @@
      "contributions": [
        "ideas"
      ]
+    },
+    {
+      "login": "pdewost",
+      "name": "Philippe Dewost",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17090228?v=4",
+      "profile": "http://blog.dewost.com/",
+      "contributions": [
+        "doc",
+        "example",
+        "ideas"
+      ]
+    },
+    {
+      "login": "kaduskj",
+      "name": "kaduskj",
+      "avatar_url": "https://avatars.githubusercontent.com/u/983067?v=4",
+      "profile": "https://github.com/kaduskj",
+      "contributions": [
+        "bug"
+      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ __pycache__
 t.out
 .vscode/
 .tox/
+.idea/
 dist/
 build/
 working/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/README.md
+++ b/README.md
--- a/README.rst
+++ b/README.rst
@@ -146,6 +146,11 @@ export default library using 'country name/year' as output directory (but use "N

 ``osxphotos export ~/Desktop/export --directory "{place.name.country,NoCountry}/{created.year}"  --person-keyword --album-keyword --keyword-template "{created.year}" --exiftool --update --verbose``

+find all videos larger than 200MB and add them to Photos album "Big Videos" creating the album if necessary
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``osxphotos query --only-movies --min-size 200MB --add-to-album "Big Videos"``
+
 Example uses of the package
 ---------------------------

--- a/docs/.buildinfo
+++ b/docs/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 25d6e59b24e8595abba5754b717909d9
+config: 210ecd9d654dea5d4c21627449ca1d63
 tags: 645f666f9bcd5a90fca523b33c5a78b7
--- a/docs/_modules/index.html
+++ b/docs/_modules/index.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Overview: module code &#8212; osxphotos 0.42.11 documentation</title>
+    <title>Overview: module code &#8212; osxphotos 0.42.20 documentation</title>
    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="../_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="../" src="../_static/documentation_options.js"></script>
--- a/docs/_modules/osxphotos/photoinfo/_photoinfo_export.html
+++ b/docs/_modules/osxphotos/photoinfo/_photoinfo_export.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos.photoinfo._photoinfo_export &#8212; osxphotos 0.41.10 documentation</title>
+    <title>osxphotos.photoinfo._photoinfo_export &#8212; osxphotos 0.42.17 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>
@@ -122,6 +122,9 @@
        <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="n">exported_album</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
+        <span class="n">skipped_album</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
+        <span class="n">missing_album</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>
@@ -144,6 +147,9 @@
        <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="bp">self</span><span class="o">.</span><span class="n">exported_album</span> <span class="o">=</span> <span class="n">exported_album</span> <span class="ow">or</span> <span class="p">[]</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">skipped_album</span> <span class="o">=</span> <span class="n">skipped_album</span> <span class="ow">or</span> <span class="p">[]</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">missing_album</span> <span class="o">=</span> <span class="n">missing_album</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>
@@ -190,6 +196,10 @@
        <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="bp">self</span><span class="o">.</span><span class="n">exported_album</span> <span class="o">+=</span> <span class="n">other</span><span class="o">.</span><span class="n">exported_album</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">skipped_album</span> <span class="o">+=</span> <span class="n">other</span><span class="o">.</span><span class="n">skipped_album</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">missing_album</span> <span class="o">+=</span> <span class="n">other</span><span class="o">.</span><span class="n">missing_album</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>
@@ -214,6 +224,9 @@
            <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="sa">f</span><span class="s2">&quot;,exported_album=</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">exported_album</span><span class="si">}</span><span class="s2">&quot;</span>
+            <span class="o">+</span> <span class="sa">f</span><span class="s2">&quot;,skipped_album=</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">skipped_album</span><span class="si">}</span><span class="s2">&quot;</span>
+            <span class="o">+</span> <span class="sa">f</span><span class="s2">&quot;,missing_album=</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">missing_album</span><span class="si">}</span><span class="s2">&quot;</span>
            <span class="o">+</span> <span class="s2">&quot;)&quot;</span>
        <span class="p">)</span>

@@ -654,7 +667,11 @@
                <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">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="n">fname</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="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="p">)</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">original_filename</span>

@@ -1687,7 +1704,7 @@
            <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>
--- a/docs/_modules/osxphotos/photoinfo/photoinfo.html
+++ b/docs/_modules/osxphotos/photoinfo/photoinfo.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos.photoinfo.photoinfo &#8212; osxphotos 0.42.11 documentation</title>
+    <title>osxphotos.photoinfo.photoinfo &#8212; osxphotos 0.42.20 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>
@@ -521,7 +521,7 @@
        <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">_burst_album_info</span>
        <span class="k">except</span> <span class="ne">AttributeError</span><span class="p">:</span>
-            <span class="n">burst_album_info</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">album_info</span><span class="p">)</span> 
+            <span class="n">burst_album_info</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">album_info</span><span class="p">)</span>
            <span class="k">for</span> <span class="n">photo</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">burst_photos</span><span class="p">:</span>
                <span class="k">if</span> <span class="n">photo</span><span class="o">.</span><span class="n">burst_key</span><span class="p">:</span>
                    <span class="n">burst_album_info</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="n">photo</span><span class="o">.</span><span class="n">album_info</span><span class="p">)</span>
@@ -637,6 +637,23 @@
        <span class="k">else</span><span class="p">:</span>
            <span class="k">return</span> <span class="kc">None</span>

+    <span class="nd">@property</span>
+    <span class="k">def</span> <span class="nf">date_added</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot; Date photo was added to the database &quot;&quot;&quot;</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">_date_added</span>
+        <span class="k">except</span> <span class="ne">AttributeError</span><span class="p">:</span>
+            <span class="n">added_date</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_info</span><span class="p">[</span><span class="s2">&quot;added_date&quot;</span><span class="p">]</span>
+            <span class="k">if</span> <span class="n">added_date</span><span class="p">:</span>
+                <span class="n">seconds</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_info</span><span class="p">[</span><span class="s2">&quot;imageTimeZoneOffsetSeconds&quot;</span><span class="p">]</span> <span class="ow">or</span> <span class="mi">0</span>
+                <span class="n">delta</span> <span class="o">=</span> <span class="n">timedelta</span><span class="p">(</span><span class="n">seconds</span><span class="o">=</span><span class="n">seconds</span><span class="p">)</span>
+                <span class="n">tz</span> <span class="o">=</span> <span class="n">timezone</span><span class="p">(</span><span class="n">delta</span><span class="p">)</span>
+                <span class="bp">self</span><span class="o">.</span><span class="n">_date_added</span> <span class="o">=</span> <span class="n">added_date</span><span class="o">.</span><span class="n">astimezone</span><span class="p">(</span><span class="n">tz</span><span class="o">=</span><span class="n">tz</span><span class="p">)</span>
+            <span class="k">else</span><span class="p">:</span>
+                <span class="bp">self</span><span class="o">.</span><span class="n">_date_added</span> <span class="o">=</span> <span class="kc">None</span>
+
+            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_date_added</span>
+
    <span class="nd">@property</span>
    <span class="k">def</span> <span class="nf">location</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
        <span class="sd">&quot;&quot;&quot; returns (latitude, longitude) as float in degrees or None &quot;&quot;&quot;</span>
@@ -834,6 +851,60 @@

        <span class="k">return</span> <span class="n">photopath</span>

+    <span class="nd">@property</span>
+    <span class="k">def</span> <span class="nf">path_derivatives</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot; Return any derivative (preview) images associated with the photo as a list of paths, sorted by file size (largest first) &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="bp">self</span><span class="o">.</span><span class="n">_path_derivatives_4</span><span class="p">()</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">derivative_path</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="bp">self</span><span class="o">.</span><span class="n">_db</span><span class="o">.</span><span class="n">_library_path</span><span class="p">)</span>
+            <span class="o">/</span> <span class="s2">&quot;resources&quot;</span>
+            <span class="o">/</span> <span class="s2">&quot;derivatives&quot;</span>
+            <span class="o">/</span> <span class="n">directory</span>
+        <span class="p">)</span>
+        <span class="n">files</span> <span class="o">=</span> <span class="n">derivative_path</span><span class="o">.</span><span class="n">glob</span><span class="p">(</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">*.*&quot;</span><span class="p">)</span>
+        <span class="n">files</span> <span class="o">=</span> <span class="nb">sorted</span><span class="p">(</span><span class="n">files</span><span class="p">,</span> <span class="n">reverse</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span> <span class="n">key</span><span class="o">=</span><span class="k">lambda</span> <span class="n">f</span><span class="p">:</span> <span class="n">f</span><span class="o">.</span><span class="n">stat</span><span class="p">()</span><span class="o">.</span><span class="n">st_size</span><span class="p">)</span>
+        <span class="c1"># return list of filename but skip .THM files (these are actually low-res thumbnails in JPEG format but with .THM extension)</span>
+        <span class="k">return</span> <span class="p">[</span><span class="nb">str</span><span class="p">(</span><span class="n">filename</span><span class="p">)</span> <span class="k">for</span> <span class="n">filename</span> <span class="ow">in</span> <span class="n">files</span> <span class="k">if</span> <span class="n">filename</span><span class="o">.</span><span class="n">suffix</span> <span class="o">!=</span> <span class="s2">&quot;.THM&quot;</span><span class="p">]</span>
+
+    <span class="k">def</span> <span class="nf">_path_derivatives_4</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot; Return paths to all derivative (preview) files for Photos &lt;= 4&quot;&quot;&quot;</span>
+        <span class="n">modelid</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_info</span><span class="p">[</span><span class="s2">&quot;masterModelID&quot;</span><span class="p">]</span>
+        <span class="k">if</span> <span class="n">modelid</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
+            <span class="k">return</span> <span class="p">[]</span>
+        <span class="n">folder_id</span><span class="p">,</span> <span class="n">file_id</span> <span class="o">=</span> <span class="n">_get_resource_loc</span><span class="p">(</span><span class="n">modelid</span><span class="p">)</span>
+        <span class="n">derivatives_root</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="bp">self</span><span class="o">.</span><span class="n">_db</span><span class="o">.</span><span class="n">_library_path</span><span class="p">)</span>
+            <span class="o">/</span> <span class="s2">&quot;resources&quot;</span>
+            <span class="o">/</span> <span class="s2">&quot;proxies&quot;</span>
+            <span class="o">/</span> <span class="s2">&quot;derivatives&quot;</span>
+            <span class="o">/</span> <span class="n">folder_id</span>
+        <span class="p">)</span>
+
+        <span class="c1"># photos appears to usually be in &quot;00&quot; subfolder but</span>
+        <span class="c1"># could be elsewhere--I haven&#39;t figured out this logic yet</span>
+        <span class="c1"># first see if it&#39;s in 00</span>
+
+        <span class="n">derivatives_path</span> <span class="o">=</span> <span class="n">derivatives_root</span> <span class="o">/</span> <span class="s2">&quot;00&quot;</span> <span class="o">/</span> <span class="n">file_id</span>
+        <span class="k">if</span> <span class="n">derivatives_path</span><span class="o">.</span><span class="n">is_dir</span><span class="p">():</span>
+            <span class="n">files</span> <span class="o">=</span> <span class="n">derivatives_path</span><span class="o">.</span><span class="n">glob</span><span class="p">(</span><span class="s2">&quot;*&quot;</span><span class="p">)</span>
+            <span class="n">files</span> <span class="o">=</span> <span class="nb">sorted</span><span class="p">(</span><span class="n">files</span><span class="p">,</span> <span class="n">reverse</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span> <span class="n">key</span><span class="o">=</span><span class="k">lambda</span> <span class="n">f</span><span class="p">:</span> <span class="n">f</span><span class="o">.</span><span class="n">stat</span><span class="p">()</span><span class="o">.</span><span class="n">st_size</span><span class="p">)</span>
+            <span class="k">return</span> <span class="p">[</span><span class="nb">str</span><span class="p">(</span><span class="n">filename</span><span class="p">)</span> <span class="k">for</span> <span class="n">filename</span> <span class="ow">in</span> <span class="n">files</span><span class="p">]</span>
+
+        <span class="c1"># didn&#39;t find derivatives path</span>
+        <span class="k">for</span> <span class="n">subdir</span> <span class="ow">in</span> <span class="n">derivatives_root</span><span class="o">.</span><span class="n">glob</span><span class="p">(</span><span class="s2">&quot;*&quot;</span><span class="p">):</span>
+            <span class="k">if</span> <span class="n">subdir</span><span class="o">.</span><span class="n">is_dir</span><span class="p">():</span>
+                <span class="n">derivatives_path</span> <span class="o">=</span> <span class="n">derivatives_root</span> <span class="o">/</span> <span class="n">subdir</span> <span class="o">/</span> <span class="n">file_id</span>
+                <span class="k">if</span> <span class="n">derivatives_path</span><span class="o">.</span><span class="n">is_dir</span><span class="p">():</span>
+                    <span class="n">files</span> <span class="o">=</span> <span class="n">derivatives_path</span><span class="o">.</span><span class="n">glob</span><span class="p">(</span><span class="s2">&quot;*&quot;</span><span class="p">)</span>
+                    <span class="n">files</span> <span class="o">=</span> <span class="nb">sorted</span><span class="p">(</span><span class="n">files</span><span class="p">,</span> <span class="n">reverse</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span> <span class="n">key</span><span class="o">=</span><span class="k">lambda</span> <span class="n">f</span><span class="p">:</span> <span class="n">f</span><span class="o">.</span><span class="n">stat</span><span class="p">()</span><span class="o">.</span><span class="n">st_size</span><span class="p">)</span>
+                    <span class="k">return</span> <span class="p">[</span><span class="nb">str</span><span class="p">(</span><span class="n">filename</span><span class="p">)</span> <span class="k">for</span> <span class="n">filename</span> <span class="ow">in</span> <span class="n">files</span><span class="p">]</span>
+
+        <span class="c1"># didn&#39;t find a derivatives path</span>
+        <span class="k">return</span> <span class="p">[]</span>
+
    <span class="nd">@property</span>
    <span class="k">def</span> <span class="nf">panorama</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
        <span class="sd">&quot;&quot;&quot; Returns True if photo is a panorama, otherwise False &quot;&quot;&quot;</span>
@@ -970,6 +1041,7 @@
        <span class="n">filename</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
        <span class="n">dirname</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
        <span class="n">strip</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
+        <span class="n">edited</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
    <span class="p">):</span>
        <span class="sd">&quot;&quot;&quot;Renders a template string for PhotoInfo instance using PhotoTemplate</span>

@@ -985,6 +1057,7 @@
 <span class="sd">            filename: if True, template output will be sanitized to produce valid file name</span>
 <span class="sd">            dirname: if True, template output will be sanitized to produce valid directory name</span>
 <span class="sd">            strip: if True, strips leading/trailing white space from resulting template</span>
+<span class="sd">            edited: if True, sets {edited_version} field to True, otherwise it gets set to False; set if you want template evaluated for edited version</span>

 <span class="sd">        Returns:</span>
 <span class="sd">            ([rendered_strings], [unmatched]): tuple of list of rendered strings and list of unmatched template values</span>
@@ -999,6 +1072,7 @@
            <span class="n">filename</span><span class="o">=</span><span class="n">filename</span><span class="p">,</span>
            <span class="n">dirname</span><span class="o">=</span><span class="n">dirname</span><span class="p">,</span>
            <span class="n">strip</span><span class="o">=</span><span class="n">strip</span><span class="p">,</span>
+            <span class="n">edited_version</span><span class="o">=</span><span class="n">edited</span><span class="p">,</span>
        <span class="p">)</span></div>

    <span class="nd">@property</span>
--- a/docs/_modules/osxphotos/photosdb/photosdb.html
+++ b/docs/_modules/osxphotos/photosdb/photosdb.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos.photosdb.photosdb &#8212; osxphotos 0.42.11 documentation</title>
+    <title>osxphotos.photosdb.photosdb &#8212; osxphotos 0.42.19 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>
@@ -933,7 +933,8 @@
 <span class="sd">                    RKVersion.subType,</span>
 <span class="sd">                    RKVersion.inTrashDate,</span>
 <span class="sd">                    RKVersion.showInLibrary,</span>
-<span class="sd">                    RKMaster.fileIsReference</span>
+<span class="sd">                    RKMaster.fileIsReference,</span>
+<span class="sd">                    RKMaster.importGroupUuid</span>
 <span class="sd">                    FROM RKVersion, RKMaster</span>
 <span class="sd">                    WHERE RKVersion.masterUuid = RKMaster.uuid&quot;&quot;&quot;</span>
            <span class="p">)</span>
@@ -964,7 +965,8 @@
 <span class="sd">                    RKVersion.subType,</span>
 <span class="sd">                    RKVersion.inTrashDate,</span>
 <span class="sd">                    RKVersion.showInLibrary,</span>
-<span class="sd">                    RKMaster.fileIsReference</span>
+<span class="sd">                    RKMaster.fileIsReference,</span>
+<span class="sd">                    RKMaster.importGroupUuid</span>
 <span class="sd">                    FROM RKVersion, RKMaster</span>
 <span class="sd">                    WHERE RKVersion.masterUuid = RKMaster.uuid&quot;&quot;&quot;</span>
            <span class="p">)</span>
@@ -1014,6 +1016,7 @@
        <span class="c1"># 41    RKVersion.inTrashDate</span>
        <span class="c1"># 42    RKVersion.showInLibrary -- is item visible in library (e.g. non-selected burst images are not visible)</span>
        <span class="c1"># 43    RKMaster.fileIsReference -- file is reference (imported without copying to Photos library)</span>
+        <span class="c1"># 44    RKMaster.importGroupUuid -- to get date added from RKImportGroup</span>

        <span class="k">for</span> <span class="n">row</span> <span class="ow">in</span> <span class="n">c</span><span class="p">:</span>
            <span class="n">uuid</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
@@ -1207,7 +1210,7 @@

            <span class="c1"># import session not yet handled for Photos 4</span>
            <span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">[</span><span class="n">uuid</span><span class="p">][</span><span class="s2">&quot;import_session&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">None</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">[</span><span class="n">uuid</span><span class="p">][</span><span class="s2">&quot;import_uuid&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">None</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">[</span><span class="n">uuid</span><span class="p">][</span><span class="s2">&quot;import_uuid&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">44</span><span class="p">]</span>
            <span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">[</span><span class="n">uuid</span><span class="p">][</span><span class="s2">&quot;fok_import_session&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">None</span>

        <span class="c1"># get additional details from RKMaster, needed for RAW processing</span>
@@ -1397,11 +1400,17 @@

        <span class="c1"># get the place data</span>
        <span class="n">place_data</span> <span class="o">=</span> <span class="n">c</span><span class="o">.</span><span class="n">execute</span><span class="p">(</span>
-            <span class="s2">&quot;SELECT modelID, defaultName, type, area &quot;</span> <span class="s2">&quot;FROM RKPlace &quot;</span>
+            <span class="s2">&quot;SELECT modelID, defaultName, type, area FROM RKPlace&quot;</span>
        <span class="p">)</span><span class="o">.</span><span class="n">fetchall</span><span class="p">()</span>
        <span class="n">places</span> <span class="o">=</span> <span class="p">{</span><span class="n">p</span><span class="p">[</span><span class="mi">0</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="n">place_data</span><span class="p">}</span>
        <span class="bp">self</span><span class="o">.</span><span class="n">_db_places</span> <span class="o">=</span> <span class="n">places</span>

+        <span class="c1"># get import data</span>
+        <span class="n">import_data</span> <span class="o">=</span> <span class="n">c</span><span class="o">.</span><span class="n">execute</span><span class="p">(</span>
+            <span class="s2">&quot;SELECT modelID, uuid, name, importDate from RKImportGroup&quot;</span>
+        <span class="p">)</span><span class="o">.</span><span class="n">fetchall</span><span class="p">()</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">_db_import_group</span> <span class="o">=</span> <span class="p">{</span><span class="n">i</span><span class="p">[</span><span class="mi">1</span><span class="p">]:</span> <span class="n">i</span> <span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="n">import_data</span><span class="p">}</span>
+
        <span class="k">for</span> <span class="n">uuid</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">:</span>
            <span class="c1"># get placeId which is then used to lookup defaultName</span>
            <span class="n">place_ids_query</span> <span class="o">=</span> <span class="n">c</span><span class="o">.</span><span class="n">execute</span><span class="p">(</span>
@@ -1435,6 +1444,17 @@
            <span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">[</span><span class="n">uuid</span><span class="p">][</span><span class="s2">&quot;placeNames&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">place_names</span>
            <span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">[</span><span class="n">uuid</span><span class="p">][</span><span class="s2">&quot;reverse_geolocation&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">None</span>  <span class="c1"># Photos 5</span>

+            <span class="c1"># add date added</span>
+            <span class="k">try</span><span class="p">:</span>
+                <span class="n">import_session</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_db_import_group</span><span class="p">[</span>
+                    <span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">[</span><span class="n">uuid</span><span class="p">][</span><span class="s2">&quot;import_uuid&quot;</span><span class="p">]</span>
+                <span class="p">]</span>
+                <span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">[</span><span class="n">uuid</span><span class="p">][</span><span class="s2">&quot;added_date&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">datetime</span><span class="o">.</span><span class="n">fromtimestamp</span><span class="p">(</span>
+                    <span class="n">import_session</span><span class="p">[</span><span class="mi">3</span><span class="p">]</span> <span class="o">+</span> <span class="n">TIME_DELTA</span>
+                <span class="p">)</span>
+            <span class="k">except</span> <span class="p">(</span><span class="ne">ValueError</span><span class="p">,</span> <span class="ne">TypeError</span><span class="p">,</span> <span class="ne">KeyError</span><span class="p">):</span>
+                <span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">[</span><span class="n">uuid</span><span class="p">][</span><span class="s2">&quot;added_date&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">datetime</span><span class="p">(</span><span class="mi">1970</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="mi">1</span><span class="p">)</span>
+
        <span class="c1"># build album_titles dictionary</span>
        <span class="k">for</span> <span class="n">album_id</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">_dbalbum_details</span><span class="p">:</span>
            <span class="n">title</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_dbalbum_details</span><span class="p">[</span><span class="n">album_id</span><span class="p">][</span><span class="s2">&quot;title&quot;</span><span class="p">]</span>
@@ -1900,7 +1920,8 @@
 <span class="s2">                </span><span class="si">{</span><span class="n">asset_table</span><span class="si">}</span><span class="s2">.ZADJUSTMENTTIMESTAMP,</span>
 <span class="s2">                </span><span class="si">{</span><span class="n">asset_table</span><span class="si">}</span><span class="s2">.ZVISIBILITYSTATE,</span>
 <span class="s2">                </span><span class="si">{</span><span class="n">asset_table</span><span class="si">}</span><span class="s2">.ZTRASHEDDATE,</span>
-<span class="s2">                </span><span class="si">{</span><span class="n">asset_table</span><span class="si">}</span><span class="s2">.ZSAVEDASSETTYPE</span>
+<span class="s2">                </span><span class="si">{</span><span class="n">asset_table</span><span class="si">}</span><span class="s2">.ZSAVEDASSETTYPE,</span>
+<span class="s2">                </span><span class="si">{</span><span class="n">asset_table</span><span class="si">}</span><span class="s2">.ZADDEDDATE</span>
 <span class="s2">                FROM </span><span class="si">{</span><span class="n">asset_table</span><span class="si">}</span><span class="s2"> </span>
 <span class="s2">                JOIN ZADDITIONALASSETATTRIBUTES ON ZADDITIONALASSETATTRIBUTES.ZASSET = </span><span class="si">{</span><span class="n">asset_table</span><span class="si">}</span><span class="s2">.Z_PK </span>
 <span class="s2">                ORDER BY </span><span class="si">{</span><span class="n">asset_table</span><span class="si">}</span><span class="s2">.ZUUID  &quot;&quot;&quot;</span>
@@ -1948,6 +1969,7 @@
        <span class="c1"># 38   ZGENERICASSET.ZVISIBILITYSTATE -- 0 if visible, 2 if not (e.g. a burst image)</span>
        <span class="c1"># 39   ZGENERICASSET.ZTRASHEDDATE -- date item placed in the trash or null if not in trash</span>
        <span class="c1"># 40   ZGENERICASSET.ZSAVEDASSETTYPE -- how item imported</span>
+        <span class="c1"># 41   ZGENERICASSET.ZADDEDDATE -- date item added to the library</span>

        <span class="k">for</span> <span class="n">row</span> <span class="ow">in</span> <span class="n">c</span><span class="p">:</span>
            <span class="n">uuid</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
@@ -2127,6 +2149,11 @@
            <span class="n">info</span><span class="p">[</span><span class="s2">&quot;saved_asset_type&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">40</span><span class="p">]</span>
            <span class="n">info</span><span class="p">[</span><span class="s2">&quot;isreference&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">40</span><span class="p">]</span> <span class="o">==</span> <span class="mi">10</span>

+            <span class="k">try</span><span class="p">:</span>
+                <span class="n">info</span><span class="p">[</span><span class="s2">&quot;added_date&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">datetime</span><span class="o">.</span><span class="n">fromtimestamp</span><span class="p">(</span><span class="n">row</span><span class="p">[</span><span class="mi">41</span><span class="p">]</span> <span class="o">+</span> <span class="n">TIME_DELTA</span><span class="p">)</span>
+            <span class="k">except</span> <span class="p">(</span><span class="ne">ValueError</span><span class="p">,</span> <span class="ne">TypeError</span><span class="p">):</span>
+                <span class="n">info</span><span class="p">[</span><span class="s2">&quot;added_date&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">datetime</span><span class="p">(</span><span class="mi">1970</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="mi">1</span><span class="p">)</span>
+
            <span class="c1"># initialize import session info which will be filled in later</span>
            <span class="c1"># not every photo has an import session so initialize all records now</span>
            <span class="n">info</span><span class="p">[</span><span class="s2">&quot;import_session&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">None</span>
--- a/docs/_sources/tutorial.md.txt
+++ b/docs/_sources/tutorial.md.txt
@@ -55,7 +55,7 @@ By default, osxphotos will use the original filename of the photo when exporting

 `osxphotos export /path/to/export --filename "{title}"`

-The above command will export photos using the title.  Note that you don't need to specify the extension as part of the `--filename` template as osxphotos will automatically add the correct fie extension.  Some photos might not have a title so in this case, you could use the default value feature to specify a different name for these photos.  For example, to use the title as the filename, but if no title is specified, use the original filename instead:
+The above command will export photos using the title.  Note that you don't need to specify the extension as part of the `--filename` template as osxphotos will automatically add the correct file extension.  Some photos might not have a title so in this case, you could use the default value feature to specify a different name for these photos.  For example, to use the title as the filename, but if no title is specified, use the original filename instead:

 ```txt
 osxphotos export /path/to/export --filename "{title,{original_name}}"
@@ -315,6 +315,40 @@ Then the next to you run osxphotos, you can simply do this:

 The configuration file is a plain text file in [TOML](https://toml.io/en/) format so the `.toml` extension is standard but you can name the file anything you like. 

+### An example from an actual osxphotos user
+
+Here's a comprehensive use case from an actual osxphotos user that integrates many of the concepts discussed in this tutorial (thank-you Philippe for contributing this!):
+
+    I usually import my iPhone’s photo roll on a more or less regular basis, and it
+    includes photos and videos. As a result, the size ot my Photos library may rise
+    very quickly. Nevertheless, I will tag and geolocate everything as Photos has a
+    quite good keyword management system.
+
+    After a while, I want to take most of the videos out of the library and move them
+    to a separate "videos" folder on a different folder / volume. As I might want to
+    use them in Final Cut Pro, and since Final Cut is able to import Finder tags into
+    its internal library tagging system, I will use osxphotos to do just this.
+
+    Picking the videos can be left to Photos, using a smart folder for instance. Then
+    just add a keyword to all videos to be processed. Here I chose "Quik" as I wanted
+    to spot all videos created on my iPhone using the Quik application (now part of
+    GoPro).
+
+    I want to retrieve my keywords only and make sure they populate the Finder tags, as
+    well as export all the persons identified in the videos by Photos.  I also want to
+    merge any keywords or persons already in the video metadata with the exported
+    metadata.
+
+    Keeping Photo’s edited titles and descriptions and putting both in the Finder
+    comments field in a readable manner is also enabled.
+
+    And I want to keep the file’s creation date (using `--touch-file`).
+
+    Finally, use `--strip` to remove any leading or trailing whitespace from processed
+    template fields.
+
+`osxphotos export ~/Desktop/folder for exported videos/ --keyword Quik --only-movies --db /path to my.photoslibrary --touch-file --finder-tag-keywords --person-keyword --xattr-template findercomment "{title}{title?{descr?{newline},},}{descr}" --exiftool-merge-keywords --exiftool-merge-persons --exiftool --strip`
+
 ### Conclusion

 osxphotos is very flexible.  If you merely want to backup your Photos library, then spending a few minutes to understand the `--directory` option is likely all you need and you can be up and running in minutes.  However, if you have a more complex workflow, osxphotos likely provides options to implement your workflow.  This tutorial does not attempt to cover every option offered by osxphotos but hopefully it provides a good understanding of what kinds of things are possible and where to explore if you want to learn more.
--- a/docs/_static/documentation_options.js
+++ b/docs/_static/documentation_options.js
@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
    URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '0.42.11',
+    VERSION: '0.42.20',
    LANGUAGE: 'None',
    COLLAPSE_INDEX: false,
    BUILDER: 'html',
--- a/docs/cli.html
+++ b/docs/cli.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos command line interface (CLI) &#8212; osxphotos 0.42.11 documentation</title>
+    <title>osxphotos command line interface (CLI) &#8212; osxphotos 0.42.20 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>
@@ -813,6 +813,24 @@ to modify this behavior.</p>
 <dd><p>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. WARNING: –cleanup will delete <em>any</em> 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.</p>
 </dd></dl>

+<dl class="std option">
+<dt id="cmdoption-osxphotos-export-add-exported-to-album">
+<code class="sig-name descname"><span class="pre">--add-exported-to-album</span></code><code class="sig-prename descclassname"> <span class="pre">&lt;ALBUM&gt;</span></code><a class="headerlink" href="#cmdoption-osxphotos-export-add-exported-to-album" title="Permalink to this definition">¶</a></dt>
+<dd><p>Add all exported photos to album ALBUM in Photos. Album ALBUM will be created if it doesn’t exist.  All exported photos will be added to this album. This only works if the Photos library being exported is the last-opened (default) library in Photos. This feature is currently experimental.  I don’t know how well it will work on large export sets.</p>
+</dd></dl>
+
+<dl class="std option">
+<dt id="cmdoption-osxphotos-export-add-skipped-to-album">
+<code class="sig-name descname"><span class="pre">--add-skipped-to-album</span></code><code class="sig-prename descclassname"> <span class="pre">&lt;ALBUM&gt;</span></code><a class="headerlink" href="#cmdoption-osxphotos-export-add-skipped-to-album" title="Permalink to this definition">¶</a></dt>
+<dd><p>Add all skipped photos to album ALBUM in Photos. Album ALBUM will be created if it doesn’t exist.  All skipped photos will be added to this album. This only works if the Photos library being exported is the last-opened (default) library in Photos. This feature is currently experimental.  I don’t know how well it will work on large export sets.</p>
+</dd></dl>
+
+<dl class="std option">
+<dt id="cmdoption-osxphotos-export-add-missing-to-album">
+<code class="sig-name descname"><span class="pre">--add-missing-to-album</span></code><code class="sig-prename descclassname"> <span class="pre">&lt;ALBUM&gt;</span></code><a class="headerlink" href="#cmdoption-osxphotos-export-add-missing-to-album" title="Permalink to this definition">¶</a></dt>
+<dd><p>Add all missing photos to album ALBUM in Photos. Album ALBUM will be created if it doesn’t exist.  All missing photos will be added to this album. This only works if the Photos library being exported is the last-opened (default) library in Photos. This feature is currently experimental.  I don’t know how well it will work on large export sets.</p>
+</dd></dl>
+
 <dl class="std option">
 <dt id="cmdoption-osxphotos-export-exportdb">
 <code class="sig-name descname"><span class="pre">--exportdb</span></code><code class="sig-prename descclassname"> <span class="pre">&lt;EXPORTDB_FILE&gt;</span></code><a class="headerlink" href="#cmdoption-osxphotos-export-exportdb" title="Permalink to this definition">¶</a></dt>
@@ -1437,6 +1455,12 @@ if more than one option is provided, they are treated as “AND”
 <dd><p>Search for photos that are not in iCloud (have not been synched)</p>
 </dd></dl>

+<dl class="std option">
+<dt id="cmdoption-osxphotos-query-add-to-album">
+<code class="sig-name descname"><span class="pre">--add-to-album</span></code><code class="sig-prename descclassname"> <span class="pre">&lt;ALBUM&gt;</span></code><a class="headerlink" href="#cmdoption-osxphotos-query-add-to-album" title="Permalink to this definition">¶</a></dt>
+<dd><p>Add all photos from query to album ALBUM in Photos. Album ALBUM will be created if it doesn’t exist.  All photos in the query results will be added to this album. This only works if the Photos library being queried is the last-opened (default) library in Photos. This feature is currently experimental.  I don’t know how well it will work on large query sets.</p>
+</dd></dl>
+
 <p class="rubric">Arguments</p>
 <dl class="std option">
 <dt id="cmdoption-osxphotos-query-arg-PHOTOS_LIBRARY">
--- a/docs/genindex.html
+++ b/docs/genindex.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Index &#8212; osxphotos 0.42.11 documentation</title>
+    <title>Index &#8212; osxphotos 0.42.20 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>
@@ -65,6 +65,34 @@
 <table style="width: 100%" class="indextable genindextable"><tr>
  <td style="width: 33%; vertical-align: top;"><ul>
      <li>
+    --add-exported-to-album &lt;ALBUM&gt;
+
+      <ul>
+        <li><a href="cli.html#cmdoption-osxphotos-export-add-exported-to-album">osxphotos-export command line option</a>
+</li>
+      </ul></li>
+      <li>
+    --add-missing-to-album &lt;ALBUM&gt;
+
+      <ul>
+        <li><a href="cli.html#cmdoption-osxphotos-export-add-missing-to-album">osxphotos-export command line option</a>
+</li>
+      </ul></li>
+      <li>
+    --add-skipped-to-album &lt;ALBUM&gt;
+
+      <ul>
+        <li><a href="cli.html#cmdoption-osxphotos-export-add-skipped-to-album">osxphotos-export command line option</a>
+</li>
+      </ul></li>
+      <li>
+    --add-to-album &lt;ALBUM&gt;
+
+      <ul>
+        <li><a href="cli.html#cmdoption-osxphotos-query-add-to-album">osxphotos-query command line option</a>
+</li>
+      </ul></li>
+      <li>
    --album &lt;ALBUM&gt;

      <ul>
@@ -557,6 +585,8 @@
        <li><a href="cli.html#cmdoption-osxphotos-query-no-comment">osxphotos-query command line option</a>
 </li>
      </ul></li>
+  </ul></td>
+  <td style="width: 33%; vertical-align: top;"><ul>
      <li>
    --no-description

@@ -566,8 +596,6 @@
        <li><a href="cli.html#cmdoption-osxphotos-query-no-description">osxphotos-query command line option</a>
 </li>
      </ul></li>
-  </ul></td>
-  <td style="width: 33%; vertical-align: top;"><ul>
      <li>
    --no-likes

@@ -1189,6 +1217,8 @@
 <table style="width: 100%" class="indextable genindextable"><tr>
  <td style="width: 33%; vertical-align: top;"><ul>
      <li><a href="reference.html#osxphotos.PhotoInfo.date">date() (osxphotos.PhotoInfo property)</a>
+</li>
+      <li><a href="reference.html#osxphotos.PhotoInfo.date_added">date_added() (osxphotos.PhotoInfo property)</a>
 </li>
      <li><a href="reference.html#osxphotos.PhotoInfo.date_modified">date_modified() (osxphotos.PhotoInfo property)</a>
 </li>
@@ -1490,6 +1520,12 @@
    osxphotos-export command line option

      <ul>
+        <li><a href="cli.html#cmdoption-osxphotos-export-add-exported-to-album">--add-exported-to-album &lt;ALBUM&gt;</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-export-add-missing-to-album">--add-missing-to-album &lt;ALBUM&gt;</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-export-add-skipped-to-album">--add-skipped-to-album &lt;ALBUM&gt;</a>
+</li>
        <li><a href="cli.html#cmdoption-osxphotos-export-album">--album &lt;ALBUM&gt;</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-export-album-keyword">--album-keyword</a>
@@ -1798,6 +1834,8 @@
    osxphotos-query command line option

      <ul>
+        <li><a href="cli.html#cmdoption-osxphotos-query-add-to-album">--add-to-album &lt;ALBUM&gt;</a>
+</li>
        <li><a href="cli.html#cmdoption-osxphotos-query-album">--album &lt;ALBUM&gt;</a>
 </li>
        <li><a href="cli.html#cmdoption-osxphotos-query-burst">--burst</a>
@@ -1954,6 +1992,8 @@
      <li><a href="reference.html#osxphotos.PhotoInfo.panorama">panorama() (osxphotos.PhotoInfo property)</a>
 </li>
      <li><a href="reference.html#osxphotos.PhotoInfo.path">path() (osxphotos.PhotoInfo property)</a>
+</li>
+      <li><a href="reference.html#osxphotos.PhotoInfo.path_derivatives">path_derivatives() (osxphotos.PhotoInfo property)</a>
 </li>
      <li><a href="reference.html#osxphotos.PhotoInfo.path_edited">path_edited() (osxphotos.PhotoInfo property)</a>
 </li>
--- a/docs/index.html
+++ b/docs/index.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Welcome to osxphotos’s documentation! &#8212; osxphotos 0.42.11 documentation</title>
+    <title>Welcome to osxphotos’s documentation! &#8212; osxphotos 0.42.20 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>
@@ -150,6 +150,10 @@ Alternatively, you can also run the command line utility like this: <code class=
 <h4>export default library using ‘country name/year’ as output directory (but use “NoCountry/year” if country not specified), add persons, album names, and year as keywords, write exif metadata to files when exporting, update only changed files, print verbose ouput<a class="headerlink" href="#export-default-library-using-country-name-year-as-output-directory-but-use-nocountry-year-if-country-not-specified-add-persons-album-names-and-year-as-keywords-write-exif-metadata-to-files-when-exporting-update-only-changed-files-print-verbose-ouput" title="Permalink to this headline">¶</a></h4>
 <p><code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">export</span> <span class="pre">~/Desktop/export</span> <span class="pre">--directory</span> <span class="pre">&quot;{place.name.country,NoCountry}/{created.year}&quot;</span>&#160; <span class="pre">--person-keyword</span> <span class="pre">--album-keyword</span> <span class="pre">--keyword-template</span> <span class="pre">&quot;{created.year}&quot;</span> <span class="pre">--exiftool</span> <span class="pre">--update</span> <span class="pre">--verbose</span></code></p>
 </div>
+<div class="section" id="find-all-videos-larger-than-200mb-and-add-them-to-photos-album-big-videos-creating-the-album-if-necessary">
+<h4>find all videos larger than 200MB and add them to Photos album “Big Videos” creating the album if necessary<a class="headerlink" href="#find-all-videos-larger-than-200mb-and-add-them-to-photos-album-big-videos-creating-the-album-if-necessary" title="Permalink to this headline">¶</a></h4>
+<p><code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">query</span> <span class="pre">--only-movies</span> <span class="pre">--min-size</span> <span class="pre">200MB</span> <span class="pre">--add-to-album</span> <span class="pre">&quot;Big</span> <span class="pre">Videos&quot;</span></code></p>
+</div>
 </div>
 </div>
 <div class="section" id="example-uses-of-the-package">
--- a/docs/modules.html
+++ b/docs/modules.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos &#8212; osxphotos 0.42.11 documentation</title>
+    <title>osxphotos &#8212; osxphotos 0.42.20 documentation</title>
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
    <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
--- a/docs/objects.inv
+++ b/docs/objects.inv
--- a/docs/osxphotos.pdf
+++ b/docs/osxphotos.pdf
--- a/docs/reference.html
+++ b/docs/reference.html
--- a/docs/search.html
+++ b/docs/search.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Search &#8212; osxphotos 0.42.11 documentation</title>
+    <title>Search &#8212; osxphotos 0.42.20 documentation</title>
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
    <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
    
--- a/docs/searchindex.js
+++ b/docs/searchindex.js
--- a/docs/tutorial.html
+++ b/docs/tutorial.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Export your photos &#8212; osxphotos 0.42.11 documentation</title>
+    <title>Export your photos &#8212; osxphotos 0.42.20 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>
@@ -69,7 +69,7 @@
 <h1>Specify exported filename<a class="headerlink" href="#specify-exported-filename" title="Permalink to this headline">¶</a></h1>
 <p>By default, osxphotos will use the original filename of the photo when exporting.  That is, the filename the photo had when it was taken or imported into Photos.  This is often something like <code class="docutils literal notranslate"><span class="pre">IMG_1234.JPG</span></code> or <code class="docutils literal notranslate"><span class="pre">DSC05678.dng</span></code>.  osxphotos allows you to specify a custom filename template using the <code class="docutils literal notranslate"><span class="pre">--filename</span></code> option in the same way as <code class="docutils literal notranslate"><span class="pre">--directory</span></code> allows you to specify a custom directory name.  For example, Photos allows you specify a title or caption for a photo and you can use this in place of the original filename:</p>
 <p><code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">export</span> <span class="pre">/path/to/export</span> <span class="pre">--filename</span> <span class="pre">&quot;{title}&quot;</span></code></p>
-<p>The above command will export photos using the title.  Note that you don’t need to specify the extension as part of the <code class="docutils literal notranslate"><span class="pre">--filename</span></code> template as osxphotos will automatically add the correct fie extension.  Some photos might not have a title so in this case, you could use the default value feature to specify a different name for these photos.  For example, to use the title as the filename, but if no title is specified, use the original filename instead:</p>
+<p>The above command will export photos using the title.  Note that you don’t need to specify the extension as part of the <code class="docutils literal notranslate"><span class="pre">--filename</span></code> template as osxphotos will automatically add the correct file extension.  Some photos might not have a title so in this case, you could use the default value feature to specify a different name for these photos.  For example, to use the title as the filename, but if no title is specified, use the original filename instead:</p>
 <div class="highlight-txt notranslate"><div class="highlight"><pre><span></span>osxphotos export /path/to/export --filename &quot;{title,{original_name}}&quot;
                                              │    ││  │
                                              │    ││  │
@@ -258,6 +258,40 @@
 <p><code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">export</span> <span class="pre">/path/to/export</span> <span class="pre">--load-config</span> <span class="pre">osxphotos.toml</span></code></p>
 <p>The configuration file is a plain text file in <a class="reference external" href="https://toml.io/en/">TOML</a> format so the <code class="docutils literal notranslate"><span class="pre">.toml</span></code> extension is standard but you can name the file anything you like.</p>
 </div>
+<div class="section" id="an-example-from-an-actual-osxphotos-user">
+<h1>An example from an actual osxphotos user<a class="headerlink" href="#an-example-from-an-actual-osxphotos-user" title="Permalink to this headline">¶</a></h1>
+<p>Here’s a comprehensive use case from an actual osxphotos user that integrates many of the concepts discussed in this tutorial (thank-you Philippe for contributing this!):</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span>I usually import my iPhone’s photo roll on a more or less regular basis, and it
+includes photos and videos. As a result, the size ot my Photos library may rise
+very quickly. Nevertheless, I will tag and geolocate everything as Photos has a
+quite good keyword management system.
+
+After a while, I want to take most of the videos out of the library and move them
+to a separate &quot;videos&quot; folder on a different folder / volume. As I might want to
+use them in Final Cut Pro, and since Final Cut is able to import Finder tags into
+its internal library tagging system, I will use osxphotos to do just this.
+
+Picking the videos can be left to Photos, using a smart folder for instance. Then
+just add a keyword to all videos to be processed. Here I chose &quot;Quik&quot; as I wanted
+to spot all videos created on my iPhone using the Quik application (now part of
+GoPro).
+
+I want to retrieve my keywords only and make sure they populate the Finder tags, as
+well as export all the persons identified in the videos by Photos.  I also want to
+merge any keywords or persons already in the video metadata with the exported
+metadata.
+
+Keeping Photo’s edited titles and descriptions and putting both in the Finder
+comments field in a readable manner is also enabled.
+
+And I want to keep the file’s creation date (using `--touch-file`).
+
+Finally, use `--strip` to remove any leading or trailing whitespace from processed
+template fields.
+</pre></div>
+</div>
+<p><code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">export</span> <span class="pre">~/Desktop/folder</span> <span class="pre">for</span> <span class="pre">exported</span> <span class="pre">videos/</span> <span class="pre">--keyword</span> <span class="pre">Quik</span> <span class="pre">--only-movies</span> <span class="pre">--db</span> <span class="pre">/path</span> <span class="pre">to</span> <span class="pre">my.photoslibrary</span> <span class="pre">--touch-file</span> <span class="pre">--finder-tag-keywords</span> <span class="pre">--person-keyword</span> <span class="pre">--xattr-template</span> <span class="pre">findercomment</span> <span class="pre">&quot;{title}{title?{descr?{newline},},}{descr}&quot;</span> <span class="pre">--exiftool-merge-keywords</span> <span class="pre">--exiftool-merge-persons</span> <span class="pre">--exiftool</span> <span class="pre">--strip</span></code></p>
+</div>
 <div class="section" id="conclusion">
 <h1>Conclusion<a class="headerlink" href="#conclusion" title="Permalink to this headline">¶</a></h1>
 <p>osxphotos is very flexible.  If you merely want to backup your Photos library, then spending a few minutes to understand the <code class="docutils literal notranslate"><span class="pre">--directory</span></code> option is likely all you need and you can be up and running in minutes.  However, if you have a more complex workflow, osxphotos likely provides options to implement your workflow.  This tutorial does not attempt to cover every option offered by osxphotos but hopefully it provides a good understanding of what kinds of things are possible and where to explore if you want to learn more.</p>
--- a/docsrc/source/tutorial.md
+++ b/docsrc/source/tutorial.md
@@ -55,7 +55,7 @@ By default, osxphotos will use the original filename of the photo when exporting

 `osxphotos export /path/to/export --filename "{title}"`

-The above command will export photos using the title.  Note that you don't need to specify the extension as part of the `--filename` template as osxphotos will automatically add the correct fie extension.  Some photos might not have a title so in this case, you could use the default value feature to specify a different name for these photos.  For example, to use the title as the filename, but if no title is specified, use the original filename instead:
+The above command will export photos using the title.  Note that you don't need to specify the extension as part of the `--filename` template as osxphotos will automatically add the correct file extension.  Some photos might not have a title so in this case, you could use the default value feature to specify a different name for these photos.  For example, to use the title as the filename, but if no title is specified, use the original filename instead:

 ```txt
 osxphotos export /path/to/export --filename "{title,{original_name}}"
@@ -315,6 +315,40 @@ Then the next to you run osxphotos, you can simply do this:

 The configuration file is a plain text file in [TOML](https://toml.io/en/) format so the `.toml` extension is standard but you can name the file anything you like. 

+### An example from an actual osxphotos user
+
+Here's a comprehensive use case from an actual osxphotos user that integrates many of the concepts discussed in this tutorial (thank-you Philippe for contributing this!):
+
+    I usually import my iPhone’s photo roll on a more or less regular basis, and it
+    includes photos and videos. As a result, the size ot my Photos library may rise
+    very quickly. Nevertheless, I will tag and geolocate everything as Photos has a
+    quite good keyword management system.
+
+    After a while, I want to take most of the videos out of the library and move them
+    to a separate "videos" folder on a different folder / volume. As I might want to
+    use them in Final Cut Pro, and since Final Cut is able to import Finder tags into
+    its internal library tagging system, I will use osxphotos to do just this.
+
+    Picking the videos can be left to Photos, using a smart folder for instance. Then
+    just add a keyword to all videos to be processed. Here I chose "Quik" as I wanted
+    to spot all videos created on my iPhone using the Quik application (now part of
+    GoPro).
+
+    I want to retrieve my keywords only and make sure they populate the Finder tags, as
+    well as export all the persons identified in the videos by Photos.  I also want to
+    merge any keywords or persons already in the video metadata with the exported
+    metadata.
+
+    Keeping Photo’s edited titles and descriptions and putting both in the Finder
+    comments field in a readable manner is also enabled.
+
+    And I want to keep the file’s creation date (using `--touch-file`).
+
+    Finally, use `--strip` to remove any leading or trailing whitespace from processed
+    template fields.
+
+`osxphotos export ~/Desktop/folder for exported videos/ --keyword Quik --only-movies --db /path to my.photoslibrary --touch-file --finder-tag-keywords --person-keyword --xattr-template findercomment "{title}{title?{descr?{newline},},}{descr}" --exiftool-merge-keywords --exiftool-merge-persons --exiftool --strip`
+
 ### Conclusion

 osxphotos is very flexible.  If you merely want to backup your Photos library, then spending a few minutes to understand the `--directory` option is likely all you need and you can be up and running in minutes.  However, if you have a more complex workflow, osxphotos likely provides options to implement your workflow.  This tutorial does not attempt to cover every option offered by osxphotos but hopefully it provides a good understanding of what kinds of things are possible and where to explore if you want to learn more.
--- a/osxphotos/_constants.py
+++ b/osxphotos/_constants.py
@@ -70,6 +70,7 @@ _TESTED_OS_VERSIONS = [
    ("11", "0"),
    ("11", "1"),
    ("11", "2"),
+    ("11", "3"),
 ]

 # Photos 5 has persons who are empty string if unidentified face
@@ -212,8 +213,13 @@ EXTENDED_ATTRIBUTE_NAMES_QUOTED = [f"'{x}'" for x in EXTENDED_ATTRIBUTE_NAMES]
 OSXPHOTOS_EXPORT_DB = ".osxphotos_export.db"

 # bit flags for burst images ("burstPickType")
-BURST_NOT_SELECTED = 0b10 # 2: burst image is not selected
-BURST_DEFAULT_PICK = 0b100 # 4: burst image is the one Photos picked to be key image before any selections made
-BURST_SELECTED = 0b1000 # 8: burst image is selected
-BURST_KEY = 0b10000 # 16: burst image is the key photo (top of burst stack)
-BURST_UNKNOWN = 0b100000 # 32: this is almost always set with BURST_DEFAULT_PICK and never if BURST_DEFAULT_PICK is not set.  I think this has something to do with what algorithm Photos used to pick the default image
+BURST_NOT_SELECTED = 0b10  # 2: burst image is not selected
+BURST_DEFAULT_PICK = (
+    0b100
+)  # 4: burst image is the one Photos picked to be key image before any selections made
+BURST_SELECTED = 0b1000  # 8: burst image is selected
+BURST_KEY = 0b10000  # 16: burst image is the key photo (top of burst stack)
+BURST_UNKNOWN = (
+    0b100000
+)  # 32: this is almost always set with BURST_DEFAULT_PICK and never if BURST_DEFAULT_PICK is not set.  I think this has something to do with what algorithm Photos used to pick the default image
+
--- a/osxphotos/_version.py
+++ b/osxphotos/_version.py
@@ -1,3 +1,3 @@
 """ version info """

-__version__ = "0.42.11"
+__version__ = "0.42.26"
--- a/osxphotos/cli.py
+++ b/osxphotos/cli.py
@@ -14,6 +14,7 @@ import unicodedata
 import bitmath
 import click
 import osxmetadata
+import photoscript
 import yaml

 import osxphotos
@@ -53,6 +54,7 @@ from .photoinfo import ExportResults
 from .photokit import check_photokit_authorization, request_photokit_authorization
 from .queryoptions import QueryOptions
 from .utils import get_preferred_uti_extension
+from .photosalbum import PhotosAlbum

 # global variable to control verbose output
 # set via --verbose/-V
@@ -878,6 +880,30 @@ def cli(ctx, db, json_, debug):
    "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(
+    "--add-exported-to-album",
+    metavar="ALBUM",
+    help="Add all exported photos to album ALBUM in Photos. Album ALBUM will be created "
+    "if it doesn't exist.  All exported photos will be added to this album. "
+    "This only works if the Photos library being exported is the last-opened (default) library in Photos. "
+    "This feature is currently experimental.  I don't know how well it will work on large export sets.",
+)
+@click.option(
+    "--add-skipped-to-album",
+    metavar="ALBUM",
+    help="Add all skipped photos to album ALBUM in Photos. Album ALBUM will be created "
+    "if it doesn't exist.  All skipped photos will be added to this album. "
+    "This only works if the Photos library being exported is the last-opened (default) library in Photos. "
+    "This feature is currently experimental.  I don't know how well it will work on large export sets.",
+)
+@click.option(
+    "--add-missing-to-album",
+    metavar="ALBUM",
+    help="Add all missing photos to album ALBUM in Photos. Album ALBUM will be created "
+    "if it doesn't exist.  All missing photos will be added to this album. "
+    "This only works if the Photos library being exported is the last-opened (default) library in Photos. "
+    "This feature is currently experimental.  I don't know how well it will work on large export sets.",
+)
@click.option(
    "--exportdb",
    metavar="EXPORTDB_FILE",
@@ -1027,6 +1053,9 @@ def export(
    use_photokit,
    report,
    cleanup,
+    add_exported_to_album,
+    add_skipped_to_album,
+    add_missing_to_album,
    exportdb,
    load_config,
    save_config,
@@ -1180,6 +1209,9 @@ def export(
        use_photokit = cfg.use_photokit
        report = cfg.report
        cleanup = cfg.cleanup
+        add_exported_to_album = cfg.add_exported_to_album
+        add_skipped_to_album = cfg.add_skipped_to_album
+        add_missing_to_album = cfg.add_missing_to_album
        exportdb = cfg.exportdb
        beta = cfg.beta
        only_new = cfg.only_new
@@ -1524,6 +1556,24 @@ def export(
        original_name = not current_name

        results = ExportResults()
+
+        # set up for --add-export-to-album if needed
+        album_export = (
+            PhotosAlbum(add_exported_to_album, verbose=verbose_)
+            if add_exported_to_album
+            else None
+        )
+        album_skipped = (
+            PhotosAlbum(add_skipped_to_album, verbose=verbose_)
+            if add_skipped_to_album
+            else None
+        )
+        album_missing = (
+            PhotosAlbum(add_missing_to_album, verbose=verbose_)
+            if add_missing_to_album
+            else None
+        )
+
        # send progress bar output to /dev/null if verbose to hide the progress bar
        fp = open(os.devnull, "w") if verbose else None
        with click.progressbar(photos, file=fp) as bar:
@@ -1571,6 +1621,49 @@ def export(
                    replace_keywords=replace_keywords,
                    retry=retry,
                )
+
+                if album_export and export_results.exported:
+                    try:
+                        album_export.add(p)
+                        export_results.exported_album = [
+                            (filename, album_export.name)
+                            for filename in export_results.exported
+                        ]
+                    except Exception as e:
+                        click.secho(
+                            f"Error adding photo {p.original_filename} ({p.uuid}) to album {album_export.name}: {e}",
+                            fg=CLI_COLOR_ERROR,
+                            err=True,
+                        )
+
+                if album_skipped and export_results.skipped:
+                    try:
+                        album_skipped.add(p)
+                        export_results.skipped_album = [
+                            (filename, album_skipped.name)
+                            for filename in export_results.skipped
+                        ]
+                    except Exception as e:
+                        click.secho(
+                            f"Error adding photo {p.original_filename} ({p.uuid}) to album {album_skipped.name}: {e}",
+                            fg=CLI_COLOR_ERROR,
+                            err=True,
+                        )
+
+                if album_missing and export_results.missing:
+                    try:
+                        album_missing.add(p)
+                        export_results.missing_album = [
+                            (filename, album_missing.name)
+                            for filename in export_results.missing
+                        ]
+                    except Exception as e:
+                        click.secho(
+                            f"Error adding photo {p.original_filename} ({p.uuid}) to album {album_missing.name}: {e}",
+                            fg=CLI_COLOR_ERROR,
+                            err=True,
+                        )
+
                results += export_results

                # all photo files (not including sidecars) that are part of this export set
@@ -1717,6 +1810,14 @@ def help(ctx, topic, **kw):
    is_flag=True,
    help="Search for photos that are not in iCloud (have not been synched)",
 )
+@click.option(
+    "--add-to-album",
+    metavar="ALBUM",
+    help="Add all photos from query to album ALBUM in Photos. Album ALBUM will be created "
+    "if it doesn't exist.  All photos in the query results will be added to this album. "
+    "This only works if the Photos library being queried is the last-opened (default) library in Photos. "
+    "This feature is currently experimental.  I don't know how well it will work on large query sets.",
+)
@DB_ARGUMENT
@click.pass_obj
@click.pass_context
@@ -1794,6 +1895,7 @@ def query(
    max_size,
    regex,
    query_eval,
+    add_to_album,
 ):
    """Query the Photos database using 1 or more search options;
    if more than one option is provided, they are treated as "AND"
@@ -1964,6 +2066,24 @@ def query(

    # below needed for to make CliRunner work for testing
    cli_json = cli_obj.json if cli_obj is not None else None
+
+    if add_to_album and photos:
+        album_query = PhotosAlbum(add_to_album, verbose=None)
+        photo_len = len(photos)
+        photo_word = "photos" if photo_len > 1 else "photo"
+        click.echo(
+            f"Adding {photo_len} {photo_word} to album '{album_query.name}'. Note: Photos may prompt you to confirm this action.",
+            err=True,
+        )
+        try:
+            album_query.add_list(photos)
+        except Exception as e:
+            click.secho(
+                f"Error adding photos to album {add_to_album}",
+                fg=CLI_COLOR_ERROR,
+                err=True,
+            )
+
    print_photo_info(photos, cli_json or json_)


@@ -2317,7 +2437,7 @@ def export_photo(
    if export_edited and photo.hasadjustments:
        # if export-edited, also export the edited version
        edited_filenames = get_filenames_from_template(
-            photo, filename_template, original_name, strip=strip
+            photo, filename_template, original_name, strip=strip, edited=True
        )
        for edited_filename in edited_filenames:
            edited_filename = pathlib.Path(edited_filename)
@@ -2461,7 +2581,7 @@ def export_photo_with_template(
    results = ExportResults()

    dest_paths = get_dirnames_from_template(
-        photo, directory, export_by_date, dest, dry_run, strip=strip
+        photo, directory, export_by_date, dest, dry_run, strip=strip, edited=edited
    )

    # export the photo to each path in dest_paths
@@ -2602,13 +2722,17 @@ def export_photo_with_template(
    return results


-def get_filenames_from_template(photo, filename_template, original_name, strip=False):
+def get_filenames_from_template(
+    photo, filename_template, original_name, strip=False, edited=False
+):
    """get list of export filenames for a photo

    Args:
        photo: a PhotoInfo instance
        filename_template: a PhotoTemplate template string, may be None
        original_name: boolean; if True, use photo's original filename instead of current filename
+        strip: if True, strips leading/trailing white space from resulting template
+        edited: if True, sets {edited_version} field to True, otherwise it gets set to False; set if you want template evaluated for edited version

    Returns:
        list of filenames
@@ -2620,7 +2744,11 @@ def get_filenames_from_template(photo, filename_template, original_name, strip=F
        photo_ext = pathlib.Path(photo.original_filename).suffix
        try:
            filenames, unmatched = photo.render_template(
-                filename_template, path_sep="_", filename=True, strip=strip
+                filename_template,
+                path_sep="_",
+                filename=True,
+                strip=strip,
+                edited=edited,
            )
        except ValueError as e:
            raise click.BadOptionUsage(
@@ -2644,7 +2772,7 @@ def get_filenames_from_template(photo, filename_template, original_name, strip=F


 def get_dirnames_from_template(
-    photo, directory, export_by_date, dest, dry_run, strip=False
+    photo, directory, export_by_date, dest, dry_run, strip=False, edited=False
 ):
    """get list of directories to export a photo into, creates directories if they don't exist

@@ -2654,6 +2782,8 @@ def get_dirnames_from_template(
        export_by_date: boolean; if True, creates output directories in form YYYY-MM-DD
        dest: top-level destination directory
        dry_run: boolean; if True, runs in dry-run mode and does not create output directories
+        strip: if True, strips leading/trailing white space from resulting template
+        edited: if True, sets {edited_version} field to True, otherwise it gets set to False; set if you want template evaluated for edited version

    Returns:
        list of export directories
@@ -2674,7 +2804,7 @@ def get_dirnames_from_template(
        # got a directory template, render it and check results are valid
        try:
            dirnames, unmatched = photo.render_template(
-                directory, dirname=True, strip=strip
+                directory, dirname=True, strip=strip, edited=edited
            )
        except ValueError as e:
            raise click.BadOptionUsage(
@@ -2774,7 +2904,6 @@ def write_export_report(report_file, results):
    """

    # Collect results for reporting
-    # TODO: pull this in a separate write_report function
    all_results = {
        result: {
            "filename": result,
@@ -2796,6 +2925,7 @@ def write_export_report(report_file, results):
            "extended_attributes_skipped": 0,
            "cleanup_deleted_file": 0,
            "cleanup_deleted_directory": 0,
+            "exported_album": "",
        }
        for result in results.all_files()
        + results.deleted_files
@@ -2871,6 +3001,9 @@ def write_export_report(report_file, results):
    for result in results.deleted_directories:
        all_results[result]["cleanup_deleted_directory"] = 1

+    for result, album in results.exported_album:
+        all_results[result]["exported_album"] = album
+
    report_columns = [
        "filename",
        "exported",
@@ -2891,6 +3024,7 @@ def write_export_report(report_file, results):
        "extended_attributes_skipped",
        "cleanup_deleted_file",
        "cleanup_deleted_directory",
+        "exported_album",
    ]

    try:
--- a/osxphotos/exiftool.py
+++ b/osxphotos/exiftool.py
@@ -6,18 +6,30 @@
    If these aren't important to you, I highly recommend you use Sven Marnach's excellent 
    pyexiftool: https://github.com/smarnach/pyexiftool which provides more functionality """

+import atexit
 import json
 import logging
 import os
 import re
 import shutil
 import subprocess
+from abc import ABC, abstractmethod
 from functools import lru_cache  # pylint: disable=syntax-error

 # exiftool -stay_open commands outputs this EOF marker after command is run
 EXIFTOOL_STAYOPEN_EOF = "{ready}"
 EXIFTOOL_STAYOPEN_EOF_LEN = len(EXIFTOOL_STAYOPEN_EOF)

+# list of exiftool processes to cleanup when exiting or when terminate is called
+EXIFTOOL_PROCESSES = []
+
+
+@atexit.register
+def terminate_exiftool():
+    """Terminate any running ExifTool subprocesses; call this to cleanup when done using ExifTool """
+    for proc in EXIFTOOL_PROCESSES:
+        proc._stop_proc()
+

@lru_cache(maxsize=1)
 def get_exiftool_path():
@@ -66,7 +78,8 @@ class _ExifToolProc:
        if self._process_running:
            return self._process
        else:
-            raise ValueError("exiftool process is not running")
+            self._start_proc()
+            return self._process

    @property
    def pid(self):
@@ -104,30 +117,30 @@ class _ExifToolProc:
        )
        self._process_running = True

+        EXIFTOOL_PROCESSES.append(self)
+
    def _stop_proc(self):
        """ stop the exiftool process if it's running, otherwise, do nothing """

        if not self._process_running:
            return

-        self._process.stdin.write(b"-stay_open\n")
-        self._process.stdin.write(b"False\n")
-        self._process.stdin.flush()
+        try:
+            self._process.stdin.write(b"-stay_open\n")
+            self._process.stdin.write(b"False\n")
+            self._process.stdin.flush()
+        except Exception as e:
+            pass
+
        try:
            self._process.communicate(timeout=5)
        except subprocess.TimeoutExpired:
-            logging.warning(
-                f"exiftool pid {self._process.pid} did not exit, killing it"
-            )
            self._process.kill()
            self._process.communicate()

        del self._process
        self._process_running = False

-    def __del__(self):
-        self._stop_proc()
-

 class ExifTool:
    """ Basic exiftool interface for reading and writing EXIF tags """
@@ -153,9 +166,12 @@ class ExifTool:
        # if running as a context manager, self._context_mgr will be True
        self._context_mgr = False
        self._exiftoolproc = _ExifToolProc(exiftool=exiftool)
-        self._process = self._exiftoolproc.process
        self._read_exif()

+    @property
+    def _process(self):
+        return self._exiftoolproc.process
+
    def setvalue(self, tag, value):
        """Set tag to value(s); if value is None, will delete tag

@@ -185,7 +201,7 @@ class ExifTool:
            return True
        else:
            _, _, error = self.run_commands(*command)
-            return error is None
+            return error == ""

    def addvalues(self, tag, *values):
        """Add one or more value(s) to tag
@@ -227,7 +243,7 @@ class ExifTool:
            return True
        else:
            _, _, error = self.run_commands(*command)
-            return error is None
+            return error == ""

    def run_commands(self, *commands, no_file=False):
        """Run commands in the exiftool process and return result.
@@ -308,12 +324,13 @@ class ExifTool:
        ver, _, _ = self.run_commands("-ver", no_file=True)
        return ver.decode("utf-8")

-    def asdict(self, tag_groups=True):
+    def asdict(self, tag_groups=True, normalized=False):
        """return dictionary of all EXIF tags and values from exiftool
        returns empty dict if no tags

        Args:
            tag_groups: if True (default), dict keys have tag groups, e.g. "IPTC:Keywords"; if False, drops groups from keys, e.g. "Keywords"
+            normalized: if True, dict keys are all normalized to lower case (default is False)
        """
        json_str, _, _ = self.run_commands("-json")
        if not json_str:
@@ -334,6 +351,10 @@ class ExifTool:
                k = re.sub(r".*:", "", k)
                exif_new[k] = v
            exifdict = exif_new
+
+        if normalized:
+            exifdict = {k.lower(): v for (k, v) in exifdict.items()}
+
        return exifdict

    def json(self):
@@ -360,3 +381,74 @@ class ExifTool:
        elif self._commands:
            # run_commands sets self.warning and self.error as needed
            self.run_commands(*self._commands)
+
+
+class ExifToolCaching(ExifTool):
+    """ Basic exiftool interface for reading and writing EXIF tags, with caching. 
+        Use this only when you know the file's EXIF data will not be changed by any external process. 
+        
+        Creates a singleton cached ExifTool instance """
+
+    _singletons = {}
+
+    def __new__(cls, filepath, exiftool=None):
+        """ create new object or return instance of already created singleton """
+        if filepath not in cls._singletons:
+            cls._singletons[filepath] = _ExifToolCaching(filepath, exiftool=exiftool)
+        return cls._singletons[filepath]
+
+
+class _ExifToolCaching(ExifTool):
+    def __init__(self, filepath, exiftool=None):
+        """Create read-only ExifTool object that caches values
+
+        Args:
+            file: path to image file
+            exiftool: path to exiftool, if not specified will look in path
+
+        Returns:
+            ExifTool instance
+        """
+        self._json_cache = None
+        self._asdict_cache = {}
+        super().__init__(filepath, exiftool=exiftool, overwrite=False, flags=None)
+
+    def run_commands(self, *commands, no_file=False):
+        if commands[0] not in ["-json", "-ver"]:
+            raise NotImplementedError(f"{self.__class__} is read-only")
+        return super().run_commands(*commands, no_file=no_file)
+
+    def setvalue(self, tag, value):
+        raise NotImplementedError(f"{self.__class__} is read-only")
+
+    def addvalues(self, tag, *values):
+        raise NotImplementedError(f"{self.__class__} is read-only")
+
+    def json(self):
+        if not self._json_cache:
+            self._json_cache = super().json()
+        return self._json_cache
+
+    def asdict(self, tag_groups=True, normalized=False):
+        """return dictionary of all EXIF tags and values from exiftool
+        returns empty dict if no tags
+
+        Args:
+            tag_groups: if True (default), dict keys have tag groups, e.g. "IPTC:Keywords"; if False, drops groups from keys, e.g. "Keywords"
+            normalized: if True, dict keys are all normalized to lower case (default is False)
+        """
+        try:
+            return self._asdict_cache[tag_groups][normalized]
+        except KeyError:
+            if tag_groups not in self._asdict_cache:
+                self._asdict_cache[tag_groups] = {}
+            self._asdict_cache[tag_groups][normalized] = super().asdict(
+                tag_groups=tag_groups, normalized=normalized
+            )
+            return self._asdict_cache[tag_groups][normalized]
+
+    def flush_cache(self):
+        """ Clear cached data so that calls to json or asdict return fresh data """
+        self._json_cache = None
+        self._asdict_cache = {}
+
--- a/osxphotos/imageconverter.py
+++ b/osxphotos/imageconverter.py
@@ -121,6 +121,6 @@ class ImageConverter:
                return True
            else:
                raise ImageConversionError(
-                    "Error converting file {input_path} to jpeg at {output_path}: {error}"
+                    f"Error converting file {input_path} to jpeg at {output_path}: {error}"
                )

--- a/osxphotos/photoinfo/_photoinfo_exiftool.py
+++ b/osxphotos/photoinfo/_photoinfo_exiftool.py
@@ -3,13 +3,13 @@
 import logging
 import os

-from ..exiftool import ExifTool, get_exiftool_path
+from ..exiftool import ExifToolCaching, get_exiftool_path


@property
 def exiftool(self):
-    """ Returns an ExifTool object for the photo
-        requires that exiftool (https://exiftool.org/) be installed
+    """ Returns a ExifToolCaching (read-only instance of ExifTool) object for the photo.
+        Requires that exiftool (https://exiftool.org/) be installed
        If exiftool not installed, logs warning and returns None
        If photo path is missing, returns None
    """
@@ -20,7 +20,7 @@ def exiftool(self):
        try:
            exiftool_path = self._db._exiftool_path or get_exiftool_path()
            if self.path is not None and os.path.isfile(self.path):
-                exiftool = ExifTool(self.path, exiftool=exiftool_path)
+                exiftool = ExifToolCaching(self.path, exiftool=exiftool_path)
            else:
                exiftool = None
        except FileNotFoundError:
--- a/osxphotos/photoinfo/_photoinfo_export.py
+++ b/osxphotos/photoinfo/_photoinfo_export.py
@@ -89,6 +89,9 @@ class ExportResults:
        xattr_skipped=None,
        deleted_files=None,
        deleted_directories=None,
+        exported_album=None,
+        skipped_album=None,
+        missing_album=None,
    ):
        self.exported = exported or []
        self.new = new or []
@@ -111,6 +114,9 @@ class ExportResults:
        self.xattr_skipped = xattr_skipped or []
        self.deleted_files = deleted_files or []
        self.deleted_directories = deleted_directories or []
+        self.exported_album = exported_album or []
+        self.skipped_album = skipped_album or []
+        self.missing_album = missing_album or []

    def all_files(self):
        """ return all filenames contained in results """
@@ -157,6 +163,10 @@ class ExportResults:
        self.exiftool_error += other.exiftool_error
        self.deleted_files += other.deleted_files
        self.deleted_directories += other.deleted_directories
+        self.exported_album += other.exported_album
+        self.skipped_album += other.skipped_album
+        self.missing_album += other.missing_album
+
        return self

    def __str__(self):
@@ -181,6 +191,9 @@ class ExportResults:
            + f",exiftool_error={self.exiftool_error}"
            + f",deleted_files={self.deleted_files}"
            + f",deleted_directories={self.deleted_directories}"
+            + f",exported_album={self.exported_album}"
+            + f",skipped_album={self.skipped_album}"
+            + f",missing_album={self.missing_album}"
            + ")"
        )

@@ -621,7 +634,11 @@ def export2(
                )
            edited_name = pathlib.Path(self.path_edited).name
            edited_suffix = pathlib.Path(edited_name).suffix
-            fname = pathlib.Path(self.original_filename).stem + edited_identifier + edited_suffix
+            fname = (
+                pathlib.Path(self.original_filename).stem
+                + edited_identifier
+                + edited_suffix
+            )
        else:
            fname = self.original_filename

@@ -1654,7 +1671,7 @@ 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:
--- a/osxphotos/photoinfo/photoinfo.py
+++ b/osxphotos/photoinfo/photoinfo.py
@@ -488,7 +488,7 @@ class PhotoInfo:
        try:
            return self._burst_album_info
        except AttributeError:
-            burst_album_info = list(self.album_info) 
+            burst_album_info = list(self.album_info)
            for photo in self.burst_photos:
                if photo.burst_key:
                    burst_album_info.extend(photo.album_info)
@@ -604,6 +604,23 @@ class PhotoInfo:
        else:
            return None

+    @property
+    def date_added(self):
+        """ Date photo was added to the database """
+        try:
+            return self._date_added
+        except AttributeError:
+            added_date = self._info["added_date"]
+            if added_date:
+                seconds = self._info["imageTimeZoneOffsetSeconds"] or 0
+                delta = timedelta(seconds=seconds)
+                tz = timezone(delta)
+                self._date_added = added_date.astimezone(tz=tz)
+            else:
+                self._date_added = None
+
+            return self._date_added
+
    @property
    def location(self):
        """ returns (latitude, longitude) as float in degrees or None """
@@ -801,6 +818,60 @@ class PhotoInfo:

        return photopath

+    @property
+    def path_derivatives(self):
+        """ Return any derivative (preview) images associated with the photo as a list of paths, sorted by file size (largest first) """
+        if self._db._db_version <= _PHOTOS_4_VERSION:
+            return self._path_derivatives_4()
+
+        directory = self._uuid[0]  # first char of uuid
+        derivative_path = (
+            pathlib.Path(self._db._library_path)
+            / "resources"
+            / "derivatives"
+            / directory
+        )
+        files = derivative_path.glob(f"{self.uuid}*.*")
+        files = sorted(files, reverse=True, key=lambda f: f.stat().st_size)
+        # return list of filename but skip .THM files (these are actually low-res thumbnails in JPEG format but with .THM extension)
+        return [str(filename) for filename in files if filename.suffix != ".THM"]
+
+    def _path_derivatives_4(self):
+        """ Return paths to all derivative (preview) files for Photos <= 4"""
+        modelid = self._info["modelID"]
+        if modelid is None:
+            return []
+        folder_id, file_id = _get_resource_loc(modelid)
+        derivatives_root = (
+            pathlib.Path(self._db._library_path)
+            / "resources"
+            / "proxies"
+            / "derivatives"
+            / folder_id
+        )
+
+        # photos appears to usually be in "00" subfolder but
+        # could be elsewhere--I haven't figured out this logic yet
+        # first see if it's in 00
+
+        derivatives_path = derivatives_root / "00" / file_id
+        if derivatives_path.is_dir():
+            files = derivatives_path.glob("*")
+            files = sorted(files, reverse=True, key=lambda f: f.stat().st_size)
+            return [str(filename) for filename in files]
+
+        # didn't find derivatives path
+        for subdir in derivatives_root.glob("*"):
+            if subdir.is_dir():
+                derivatives_path = derivatives_root / subdir / file_id
+                if derivatives_path.is_dir():
+                    files = derivatives_path.glob("*")
+                    files = sorted(files, reverse=True, key=lambda f: f.stat().st_size)
+                    return [str(filename) for filename in files]
+
+        # didn't find a derivatives path
+        return []
+
    @property
    def panorama(self):
        """ Returns True if photo is a panorama, otherwise False """
@@ -937,6 +1008,7 @@ class PhotoInfo:
        filename=False,
        dirname=False,
        strip=False,
+        edited=False,
    ):
        """Renders a template string for PhotoInfo instance using PhotoTemplate

@@ -952,6 +1024,7 @@ class PhotoInfo:
            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
            strip: if True, strips leading/trailing white space from resulting template
+            edited: if True, sets {edited_version} field to True, otherwise it gets set to False; set if you want template evaluated for edited version

        Returns:
            ([rendered_strings], [unmatched]): tuple of list of rendered strings and list of unmatched template values
@@ -966,6 +1039,7 @@ class PhotoInfo:
            filename=filename,
            dirname=dirname,
            strip=strip,
+            edited_version=edited,
        )

    @property
--- a/osxphotos/photosalbum.py
+++ b/osxphotos/photosalbum.py
@@ -0,0 +1,36 @@
+""" PhotosAlbum class to create an album in default Photos library and add photos to it """
+
+from typing import Optional, List
+import photoscript
+from .photoinfo import PhotoInfo
+from .utils import noop
+
+
+class PhotosAlbum:
+    def __init__(self, name: str, verbose: Optional[callable] = None):
+        self.name = name
+        self.verbose = verbose or noop
+        self.library = photoscript.PhotosLibrary()
+
+        album = self.library.album(name)
+        if album is None:
+            self.verbose(f"Creating Photos album '{self.name}'")
+            album = self.library.create_album(name)
+        self.album = album
+
+    def add(self, photo: PhotoInfo):
+        photo_ = photoscript.Photo(photo.uuid)
+        self.album.add([photo_])
+        self.verbose(
+            f"Added {photo.original_filename} ({photo.uuid}) to album {self.name}"
+        )
+
+    def add_list(self, photo_list: List[PhotoInfo]):
+        photos = [photoscript.Photo(p.uuid) for p in photo_list]
+        self.album.add(photos)
+        photo_len = len(photos)
+        photo_word = "photos" if photo_len > 1 else "photo"
+        self.verbose(f"Added {photo_len} {photo_word} to album {self.name}")
+
+    def photos(self):
+        return self.album.photos()
--- a/osxphotos/photosdb/photosdb.py
+++ b/osxphotos/photosdb/photosdb.py
@@ -900,7 +900,8 @@ class PhotosDB:
                    RKVersion.subType,
                    RKVersion.inTrashDate,
                    RKVersion.showInLibrary,
-                    RKMaster.fileIsReference
+                    RKMaster.fileIsReference,
+                    RKMaster.importGroupUuid
                    FROM RKVersion, RKMaster
                    WHERE RKVersion.masterUuid = RKMaster.uuid"""
            )
@@ -931,7 +932,8 @@ class PhotosDB:
                    RKVersion.subType,
                    RKVersion.inTrashDate,
                    RKVersion.showInLibrary,
-                    RKMaster.fileIsReference
+                    RKMaster.fileIsReference,
+                    RKMaster.importGroupUuid
                    FROM RKVersion, RKMaster
                    WHERE RKVersion.masterUuid = RKMaster.uuid"""
            )
@@ -981,6 +983,7 @@ class PhotosDB:
        # 41    RKVersion.inTrashDate
        # 42    RKVersion.showInLibrary -- is item visible in library (e.g. non-selected burst images are not visible)
        # 43    RKMaster.fileIsReference -- file is reference (imported without copying to Photos library)
+        # 44    RKMaster.importGroupUuid -- to get date added from RKImportGroup

        for row in c:
            uuid = row[0]
@@ -1174,7 +1177,7 @@ class PhotosDB:

            # import session not yet handled for Photos 4
            self._dbphotos[uuid]["import_session"] = None
-            self._dbphotos[uuid]["import_uuid"] = None
+            self._dbphotos[uuid]["import_uuid"] = row[44]
            self._dbphotos[uuid]["fok_import_session"] = None

        # get additional details from RKMaster, needed for RAW processing
@@ -1364,11 +1367,17 @@ class PhotosDB:

        # get the place data
        place_data = c.execute(
-            "SELECT modelID, defaultName, type, area " "FROM RKPlace "
+            "SELECT modelID, defaultName, type, area FROM RKPlace"
        ).fetchall()
        places = {p[0]: p for p in place_data}
        self._db_places = places

+        # get import data
+        import_data = c.execute(
+            "SELECT modelID, uuid, name, importDate from RKImportGroup"
+        ).fetchall()
+        self._db_import_group = {i[1]: i for i in import_data}
+
        for uuid in self._dbphotos:
            # get placeId which is then used to lookup defaultName
            place_ids_query = c.execute(
@@ -1402,6 +1411,17 @@ class PhotosDB:
            self._dbphotos[uuid]["placeNames"] = place_names
            self._dbphotos[uuid]["reverse_geolocation"] = None  # Photos 5

+            # add date added
+            try:
+                import_session = self._db_import_group[
+                    self._dbphotos[uuid]["import_uuid"]
+                ]
+                self._dbphotos[uuid]["added_date"] = datetime.fromtimestamp(
+                    import_session[3] + TIME_DELTA
+                )
+            except (ValueError, TypeError, KeyError):
+                self._dbphotos[uuid]["added_date"] = datetime(1970, 1, 1)
+
        # build album_titles dictionary
        for album_id in self._dbalbum_details:
            title = self._dbalbum_details[album_id]["title"]
@@ -1595,7 +1615,11 @@ class PhotosDB:

        for person in c:
            pk = person[0]
-            fullname = person[2] if person[2] != "" else _UNKNOWN_PERSON
+            fullname = (
+                person[2]
+                if (person[2] != "" and person[2] is not None)
+                else _UNKNOWN_PERSON
+            )
            self._dbpersons_pk[pk] = {
                "pk": pk,
                "uuid": person[1],
@@ -1867,7 +1891,8 @@ class PhotosDB:
                {asset_table}.ZADJUSTMENTTIMESTAMP,
                {asset_table}.ZVISIBILITYSTATE,
                {asset_table}.ZTRASHEDDATE,
-                {asset_table}.ZSAVEDASSETTYPE
+                {asset_table}.ZSAVEDASSETTYPE,
+                {asset_table}.ZADDEDDATE
                FROM {asset_table} 
                JOIN ZADDITIONALASSETATTRIBUTES ON ZADDITIONALASSETATTRIBUTES.ZASSET = {asset_table}.Z_PK 
                ORDER BY {asset_table}.ZUUID  """
@@ -1915,6 +1940,7 @@ class PhotosDB:
        # 38   ZGENERICASSET.ZVISIBILITYSTATE -- 0 if visible, 2 if not (e.g. a burst image)
        # 39   ZGENERICASSET.ZTRASHEDDATE -- date item placed in the trash or null if not in trash
        # 40   ZGENERICASSET.ZSAVEDASSETTYPE -- how item imported
+        # 41   ZGENERICASSET.ZADDEDDATE -- date item added to the library

        for row in c:
            uuid = row[0]
@@ -2094,6 +2120,11 @@ class PhotosDB:
            info["saved_asset_type"] = row[40]
            info["isreference"] = row[40] == 10

+            try:
+                info["added_date"] = datetime.fromtimestamp(row[41] + TIME_DELTA)
+            except (ValueError, TypeError):
+                info["added_date"] = datetime(1970, 1, 1)
+
            # initialize import session info which will be filled in later
            # not every photo has an import session so initialize all records now
            info["import_session"] = None
--- a/osxphotos/phototemplate.py
+++ b/osxphotos/phototemplate.py
@@ -4,12 +4,14 @@ import datetime
 import locale
 import os
 import pathlib
+import sys

 from textx import TextXSyntaxError, metamodel_from_file

 from ._constants import _UNKNOWN_PERSON
+from ._version import __version__
 from .datetime_formatter import DateTimeFormatter
-from .exiftool import ExifTool
+from .exiftool import ExifToolCaching
 from .path_utils import sanitize_dirname, sanitize_filename, sanitize_pathpart
 from .utils import load_function

@@ -48,7 +50,8 @@ TEMPLATE_SUBSTITUTIONS = {
    ),
    "{photo_or_video}": "'photo' or 'video' depending on what type the image is. To customize, use default value as in '{photo_or_video,photo=fotos;video=videos}'",
    "{hdr}": "Photo is HDR?; True/False value, use in format '{hdr?VALUE_IF_TRUE,VALUE_IF_FALSE}'",
-    "{edited}": "Photo has been edited (has adjustments)?; True/False value, use in format '{edited?VALUE_IF_TRUE,VALUE_IF_FALSE}'",
+    "{edited}": "True if photo has been edited (has adjustments), otherwise False; use in format '{edited?VALUE_IF_TRUE,VALUE_IF_FALSE}'",
+    "{edited_version}": "True if template is being rendered for the edited version of a photo, otherwise False. ",
    "{favorite}": "Photo has been marked as favorite?; True/False value, use in format '{favorite?VALUE_IF_TRUE,VALUE_IF_FALSE}'",
    "{created.date}": "Photo's creation date in ISO format, e.g. '2020-03-22'",
    "{created.year}": "4-digit year of photo creation time",
@@ -133,6 +136,8 @@ TEMPLATE_SUBSTITUTIONS = {
    "{lf}": r"A line feed: '\n', alias for {newline}",
    "{cr}": r"A carriage return: '\r'",
    "{crlf}": r"a carriage return + line feed: '\r\n'",
+    "{osxphotos_version}": f"The osxphotos version, e.g. '{__version__}'",
+    "{osxphotos_cmd_line}": "The full command line used to run osxphotos"
 }

 # Permitted multi-value substitutions (each of these returns None or 1 or more values)
@@ -257,6 +262,9 @@ class PhotoTemplate:
        # get parser singleton
        self.parser = PhotoTemplateParser()

+        # should {edited_version} render True?
+        self.edited_version = False
+
    def render(
        self,
        template,
@@ -267,6 +275,7 @@ class PhotoTemplate:
        filename=False,
        dirname=False,
        strip=False,
+        edited_version=False,
    ):
        """ Render a filename or directory template 

@@ -281,6 +290,7 @@ class PhotoTemplate:
            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 
            strip: if True, strips leading/trailing whitespace from rendered templates
+            edited_version: set to True if you want {edited_version} to resolve to True (e.g. exporting edited version of photo)

        Returns:
            ([rendered_strings], [unmatched]): tuple of list of rendered strings and list of unmatched template values
@@ -304,6 +314,8 @@ class PhotoTemplate:
            # empty string
            return [], []

+        self.edited_version = edited_version
+
        return self._render_statement(
            model,
            none_str=none_str,
@@ -669,6 +681,8 @@ class PhotoTemplate:
            value = "hdr" if self.photo.hdr else None
        elif field == "edited":
            value = "edited" if self.photo.hasadjustments else None
+        elif field == "edited_version":
+            value = "edited_version" if self.edited_version else None
        elif field == "favorite":
            value = "favorite" if self.photo.favorite else None
        elif field == "created.date":
@@ -898,6 +912,10 @@ class PhotoTemplate:
            value = self.photo.uuid
        elif field in PUNCTUATION:
            value = PUNCTUATION[field]
+        elif field == "osxphotos_version":
+            value = __version__
+        elif field == "osxphotos_cmd_line":
+            value = " ".join(sys.argv)
        else:
            # if here, didn't get a match
            raise ValueError(f"Unhandled template value: {field}")
@@ -1071,9 +1089,8 @@ class PhotoTemplate:
        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()}
+        exif = ExifToolCaching(self.photo.path, exiftool=self.exiftool_path)
+        exifdict = exif.asdict(normalized=True)
        subfield = subfield.lower()
        if subfield in exifdict:
            values = exifdict[subfield]
--- a/requirements.txt
+++ b/requirements.txt
@@ -48,7 +48,7 @@ parso==0.6.2
 pathspec==0.7.0
 pathvalidate==2.2.1
 pexpect==4.8.0
-photoscript==0.1.0
+photoscript==0.1.2
 pickleshare==0.7.5
 Pillow==8.1.1
 pkginfo==1.5.0.1
--- a/setup.py
+++ b/setup.py
@@ -81,7 +81,7 @@ setup(
        "pathvalidate==2.2.1",
        "dataclasses==0.7;python_version<'3.7'",
        "wurlitzer>=2.0.1",
-        "photoscript>=0.1.0",
+        "photoscript>=0.1.2",
        "toml>=0.10.0",
        "osxmetadata>=0.99.13",
        "textx==2.3.0",
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,9 +1,120 @@
 """ pytest test configuration """
-import pytest
+import os
+import pathlib

+import pytest
+from photoscript.utils import ditto
+
+import osxphotos
+from applescript import AppleScript
 from osxphotos.exiftool import _ExifToolProc

+
+def get_os_version():
+    import platform
+
+    # returns tuple containing OS version
+    # e.g. 10.13.6 = (10, 13, 6)
+    version = platform.mac_ver()[0].split(".")
+    if len(version) == 2:
+        (ver, major) = version
+        minor = "0"
+    elif len(version) == 3:
+        (ver, major, minor) = version
+    else:
+        raise (
+            ValueError(
+                f"Could not parse version string: {platform.mac_ver()} {version}"
+            )
+        )
+    return (ver, major, minor)
+
+
+OS_VER = get_os_version()[1]
+if OS_VER == "15":
+    TEST_LIBRARY = "tests/Test-10.15.7.photoslibrary"
+else:
+    TEST_LIBRARY = None
+    # pytest.exit("This test suite currently only runs on MacOS Catalina ")
+
+
@pytest.fixture(autouse=True)
 def reset_singletons():
    """ Need to clean up any ExifTool singletons between tests """
-    _ExifToolProc.instance = None
+    _ExifToolProc.instance = None
+
+
+def pytest_addoption(parser):
+    parser.addoption(
+        "--addalbum",
+        action="store_true",
+        default=False,
+        help="run --add-exported-to-album tests",
+    )
+
+
+def pytest_configure(config):
+    config.addinivalue_line(
+        "markers", "addalbum: mark test as requiring --addalbum to run"
+    )
+
+
+def pytest_collection_modifyitems(config, items):
+    if config.getoption("--addalbum") and TEST_LIBRARY is not None:
+        # --addalbum given in cli: do not skip addalbum tests (these require interactive test)
+        return
+
+    skip_addalbum = pytest.mark.skip(
+        reason="need --addalbum option and MacOS Catalina to run"
+    )
+    for item in items:
+        if "addalbum" in item.keywords:
+            item.add_marker(skip_addalbum)
+
+
+def copy_photos_library(photos_library=TEST_LIBRARY, delay=0):
+    """ copy the test library and open Photos, returns path to copied library """
+    script = AppleScript(
+        """
+        tell application "Photos"
+            quit
+        end tell
+        """
+    )
+    script.run()
+    src = pathlib.Path(os.getcwd()) / photos_library
+    picture_folder = (
+        pathlib.Path(os.environ["PHOTOSCRIPT_PICTURES_FOLDER"])
+        if "PHOTOSCRIPT_PICTURES_FOLDER" in os.environ
+        else pathlib.Path("~/Pictures")
+    )
+    picture_folder = picture_folder.expanduser()
+    if not picture_folder.is_dir():
+        pytest.exit(f"Invalid picture folder: '{picture_folder}'")
+    dest = picture_folder / photos_library
+    ditto(src, dest)
+    script = AppleScript(
+        f"""
+            set tries to 0
+            repeat while tries < 5
+                try
+                    tell application "Photos"
+                        activate
+                        delay 3 
+                        open POSIX file "{dest}"
+                        delay {delay}
+                    end tell
+                    set tries to 5
+                on error
+                    set tries to tries + 1
+                end try
+            end repeat
+        """
+    )
+    script.run()
+    return dest
+
+
+@pytest.fixture
+def addalbum_library():
+    copy_photos_library(delay=10)
--- a/tests/search_info_test_data_10_15_7.json
+++ b/tests/search_info_test_data_10_15_7.json
--- a/tests/test_10_12_6.py
+++ b/tests/test_10_12_6.py
@@ -30,6 +30,8 @@ KEYWORDS_DICT = {
 PERSONS_DICT = {"Katie": 3, "Suzy": 2, "Maria": 1, _UNKNOWN_PERSON: 1}
 ALBUM_DICT = {"Pumpkin Farm": 3, "AlbumInFolder": 1}

+UUID_DICT = {"derivatives": "FPm+ICxpQV+LPBKR22UepA"}
+

 def test_init():
    import osxphotos
@@ -162,3 +164,19 @@ def test_keyword_not_in_album():
    photos3 = [p for p in photos2 if p not in photos1]
    assert len(photos3) == 1
    assert photos3[0].uuid == "Pj99JmYjQkeezdY2OFuSaw"
+
+
+def test_path_derivatives():
+    # test path_derivatives
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+
+    photos = photosdb.photos(uuid=[UUID_DICT["derivatives"]])
+    p = photos[0]
+    derivs = [
+        "/resources/proxies/derivatives/00/00/9/UNADJUSTEDRAW_thumb_9.jpg",
+        "/resources/proxies/derivatives/00/00/9/UNADJUSTEDRAW_mini_9.jpg",
+    ]
+    for i, p in enumerate(p.path_derivatives):
+        assert p.endswith(derivs[i])
--- a/tests/test_bigsur_10_16_0_1.py
+++ b/tests/test_bigsur_10_16_0_1.py
@@ -316,6 +316,16 @@ def test_attributes(photosdb):
    assert p.date == datetime.datetime(
        2018, 9, 28, 16, 7, 7, 0, datetime.timezone(datetime.timedelta(seconds=-14400))
    )
+    assert p.date_added == datetime.datetime(
+        2019,
+        7,
+        27,
+        9,
+        16,
+        49,
+        778432,
+        tzinfo=datetime.timezone(datetime.timedelta(days=-1, seconds=72000)),
+    )
    assert p.description == "Girl holding pumpkin"
    assert p.title == "I found one!"
    assert sorted(p.albums) == ["Pumpkin Farm", "Test Album"]
@@ -486,6 +496,21 @@ def test_path_edited2(photosdb):
    assert path is None


+def test_path_derivatives(photosdb):
+    # test an path_derivatives
+
+    photos = photosdb.photos(uuid=[UUID_DICT["no_adjustments"]])
+    assert len(photos) == 1
+    p = photos[0]
+    path = p.path_derivatives
+    derivs = [
+        "D05A5FE3-15FB-49A1-A15D-AB3DA6F8B068_1_100_o.jpeg",
+        "D05A5FE3-15FB-49A1-A15D-AB3DA6F8B068_1_105_c.jpeg",
+    ]
+    for i, p in enumerate(path):
+        assert p.endswith(derivs[i])
+
+
 def test_count(photosdb):
    photos = photosdb.photos()
    assert len(photos) == PHOTOS_NOT_IN_TRASH_LEN
@@ -848,7 +873,9 @@ def test_export_12(photosdb):

    edited_name = pathlib.Path(photos[0].path_edited).name
    edited_suffix = pathlib.Path(edited_name).suffix
-    filename = pathlib.Path(photos[0].original_filename).stem + "_edited" + edited_suffix
+    filename = (
+        pathlib.Path(photos[0].original_filename).stem + "_edited" + edited_suffix
+    )
    expected_dest = os.path.join(dest, filename)

    got_dest = photos[0].export(dest, edited=True)[0]
@@ -1098,4 +1125,4 @@ def test_no_adjustments(photosdb):
    """ test adjustments when photo has no adjusments"""

    photo = photosdb.get_photo(UUID_DICT["no_adjustments"])
-    assert photo.adjustments is None
+    assert photo.adjustments is None
--- a/tests/test_catalina_10_15_7.py
+++ b/tests/test_catalina_10_15_7.py
@@ -359,6 +359,16 @@ def test_attributes(photosdb):
    assert p.date == datetime.datetime(
        2018, 9, 28, 16, 7, 7, 0, datetime.timezone(datetime.timedelta(seconds=-14400))
    )
+    assert p.date_added == datetime.datetime(
+        2019,
+        7,
+        27,
+        9,
+        16,
+        49,
+        778432,
+        tzinfo=datetime.timezone(datetime.timedelta(days=-1, seconds=72000)),
+    )
    assert p.description == "Girl holding pumpkin"
    assert p.title == "I found one!"
    assert sorted(p.albums) == ["Pumpkin Farm", "Test Album"]
@@ -546,6 +556,21 @@ def test_path_edited2(photosdb):
    assert path is None


+def test_path_derivatives(photosdb):
+    # test an path_derivatives
+
+    photos = photosdb.photos(uuid=[UUID_DICT["no_adjustments"]])
+    assert len(photos) == 1
+    p = photos[0]
+    path = p.path_derivatives
+    derivs = [
+        "D05A5FE3-15FB-49A1-A15D-AB3DA6F8B068_1_100_o.jpeg",
+        "D05A5FE3-15FB-49A1-A15D-AB3DA6F8B068_1_105_c.jpeg",
+    ]
+    for i, p in enumerate(path):
+        assert p.endswith(derivs[i])
+
+
 def test_ismovie(photosdb):
    # test ismovie == True

--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -34,9 +34,9 @@ UUID_BURST_ALBUM = {
        "TestBurst2/IMG_9814.JPG",
    ],
    "38F8F30C-FF6D-49DA-8092-18497F1D6628": [
-        "TestBurst/IMG_9812.JPG", 
+        "TestBurst/IMG_9812.JPG",
        "TestBurst/IMG_9813.JPG",
-        "TestBurst/IMG_9814.JPG", # in my personal library, "38F8F30C-FF6D-49DA-8092-18497F1D6628" 
+        "TestBurst/IMG_9814.JPG",  # in my personal library, "38F8F30C-FF6D-49DA-8092-18497F1D6628"
        "TestBurst/IMG_9815.JPG",
        "TestBurst/IMG_9816.JPG",
        "TestBurst2/IMG_9814.JPG",
@@ -1229,16 +1229,12 @@ def test_export_exiftool_path():
    import shutil
    import tempfile
    from osxphotos.cli import export
-    from osxphotos.exiftool import ExifTool, get_exiftool_path
+    from osxphotos.exiftool import ExifTool

    runner = CliRunner()
    cwd = os.getcwd()
    # pylint: disable=not-context-manager
    with runner.isolated_filesystem():
-        tempdir = tempfile.TemporaryDirectory()
-        exiftool_source = get_exiftool_path()
-        exiftool_path = os.path.join(tempdir.name, "myexiftool")
-        shutil.copy2(exiftool_source, exiftool_path)
        for uuid in CLI_EXIFTOOL:
            result = runner.invoke(
                export,
@@ -1250,11 +1246,11 @@ def test_export_exiftool_path():
                    "--uuid",
                    f"{uuid}",
                    "--exiftool-path",
-                    exiftool_path,
+                    exiftool,
                ],
            )
            assert result.exit_code == 0
-            assert f"exiftool path: {exiftool_path}" in result.output
+            assert f"exiftool path: {exiftool}" in result.output
            files = glob.glob("*")
            assert sorted(files) == sorted([CLI_EXIFTOOL[uuid]["File:FileName"]])

@@ -1290,9 +1286,6 @@ def test_export_exiftool_path_render_template():
    cwd = os.getcwd()
    # pylint: disable=not-context-manager
    with runner.isolated_filesystem():
-        tempdir = tempfile.TemporaryDirectory()
-        exiftool_path = os.path.join(tempdir.name, "myexiftool")
-        shutil.copy2(exiftool_source, exiftool_path)
        for uuid in CLI_EXIFTOOL:
            result = runner.invoke(
                export,
@@ -1305,7 +1298,7 @@ def test_export_exiftool_path_render_template():
                    "--uuid",
                    f"{uuid}",
                    "--exiftool-path",
-                    exiftool_path,
+                    exiftool,
                ],
            )
            assert result.exit_code == 0
--- a/tests/test_cli_add_to_album.py
+++ b/tests/test_cli_add_to_album.py
@@ -0,0 +1,115 @@
+""" Test --add-exported-to-album """
+
+import pytest
+import os
+from click.testing import CliRunner
+import photoscript
+
+UUID_EXPORT = {"3DD2C897-F19E-4CA6-8C22-B027D5A71907": {"filename": "IMG_4547.jpg"}}
+UUID_MISSING = {
+    "8E1D7BC9-9321-44F9-8CFB-4083F6B9232A": {"filename": "IMG_2000.JPGssss"}
+}
+
+
+@pytest.mark.addalbum
+def test_export_add_to_album(addalbum_library):
+    from osxphotos.cli import export
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    with runner.isolated_filesystem():
+        EXPORT_ALBUM = "OSXPhotos Export"
+        SKIP_ALBUM = "OSXPhotos Skipped"
+        MISSING_ALBUM = "OSXPhotos Missing"
+
+        uuid_opt = [f"--uuid={uuid}" for uuid in UUID_EXPORT]
+        uuid_opt += [f"--uuid={uuid}" for uuid in UUID_MISSING]
+
+        result = runner.invoke(
+            export,
+            [
+                ".",
+                "-V",
+                "--add-exported-to-album",
+                EXPORT_ALBUM,
+                "--add-skipped-to-album",
+                SKIP_ALBUM,
+                *uuid_opt,
+            ],
+        )
+        assert result.exit_code == 0
+        assert f"Creating Photos album '{EXPORT_ALBUM}'" in result.output
+        assert f"Creating Photos album '{SKIP_ALBUM}'" in result.output
+
+        photoslib = photoscript.PhotosLibrary()
+        album = photoslib.album(EXPORT_ALBUM)
+        assert album is not None
+
+        assert len(album) == len(UUID_EXPORT)
+        got_uuids = [p.uuid for p in album.photos()]
+        assert sorted(got_uuids) == sorted(list(UUID_EXPORT.keys()))
+
+        skip_album = photoslib.album(SKIP_ALBUM)
+        assert skip_album is not None
+        assert len(skip_album) == 0
+
+        result = runner.invoke(
+            export,
+            [
+                ".",
+                "-V",
+                "--add-exported-to-album",
+                EXPORT_ALBUM,
+                "--add-skipped-to-album",
+                SKIP_ALBUM,
+                "--add-missing-to-album",
+                MISSING_ALBUM,
+                "--update",
+                *uuid_opt,
+            ],
+        )
+        assert result.exit_code == 0
+        assert f"Creating Photos album '{EXPORT_ALBUM}'" not in result.output
+        assert f"Creating Photos album '{SKIP_ALBUM}'" not in result.output
+        assert f"Creating Photos album '{MISSING_ALBUM}'" in result.output
+
+        photoslib = photoscript.PhotosLibrary()
+        export_album = photoslib.album(EXPORT_ALBUM)
+        assert export_album is not None
+        assert len(export_album) == len(UUID_EXPORT)
+
+        skip_album = photoslib.album(SKIP_ALBUM)
+        assert skip_album is not None
+        assert len(skip_album) == len(UUID_EXPORT)
+        got_uuids = [p.uuid for p in skip_album.photos()]
+        assert sorted(got_uuids) == sorted(list(UUID_EXPORT.keys()))
+
+        missing_album = photoslib.album(MISSING_ALBUM)
+        assert missing_album is not None
+        assert len(missing_album) == len(UUID_MISSING)
+        got_uuids = [p.uuid for p in missing_album.photos()]
+        assert sorted(got_uuids) == sorted(list(UUID_MISSING.keys()))
+
+
+@pytest.mark.addalbum
+def test_query_add_to_album(addalbum_library):
+    from osxphotos.cli import query
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    with runner.isolated_filesystem():
+        QUERY_ALBUM = "OSXPhotos Query"
+
+        uuid_opt = [f"--uuid={uuid}" for uuid in UUID_EXPORT]
+
+        result = runner.invoke(query, ["--add-to-album", QUERY_ALBUM, *uuid_opt])
+        assert result.exit_code == 0
+
+        photoslib = photoscript.PhotosLibrary()
+        album = photoslib.album(QUERY_ALBUM)
+        assert album is not None
+
+        assert len(album) == len(UUID_EXPORT)
+        got_uuids = [p.uuid for p in album.photos()]
+        assert sorted(got_uuids) == sorted(list(UUID_EXPORT.keys()))
+
--- a/tests/test_exiftool.py
+++ b/tests/test_exiftool.py
@@ -349,6 +349,15 @@ def test_as_dict():
    assert exifdata["XMP:TagsList"] == "wedding"


+def test_as_dict_normalized():
+    import osxphotos.exiftool
+
+    exif1 = osxphotos.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
+    exifdata = exif1.asdict(normalized=True)
+    assert exifdata["xmp:tagslist"] == "wedding"
+    assert "XMP:TagsList" not in exifdata
+
+
 def test_as_dict_no_tag_groups():
    import osxphotos.exiftool

@@ -408,3 +417,25 @@ def test_photoinfo_exiftool_none():
        photo = photosdb.photos(uuid=[uuid])[0]
        exiftool = photo.exiftool
        assert exiftool is None
+
+
+def test_exiftool_terminate():
+    """ Test that exiftool process is terminated when exiftool.terminate() is called """
+    import osxphotos.exiftool
+    import subprocess
+
+    exif1 = osxphotos.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
+
+    ps = subprocess.run(["ps"], capture_output=True)
+    stdout = ps.stdout.decode("utf-8")
+    assert "exiftool -stay_open" in stdout
+
+    osxphotos.exiftool.terminate_exiftool()
+
+    ps = subprocess.run(["ps"], capture_output=True)
+    stdout = ps.stdout.decode("utf-8")
+    assert "exiftool -stay_open" not in stdout
+ 
+    # verify we can create a new instance after termination
+    exif2 = osxphotos.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
+    assert exif2.asdict()["IPTC:Keywords"] == "wedding"
--- a/tests/test_exiftool_caching.py
+++ b/tests/test_exiftool_caching.py
@@ -0,0 +1,328 @@
+import pytest
+from osxphotos.exiftool import get_exiftool_path
+
+TEST_FILE_ONE_KEYWORD = "tests/test-images/wedding.jpg"
+TEST_FILE_BAD_IMAGE = "tests/test-images/badimage.jpeg"
+TEST_FILE_WARNING = "tests/test-images/exiftool_warning.heic"
+TEST_FILE_MULTI_KEYWORD = "tests/test-images/Tulips.jpg"
+TEST_MULTI_KEYWORDS = [
+    "Top Shot",
+    "flowers",
+    "flower",
+    "design",
+    "Stock Photography",
+    "vibrant",
+    "plastic",
+    "Digital Nomad",
+    "close up",
+    "stock photo",
+    "outdoor",
+    "wedding",
+    "Reiseblogger",
+    "fake",
+    "colorful",
+    "Indoor",
+    "display",
+    "photography",
+]
+
+PHOTOS_DB = "tests/Test-10.15.4.photoslibrary"
+EXIF_UUID = {
+    "6191423D-8DB8-4D4C-92BE-9BBBA308AAC4": {
+        "EXIF:DateTimeOriginal": "2019:07:04 16:24:01",
+        "EXIF:LensModel": "XF18-55mmF2.8-4 R LM OIS",
+        "IPTC:Keywords": [
+            "Digital Nomad",
+            "Indoor",
+            "Reiseblogger",
+            "Stock Photography",
+            "Top Shot",
+            "close up",
+            "colorful",
+            "design",
+            "display",
+            "fake",
+            "flower",
+            "outdoor",
+            "photography",
+            "plastic",
+            "stock photo",
+            "vibrant",
+        ],
+        "IPTC:DocumentNotes": "https://flickr.com/e/l7FkSm4f2lQkSV3CG6xlv8Sde5uF3gVu4Hf0Qk11AnU%3D",
+    },
+    "E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51": {
+        "EXIF:Make": "NIKON CORPORATION",
+        "EXIF:Model": "NIKON D810",
+        "IPTC:DateCreated": "2019:04:15",
+    },
+}
+EXIF_UUID_NO_GROUPS = {
+    "6191423D-8DB8-4D4C-92BE-9BBBA308AAC4": {
+        "DateTimeOriginal": "2019:07:04 16:24:01",
+        "LensModel": "XF18-55mmF2.8-4 R LM OIS",
+        "Keywords": [
+            "Digital Nomad",
+            "Indoor",
+            "Reiseblogger",
+            "Stock Photography",
+            "Top Shot",
+            "close up",
+            "colorful",
+            "design",
+            "display",
+            "fake",
+            "flower",
+            "outdoor",
+            "photography",
+            "plastic",
+            "stock photo",
+            "vibrant",
+        ],
+        "DocumentNotes": "https://flickr.com/e/l7FkSm4f2lQkSV3CG6xlv8Sde5uF3gVu4Hf0Qk11AnU%3D",
+    },
+    "E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51": {
+        "Make": "NIKON CORPORATION",
+        "Model": "NIKON D810",
+        "DateCreated": "2019:04:15",
+    },
+}
+EXIF_UUID_NONE = ["A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C"]
+
+try:
+    exiftool = get_exiftool_path()
+except:
+    exiftool = None
+
+if exiftool is None:
+    pytest.skip("could not find exiftool in path", allow_module_level=True)
+
+
+def test_version():
+    import osxphotos.exiftool
+
+    exif = osxphotos.exiftool.ExifToolCaching(TEST_FILE_ONE_KEYWORD)
+    assert exif.version is not None
+    assert isinstance(exif.version, str)
+
+
+def test_singleton():
+    """ tests per-file singleton behavior """
+    import osxphotos.exiftool
+
+    exif1 = osxphotos.exiftool.ExifToolCaching(TEST_FILE_ONE_KEYWORD)
+    exif2 = osxphotos.exiftool.ExifToolCaching(TEST_FILE_ONE_KEYWORD)
+    assert exif1 is exif2
+
+    exif3 = osxphotos.exiftool.ExifToolCaching(TEST_FILE_MULTI_KEYWORD)
+    assert exif1 is not exif3
+
+
+def test_read():
+    import osxphotos.exiftool
+
+    exif = osxphotos.exiftool.ExifToolCaching(TEST_FILE_ONE_KEYWORD)
+    assert exif.data["File:MIMEType"] == "image/jpeg"
+    assert exif.data["EXIF:ISO"] == 160
+    assert exif.data["IPTC:Keywords"] == "wedding"
+
+
+def test_setvalue_1():
+    # test setting a tag value
+    import os.path
+    import tempfile
+    import osxphotos.exiftool
+    from osxphotos.fileutil import FileUtil
+
+    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
+    tempfile = os.path.join(tempdir.name, os.path.basename(TEST_FILE_ONE_KEYWORD))
+    FileUtil.copy(TEST_FILE_ONE_KEYWORD, tempfile)
+
+    exif = osxphotos.exiftool.ExifToolCaching(tempfile)
+    with pytest.raises(NotImplementedError):
+        exif.setvalue("IPTC:Keywords", "test")
+
+
+def test_setvalue_cache():
+    # test setting a tag value doesn't affect cached value
+    import os.path
+    import tempfile
+    import osxphotos.exiftool
+    from osxphotos.fileutil import FileUtil
+
+    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
+    tempfile = os.path.join(tempdir.name, os.path.basename(TEST_FILE_ONE_KEYWORD))
+    FileUtil.copy(TEST_FILE_ONE_KEYWORD, tempfile)
+
+    exif = osxphotos.exiftool.ExifTool(tempfile)
+    exif.setvalue("IPTC:Keywords", "test")
+    assert exif.asdict()["IPTC:Keywords"] == "test"
+
+    exifcache = osxphotos.exiftool.ExifToolCaching(tempfile)
+    assert exifcache.asdict()["IPTC:Keywords"] == "test"
+
+    # now change the value
+    exif.setvalue("IPTC:Keywords", "foo")
+    assert exif.asdict()["IPTC:Keywords"] == "foo"
+    assert exifcache.asdict()["IPTC:Keywords"] == "test"
+
+    exifcache.flush_cache()
+    assert exifcache.asdict()["IPTC:Keywords"] == "foo"
+
+
+def test_setvalue_context_manager():
+    # test setting a tag value as context manager
+    import os.path
+    import tempfile
+    import osxphotos.exiftool
+    from osxphotos.fileutil import FileUtil
+
+    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
+    tempfile = os.path.join(tempdir.name, os.path.basename(TEST_FILE_ONE_KEYWORD))
+    FileUtil.copy(TEST_FILE_ONE_KEYWORD, tempfile)
+
+    with pytest.raises(NotImplementedError):
+        with osxphotos.exiftool.ExifToolCaching(tempfile) as exif:
+            exif.setvalue("IPTC:Keywords", "test1")
+
+
+def test_flags():
+    # test that flags raise error
+    import os.path
+    import tempfile
+    import osxphotos.exiftool
+    from osxphotos.fileutil import FileUtil
+
+    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
+    tempfile = os.path.join(tempdir.name, os.path.basename(TEST_FILE_WARNING))
+    FileUtil.copy(TEST_FILE_WARNING, tempfile)
+
+    with pytest.raises(TypeError):
+        # ExifToolCaching doesn't take flags arg
+        with osxphotos.exiftool.ExifToolCaching(tempfile, flags=["-m"]) as exif:
+            exif.setvalue("XMP:Subject", "foo/ba    r")
+
+
+def test_clear_value():
+    # test clearing a tag value
+    import os.path
+    import tempfile
+    import osxphotos.exiftool
+    from osxphotos.fileutil import FileUtil
+
+    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
+    tempfile = os.path.join(tempdir.name, os.path.basename(TEST_FILE_ONE_KEYWORD))
+    FileUtil.copy(TEST_FILE_ONE_KEYWORD, tempfile)
+
+    exif = osxphotos.exiftool.ExifToolCaching(tempfile)
+
+    with pytest.raises(NotImplementedError):
+        exif.setvalue("IPTC:Keywords", None)
+
+
+def test_addvalues_1():
+    # test setting a tag value
+    import os.path
+    import tempfile
+    import osxphotos.exiftool
+    from osxphotos.fileutil import FileUtil
+
+    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
+    tempfile = os.path.join(tempdir.name, os.path.basename(TEST_FILE_ONE_KEYWORD))
+    FileUtil.copy(TEST_FILE_ONE_KEYWORD, tempfile)
+
+    exif = osxphotos.exiftool.ExifToolCaching(tempfile)
+    with pytest.raises(NotImplementedError):
+        exif.addvalues("IPTC:Keywords", "test")
+
+
+def test_exiftoolproc_process():
+    import osxphotos.exiftool
+
+    exif1 = osxphotos.exiftool.ExifToolCaching(TEST_FILE_ONE_KEYWORD)
+    assert exif1._exiftoolproc.process is not None
+
+
+def test_exiftoolproc_exiftool():
+    import osxphotos.exiftool
+
+    exif1 = osxphotos.exiftool.ExifToolCaching(TEST_FILE_ONE_KEYWORD)
+    assert exif1._exiftoolproc.exiftool == osxphotos.exiftool.get_exiftool_path()
+
+
+def test_as_dict():
+    import osxphotos.exiftool
+
+    exif1 = osxphotos.exiftool.ExifToolCaching(TEST_FILE_ONE_KEYWORD)
+    exifdata = exif1.asdict()
+    assert exifdata["XMP:TagsList"] == "wedding"
+
+
+def test_as_dict_normalized():
+    import osxphotos.exiftool
+
+    exif1 = osxphotos.exiftool.ExifToolCaching(TEST_FILE_ONE_KEYWORD)
+    exifdata = exif1.asdict(normalized=True)
+    assert exifdata["xmp:tagslist"] == "wedding"
+    assert "XMP:TagsList" not in exifdata
+
+
+def test_as_dict_no_tag_groups():
+    import osxphotos.exiftool
+
+    exif1 = osxphotos.exiftool.ExifToolCaching(TEST_FILE_ONE_KEYWORD)
+    exifdata = exif1.asdict(tag_groups=False)
+    assert exifdata["TagsList"] == "wedding"
+
+
+def test_json():
+    import osxphotos.exiftool
+    import json
+
+    exif1 = osxphotos.exiftool.ExifToolCaching(TEST_FILE_ONE_KEYWORD)
+    exifdata = json.loads(exif1.json())
+    assert exifdata[0]["XMP:TagsList"] == "wedding"
+
+
+def test_str():
+    import osxphotos.exiftool
+
+    exif1 = osxphotos.exiftool.ExifToolCaching(TEST_FILE_ONE_KEYWORD)
+    assert "file: " in str(exif1)
+    assert "exiftool: " in str(exif1)
+
+
+def test_photoinfo_exiftool():
+    """ test PhotoInfo.exiftool which returns ExifTool object for photo """
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    for uuid in EXIF_UUID:
+        photo = photosdb.photos(uuid=[uuid])[0]
+        exiftool = photo.exiftool
+        exif_dict = exiftool.asdict()
+        for key, val in EXIF_UUID[uuid].items():
+            assert exif_dict[key] == val
+
+
+def test_photoinfo_exiftool_no_groups():
+    """ test PhotoInfo.exiftool which returns ExifTool object for photo without tag group names"""
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    for uuid in EXIF_UUID_NO_GROUPS:
+        photo = photosdb.photos(uuid=[uuid])[0]
+        exiftool = photo.exiftool
+        exif_dict = exiftool.asdict(tag_groups=False)
+        for key, val in EXIF_UUID_NO_GROUPS[uuid].items():
+            assert exif_dict[key] == val
+
+
+def test_photoinfo_exiftool_none():
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    for uuid in EXIF_UUID_NONE:
+        photo = photosdb.photos(uuid=[uuid])[0]
+        exiftool = photo.exiftool
+        assert exiftool is None
--- a/tests/test_exportresults.py
+++ b/tests/test_exportresults.py
@@ -47,6 +47,9 @@ def test_exportresults_init():
    assert results.exiftool_error == []
    assert results.deleted_files == []
    assert results.deleted_directories == []
+    assert results.exported_album == []
+    assert results.skipped_album == []
+    assert results.missing_album == []


 def test_exportresults_iadd():
@@ -110,6 +113,6 @@ def test_str():
    results = ExportResults()
    assert (
        str(results)
-        == "ExportResults(exported=[],new=[],updated=[],skipped=[],exif_updated=[],touched=[],converted_to_jpeg=[],sidecar_json_written=[],sidecar_json_skipped=[],sidecar_exiftool_written=[],sidecar_exiftool_skipped=[],sidecar_xmp_written=[],sidecar_xmp_skipped=[],missing=[],error=[],exiftool_warning=[],exiftool_error=[],deleted_files=[],deleted_directories=[])"
+        == "ExportResults(exported=[],new=[],updated=[],skipped=[],exif_updated=[],touched=[],converted_to_jpeg=[],sidecar_json_written=[],sidecar_json_skipped=[],sidecar_exiftool_written=[],sidecar_exiftool_skipped=[],sidecar_xmp_written=[],sidecar_xmp_skipped=[],missing=[],error=[],exiftool_warning=[],exiftool_error=[],deleted_files=[],deleted_directories=[],exported_album=[],skipped_album=[],missing_album=[])"
    )

--- a/tests/test_mojave_10_14_6.py
+++ b/tests/test_mojave_10_14_6.py
@@ -244,6 +244,15 @@ def test_attributes(photosdb):
    assert p.date == datetime.datetime(
        2018, 9, 28, 16, 7, 7, 0, datetime.timezone(datetime.timedelta(seconds=-14400))
    )
+    assert p.date_added == datetime.datetime(
+        2019,
+        7,
+        27,
+        9,
+        16,
+        50,
+        tzinfo=datetime.timezone(datetime.timedelta(days=-1, seconds=72000)),
+    )
    assert p.description == "Girl holding pumpkin"
    assert p.title == "I found one!"
    assert sorted(p.albums) == sorted(
@@ -410,6 +419,20 @@ def test_path_edited1(photosdb):
    assert os.path.exists(path)


+def test_path_derivatives(photosdb):
+    # test path_derivatives (not currently implemented for Photos <= 4)
+    import os.path
+
+    photos = photosdb.photos(uuid=[UUID_DICT["has_adjustments"]])
+    p = photos[0]
+    derivs = [
+        "/resources/proxies/derivatives/00/00/1/Y6OofYkbR96spbS6XgwOQw_thumb_1.jpg",
+        "/resources/proxies/derivatives/00/00/1/Y6OofYkbR96spbS6XgwOQw_mini_1.jpg",
+    ]
+    for i, p in enumerate(p.path_derivatives):
+        assert p.endswith(derivs[i])
+
+
 def test_path_edited2(photosdb):
    # test an invalid edited path
    photos = photosdb.photos(uuid=[UUID_DICT["no_adjustments"]])
@@ -651,4 +674,4 @@ def test_no_adjustments(photosdb):
    """ test adjustments when photo has no adjusments"""

    photo = photosdb.get_photo(UUID_DICT["no_adjustments"])
-    assert photo.adjustments is None
+    assert photo.adjustments is None
--- a/tests/test_template.py
+++ b/tests/test_template.py
@@ -87,11 +87,13 @@ TEMPLATE_VALUES_TITLE = {
 UUID_BOOL_VALUES = {
    "hdr": "D11D25FF-5F31-47D2-ABA9-58418878DC15",
    "edited": "51F2BEF7-431A-4D31-8AC1-3284A57826AE",
+    "edited_version": "51F2BEF7-431A-4D31-8AC1-3284A57826AE",
 }

 # Boolean type values that render to False
 UUID_BOOL_VALUES_NOT = {
    "hdr": "51F2BEF7-431A-4D31-8AC1-3284A57826AE",
+    "edited_version": "51F2BEF7-431A-4D31-8AC1-3284A57826AE",
    "edited": "CCBE0EB9-AE9F-4479-BFFD-107042C75227",
 }

@@ -830,7 +832,10 @@ def test_bool_values(photosdb_cloud):
    for field, uuid in UUID_BOOL_VALUES.items():
        if uuid is not None:
            photo = photosdb_cloud.get_photo(uuid)
-            rendered, _ = photo.render_template("{" + f"{field}" + "?True,False}")
+            edited = field == "edited_version"
+            rendered, _ = photo.render_template(
+                "{" + f"{field}" + "?True,False}", edited=edited
+            )
            assert rendered[0] == "True"
Author	SHA1	Message	Date
Rhet Turnbull	24ccf798c2	Updated README.md [skip ci]	2021-05-28 09:05:00 -07:00
Rhet Turnbull	a298772515	Updated tested versions to 11.3	2021-05-28 09:02:37 -07:00
Rhet Turnbull	2d68594b78	Fixes for #454	2021-05-28 08:48:21 -07:00
Rhet Turnbull	b026147c9a	Updated README.md [skip ci]	2021-05-23 14:26:01 -07:00
Rhet Turnbull	186a5b77d0	Fixed bug in imageconverter exception handling, closes #440	2021-05-23 14:21:13 -07:00
Rhet Turnbull	518f855a9b	PhotoInfo.exiftool now returns ExifToolCaching, closes #450	2021-05-23 14:14:22 -07:00
allcontributors[bot]	0d2067787c	docs: add kaduskj as a contributor (#453 ) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>	2021-05-23 12:33:08 -07:00
Rhet Turnbull	0448a42329	Updated CHANGELOG.md [skip ci]	2021-05-23 12:30:10 -07:00
Rhet Turnbull	a724e15dd6	Updated README.md [skip ci]	2021-05-23 12:26:51 -07:00
Rhet Turnbull	be8fe9d059	Bug fix for #452	2021-05-23 12:01:36 -07:00
Rhet Turnbull	bd6656107b	Updated CHANGELOG.md [skip ci]	2021-05-23 09:46:29 -07:00
Rhet Turnbull	a54e051d41	Updated README.md	2021-05-23 09:37:25 -07:00
Rhet Turnbull	7cde52bf9b	Fixed #451 , path_derivatives for Photos version <= 4	2021-05-23 09:34:40 -07:00
Rhet Turnbull	96037508c1	README.md update [skip ci]	2021-05-22 10:31:52 -07:00
Rhet Turnbull	9f2268fb2b	Cleanup exiftool processes when exiting, #449	2021-05-19 06:16:52 -07:00
Rhet Turnbull	df167c00eb	Added osxphotos related template fields, partial fix for #444	2021-05-15 14:46:35 -07:00
Rhet Turnbull	e8f9cda0c6	Update README.md	2021-05-09 18:21:38 -07:00
Rhet Turnbull	d4a951f547	Updated CHANGELOG.md, [skip ci]	2021-05-09 18:17:23 -07:00
Rhet Turnbull	f24e4a7e3c	Updated path_derivatives to return results in sorted order (largest to smallest)	2021-05-09 17:52:24 -07:00
Rhet Turnbull	98b84c17f1	Updated CHANGELOG.md, [skip ci]	2021-05-08 23:18:04 -07:00
Rhet Turnbull	78c411a643	Updated docs	2021-05-08 23:10:47 -07:00
Rhet Turnbull	6bdf15b41e	Added path_derivatives for Photos <= 4	2021-05-08 22:36:11 -07:00
Rhet Turnbull	a0fcec2a7a	Fixed typo in README	2021-05-08 16:08:34 -07:00
Rhet Turnbull	63834ab8ab	Added path_derivatives for Photos 5, issue #50	2021-05-08 15:11:59 -07:00
Rhet Turnbull	b23cfa32bb	Updated docs	2021-05-07 23:00:17 -07:00
Rhet Turnbull	0e22ce54ab	Added date_added for Photos 4, #439	2021-05-07 22:56:03 -07:00
Rhet Turnbull	0f41588701	Added date_added, #439	2021-05-05 06:50:41 -07:00
Rhet Turnbull	442b542794	Added --add-to-album example to README	2021-05-02 13:51:48 -07:00
Rhet Turnbull	88fae81b19	Updated CHANGELOG.md, [skip ci]	2021-05-02 13:51:26 -07:00
Rhet Turnbull	c4fec00f67	Updated docs [skip ci]	2021-05-02 09:15:13 -07:00
Rhet Turnbull	9a0cc3e8fa	Added --add-to-album to query	2021-05-02 08:35:37 -07:00
Rhet Turnbull	3ed2362fe3	Updated CHANGELOG.md, [skip ci]	2021-05-01 21:26:49 -07:00
Rhet Turnbull	cd8dd552a4	Add --add-exported-to-album, # 428	2021-05-01 21:15:31 -07:00
Rhet Turnbull	64379f313e	Update README.md	2021-04-29 00:53:04 -07:00
Rhet Turnbull	dc53480126	Updated known bugs section	2021-04-29 00:52:20 -07:00
Rhet Turnbull	3e06e0e344	Updated tutorial	2021-04-26 11:30:56 -07:00
Rhet Turnbull	aa9f6520d4	Updated tutorial	2021-04-26 11:30:31 -07:00
Rhet Turnbull	3a56e05c85	Updated tutorial	2021-04-26 11:27:12 -07:00
Rhet Turnbull	454a813908	Updated tutorial	2021-04-26 11:26:35 -07:00
Rhet Turnbull	31e162ba94	Add @pdewost as a contributor	2021-04-26 11:25:00 -07:00
Rhet Turnbull	5b8d51da38	Updated CHANGELOG.md, [skip ci]	2021-04-25 19:09:35 -07:00
Rhet Turnbull	846ea89012	Added PyCharm .idea/	2021-04-25 18:53:31 -07:00
Rhet Turnbull	dc0bbd5fd6	Updated docs	2021-04-25 18:49:51 -07:00
Rhet Turnbull	91804d53ea	Added read-only ExifToolCaching class, to implement #325	2021-04-25 18:44:48 -07:00
Rhet Turnbull	3d26206d91	Added normalized flag to ExifTool.asdict()	2021-04-25 08:31:08 -07:00
Rhet Turnbull	92d9dfaef2	Updated CHANGELOG.md, [skip ci]	2021-04-24 22:49:41 -07:00
Rhet Turnbull	51025e7f8b	Added {edited_version} template field, closes #420	2021-04-24 22:20:37 -07:00
Rhet Turnbull	d52e5e9316	Updated CHANGELOG.md, [skip ci]	2021-04-24 20:01:40 -07:00