Added --name to search filename, closes #249, #412

Fix for non-str values in exiftool template (#409)

CHANGELOG.md

@@ -4,6 +4,35 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v0.41.7](https://github.com/RhetTbull/osxphotos/compare/v0.41.6...v0.41.7)
+
+> 3 April 2021
+
+- Bump pygments from 2.6.1 to 2.7.4 [`#408`](https://github.com/RhetTbull/osxphotos/pull/408)
+- Removed logging.debug code [`e21a78c`](https://github.com/RhetTbull/osxphotos/commit/e21a78c2b39ee82610394b447a9aa697e489c3e4)
+- Added test for #409 [`db27aac`](https://github.com/RhetTbull/osxphotos/commit/db27aac14bbaff0b2db44f8b2d41022ebcad18a7)
+- Update phototemplate.py [`d174547`](https://github.com/RhetTbull/osxphotos/commit/d17454772cebbd6edd5d8e0f04e80feecbdb2355)
+
+#### [v0.41.6](https://github.com/RhetTbull/osxphotos/compare/v0.41.5...v0.41.6)
+
+> 28 March 2021
+
+- Added --retry, issue #406 [`b330e27`](https://github.com/RhetTbull/osxphotos/commit/b330e27fb838b702cefcbdb588c2fbb924b4cbc4)
+
+#### [v0.41.5](https://github.com/RhetTbull/osxphotos/compare/v0.41.4...v0.41.5)
+
+> 27 March 2021
+
+- Bump pyyaml from 5.1.2 to 5.4 [`#402`](https://github.com/RhetTbull/osxphotos/pull/402)
+- Fixed albums for burst images, closes #401, #403, #404 [`#401`](https://github.com/RhetTbull/osxphotos/issues/401)
+
+#### [v0.41.4](https://github.com/RhetTbull/osxphotos/compare/v0.41.3...v0.41.4)
+
+> 22 March 2021
+
+- Bump pillow from 7.2.0 to 8.1.1 [`#399`](https://github.com/RhetTbull/osxphotos/pull/399)
+- Added --from-time, --to-time, closes #400 [`#400`](https://github.com/RhetTbull/osxphotos/issues/400)
+
 #### [v0.41.3](https://github.com/RhetTbull/osxphotos/compare/v0.41.2...v0.41.3)
 
 > 14 March 2021

README.md

@@ -203,6 +203,11 @@ Options:
                                   searches top level folders (e.g. does not look
                                   at subfolders)
 
+  --name FILENAME                 Search for photos with filename matching
+                                  FILENAME. If more than one --name options is
+                                  specified, they are treated as "OR", e.g. find
+                                  photos matching any FILENAME.
+
   --uuid UUID                     Search for photos with UUID(s).
   --uuid-from-file FILE           Search for photos with UUID(s) loaded from
                                   FILE. Format is a single UUID per line.  Lines
@@ -366,6 +371,11 @@ Options:
                                   may create name collisions on export. (e.g. if
                                   two files happen to have the same name)
 
+  --retry RETRY                   Automatically retry export up to RETRY times
+                                  if an error occurs during export.  This may be
+                                  useful with network drives that experience
+                                  intermittent errors.
+
   --export-by-date                Automatically create output folders to
                                   organize photos by date created (e.g.
                                   DEST/2019/12/20/photoname.jpg).
@@ -1394,7 +1404,7 @@ Returns a list of the keywords found in the Photos library
 albums = photosdb.album_info
 ```
 
-Returns a list of [AlbumInfo](#AlbumInfo) objects representing albums in the database or empty list if there are no albums.  See also [albums](#albums).
+Returns a list of [AlbumInfo](#AlbumInfo) objects representing albums in the database or empty list if there are no albums.  See also [albums](#albums) and [burst_album_info](#burst_album_info).
 
 #### `albums`
 ```python
@@ -1402,7 +1412,7 @@ Returns a list of [AlbumInfo](#AlbumInfo) objects representing albums in the dat
 album_names = photosdb.albums
 ```
 
-Returns a list of the album names found in the Photos library.  
+Returns a list of the album names found in the Photos library. See also [burst_albums](#burst_albums).
 
 **Note**: In Photos 5.0 (MacOS 10.15/Catalina), It is possible to have more than one album with the same name in Photos.  Albums with duplicate names are treated as a single album and the photos in each are combined.  For example, if you have two albums named "Wedding" and each has 2 photos, osxphotos will treat this as a single album named "Wedding" with 4 photos in it.
 
@@ -1838,6 +1848,9 @@ Returns Uniform Type Identifier (UTI) for the associated raw image, if there is
 Returns True if photos is a burst image (e.g. part of a set of burst images), otherwise False.
 See [burst_photos](#burst_photos)
 
+#### `burst_selected`
+Returns True if photo is a burst photo and has been selected from the burst set by the user, otherwise False.
+
 #### `burst_photos`
 If photo is a burst image (see [burst](#burst)), returns a list of PhotoInfo objects for all other photos in the same burst set. If not a burst image, returns empty list.
 
@@ -1861,6 +1874,12 @@ IMG_9854.JPG
 IMG_9855.JPG
 ```
 
+#### `burst_albums`
+If photo is a non-selected burst photo, returns a list of albums any other photos in the same burst set, are contained in. Otherwise, returns `PhotoInfo.albums`. If a burst photo which has unselected burst images (e.g. the burst images are in the library but haven't been selected by the user using the "Make a selection" feature) is placed in a an album, Photos treats only the selected "key" photo as in the album.  The unselected burst images, while associated with the photo in the album, are not technically in the album.  If you are handling one of these unselected burst photos and want to know which album it would be in based on which albums it's selected key images are in, use `burst_albums`. See also [burst_album_info](#burst_album_info) and [albums](#albums).
+
+#### `burst_album_info`
+If photo is non-selected burst photo, teturns a list of [AlbumInfo](#AlbumInfo) objects representing the albums any other photos in the same burst set are contained in.  Otherwise, returns `PhotoInfo.album_info`. See also [burst_albums](#burst_albums) and [album_info](#album_info).
+
 #### `live_photo`
 Returns True if photo is an Apple live photo (ie. it has an associated "live" video component), otherwise returns False.  See [path_live_photo](#path_live_photo).
 

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: c43f566654ff6a66a64cd55da2e67fef
+config: 83db317a0b058d0bba826496215f3269
 tags: 645f666f9bcd5a90fca523b33c5a78b7

docs/_modules/index.html

@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Overview: module code &#8212; osxphotos 0.41.4 documentation</title>
+    <title>Overview: module code &#8212; osxphotos 0.41.6 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>

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.4 documentation</title>
+    <title>osxphotos.photoinfo._photoinfo_export &#8212; osxphotos 0.41.6 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>

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.41.4 documentation</title>
+    <title>osxphotos.photoinfo.photoinfo &#8212; osxphotos 0.41.6 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>
@@ -486,9 +486,24 @@
             <span class="p">)</span>
             <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_albums</span>
 
+    <span class="nd">@property</span>
+    <span class="k">def</span> <span class="nf">burst_albums</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot;If photo is non-selected burst photo, list of albums any other images in the same burst set are contained in, otherwise returns self.albums&quot;&quot;&quot;</span>
+        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">burst_selected</span> <span class="ow">or</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">burst</span><span class="p">:</span>
+            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">albums</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">_burst_albums</span>
+        <span class="k">except</span> <span class="ne">AttributeError</span><span class="p">:</span>
+            <span class="n">burst_albums</span> <span class="o">=</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="n">burst_albums</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">albums</span><span class="p">)</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">_burst_albums</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="nb">set</span><span class="p">(</span><span class="n">burst_albums</span><span class="p">))</span>
+            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_burst_albums</span>
+
     <span class="nd">@property</span>
     <span class="k">def</span> <span class="nf">album_info</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-        <span class="sd">&quot;&quot;&quot; list of AlbumInfo objects representing albums the photos is contained in &quot;&quot;&quot;</span>
+        <span class="sd">&quot;&quot;&quot; list of AlbumInfo objects representing albums the photo is contained in &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">_album_info</span>
         <span class="k">except</span> <span class="ne">AttributeError</span><span class="p">:</span>
@@ -498,6 +513,21 @@
             <span class="p">]</span>
             <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_album_info</span>
 
+    <span class="nd">@property</span>
+    <span class="k">def</span> <span class="nf">burst_album_info</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot; If photo is a non-selected burst photo, returns list of AlbumInfo objects representing albums any other photos in the same burst set are contained in, otherwise returns self.album_info &quot;&quot;&quot;</span>
+        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">burst_selected</span> <span class="ow">or</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">burst</span><span class="p">:</span>
+            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">album_info</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">_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="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="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>
+            <span class="bp">self</span><span class="o">.</span><span class="n">_burst_album_info</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="nb">set</span><span class="p">(</span><span class="n">burst_album_info</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="nd">@property</span>
     <span class="k">def</span> <span class="nf">import_info</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; ImportInfo object representing import session for the photo or None if no import session &quot;&quot;&quot;</span>
@@ -713,6 +743,11 @@
         <span class="sd">&quot;&quot;&quot; Returns True if photo is part of a Burst photo set, otherwise False &quot;&quot;&quot;</span>
         <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_info</span><span class="p">[</span><span class="s2">&quot;burst&quot;</span><span class="p">]</span>
 
+    <span class="nd">@property</span>
+    <span class="k">def</span> <span class="nf">burst_selected</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 burst photo and has been selected from the burst set by the user, otherwise False &quot;&quot;&quot;</span>
+        <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_info</span><span class="p">[</span><span class="s2">&quot;burst_key&quot;</span><span class="p">]</span>
+
     <span class="nd">@property</span>
     <span class="k">def</span> <span class="nf">burst_photos</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot;If photo is a burst photo, returns list of PhotoInfo objects</span>

docs/_static/documentation_options.js

@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
     URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '0.41.4',
+    VERSION: '0.41.6',
     LANGUAGE: 'None',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

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.41.4 documentation</title>
+    <title>osxphotos command line interface (CLI) &#8212; osxphotos 0.41.6 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>
@@ -549,6 +549,12 @@ to modify this behavior.</p>
 <dd><p>Overwrite existing files. Default behavior is to add (1), (2), etc to filename if file already exists. Use this with caution as it may create name collisions on export. (e.g. if two files happen to have the same name)</p>
 </dd></dl>
 
+<dl class="std option">
+<dt id="cmdoption-osxphotos-export-retry">
+<code class="sig-name descname"><span class="pre">--retry</span></code><code class="sig-prename descclassname"> <span class="pre">&lt;RETRY&gt;</span></code><a class="headerlink" href="#cmdoption-osxphotos-export-retry" title="Permalink to this definition">¶</a></dt>
+<dd><p>Automatically retry export up to RETRY times if an error occurs during export.  This may be useful with network drives that experience intermittent errors.</p>
+</dd></dl>
+
 <dl class="std option">
 <dt id="cmdoption-osxphotos-export-export-by-date">
 <code class="sig-name descname"><span class="pre">--export-by-date</span></code><code class="sig-prename descclassname"></code><a class="headerlink" href="#cmdoption-osxphotos-export-export-by-date" title="Permalink to this definition">¶</a></dt>

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.41.4 documentation</title>
+    <title>Index &#8212; osxphotos 0.41.6 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>
@@ -538,8 +538,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
 
@@ -549,6 +547,8 @@
         <li><a href="cli.html#cmdoption-osxphotos-query-no-likes">osxphotos-query command line option</a>
 </li>
       </ul></li>
+  </ul></td>
+  <td style="width: 33%; vertical-align: top;"><ul>
       <li>
     --no-place
 
@@ -799,6 +799,13 @@
 
       <ul>
         <li><a href="cli.html#cmdoption-osxphotos-export-report">osxphotos-export command line option</a>
+</li>
+      </ul></li>
+      <li>
+    --retry &lt;RETRY&gt;
+
+      <ul>
+        <li><a href="cli.html#cmdoption-osxphotos-export-retry">osxphotos-export command line option</a>
 </li>
       </ul></li>
       <li>
@@ -1089,13 +1096,19 @@
 </li>
       <li><a href="reference.html#osxphotos.PhotoInfo.ExifInfo.bit_rate">bit_rate (osxphotos.PhotoInfo.ExifInfo attribute)</a>
 </li>
-  </ul></td>
-  <td style="width: 33%; vertical-align: top;"><ul>
       <li><a href="reference.html#osxphotos.PhotoInfo.SearchInfo.bodies_of_water">bodies_of_water() (osxphotos.PhotoInfo.SearchInfo property)</a>
 </li>
       <li><a href="reference.html#osxphotos.PhotoInfo.burst">burst() (osxphotos.PhotoInfo property)</a>
+</li>
+  </ul></td>
+  <td style="width: 33%; vertical-align: top;"><ul>
+      <li><a href="reference.html#osxphotos.PhotoInfo.burst_album_info">burst_album_info() (osxphotos.PhotoInfo property)</a>
+</li>
+      <li><a href="reference.html#osxphotos.PhotoInfo.burst_albums">burst_albums() (osxphotos.PhotoInfo property)</a>
 </li>
       <li><a href="reference.html#osxphotos.PhotoInfo.burst_photos">burst_photos() (osxphotos.PhotoInfo property)</a>
+</li>
+      <li><a href="reference.html#osxphotos.PhotoInfo.burst_selected">burst_selected() (osxphotos.PhotoInfo property)</a>
 </li>
   </ul></td>
 </tr></table>
@@ -1586,6 +1599,8 @@
         <li><a href="cli.html#cmdoption-osxphotos-export-replace-keywords">--replace-keywords</a>
 </li>
         <li><a href="cli.html#cmdoption-osxphotos-export-report">--report &lt;path to export report&gt;</a>
+</li>
+        <li><a href="cli.html#cmdoption-osxphotos-export-retry">--retry &lt;RETRY&gt;</a>
 </li>
         <li><a href="cli.html#cmdoption-osxphotos-export-save-config">--save-config &lt;config file path&gt;</a>
 </li>

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.41.4 documentation</title>
+    <title>Welcome to osxphotos’s documentation! &#8212; osxphotos 0.41.6 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>

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.41.4 documentation</title>
+    <title>osxphotos &#8212; osxphotos 0.41.6 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>

docs/reference.html

@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos package &#8212; osxphotos 0.41.4 documentation</title>
+    <title>osxphotos package &#8212; osxphotos 0.41.6 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>
@@ -650,7 +650,7 @@ including keywords, persons, albums, uuid, path, etc.</p>
 <dl class="py method">
 <dt id="osxphotos.PhotoInfo.album_info">
 <em class="property"><span class="pre">property</span> </em><code class="sig-name descname"><span class="pre">album_info</span></code><a class="headerlink" href="#osxphotos.PhotoInfo.album_info" title="Permalink to this definition">¶</a></dt>
-<dd><p>list of AlbumInfo objects representing albums the photos is contained in</p>
+<dd><p>list of AlbumInfo objects representing albums the photo is contained in</p>
 </dd></dl>
 
 <dl class="py method">
@@ -671,6 +671,18 @@ including keywords, persons, albums, uuid, path, etc.</p>
 <dd><p>Returns True if photo is part of a Burst photo set, otherwise False</p>
 </dd></dl>
 
+<dl class="py method">
+<dt id="osxphotos.PhotoInfo.burst_album_info">
+<em class="property"><span class="pre">property</span> </em><code class="sig-name descname"><span class="pre">burst_album_info</span></code><a class="headerlink" href="#osxphotos.PhotoInfo.burst_album_info" title="Permalink to this definition">¶</a></dt>
+<dd><p>If photo is a non-selected burst photo, returns list of AlbumInfo objects representing albums any other photos in the same burst set are contained in, otherwise returns self.album_info</p>
+</dd></dl>
+
+<dl class="py method">
+<dt id="osxphotos.PhotoInfo.burst_albums">
+<em class="property"><span class="pre">property</span> </em><code class="sig-name descname"><span class="pre">burst_albums</span></code><a class="headerlink" href="#osxphotos.PhotoInfo.burst_albums" title="Permalink to this definition">¶</a></dt>
+<dd><p>If photo is non-selected burst photo, list of albums any other images in the same burst set are contained in, otherwise returns self.albums</p>
+</dd></dl>
+
 <dl class="py method">
 <dt id="osxphotos.PhotoInfo.burst_photos">
 <em class="property"><span class="pre">property</span> </em><code class="sig-name descname"><span class="pre">burst_photos</span></code><a class="headerlink" href="#osxphotos.PhotoInfo.burst_photos" title="Permalink to this definition">¶</a></dt>
@@ -679,6 +691,12 @@ that are part of the same burst photo set; otherwise returns empty list.
 self is not included in the returned list</p>
 </dd></dl>
 
+<dl class="py method">
+<dt id="osxphotos.PhotoInfo.burst_selected">
+<em class="property"><span class="pre">property</span> </em><code class="sig-name descname"><span class="pre">burst_selected</span></code><a class="headerlink" href="#osxphotos.PhotoInfo.burst_selected" title="Permalink to this definition">¶</a></dt>
+<dd><p>Returns True if photo is a burst photo and has been selected from the burst set by the user, otherwise False</p>
+</dd></dl>
+
 <dl class="py method">
 <dt id="osxphotos.PhotoInfo.comments">
 <em class="property"><span class="pre">property</span> </em><code class="sig-name descname"><span class="pre">comments</span></code><a class="headerlink" href="#osxphotos.PhotoInfo.comments" title="Permalink to this definition">¶</a></dt>

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.41.4 documentation</title>
+    <title>Search &#8212; osxphotos 0.41.6 documentation</title>
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
     

osxphotos/_version.py

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

osxphotos/cli.py

@@ -238,6 +238,15 @@ def query_options(f):
             'If more than one folder, treated as "OR", e.g. find photos in any FOLDER.  '
             "Only searches top level folders (e.g. does not look at subfolders)",
         ),
+        o(
+            "--name",
+            metavar="FILENAME",
+            default=None,
+            multiple=True,
+            help="Search for photos with filename matching FILENAME. "
+            'If more than one --name options is specified, they are treated as "OR", '
+            "e.g. find photos matching any FILENAME. ",
+        ),
         o(
             "--uuid",
             metavar="UUID",
@@ -517,6 +526,13 @@ def cli(ctx, db, json_, debug):
     "Use this with caution as it may create name collisions on export. "
     "(e.g. if two files happen to have the same name)",
 )
+@click.option(
+    "--retry",
+    metavar="RETRY",
+    type=click.INT,
+    help="Automatically retry export up to RETRY times if an error occurs during export.  "
+    "This may be useful with network drives that experience intermittent errors.",
+)
 @click.option(
     "--export-by-date",
     is_flag=True,
@@ -864,6 +880,7 @@ def export(
     album,
     folder,
     uuid,
+    name,
     uuid_from_file,
     title,
     no_title,
@@ -892,6 +909,7 @@ def export(
     export_as_hardlink,
     touch_file,
     overwrite,
+    retry,
     export_by_date,
     skip_edited,
     skip_original_if_edited,
@@ -1012,6 +1030,7 @@ def export(
         person = cfg.person
         album = cfg.album
         folder = cfg.folder
+        name = cfg.name
         uuid = cfg.uuid
         uuid_from_file = cfg.uuid_from_file
         title = cfg.title
@@ -1040,6 +1059,7 @@ def export(
         export_as_hardlink = cfg.export_as_hardlink
         touch_file = cfg.touch_file
         overwrite = cfg.overwrite
+        retry = cfg.retry
         export_by_date = cfg.export_by_date
         skip_edited = cfg.skip_edited
         skip_original_if_edited = cfg.skip_original_if_edited
@@ -1199,6 +1219,7 @@ def export(
     original_suffix = (
         DEFAULT_ORIGINAL_SUFFIX if original_suffix is None else original_suffix
     )
+    retry = 0 if not retry else retry
 
     if not os.path.isdir(dest):
         click.echo(
@@ -1408,6 +1429,10 @@ def export(
         is_reference=is_reference,
         in_album=in_album,
         not_in_album=not_in_album,
+        burst_photos=export_bursts,
+        # skip missing bursts if using --download-missing by itself as AppleScript otherwise causes errors
+        missing_bursts=(download_missing and use_photokit) or not download_missing,
+        name=name,
     )
 
     if photos:
@@ -1416,13 +1441,6 @@ def export(
             previous_uuids = {uuid: 1 for uuid in export_db.get_previous_uuids()}
             photos = [p for p in photos if p.uuid not in previous_uuids]
 
-        if export_bursts:
-            # add the burst_photos to the export set
-            photos_burst = [p for p in photos if p.burst]
-            for burst in photos_burst:
-                burst_set = [p for p in burst.burst_photos if not p.ismissing]
-                photos.extend(burst_set)
-
         num_photos = len(photos)
         # TODO: photos or photo appears several times, pull into a separate function
         photo_str = "photos" if num_photos > 1 else "photo"
@@ -1479,6 +1497,7 @@ def export(
                     strip=strip,
                     jpeg_ext=jpeg_ext,
                     replace_keywords=replace_keywords,
+                    retry=retry,
                 )
                 results += export_results
 
@@ -1638,6 +1657,7 @@ def query(
     person,
     album,
     folder,
+    name,
     uuid,
     uuid_from_file,
     title,
@@ -1711,6 +1731,7 @@ def query(
         person,
         album,
         folder,
+        name,
         uuid,
         uuid_from_file,
         edited,
@@ -1844,6 +1865,7 @@ def query(
         is_reference=is_reference,
         in_album=in_album,
         not_in_album=not_in_album,
+        name=name,
     )
 
     # below needed for to make CliRunner work for testing
@@ -2019,6 +2041,9 @@ def _query(
     is_reference=False,
     in_album=False,
     not_in_album=False,
+    burst_photos=None,
+    missing_bursts=None,
+    name=None,
 ):
     """Run a query against PhotosDB to extract the photos based on user supply criteria used by query and export commands
 
@@ -2085,30 +2110,38 @@ def _query(
     if title:
         # search title field for text
         # if more than one, find photos with all title values in title
+        photo_list = []
         if ignore_case:
             # case-insensitive
             for t in title:
                 t = t.lower()
-                photos = [p for p in photos if p.title and t in p.title.lower()]
+                photo_list.extend(
+                    [p for p in photos if p.title and t in p.title.lower()]
+                )
         else:
             for t in title:
-                photos = [p for p in photos if p.title and t in p.title]
+                photo_list.extend([p for p in photos if p.title and t in p.title])
+        photos = photo_list
     elif no_title:
         photos = [p for p in photos if not p.title]
 
     if description:
         # search description field for text
         # if more than one, find photos with all description values in description
+        photo_list = []
         if ignore_case:
             # case-insensitive
             for d in description:
                 d = d.lower()
-                photos = [
-                    p for p in photos if p.description and d in p.description.lower()
-                ]
+                photo_list.extend(
+                    [p for p in photos if p.description and d in p.description.lower()]
+                )
         else:
             for d in description:
-                photos = [p for p in photos if p.description and d in p.description]
+                photo_list.extend(
+                    [p for p in photos if p.description and d in p.description]
+                )
+        photos = photo_list
     elif no_description:
         photos = [p for p in photos if not p.description]
 
@@ -2262,6 +2295,49 @@ def _query(
     if to_time:
         photos = [p for p in photos if p.date.time() <= to_time]
 
+    if burst_photos:
+        # add the burst_photos to the export set
+        photos_burst = [p for p in photos if p.burst]
+        for burst in photos_burst:
+            if missing_bursts:
+                # include burst photos that are missing
+                photos.extend(burst.burst_photos)
+            else:
+                # don't include missing burst images (these can't be downloaded with AppleScript)
+                photos.extend([p for p in burst.burst_photos if not p.ismissing])
+
+        # remove duplicates as each burst photo in the set that's selected would
+        # result in the entire set being added above
+        # can't use set() because PhotoInfo not hashable
+        seen_uuids = {}
+        for p in photos:
+            if p.uuid in seen_uuids:
+                continue
+            seen_uuids[p.uuid] = p
+        photos = list(seen_uuids.values())
+
+    if name:
+        # search filename fields for text
+        # if more than one, find photos with all title values in filename
+        photo_list = []
+        if ignore_case:
+            # case-insensitive
+            for n in name:
+                n = n.lower()
+                photo_list.extend(
+                    [
+                        p
+                        for p in photos
+                        if n in p.filename.lower() or n in p.original_filename.lower()
+                    ]
+                )
+        else:
+            for n in name:
+                photo_list.extend(
+                    [p for p in photos if n in p.filename or n in p.original_filename]
+                )
+        photos = photo_list
+
     return photos
 
 
@@ -2334,6 +2410,7 @@ def export_photo(
     strip=False,
     jpeg_ext=None,
     replace_keywords=False,
+    retry=0,
 ):
     """Helper function for export that does the actual export
 
@@ -2373,6 +2450,7 @@ def export_photo(
         exiftool_merge_persons: boolean; if True, merged persons found in file's exif data (requires exiftool)
         jpeg_ext: if not None, specify the extension to use for all JPEG images on export
         replace_keywords: if True, --keyword-template replaces keywords instead of adding keywords
+        retry: retry up to retry # of times if there's an error
 
     Returns:
         list of path(s) of exported photo or None if photo was missing
@@ -2522,72 +2600,88 @@ def export_photo(
                         str(pathlib.Path(dest_path) / original_filename)
                     )
                 else:
-                    try:
-                        export_results = photo.export2(
-                            dest_path,
-                            original_filename,
-                            sidecar=sidecar_flags,
-                            sidecar_drop_ext=sidecar_drop_ext,
-                            live_photo=export_live,
-                            raw_photo=export_raw,
-                            export_as_hardlink=export_as_hardlink,
-                            overwrite=overwrite,
-                            use_photos_export=use_photos_export,
-                            exiftool=exiftool,
-                            merge_exif_keywords=exiftool_merge_keywords,
-                            merge_exif_persons=exiftool_merge_persons,
-                            use_albums_as_keywords=album_keyword,
-                            use_persons_as_keywords=person_keyword,
-                            keyword_template=keyword_template,
-                            description_template=description_template,
-                            update=update,
-                            ignore_signature=ignore_signature,
-                            export_db=export_db,
-                            fileutil=fileutil,
-                            dry_run=dry_run,
-                            touch_file=touch_file,
-                            convert_to_jpeg=convert_to_jpeg,
-                            jpeg_quality=jpeg_quality,
-                            ignore_date_modified=ignore_date_modified,
-                            use_photokit=use_photokit,
-                            verbose=verbose_,
-                            exiftool_flags=exiftool_option,
-                            jpeg_ext=jpeg_ext,
-                            replace_keywords=replace_keywords,
-                        )
-                        results += export_results
-                        for warning_ in export_results.exiftool_warning:
-                            verbose_(
-                                f"exiftool warning for file {warning_[0]}: {warning_[1]}"
+                    tries = 0
+                    while tries <= retry:
+                        tries += 1
+                        error = 0
+                        try:
+                            export_results = photo.export2(
+                                dest_path,
+                                original_filename,
+                                sidecar=sidecar_flags,
+                                sidecar_drop_ext=sidecar_drop_ext,
+                                live_photo=export_live,
+                                raw_photo=export_raw,
+                                export_as_hardlink=export_as_hardlink,
+                                overwrite=overwrite,
+                                use_photos_export=use_photos_export,
+                                exiftool=exiftool,
+                                merge_exif_keywords=exiftool_merge_keywords,
+                                merge_exif_persons=exiftool_merge_persons,
+                                use_albums_as_keywords=album_keyword,
+                                use_persons_as_keywords=person_keyword,
+                                keyword_template=keyword_template,
+                                description_template=description_template,
+                                update=update,
+                                ignore_signature=ignore_signature,
+                                export_db=export_db,
+                                fileutil=fileutil,
+                                dry_run=dry_run,
+                                touch_file=touch_file,
+                                convert_to_jpeg=convert_to_jpeg,
+                                jpeg_quality=jpeg_quality,
+                                ignore_date_modified=ignore_date_modified,
+                                use_photokit=use_photokit,
+                                verbose=verbose_,
+                                exiftool_flags=exiftool_option,
+                                jpeg_ext=jpeg_ext,
+                                replace_keywords=replace_keywords,
                             )
-                        for error_ in export_results.exiftool_error:
+                            for warning_ in export_results.exiftool_warning:
+                                verbose_(
+                                    f"exiftool warning for file {warning_[0]}: {warning_[1]}"
+                                )
+                            for error_ in export_results.exiftool_error:
+                                click.echo(
+                                    click.style(
+                                        f"exiftool error for file {error_[0]}: {error_[1]}",
+                                        fg=CLI_COLOR_ERROR,
+                                    ),
+                                    err=True,
+                                )
+                            for error_ in export_results.error:
+                                click.echo(
+                                    click.style(
+                                        f"Error exporting photo ({photo.uuid}: {photo.original_filename}) as {error_[0]}: {error_[1]}",
+                                        fg=CLI_COLOR_ERROR,
+                                    ),
+                                    err=True,
+                                )
+                                error += 1
+                            if not error or tries > retry:
+                                results += export_results
+                                break
+                            else:
+                                click.echo(
+                                    "Retrying export for photo ({photo.uuid}: {photo.original_filename})"
+                                )
+                        except Exception as e:
                             click.echo(
                                 click.style(
-                                    f"exiftool error for file {error_[0]}: {error_[1]}",
+                                    f"Error exporting photo ({photo.uuid}: {photo.original_filename}) as {original_filename}: {e}",
                                     fg=CLI_COLOR_ERROR,
                                 ),
                                 err=True,
                             )
-                        for error_ in export_results.error:
-                            click.echo(
-                                click.style(
-                                    f"Error exporting photo ({photo.uuid}: {photo.original_filename}) as {error_[0]}: {error_[1]}",
-                                    fg=CLI_COLOR_ERROR,
-                                ),
-                                err=True,
-                            )
-
-                    except Exception as e:
-                        click.echo(
-                            click.style(
-                                f"Error exporting photo ({photo.uuid}: {photo.original_filename}) as {original_filename}: {e}",
-                                fg=CLI_COLOR_ERROR,
-                            ),
-                            err=True,
-                        )
-                        results.error.append(
-                            (str(pathlib.Path(dest) / original_filename), e)
-                        )
+                            if tries > retry:
+                                results.error.append(
+                                    (str(pathlib.Path(dest) / original_filename), e)
+                                )
+                                break
+                            else:
+                                click.echo(
+                                    f"Retrying export for photo ({photo.uuid}: {photo.original_filename})"
+                                )
             else:
                 verbose_(f"Skipping original version of {photo.original_filename}")
 
@@ -2671,70 +2765,87 @@ def export_photo(
                     )
 
                 else:
-                    try:
-                        export_results_edited = photo.export2(
-                            dest_path,
-                            edited_filename,
-                            sidecar=sidecar_flags,
-                            sidecar_drop_ext=sidecar_drop_ext,
-                            export_as_hardlink=export_as_hardlink,
-                            overwrite=overwrite,
-                            edited=True,
-                            use_photos_export=use_photos_export,
-                            exiftool=exiftool,
-                            merge_exif_keywords=exiftool_merge_keywords,
-                            merge_exif_persons=exiftool_merge_persons,
-                            use_albums_as_keywords=album_keyword,
-                            use_persons_as_keywords=person_keyword,
-                            keyword_template=keyword_template,
-                            description_template=description_template,
-                            update=update,
-                            ignore_signature=ignore_signature,
-                            export_db=export_db,
-                            fileutil=fileutil,
-                            dry_run=dry_run,
-                            touch_file=touch_file,
-                            convert_to_jpeg=convert_to_jpeg,
-                            jpeg_quality=jpeg_quality,
-                            ignore_date_modified=ignore_date_modified,
-                            use_photokit=use_photokit,
-                            verbose=verbose_,
-                            exiftool_flags=exiftool_option,
-                            jpeg_ext=jpeg_ext,
-                            replace_keywords=replace_keywords,
-                        )
-                        results += export_results_edited
-                        for warning_ in export_results_edited.exiftool_warning:
-                            verbose_(
-                                f"exiftool warning for file {warning_[0]}: {warning_[1]}"
+                    tries = 0
+                    while tries <= retry:
+                        tries += 1
+                        error = 0
+                        try:
+                            export_results_edited = photo.export2(
+                                dest_path,
+                                edited_filename,
+                                sidecar=sidecar_flags,
+                                sidecar_drop_ext=sidecar_drop_ext,
+                                export_as_hardlink=export_as_hardlink,
+                                overwrite=overwrite,
+                                edited=True,
+                                use_photos_export=use_photos_export,
+                                exiftool=exiftool,
+                                merge_exif_keywords=exiftool_merge_keywords,
+                                merge_exif_persons=exiftool_merge_persons,
+                                use_albums_as_keywords=album_keyword,
+                                use_persons_as_keywords=person_keyword,
+                                keyword_template=keyword_template,
+                                description_template=description_template,
+                                update=update,
+                                ignore_signature=ignore_signature,
+                                export_db=export_db,
+                                fileutil=fileutil,
+                                dry_run=dry_run,
+                                touch_file=touch_file,
+                                convert_to_jpeg=convert_to_jpeg,
+                                jpeg_quality=jpeg_quality,
+                                ignore_date_modified=ignore_date_modified,
+                                use_photokit=use_photokit,
+                                verbose=verbose_,
+                                exiftool_flags=exiftool_option,
+                                jpeg_ext=jpeg_ext,
+                                replace_keywords=replace_keywords,
                             )
-                        for error_ in export_results_edited.exiftool_error:
+                            for warning_ in export_results_edited.exiftool_warning:
+                                verbose_(
+                                    f"exiftool warning for file {warning_[0]}: {warning_[1]}"
+                                )
+                            for error_ in export_results_edited.exiftool_error:
+                                click.echo(
+                                    click.style(
+                                        f"exiftool error for file {error_[0]}: {error_[1]}",
+                                        fg=CLI_COLOR_ERROR,
+                                    ),
+                                    err=True,
+                                )
+                            for error_ in export_results_edited.error:
+                                click.echo(
+                                    click.style(
+                                        f"Error exporting edited photo ({photo.uuid}: {photo.original_filename}) as {error_[0]}: {error_[1]}",
+                                        fg=CLI_COLOR_ERROR,
+                                    ),
+                                    err=True,
+                                )
+                                error += 1
+                            if not error or tries > retry:
+                                results += export_results_edited
+                                break
+                            else:
+                                click.echo(
+                                    "Retrying export for photo ({photo.uuid}: {photo.original_filename})"
+                                )
+                        except Exception as e:
                             click.echo(
                                 click.style(
-                                    f"exiftool error for file {error_[0]}: {error_[1]}",
+                                    f"Error exporting edited photo ({photo.uuid}: {photo.original_filename}) {filename} as {edited_filename}: {e}",
                                     fg=CLI_COLOR_ERROR,
                                 ),
                                 err=True,
                             )
-                        for error_ in export_results_edited.error:
-                            click.echo(
-                                click.style(
-                                    f"Error exporting edited photo ({photo.uuid}: {photo.original_filename}) as {error_[0]}: {error_[1]}",
-                                    fg=CLI_COLOR_ERROR,
-                                ),
-                                err=True,
-                            )
-                    except Exception as e:
-                        click.echo(
-                            click.style(
-                                f"Error exporting edited photo ({photo.uuid}: {photo.original_filename}) {filename} as {edited_filename}: {e}",
-                                fg=CLI_COLOR_ERROR,
-                            ),
-                            err=True,
-                        )
-                        results.error.append(
-                            (str(pathlib.Path(dest) / edited_filename), e)
-                        )
+                            if tries > retry:
+                                results.error.append(
+                                    (str(pathlib.Path(dest) / edited_filename), e)
+                                )
+                                break
+                            else:
+                                click.echo(
+                                    f"Retrying export for photo ({photo.uuid}: {photo.original_filename})"
+                                )
 
             if verbose:
                 if update:

osxphotos/photoinfo/photoinfo.py

@@ -453,9 +453,24 @@ class PhotoInfo:
             )
             return self._albums
 
+    @property
+    def burst_albums(self):
+        """If photo is non-selected burst photo, list of albums any other images in the same burst set are contained in, otherwise returns self.albums"""
+        if self.burst_selected or not self.burst:
+            return self.albums
+
+        try:
+            return self._burst_albums
+        except AttributeError:
+            burst_albums = []
+            for photo in self.burst_photos:
+                burst_albums.extend(photo.albums)
+            self._burst_albums = list(set(burst_albums))
+            return self._burst_albums
+
     @property
     def album_info(self):
-        """ list of AlbumInfo objects representing albums the photos is contained in """
+        """ list of AlbumInfo objects representing albums the photo is contained in """
         try:
             return self._album_info
         except AttributeError:
@@ -465,6 +480,21 @@ class PhotoInfo:
             ]
             return self._album_info
 
+    @property
+    def burst_album_info(self):
+        """ If photo is a non-selected burst photo, returns list of AlbumInfo objects representing albums any other photos in the same burst set are contained in, otherwise returns self.album_info """
+        if self.burst_selected or not self.burst:
+            return self.album_info
+
+        try:
+            return self._burst_album_info
+        except AttributeError:
+            burst_album_info = []
+            for photo in self.burst_photos:
+                burst_album_info.extend(photo.album_info)
+            self._burst_album_info = list(set(burst_album_info))
+            return self._burst_album_info
+
     @property
     def import_info(self):
         """ ImportInfo object representing import session for the photo or None if no import session """
@@ -680,6 +710,11 @@ class PhotoInfo:
         """ Returns True if photo is part of a Burst photo set, otherwise False """
         return self._info["burst"]
 
+    @property
+    def burst_selected(self):
+        """ Returns True if photo is a burst photo and has been selected from the burst set by the user, otherwise False """
+        return self._info["burst_key"]
+
     @property
     def burst_photos(self):
         """If photo is a burst photo, returns list of PhotoInfo objects

osxphotos/photosdb/photosdb.py

@@ -1828,7 +1828,6 @@ class PhotosDB:
 
         # get details about photos
         verbose("Processing photo details.")
-        logging.debug(f"Getting information about photos")
         c.execute(
             f"""SELECT {asset_table}.ZUUID, 
                 ZADDITIONALASSETATTRIBUTES.ZMASTERFINGERPRINT, 
@@ -2736,8 +2735,6 @@ class PhotosDB:
                                 # an empty album will be in _dbalbum_titles but not _dbalbums_album
                                 pass
                         album_set.update(title_set)
-                    else:
-                        logging.debug(f"Could not find album '{album}' in database")
                 photos_sets.append(album_set)
 
             if uuid:
@@ -2745,8 +2742,6 @@ class PhotosDB:
                 for u in uuid:
                     if u in self._dbphotos:
                         uuid_set.update([u])
-                    else:
-                        logging.debug(f"Could not find uuid '{u}' in database")
                 photos_sets.append(uuid_set)
 
             if keywords:
@@ -2754,8 +2749,6 @@ class PhotosDB:
                 for keyword in keywords:
                     if keyword in self._dbkeywords_keyword:
                         keyword_set.update(self._dbkeywords_keyword[keyword])
-                    else:
-                        logging.debug(f"Could not find keyword '{keyword}' in database")
                 photos_sets.append(keyword_set)
 
             if persons:
@@ -2768,8 +2761,6 @@ class PhotosDB:
                             except KeyError:
                                 # some persons have zero photos so they won't be in _dbfaces_pk
                                 pass
-                    else:
-                        logging.debug(f"Could not find person '{person}' in database")
                 photos_sets.append(person_set)
 
             if from_date or to_date:  # sourcery off
@@ -2780,14 +2771,10 @@ class PhotosDB:
                     dsel = {
                         k: v for k, v in dsel.items() if v["imageDate"] >= from_date
                     }
-                    logging.debug(
-                        f"Found %i items with from_date {from_date}" % len(dsel)
-                    )
                 if to_date:
                     if not datetime_has_tz(to_date):
                         to_date = datetime_naive_to_local(to_date)
                     dsel = {k: v for k, v in dsel.items() if v["imageDate"] <= to_date}
-                    logging.debug(f"Found %i items with to_date {to_date}" % len(dsel))
                 photos_sets.append(set(dsel.keys()))
 
         photoinfo = []

osxphotos/phototemplate.py

@@ -840,7 +840,7 @@ class PhotoTemplate:
         """ return list of values for a multi-valued template field """
         values = []
         if field == "album":
-            values = self.photo.albums
+            values = self.photo.burst_albums if self.photo.burst else self.photo.albums
         elif field == "keyword":
             values = self.photo.keywords
         elif field == "person":
@@ -854,7 +854,11 @@ class PhotoTemplate:
         elif field == "folder_album":
             values = []
             # photos must be in an album to be in a folder
-            for album in self.photo.album_info:
+            if self.photo.burst:
+                album_info = self.photo.burst_album_info
+            else:
+                album_info = self.photo.album_info
+            for album in album_info:
                 if album.folder_names:
                     # album in folder
                     if dirname:
@@ -914,6 +918,7 @@ class PhotoTemplate:
         if subfield in exifdict:
             values = exifdict[subfield]
             values = [values] if not isinstance(values, list) else values
+            values = [str(v) for v in values]
 
             # sanitize directory names if needed
             if filename:

requirements.txt

@@ -59,7 +59,7 @@ py==1.8.0
 py2app==0.21
 pycparser==2.20
 pyfiglet==0.8.post1
-Pygments==2.6.1
+Pygments==2.7.4
 PyInstaller==3.6
 pyinstaller-setuptools==2019.3
 pylint==2.3.1
@@ -181,7 +181,7 @@ pyobjc-framework-Vision==6.2.2
 pyobjc-framework-WebKit==6.2.2
 pyparsing==2.4.1.1
 python-dateutil==2.8.1
-PyYAML==5.1.2
+PyYAML==5.4
 pyzmq==18.1.1
 readme-renderer==25.0
 regex==2020.2.20

tests/test_cli.py

@@ -22,6 +22,17 @@ PHOTOS_DB_TOUCH = PHOTOS_DB_15_6
 PHOTOS_DB_14_6 = "tests/Test-10.14.6.photoslibrary"
 PHOTOS_DB_MOVIES = "tests/Test-Movie-5_0.photoslibrary"
 
+# my personal library which some tests require
+PHOTOS_DB_RHET = os.path.expanduser("~/Pictures/Photos Library.photoslibrary")
+UUID_BURST_ALBUM = "9F90DC00-AAAF-4A05-9A65-61FEEE0D67F2"  # in my personal library
+BURST_ALBUM_FILES = [
+    "IMG_9812.JPG",
+    "IMG_9813.JPG",
+    "IMG_9814.JPG",
+    "IMG_9815.JPG",
+    "IMG_9816.JPG",
+]
+
 UUID_FILE = "tests/uuid_from_file.txt"
 
 CLI_OUTPUT_NO_SUBCOMMAND = [
@@ -5649,3 +5660,111 @@ def test_export_jpeg_ext_convert_to_jpeg_movie():
             assert f"{filename}.jpg".lower() not in files
             assert f"{filename}.{ext}".lower() in files
             assert f"{filename}_edited.{ext}".lower() in files
+
+
+@pytest.mark.skipif(
+    "OSXPHOTOS_TEST_EXPORT" not in os.environ,
+    reason="Skip if not running on author's personal library.",
+)
+def test_export_burst_folder_album():
+    """ test non-selected burst photos are exported with the album their key photo is in, issue #401 """
+    import glob
+    import os
+    import os.path
+    import pathlib
+    from osxphotos.cli import export
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        result = runner.invoke(
+            export,
+            [
+                os.path.join(cwd, PHOTOS_DB_RHET),
+                ".",
+                "-V",
+                "--directory",
+                "{folder_album}",
+                "--uuid",
+                UUID_BURST_ALBUM,
+                "--download-missing",
+                "--use-photokit",
+            ],
+        )
+        assert result.exit_code == 0
+        folder_album = pathlib.Path("TestBurst")
+        assert folder_album.is_dir()
+        for filename in BURST_ALBUM_FILES:
+            path = folder_album / filename
+            assert path.is_file()
+
+
+def test_query_name():
+    """ test query --name """
+    import json
+    import os
+    import os.path
+    import osxphotos
+    from osxphotos.cli import query
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    result = runner.invoke(
+        query,
+        ["--json", "--db", os.path.join(cwd, PHOTOS_DB_15_7), "--name", "DSC03584"],
+    )
+    assert result.exit_code == 0
+    json_got = json.loads(result.output)
+
+    assert len(json_got) == 1
+    assert json_got[0]["original_filename"] == "DSC03584.dng"
+
+
+def test_query_name_i():
+    """ test query --name -i """
+    import json
+    import os
+    import os.path
+    import osxphotos
+    from osxphotos.cli import query
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    result = runner.invoke(
+        query,
+        [
+            "--json",
+            "--db",
+            os.path.join(cwd, PHOTOS_DB_15_7),
+            "--name",
+            "dsc03584",
+            "-i",
+        ],
+    )
+    assert result.exit_code == 0
+    json_got = json.loads(result.output)
+
+    assert len(json_got) == 1
+    assert json_got[0]["original_filename"] == "DSC03584.dng"
+
+
+def test_export_name():
+    """ test export --name """
+    import glob
+    import os
+    import os.path
+    import osxphotos
+    from osxphotos.cli import export
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        result = runner.invoke(
+            export, [os.path.join(cwd, PHOTOS_DB_15_7), ".", "-V", "--name", "DSC03584"]
+        )
+        assert result.exit_code == 0
+        files = glob.glob("*")
+        assert len(files) == 1
+

tests/test_export_catalina_10_15_7_use_photos_export.py

@@ -17,6 +17,34 @@ UUID_DICT = {
     "live": "BFF29EBD-22DF-4FCF-9817-317E7104EA50",
 }
 
+UUID_BURSTS = {
+    "9F90DC00-AAAF-4A05-9A65-61FEEE0D67F2": {
+        "selected": True,
+        "filename": "IMAGE_9812.JPG",
+        "albums": ["TestBurst"],
+    },
+    "964F457D-5FFC-47B9-BEAD-56B0A83FEF63": {
+        "selected": True,
+        "filename": "IMG_9816.JPG",
+        "albums": [],
+    },
+    "A385FA13-DF8E-482F-A8C5-970EDDF54C2F": {
+        "selected": False,
+        "filename": "IMG_9813.JPG",
+        "albums": ["TestBurst", "TestBurst2"],
+    },
+    "38F8F30C-FF6D-49DA-8092-18497F1D6628": {
+        "selected": True,
+        "filename": "IMG_9814.JPG",
+        "albums": ["TestBurst2"],
+    },
+    "E3863443-9EA8-417F-A90B-8F7086623DAD": {
+        "selected": False,
+        "filename": "IMG_9815.JPG",
+        "albums": ["TestBurst", "TestBurst2"],
+    },
+}
+
 
 @pytest.fixture(scope="module")
 def photosdb():
@@ -156,3 +184,13 @@ def test_export_edited_no_edit(photosdb):
     with pytest.raises(Exception) as e:
         assert photos[0].export(dest, use_photos_export=True, edited=True)
     assert e.type == ValueError
+
+
+def test_burst_albums(photosdb):
+    """Test burst_selected, burst_albums"""
+
+    for uuid in UUID_BURSTS:
+        photo = photosdb.get_photo(uuid)
+        assert photo.burst
+        assert photo.burst_selected == UUID_BURSTS[uuid]["selected"]
+        assert sorted(photo.burst_albums) == sorted(UUID_BURSTS[uuid]["albums"])

tests/test_template.py

@@ -133,6 +133,9 @@ UUID_EXIFTOOL = {
             "England,London,London 2018,St. James's Park,UK,United Kingdom"
         ],
     },
+    "1EB2B765-0765-43BA-A90C-0D0580E6172C": {
+        "{exiftool:EXIF:SubSecTimeOriginal}": ["22"]
+    },
 }
 
 TEMPLATE_VALUES = {