Release 0.59.2 (#1041 )

Added shallow json() option, #1038 (#1040 )
Fix for json() failing on photos in projects, #999 (#1039 )
2023-04-08 12:04:54 -07:00 · 2023-04-08 11:10:29 -07:00 · 2023-04-08 09:49:31 -07:00 · 2023-04-08 09:09:33 -07:00 · 2023-04-07 08:17:00 -07:00 · 2023-04-07 08:14:51 -07:00
50 changed files with 627 additions and 421 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -531,6 +531,24 @@
      "contributions": [
        "ideas"
      ]
+    },
+    {
+      "login": "cclauss",
+      "name": "Christian Clauss",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3709715?v=4",
+      "profile": "https://www.patreon.com/cclauss",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "dvdkon",
+      "name": "dvdkon",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3526303?v=4",
+      "profile": "https://github.com/dvdkon",
+      "contributions": [
+        "code"
+      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.59.0
+current_version = 0.59.2
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
 serialize = {major}.{minor}.{patch}

--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,6 +3,15 @@ name: Tests
 on: [push, pull_request]

 jobs:
+  ruff:  # https://beta.ruff.rs
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - run: pip install --user ruff  # Lint Python twice: 1. Whole repo, 2. Exclude tests/
+    - run: ruff --format=github --line-length=7228 --target-version=py39
+                --ignore=E402,E712,E721,E722,E741,F401,F403,F405,F541,F601,F811,F822,F841 .
+    - run: ruff --format=github --line-length=366 --target-version=py39
+                --exclude=tests/ --ignore=E402,E722,E741,F401,F403,F405,F541,F822,F841 .
  build:
    runs-on: ${{ matrix.os }}
    if: "!contains(github.event.head_commit.message, '[skip ci]')"
--- a/API_README.md
+++ b/API_README.md
@@ -2456,7 +2456,7 @@ cog.out(get_template_field_table())
 |{cr}|A carriage return: '\r'|
 |{crlf}|A carriage return + line feed: '\r\n'|
 |{tab}|:A tab: '\t'|
-|{osxphotos_version}|The osxphotos version, e.g. '0.59.0'|
+|{osxphotos_version}|The osxphotos version, e.g. '0.59.2'|
 |{osxphotos_cmd_line}|The full command line used to run osxphotos|
 |{album}|Album(s) photo is contained in|
 |{folder_album}|Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder|
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,24 @@

 All notable changes to this project will be documented in this file.

+
+## [v0.59.1](https://github.com/RhetTbull/osxphotos/compare/v0.59.0...v0.59.1)
+
+Performance Boost
+
+### 2 April 2023
+
+#### Changed
+
+- Removed lock files from export code (speed boost for NAS export, see #999); will need to eventually add this back for multithreaded export
+- Optimized some code in export CLI to speed export
+- Some linting fixed for move to ruff
+- 
+#### Contributors
+
+- [@RhetTbull](https://github.com/RhetTbull) for code changes.
+- [@cclauss](https://github.com/cclauss) for linting fixes
+
 ## [v0.59.0](https://github.com/RhetTbull/osxphotos/compare/v0.58.2...v0.59.0)

 ### 1 April 2023
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 [![Downloads](https://static.pepy.tech/personalized-badge/osxphotos?period=month&units=international_system&left_color=black&right_color=brightgreen&left_text=downloads/month)](https://pepy.tech/project/osxphotos)
 [![subreddit](https://img.shields.io/reddit/subreddit-subscribers/osxphotos?style=social)](https://www.reddit.com/r/osxphotos/)
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-55-orange.svg?style=flat)](#contributors)
+[![All Contributors](https://img.shields.io/badge/all_contributors-57-orange.svg?style=flat)](#contributors)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

 OSXPhotos provides the ability to interact with and query Apple's Photos.app library on macOS. You can query the Photos library database — for example, file name, file path, and metadata such as keywords/tags, persons/faces, albums, etc. You can also easily export both the original and edited photos.
@@ -2094,7 +2094,7 @@ Substitution                    Description
 {cr}                            A carriage return: '\r'
 {crlf}                          A carriage return + line feed: '\r\n'
 {tab}                           :A tab: '\t'
-{osxphotos_version}             The osxphotos version, e.g. '0.59.0'
+{osxphotos_version}             The osxphotos version, e.g. '0.59.2'
 {osxphotos_cmd_line}            The full command line used to run osxphotos

 The following substitutions may result in multiple values. Thus if specified
@@ -2581,7 +2581,7 @@ The following template field substitutions are availabe for use the templating s
 |{cr}|A carriage return: '\r'|
 |{crlf}|A carriage return + line feed: '\r\n'|
 |{tab}|:A tab: '\t'|
-|{osxphotos_version}|The osxphotos version, e.g. '0.59.0'|
+|{osxphotos_version}|The osxphotos version, e.g. '0.59.2'|
 |{osxphotos_cmd_line}|The full command line used to run osxphotos|
 |{album}|Album(s) photo is contained in|
 |{folder_album}|Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder|
@@ -2702,6 +2702,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/swduncan"><img src="https://avatars.githubusercontent.com/u/2053195?v=4?s=75" width="75px;" alt="Steve Duncan"/><br /><sub><b>Steve Duncan</b></sub></a><br /><a href="#ideas-swduncan" title="Ideas, Planning, & Feedback">🤔</a></td>
      <td align="center" valign="top" width="14.28%"><a href="http://www.projany.com"><img src="https://avatars.githubusercontent.com/u/15144745?v=4?s=75" width="75px;" alt="Ian Moir"/><br /><sub><b>Ian Moir</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/issues?q=author%3Aianmmoir" title="Bug reports">🐛</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/pekingduck"><img src="https://avatars.githubusercontent.com/u/2597142?v=4?s=75" width="75px;" alt="Peking Duck"/><br /><sub><b>Peking Duck</b></sub></a><br /><a href="#ideas-pekingduck" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.patreon.com/cclauss"><img src="https://avatars.githubusercontent.com/u/3709715?v=4?s=75" width="75px;" alt="Christian Clauss"/><br /><sub><b>Christian Clauss</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=cclauss" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dvdkon"><img src="https://avatars.githubusercontent.com/u/3526303?v=4?s=75" width="75px;" alt="dvdkon"/><br /><sub><b>dvdkon</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=dvdkon" title="Code">💻</a></td>
    </tr>
  </tbody>
 </table>
--- 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: 97939ee226e568d1b630529e47e51a47
+config: 489a07f374a4d2bd9d01fa1d929e40e0
 tags: 645f666f9bcd5a90fca523b33c5a78b7
--- a/docs/_modules/index.html
+++ b/docs/_modules/index.html
@@ -5,7 +5,7 @@
    <meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="../genindex.html" /><link rel="search" title="Search" href="../search.html" />

    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/>
-        <title>Overview: module code - osxphotos 0.59.0 documentation</title>
+        <title>Overview: module code - osxphotos 0.59.2 documentation</title>
      <link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="../_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="../_static/copybutton.css" />
@@ -123,7 +123,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="../index.html"><div class="brand">osxphotos 0.59.0 documentation</div></a>
+      <a href="../index.html"><div class="brand">osxphotos 0.59.2 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -146,7 +146,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="../index.html">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.59.0 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.2 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="../search.html" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
--- a/docs/_modules/osxphotos/_constants.html
+++ b/docs/_modules/osxphotos/_constants.html
@@ -5,7 +5,7 @@
    <meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="../../genindex.html" /><link rel="search" title="Search" href="../../search.html" />

    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/>
-        <title>osxphotos._constants - osxphotos 0.59.0 documentation</title>
+        <title>osxphotos._constants - osxphotos 0.59.2 documentation</title>
      <link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="../../_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="../../_static/copybutton.css" />
@@ -123,7 +123,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="../../index.html"><div class="brand">osxphotos 0.59.0 documentation</div></a>
+      <a href="../../index.html"><div class="brand">osxphotos 0.59.2 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -146,7 +146,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="../../index.html">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.59.0 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.2 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="../../search.html" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
--- a/docs/_modules/osxphotos/albuminfo.html
+++ b/docs/_modules/osxphotos/albuminfo.html
@@ -5,7 +5,7 @@
    <meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="../../genindex.html" /><link rel="search" title="Search" href="../../search.html" />

    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/>
-        <title>osxphotos.albuminfo - osxphotos 0.59.0 documentation</title>
+        <title>osxphotos.albuminfo - osxphotos 0.59.2 documentation</title>
      <link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="../../_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="../../_static/copybutton.css" />
@@ -123,7 +123,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="../../index.html"><div class="brand">osxphotos 0.59.0 documentation</div></a>
+      <a href="../../index.html"><div class="brand">osxphotos 0.59.2 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -146,7 +146,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="../../index.html">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.59.0 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.2 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="../../search.html" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
@@ -583,7 +583,25 @@
 <span class="sd">    Projects are cards, calendars, slideshows, etc.</span>
 <span class="sd">    &quot;&quot;&quot;</span>

-    <span class="o">...</span></div>
+    <span class="nd">@property</span>
+    <span class="k">def</span> <span class="nf">folder_names</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot;Return hierarchical list of folders the album is contained in</span>
+<span class="sd">        the folder list is in form:</span>
+<span class="sd">        [&quot;Top level folder&quot;, &quot;sub folder 1&quot;, &quot;sub folder 2&quot;, ...]</span>
+<span class="sd">        or empty list if album is not in any folders</span>
+<span class="sd">        &quot;&quot;&quot;</span>
+
+        <span class="c1"># projects are not in folders</span>
+        <span class="k">return</span> <span class="p">[]</span>
+
+    <span class="nd">@property</span>
+    <span class="k">def</span> <span class="nf">folder_list</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot;Returns list of FolderInfo objects for each folder the album is contained in</span>
+<span class="sd">        or empty list if album is not in any folders</span>
+<span class="sd">        &quot;&quot;&quot;</span>
+
+        <span class="c1"># projects are not in folders</span>
+        <span class="k">return</span> <span class="p">[]</span></div>


 <div class="viewcode-block" id="FolderInfo"><a class="viewcode-back" href="../../reference.html#osxphotos.FolderInfo">[docs]</a><span class="k">class</span> <span class="nc">FolderInfo</span><span class="p">:</span>
--- a/docs/_modules/osxphotos/exiftool.html
+++ b/docs/_modules/osxphotos/exiftool.html
@@ -5,7 +5,7 @@
    <meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="../../genindex.html" /><link rel="search" title="Search" href="../../search.html" />

    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/>
-        <title>osxphotos.exiftool - osxphotos 0.58.1 documentation</title>
+        <title>osxphotos.exiftool - osxphotos 0.59.1 documentation</title>
      <link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="../../_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="../../_static/copybutton.css" />
@@ -123,7 +123,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="../../index.html"><div class="brand">osxphotos 0.58.1 documentation</div></a>
+      <a href="../../index.html"><div class="brand">osxphotos 0.59.1 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -146,7 +146,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="../../index.html">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.58.1 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.1 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="../../search.html" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
--- a/docs/_modules/osxphotos/export_db.html
+++ b/docs/_modules/osxphotos/export_db.html
@@ -5,7 +5,7 @@
    <meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="../../genindex.html" /><link rel="search" title="Search" href="../../search.html" />

    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/>
-        <title>osxphotos.export_db - osxphotos 0.59.0 documentation</title>
+        <title>osxphotos.export_db - osxphotos 0.59.2 documentation</title>
      <link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="../../_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="../../_static/copybutton.css" />
@@ -123,7 +123,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="../../index.html"><div class="brand">osxphotos 0.59.0 documentation</div></a>
+      <a href="../../index.html"><div class="brand">osxphotos 0.59.2 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -146,7 +146,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="../../index.html">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.59.0 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.2 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="../../search.html" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
--- a/docs/_modules/osxphotos/fileutil.html
+++ b/docs/_modules/osxphotos/fileutil.html
@@ -5,7 +5,7 @@
    <meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="../../genindex.html" /><link rel="search" title="Search" href="../../search.html" />

    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/>
-        <title>osxphotos.fileutil - osxphotos 0.58.1 documentation</title>
+        <title>osxphotos.fileutil - osxphotos 0.59.2 documentation</title>
      <link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="../../_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="../../_static/copybutton.css" />
@@ -123,7 +123,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="../../index.html"><div class="brand">osxphotos 0.58.1 documentation</div></a>
+      <a href="../../index.html"><div class="brand">osxphotos 0.59.2 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -146,7 +146,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="../../index.html">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.58.1 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.2 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="../../search.html" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
--- a/docs/_modules/osxphotos/photoexporter.html
+++ b/docs/_modules/osxphotos/photoexporter.html
@@ -5,7 +5,7 @@
    <meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="../../genindex.html" /><link rel="search" title="Search" href="../../search.html" />

    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/>
-        <title>osxphotos.photoexporter - osxphotos 0.59.0 documentation</title>
+        <title>osxphotos.photoexporter - osxphotos 0.59.2 documentation</title>
      <link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="../../_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="../../_static/copybutton.css" />
@@ -123,7 +123,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="../../index.html"><div class="brand">osxphotos 0.59.0 documentation</div></a>
+      <a href="../../index.html"><div class="brand">osxphotos 0.59.2 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -146,7 +146,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="../../index.html">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.59.0 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.2 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="../../search.html" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
@@ -1409,7 +1409,7 @@

        <span class="c1"># set data in the database</span>
        <span class="k">with</span> <span class="n">export_db</span><span class="o">.</span><span class="n">create_or_get_file_record</span><span class="p">(</span><span class="n">dest_str</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">photo</span><span class="o">.</span><span class="n">uuid</span><span class="p">)</span> <span class="k">as</span> <span class="n">rec</span><span class="p">:</span>
-            <span class="n">rec</span><span class="o">.</span><span class="n">photoinfo</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">photo</span><span class="o">.</span><span class="n">json</span><span class="p">()</span>
+            <span class="n">rec</span><span class="o">.</span><span class="n">photoinfo</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">photo</span><span class="o">.</span><span class="n">json</span><span class="p">(</span><span class="n">shallow</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
            <span class="n">rec</span><span class="o">.</span><span class="n">export_options</span> <span class="o">=</span> <span class="n">options</span><span class="o">.</span><span class="n">bit_flags</span>
            <span class="c1"># don&#39;t set src_sig as that is set above before any modifications by convert_to_jpeg or exiftool</span>
            <span class="k">if</span> <span class="ow">not</span> <span class="n">options</span><span class="o">.</span><span class="n">ignore_signature</span><span class="p">:</span>
--- a/docs/_modules/osxphotos/photoinfo.html
+++ b/docs/_modules/osxphotos/photoinfo.html
@@ -5,7 +5,7 @@
    <meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="../../genindex.html" /><link rel="search" title="Search" href="../../search.html" />

    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/>
-        <title>osxphotos.photoinfo - osxphotos 0.59.0 documentation</title>
+        <title>osxphotos.photoinfo - osxphotos 0.59.2 documentation</title>
      <link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="../../_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="../../_static/copybutton.css" />
@@ -123,7 +123,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="../../index.html"><div class="brand">osxphotos 0.59.0 documentation</div></a>
+      <a href="../../index.html"><div class="brand">osxphotos 0.59.2 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -146,7 +146,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="../../index.html">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.59.0 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.2 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="../../search.html" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
@@ -2085,14 +2085,46 @@
            <span class="s2">&quot;width&quot;</span><span class="p">:</span> <span class="bp">self</span><span class="o">.</span><span class="n">width</span><span class="p">,</span>
        <span class="p">}</span></div>

-<div class="viewcode-block" id="PhotoInfo.json"><a class="viewcode-back" href="../../reference.html#osxphotos.PhotoInfo.json">[docs]</a>    <span class="k">def</span> <span class="nf">json</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-        <span class="sd">&quot;&quot;&quot;Return JSON representation&quot;&quot;&quot;</span>
+<div class="viewcode-block" id="PhotoInfo.json"><a class="viewcode-back" href="../../reference.html#osxphotos.PhotoInfo.json">[docs]</a>    <span class="k">def</span> <span class="nf">json</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">indent</span><span class="p">:</span> <span class="nb">int</span> <span class="o">|</span> <span class="kc">None</span> <span class="o">=</span> <span class="kc">None</span><span class="p">,</span> <span class="n">shallow</span><span class="p">:</span> <span class="nb">bool</span> <span class="o">=</span> <span class="kc">False</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">str</span><span class="p">:</span>
+        <span class="sd">&quot;&quot;&quot;Return JSON representation</span>
+
+<span class="sd">        Args:</span>
+<span class="sd">            indent: indent level for JSON, if None, no indent</span>
+<span class="sd">            shallow: if True, return shallow JSON representation (does not contain folder_info, person_info, etc.)</span>
+
+<span class="sd">        Returns:</span>
+<span class="sd">            JSON string</span>
+<span class="sd">        &quot;&quot;&quot;</span>

        <span class="k">def</span> <span class="nf">default</span><span class="p">(</span><span class="n">o</span><span class="p">):</span>
            <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">o</span><span class="p">,</span> <span class="p">(</span><span class="n">datetime</span><span class="o">.</span><span class="n">date</span><span class="p">,</span> <span class="n">datetime</span><span class="o">.</span><span class="n">datetime</span><span class="p">)):</span>
                <span class="k">return</span> <span class="n">o</span><span class="o">.</span><span class="n">isoformat</span><span class="p">()</span>

        <span class="n">dict_data</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">asdict</span><span class="p">()</span>
+
+        <span class="k">if</span> <span class="n">shallow</span><span class="p">:</span>
+            <span class="c1"># delete items that are not needed for shallow JSON</span>
+            <span class="c1"># these are removed to match behavior of osxphotos &lt; 0.59.0 (See #999, #1039)</span>
+            <span class="k">for</span> <span class="n">key</span> <span class="ow">in</span> <span class="p">[</span>
+                <span class="s2">&quot;adjustments&quot;</span><span class="p">,</span>
+                <span class="s2">&quot;album_info&quot;</span><span class="p">,</span>
+                <span class="s2">&quot;burst_album_info&quot;</span><span class="p">,</span>
+                <span class="s2">&quot;burst_albums&quot;</span><span class="p">,</span>
+                <span class="s2">&quot;burst_default_pick&quot;</span><span class="p">,</span>
+                <span class="s2">&quot;burst_key&quot;</span><span class="p">,</span>
+                <span class="s2">&quot;burst_photos&quot;</span><span class="p">,</span>
+                <span class="s2">&quot;burst_selected&quot;</span><span class="p">,</span>
+                <span class="s2">&quot;cloud_metadata&quot;</span><span class="p">,</span>
+                <span class="s2">&quot;import_info&quot;</span><span class="p">,</span>
+                <span class="s2">&quot;labels_normalized&quot;</span><span class="p">,</span>
+                <span class="s2">&quot;path_derivatives&quot;</span><span class="p">,</span>
+                <span class="s2">&quot;person_info&quot;</span><span class="p">,</span>
+                <span class="s2">&quot;project_info&quot;</span><span class="p">,</span>
+                <span class="s2">&quot;search_info_normalized&quot;</span><span class="p">,</span>
+                <span class="s2">&quot;search_info&quot;</span><span class="p">,</span>
+            <span class="p">]:</span>
+                <span class="k">del</span> <span class="n">dict_data</span><span class="p">[</span><span class="n">key</span><span class="p">]</span>
+
        <span class="k">for</span> <span class="n">k</span><span class="p">,</span> <span class="n">v</span> <span class="ow">in</span> <span class="n">dict_data</span><span class="o">.</span><span class="n">items</span><span class="p">():</span>
            <span class="c1"># sort lists such as keywords so JSON is consistent</span>
            <span class="c1"># but do not sort certain items like location</span>
@@ -2100,7 +2132,7 @@
                <span class="k">continue</span>
            <span class="k">if</span> <span class="n">v</span> <span class="ow">and</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">v</span><span class="p">,</span> <span class="p">(</span><span class="nb">list</span><span class="p">,</span> <span class="nb">tuple</span><span class="p">))</span> <span class="ow">and</span> <span class="ow">not</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">v</span><span class="p">[</span><span class="mi">0</span><span class="p">],</span> <span class="nb">dict</span><span class="p">):</span>
                <span class="n">dict_data</span><span class="p">[</span><span class="n">k</span><span class="p">]</span> <span class="o">=</span> <span class="nb">sorted</span><span class="p">(</span><span class="n">v</span><span class="p">,</span> <span class="n">key</span><span class="o">=</span><span class="k">lambda</span> <span class="n">v</span><span class="p">:</span> <span class="n">v</span> <span class="k">if</span> <span class="n">v</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span> <span class="k">else</span> <span class="s2">&quot;&quot;</span><span class="p">)</span>
-        <span class="k">return</span> <span class="n">json</span><span class="o">.</span><span class="n">dumps</span><span class="p">(</span><span class="n">dict_data</span><span class="p">,</span> <span class="n">sort_keys</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span> <span class="n">default</span><span class="o">=</span><span class="n">default</span><span class="p">)</span></div>
+        <span class="k">return</span> <span class="n">json</span><span class="o">.</span><span class="n">dumps</span><span class="p">(</span><span class="n">dict_data</span><span class="p">,</span> <span class="n">sort_keys</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span> <span class="n">default</span><span class="o">=</span><span class="n">default</span><span class="p">,</span> <span class="n">indent</span><span class="o">=</span><span class="n">indent</span><span class="p">)</span></div>

    <span class="k">def</span> <span class="nf">_json_hexdigest</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
        <span class="sd">&quot;&quot;&quot;JSON for use by hexdigest()&quot;&quot;&quot;</span>
--- a/docs/_modules/osxphotos/photosalbum.html
+++ b/docs/_modules/osxphotos/photosalbum.html
@@ -5,7 +5,7 @@
    <meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="../../genindex.html" /><link rel="search" title="Search" href="../../search.html" />

    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/>
-        <title>osxphotos.photosalbum - osxphotos 0.58.1 documentation</title>
+        <title>osxphotos.photosalbum - osxphotos 0.59.2 documentation</title>
      <link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="../../_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="../../_static/copybutton.css" />
@@ -123,7 +123,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="../../index.html"><div class="brand">osxphotos 0.58.1 documentation</div></a>
+      <a href="../../index.html"><div class="brand">osxphotos 0.59.2 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -146,7 +146,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="../../index.html">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.58.1 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.2 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="../../search.html" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
--- a/docs/_modules/osxphotos/photosdb/photosdb.html
+++ b/docs/_modules/osxphotos/photosdb/photosdb.html
@@ -5,7 +5,7 @@
    <meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="../../../genindex.html" /><link rel="search" title="Search" href="../../../search.html" />

    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/>
-        <title>osxphotos.photosdb.photosdb - osxphotos 0.59.0 documentation</title>
+        <title>osxphotos.photosdb.photosdb - osxphotos 0.59.2 documentation</title>
      <link rel="stylesheet" type="text/css" href="../../../_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="../../../_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="../../../_static/copybutton.css" />
@@ -123,7 +123,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="../../../index.html"><div class="brand">osxphotos 0.59.0 documentation</div></a>
+      <a href="../../../index.html"><div class="brand">osxphotos 0.59.2 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -146,7 +146,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="../../../index.html">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.59.0 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.2 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="../../../search.html" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
--- a/docs/_modules/osxphotos/phototemplate.html
+++ b/docs/_modules/osxphotos/phototemplate.html
@@ -5,7 +5,7 @@
    <meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="../../genindex.html" /><link rel="search" title="Search" href="../../search.html" />

    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/>
-        <title>osxphotos.phototemplate - osxphotos 0.59.0 documentation</title>
+        <title>osxphotos.phototemplate - osxphotos 0.59.2 documentation</title>
      <link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="../../_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="../../_static/copybutton.css" />
@@ -123,7 +123,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="../../index.html"><div class="brand">osxphotos 0.59.0 documentation</div></a>
+      <a href="../../index.html"><div class="brand">osxphotos 0.59.2 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -146,7 +146,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="../../index.html">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.59.0 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.2 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="../../search.html" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
@@ -1350,7 +1350,7 @@
                <span class="p">)</span>
            <span class="k">except</span> <span class="ne">ValueError</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
                <span class="k">raise</span> <span class="ne">SyntaxError</span><span class="p">(</span>
-                    <span class="sa">f</span><span class="s2">&quot;comparison operators may only be used with values that can be converted to numbers: </span><span class="si">{</span><span class="n">vals</span><span class="si">}</span><span class="s2"> </span><span class="si">{</span><span class="n">conditional_value</span><span class="si">}</span><span class="s2">&quot;</span>
+                    <span class="sa">f</span><span class="s2">&quot;comparison operators may only be used with values that can be converted to numbers: </span><span class="si">{</span><span class="n">value</span><span class="si">}</span><span class="s2"> </span><span class="si">{</span><span class="n">conditional_value</span><span class="si">}</span><span class="s2">&quot;</span>
                <span class="p">)</span> <span class="kn">from</span> <span class="nn">e</span>

        <span class="n">predicate_is_true</span> <span class="o">=</span> <span class="kc">False</span>
@@ -1879,7 +1879,7 @@
            <span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;Unhandled template value: </span><span class="si">{</span><span class="n">field</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span> <span class="kn">from</span> <span class="nn">e</span>


-<span class="k">def</span> <span class="nf">get_place_value</span><span class="p">(</span><span class="n">photo</span><span class="p">:</span> <span class="s2">&quot;PhotoInfo&quot;</span><span class="p">,</span> <span class="n">field</span><span class="p">:</span> <span class="nb">str</span><span class="p">):</span>
+<span class="k">def</span> <span class="nf">get_place_value</span><span class="p">(</span><span class="n">photo</span><span class="p">:</span> <span class="s2">&quot;PhotoInfo&quot;</span><span class="p">,</span> <span class="n">field</span><span class="p">:</span> <span class="nb">str</span><span class="p">):</span>  <span class="c1"># noqa: F821</span>
    <span class="sd">&quot;&quot;&quot;Get the value of a &#39;place&#39; field by attribute</span>

 <span class="sd">    Args:</span>
--- a/docs/_sources/template_help.rst.txt
+++ b/docs/_sources/template_help.rst.txt
@@ -361,7 +361,7 @@ Template Substitutions
   * - {tab}
     - :A tab: '\t'
   * - {osxphotos_version}
-     - The osxphotos version, e.g. '0.59.0'
+     - The osxphotos version, e.g. '0.59.2'
   * - {osxphotos_cmd_line}
     - The full command line used to run osxphotos
   * - {album}
--- 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.59.0',
+    VERSION: '0.59.2',
    LANGUAGE: 'en',
    COLLAPSE_INDEX: false,
    BUILDER: 'html',
--- a/docs/cli.html
+++ b/docs/cli.html
@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="OSXPhotos Template System" href="template_help.html" /><link rel="prev" title="OSXPhotos Tutorial" href="tutorial.html" />

    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/>
-        <title>OSXPhotos Command Line Interface (CLI) - osxphotos 0.59.0 documentation</title>
+        <title>OSXPhotos Command Line Interface (CLI) - osxphotos 0.59.2 documentation</title>
      <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -124,7 +124,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="index.html"><div class="brand">osxphotos 0.59.0 documentation</div></a>
+      <a href="index.html"><div class="brand">osxphotos 0.59.2 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -147,7 +147,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.59.0 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.2 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
--- a/docs/genindex.html
+++ b/docs/genindex.html
@@ -4,7 +4,7 @@
    <meta name="viewport" content="width=device-width,initial-scale=1"/>
    <meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="#" /><link rel="search" title="Search" href="search.html" />

-    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/><title>Index - osxphotos 0.59.0 documentation</title>
+    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/><title>Index - osxphotos 0.59.2 documentation</title>
 <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -122,7 +122,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="index.html"><div class="brand">osxphotos 0.59.0 documentation</div></a>
+      <a href="index.html"><div class="brand">osxphotos 0.59.2 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -145,7 +145,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.59.0 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.2 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
@@ -3305,10 +3305,10 @@
        </ul></li>
        <li><a href="reference.html#osxphotos.FileUtil">FileUtil (class in osxphotos)</a>
 </li>
-    </ul></td>
-    <td style="width: 33%; vertical-align: top;"><ul>
        <li><a href="reference.html#osxphotos.ExportOptions.fileutil">fileutil (osxphotos.ExportOptions attribute)</a>
 </li>
+    </ul></td>
+    <td style="width: 33%; vertical-align: top;"><ul>
        <li><a href="reference.html#osxphotos.FileUtilNoOp">FileUtilNoOp (class in osxphotos)</a>
 </li>
        <li><a href="reference.html#osxphotos.PhotoTemplate.filter_predicate">filter_predicate() (osxphotos.PhotoTemplate method)</a>
@@ -3320,9 +3320,17 @@
        <li><a href="reference.html#osxphotos.PhotosDB.folder_info">folder_info (osxphotos.PhotosDB property)</a>
 </li>
        <li><a href="reference.html#osxphotos.AlbumInfo.folder_list">folder_list (osxphotos.AlbumInfo property)</a>
+
+        <ul>
+          <li><a href="reference.html#osxphotos.ProjectInfo.folder_list">(osxphotos.ProjectInfo property)</a>
 </li>
+        </ul></li>
        <li><a href="reference.html#osxphotos.AlbumInfo.folder_names">folder_names (osxphotos.AlbumInfo property)</a>
+
+        <ul>
+          <li><a href="reference.html#osxphotos.ProjectInfo.folder_names">(osxphotos.ProjectInfo property)</a>
 </li>
+        </ul></li>
        <li><a href="reference.html#osxphotos.FolderInfo">FolderInfo (class in osxphotos)</a>
 </li>
        <li><a href="reference.html#osxphotos.PhotosDB.folders">folders (osxphotos.PhotosDB property)</a>
--- a/docs/index.html
+++ b/docs/index.html
@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="OSXPhotos" href="overview.html" />

    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/>
-        <title>osxphotos 0.59.0 documentation</title>
+        <title>osxphotos 0.59.2 documentation</title>
      <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -124,7 +124,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="#"><div class="brand">osxphotos 0.59.0 documentation</div></a>
+      <a href="#"><div class="brand">osxphotos 0.59.2 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -147,7 +147,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="#">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.59.0 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.2 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
@@ -590,7 +590,11 @@
 </ul>
 </li>
 <li class="toctree-l2"><a class="reference internal" href="reference.html#osxphotos.PlaceInfo"><code class="docutils literal notranslate"><span class="pre">PlaceInfo</span></code></a></li>
-<li class="toctree-l2"><a class="reference internal" href="reference.html#osxphotos.ProjectInfo"><code class="docutils literal notranslate"><span class="pre">ProjectInfo</span></code></a></li>
+<li class="toctree-l2"><a class="reference internal" href="reference.html#osxphotos.ProjectInfo"><code class="docutils literal notranslate"><span class="pre">ProjectInfo</span></code></a><ul>
+<li class="toctree-l3"><a class="reference internal" href="reference.html#osxphotos.ProjectInfo.folder_list"><code class="docutils literal notranslate"><span class="pre">ProjectInfo.folder_list</span></code></a></li>
+<li class="toctree-l3"><a class="reference internal" href="reference.html#osxphotos.ProjectInfo.folder_names"><code class="docutils literal notranslate"><span class="pre">ProjectInfo.folder_names</span></code></a></li>
+</ul>
+</li>
 <li class="toctree-l2"><a class="reference internal" href="reference.html#osxphotos.QueryOptions"><code class="docutils literal notranslate"><span class="pre">QueryOptions</span></code></a><ul>
 <li class="toctree-l3"><a class="reference internal" href="reference.html#osxphotos.QueryOptions.added_after"><code class="docutils literal notranslate"><span class="pre">QueryOptions.added_after</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="reference.html#osxphotos.QueryOptions.added_before"><code class="docutils literal notranslate"><span class="pre">QueryOptions.added_before</span></code></a></li>
--- a/docs/objects.inv
+++ b/docs/objects.inv
--- a/docs/overview.html
+++ b/docs/overview.html
@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="OSXPhotos Tutorial" href="tutorial.html" /><link rel="prev" title="Welcome to OSXPhotos’s documentation!" href="index.html" />

    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/>
-        <title>OSXPhotos - osxphotos 0.59.0 documentation</title>
+        <title>OSXPhotos - osxphotos 0.59.2 documentation</title>
      <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -124,7 +124,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="index.html"><div class="brand">osxphotos 0.59.0 documentation</div></a>
+      <a href="index.html"><div class="brand">osxphotos 0.59.2 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -147,7 +147,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.59.0 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.2 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
--- a/docs/package_overview.html
+++ b/docs/package_overview.html
@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="OSXPhotos Python Reference" href="reference.html" /><link rel="prev" title="OSXPhotos Template System" href="template_help.html" />

    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/>
-        <title>OSXPhotos Python Package Overview - osxphotos 0.59.0 documentation</title>
+        <title>OSXPhotos Python Package Overview - osxphotos 0.59.2 documentation</title>
      <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -124,7 +124,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="index.html"><div class="brand">osxphotos 0.59.0 documentation</div></a>
+      <a href="index.html"><div class="brand">osxphotos 0.59.2 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -147,7 +147,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.59.0 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.2 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
--- a/docs/py-modindex.html
+++ b/docs/py-modindex.html
@@ -4,7 +4,7 @@
    <meta name="viewport" content="width=device-width,initial-scale=1"/>
    <meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" />

-    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/><title>Python Module Index - osxphotos 0.59.0 documentation</title>
+    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/><title>Python Module Index - osxphotos 0.59.2 documentation</title>
 <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -122,7 +122,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="index.html"><div class="brand">osxphotos 0.59.0 documentation</div></a>
+      <a href="index.html"><div class="brand">osxphotos 0.59.2 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -145,7 +145,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.59.0 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.2 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
--- a/docs/reference.html
+++ b/docs/reference.html
@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="prev" title="OSXPhotos Python Package Overview" href="package_overview.html" />

    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/>
-        <title>OSXPhotos Python Reference - osxphotos 0.59.0 documentation</title>
+        <title>OSXPhotos Python Reference - osxphotos 0.59.2 documentation</title>
      <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -124,7 +124,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="index.html"><div class="brand">osxphotos 0.59.0 documentation</div></a>
+      <a href="index.html"><div class="brand">osxphotos 0.59.2 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -147,7 +147,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.59.0 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.2 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
@@ -1814,8 +1814,19 @@ isMissing = 1</p>

 <dl class="py method">
 <dt class="sig sig-object py" id="osxphotos.PhotoInfo.json">
-<span class="sig-name descname"><span class="pre">json</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="reference internal" href="_modules/osxphotos/photoinfo.html#PhotoInfo.json"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#osxphotos.PhotoInfo.json" title="Permalink to this definition">#</a></dt>
+<span class="sig-name descname"><span class="pre">json</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">indent</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">int</span><span class="w"> </span><span class="p"><span class="pre">|</span></span><span class="w"> </span><span class="pre">None</span></span><span class="w"> </span><span class="o"><span class="pre">=</span></span><span class="w"> </span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">shallow</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">bool</span></span><span class="w"> </span><span class="o"><span class="pre">=</span></span><span class="w"> </span><span class="default_value"><span class="pre">False</span></span></em><span class="sig-paren">)</span> <span class="sig-return"><span class="sig-return-icon">&#x2192;</span> <span class="sig-return-typehint"><span class="pre">str</span></span></span><a class="reference internal" href="_modules/osxphotos/photoinfo.html#PhotoInfo.json"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#osxphotos.PhotoInfo.json" title="Permalink to this definition">#</a></dt>
 <dd><p>Return JSON representation</p>
+<dl class="field-list simple">
+<dt class="field-odd">Parameters<span class="colon">:</span></dt>
+<dd class="field-odd"><ul class="simple">
+<li><p><strong>indent</strong> – indent level for JSON, if None, no indent</p></li>
+<li><p><strong>shallow</strong> – if True, return shallow JSON representation (does not contain folder_info, person_info, etc.)</p></li>
+</ul>
+</dd>
+<dt class="field-even">Returns<span class="colon">:</span></dt>
+<dd class="field-even"><p>JSON string</p>
+</dd>
+</dl>
 </dd></dl>

 <dl class="py property">
@@ -2576,6 +2587,22 @@ Returns photos regardless of intrash state.</p>
 <em class="property"><span class="pre">class</span><span class="w"> </span></em><span class="sig-prename descclassname"><span class="pre">osxphotos.</span></span><span class="sig-name descname"><span class="pre">ProjectInfo</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">db</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">uuid</span></span></em><span class="sig-paren">)</span><a class="reference internal" href="_modules/osxphotos/albuminfo.html#ProjectInfo"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#osxphotos.ProjectInfo" title="Permalink to this definition">#</a></dt>
 <dd><p>ProjectInfo with info about projects
 Projects are cards, calendars, slideshows, etc.</p>
+<dl class="py property">
+<dt class="sig sig-object py" id="osxphotos.ProjectInfo.folder_list">
+<em class="property"><span class="pre">property</span><span class="w"> </span></em><span class="sig-name descname"><span class="pre">folder_list</span></span><a class="headerlink" href="#osxphotos.ProjectInfo.folder_list" title="Permalink to this definition">#</a></dt>
+<dd><p>Returns list of FolderInfo objects for each folder the album is contained in
+or empty list if album is not in any folders</p>
+</dd></dl>
+
+<dl class="py property">
+<dt class="sig sig-object py" id="osxphotos.ProjectInfo.folder_names">
+<em class="property"><span class="pre">property</span><span class="w"> </span></em><span class="sig-name descname"><span class="pre">folder_names</span></span><a class="headerlink" href="#osxphotos.ProjectInfo.folder_names" title="Permalink to this definition">#</a></dt>
+<dd><p>Return hierarchical list of folders the album is contained in
+the folder list is in form:
+[“Top level folder”, “sub folder 1”, “sub folder 2”, …]
+or empty list if album is not in any folders</p>
+</dd></dl>
+
 </dd></dl>

 <dl class="py class">
@@ -3997,7 +4024,11 @@ Projects are cards, calendars, slideshows, etc.</p>
 </ul>
 </li>
 <li><a class="reference internal" href="#osxphotos.PlaceInfo"><code class="docutils literal notranslate"><span class="pre">PlaceInfo</span></code></a></li>
-<li><a class="reference internal" href="#osxphotos.ProjectInfo"><code class="docutils literal notranslate"><span class="pre">ProjectInfo</span></code></a></li>
+<li><a class="reference internal" href="#osxphotos.ProjectInfo"><code class="docutils literal notranslate"><span class="pre">ProjectInfo</span></code></a><ul>
+<li><a class="reference internal" href="#osxphotos.ProjectInfo.folder_list"><code class="docutils literal notranslate"><span class="pre">ProjectInfo.folder_list</span></code></a></li>
+<li><a class="reference internal" href="#osxphotos.ProjectInfo.folder_names"><code class="docutils literal notranslate"><span class="pre">ProjectInfo.folder_names</span></code></a></li>
+</ul>
+</li>
 <li><a class="reference internal" href="#osxphotos.QueryOptions"><code class="docutils literal notranslate"><span class="pre">QueryOptions</span></code></a><ul>
 <li><a class="reference internal" href="#osxphotos.QueryOptions.added_after"><code class="docutils literal notranslate"><span class="pre">QueryOptions.added_after</span></code></a></li>
 <li><a class="reference internal" href="#osxphotos.QueryOptions.added_before"><code class="docutils literal notranslate"><span class="pre">QueryOptions.added_before</span></code></a></li>
--- a/docs/search.html
+++ b/docs/search.html
@@ -4,7 +4,7 @@
    <meta name="viewport" content="width=device-width,initial-scale=1"/>
    <meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="#" />

-    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/><title>Search - osxphotos 0.59.0 documentation</title><link rel="stylesheet" type="text/css" href="_static/pygments.css" />
+    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/><title>Search - osxphotos 0.59.2 documentation</title><link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
    <link rel="stylesheet" type="text/css" href="_static/styles/furo-extensions.css?digest=30d1aed668e5c3a91c3e3bf6a60b675221979f0e" />
@@ -121,7 +121,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="index.html"><div class="brand">osxphotos 0.59.0 documentation</div></a>
+      <a href="index.html"><div class="brand">osxphotos 0.59.2 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -144,7 +144,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.59.0 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.2 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="#" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
--- a/docs/searchindex.js
+++ b/docs/searchindex.js
--- a/docs/template_help.html
+++ b/docs/template_help.html
@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="OSXPhotos Python Package Overview" href="package_overview.html" /><link rel="prev" title="OSXPhotos Command Line Interface (CLI)" href="cli.html" />

    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/>
-        <title>OSXPhotos Template System - osxphotos 0.59.0 documentation</title>
+        <title>OSXPhotos Template System - osxphotos 0.59.2 documentation</title>
      <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -124,7 +124,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="index.html"><div class="brand">osxphotos 0.59.0 documentation</div></a>
+      <a href="index.html"><div class="brand">osxphotos 0.59.2 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -147,7 +147,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.59.0 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.2 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
@@ -613,7 +613,7 @@
 </td>
 </tr>
 <tr class="row-odd"><td><p>{osxphotos_version}</p></td>
-<td><p>The osxphotos version, e.g. ‘0.59.0’</p></td>
+<td><p>The osxphotos version, e.g. ‘0.59.2’</p></td>
 </tr>
 <tr class="row-even"><td><p>{osxphotos_cmd_line}</p></td>
 <td><p>The full command line used to run osxphotos</p></td>
--- a/docs/tutorial.html
+++ b/docs/tutorial.html
@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="OSXPhotos Command Line Interface (CLI)" href="cli.html" /><link rel="prev" title="OSXPhotos" href="overview.html" />

    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29"/>
-        <title>OSXPhotos Tutorial - osxphotos 0.59.0 documentation</title>
+        <title>OSXPhotos Tutorial - osxphotos 0.59.2 documentation</title>
      <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=d81277517bee4d6b0349d71bb2661d4890b5617c" />
    <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -124,7 +124,7 @@
      </label>
    </div>
    <div class="header-center">
-      <a href="index.html"><div class="brand">osxphotos 0.59.0 documentation</div></a>
+      <a href="index.html"><div class="brand">osxphotos 0.59.2 documentation</div></a>
    </div>
    <div class="header-right">
      <div class="theme-toggle-container theme-toggle-header">
@@ -147,7 +147,7 @@
      <div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">
  
  
-  <span class="sidebar-brand-text">osxphotos 0.59.0 documentation</span>
+  <span class="sidebar-brand-text">osxphotos 0.59.2 documentation</span>
  
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
  <input class="sidebar-search" placeholder=Search name="q" aria-label="Search">
--- a/docsrc/source/template_help.rst
+++ b/docsrc/source/template_help.rst
@@ -361,7 +361,7 @@ Template Substitutions
   * - {tab}
     - :A tab: '\t'
   * - {osxphotos_version}
-     - The osxphotos version, e.g. '0.59.0'
+     - The osxphotos version, e.g. '0.59.2'
   * - {osxphotos_cmd_line}
     - The full command line used to run osxphotos
   * - {album}
--- a/osxphotos/_version.py
+++ b/osxphotos/_version.py
@@ -1,3 +1,3 @@
 """ version info """

-__version__ = "0.59.0"
+__version__ = "0.59.2"
--- a/osxphotos/albuminfo.py
+++ b/osxphotos/albuminfo.py
@@ -386,7 +386,25 @@ class ProjectInfo(AlbumInfo):
    Projects are cards, calendars, slideshows, etc.
    """

-    ...
+    @property
+    def folder_names(self):
+        """Return hierarchical list of folders the album is contained in
+        the folder list is in form:
+        ["Top level folder", "sub folder 1", "sub folder 2", ...]
+        or empty list if album is not in any folders
+        """
+
+        # projects are not in folders
+        return []
+
+    @property
+    def folder_list(self):
+        """Returns list of FolderInfo objects for each folder the album is contained in
+        or empty list if album is not in any folders
+        """
+
+        # projects are not in folders
+        return []


 class FolderInfo:
--- a/osxphotos/cli/export.py
+++ b/osxphotos/cli/export.py
@@ -1,7 +1,5 @@
 """export command for osxphotos CLI"""

-from __future__ import annotations
-
 import atexit
 import inspect
 import os
@@ -11,8 +9,7 @@ import shlex
 import subprocess
 import sys
 import time
-from typing import Iterable, List, Optional, Tuple, Any, Callable
-import concurrent.futures
+from typing import Iterable, List, Optional, Tuple

 import click
 from osxmetadata import (
@@ -1429,156 +1426,174 @@ def export(

        photo_num = 0
        num_exported = 0
+        limit_str = f" (limit = [num]{limit}[/num])" if limit else ""
        # hack to avoid passing all the options to export_photo
-        kwargs = locals().copy()
+        kwargs = {
+            k: v
+            for k, v in locals().items()
+            if k in inspect.getfullargspec(export_photo).args
+        }
        kwargs["export_dir"] = dest
        kwargs["export_preview"] = preview
-        limit_str = f" (limit = [num]{limit}[/num])" if limit else ""
        with rich_progress(console=get_verbose_console(), mock=no_progress) as progress:
            task = progress.add_task(
                f"Exporting [num]{num_photos}[/] photos{limit_str}", total=num_photos
            )
-            futures = []
-            with concurrent.futures.ThreadPoolExecutor(
-                # max_workers=os.cpu_count()
-                max_workers=1,
-            ) as executor:
-                for p in photos:
-                    photo_num += 1
-                    kwargs["photo_num"] = photo_num
-                    futures.append(executor.submit(export_worker, p, **kwargs))
-
-                for future in concurrent.futures.as_completed(futures):
-                    p, export_results = future.result()
-                    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
-                    # used below for applying Finder tags, etc.
-                    photo_files = set(
-                        export_results.exported
-                        + export_results.new
-                        + export_results.updated
-                        + export_results.exif_updated
-                        + export_results.converted_to_jpeg
-                        + export_results.skipped
-                    )
-
-                    if finder_tag_keywords or finder_tag_template:
-                        if dry_run:
-                            for filepath in photo_files:
-                                verbose(
-                                    f"Writing Finder tags to [filepath]{filepath}[/]"
+            for p in photos:
+                photo_num += 1
+                kwargs["photo"] = p
+                kwargs["photo_num"] = photo_num
+                export_results = export_photo(**kwargs)
+                if post_function:
+                    for function in post_function:
+                        # post function is tuple of (function, filename.py::function_name)
+                        verbose(f"Calling post-function [bold]{function[1]}")
+                        if not dry_run:
+                            try:
+                                function[0](p, export_results, verbose)
+                            except Exception as e:
+                                rich_echo_error(
+                                    f"[error]Error running post-function [italic]{function[1]}[/italic]: {e}"
                                )
-                        else:
-                            tags_written, tags_skipped = write_finder_tags(
-                                p,
-                                photo_files,
-                                keywords=finder_tag_keywords,
-                                keyword_template=keyword_template,
-                                album_keyword=album_keyword,
-                                person_keyword=person_keyword,
-                                exiftool_merge_keywords=exiftool_merge_keywords,
-                                finder_tag_template=finder_tag_template,
-                                strip=strip,
-                                export_dir=dest,
-                                verbose=verbose,
+
+                run_post_command(
+                    photo=p,
+                    post_command=post_command,
+                    export_results=export_results,
+                    export_dir=dest,
+                    dry_run=dry_run,
+                    exiftool_path=exiftool_path,
+                    export_db=export_db,
+                    verbose=verbose,
+                )
+
+                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
+                # used below for applying Finder tags, etc.
+                photo_files = set(
+                    export_results.exported
+                    + export_results.new
+                    + export_results.updated
+                    + export_results.exif_updated
+                    + export_results.converted_to_jpeg
+                    + export_results.skipped
+                )
+
+                if finder_tag_keywords or finder_tag_template:
+                    if dry_run:
+                        for filepath in photo_files:
+                            verbose(f"Writing Finder tags to [filepath]{filepath}[/]")
+                    else:
+                        tags_written, tags_skipped = write_finder_tags(
+                            p,
+                            photo_files,
+                            keywords=finder_tag_keywords,
+                            keyword_template=keyword_template,
+                            album_keyword=album_keyword,
+                            person_keyword=person_keyword,
+                            exiftool_merge_keywords=exiftool_merge_keywords,
+                            finder_tag_template=finder_tag_template,
+                            strip=strip,
+                            export_dir=dest,
+                            verbose=verbose,
+                        )
+                        export_results.xattr_written.extend(tags_written)
+                        export_results.xattr_skipped.extend(tags_skipped)
+                        results.xattr_written.extend(tags_written)
+                        results.xattr_skipped.extend(tags_skipped)
+
+                if xattr_template:
+                    if dry_run:
+                        for filepath in photo_files:
+                            verbose(
+                                f"Writing extended attributes to [filepath]{filepath}[/]"
                            )
-                            export_results.xattr_written.extend(tags_written)
-                            export_results.xattr_skipped.extend(tags_skipped)
-                            results.xattr_written.extend(tags_written)
-                            results.xattr_skipped.extend(tags_skipped)
+                    else:
+                        xattr_written, xattr_skipped = write_extended_attributes(
+                            p,
+                            photo_files,
+                            xattr_template,
+                            strip=strip,
+                            export_dir=dest,
+                            verbose=verbose,
+                        )
+                        export_results.xattr_written.extend(xattr_written)
+                        export_results.xattr_skipped.extend(xattr_skipped)
+                        results.xattr_written.extend(xattr_written)
+                        results.xattr_skipped.extend(xattr_skipped)

-                    if xattr_template:
-                        if dry_run:
-                            for filepath in photo_files:
-                                verbose(
-                                    f"Writing extended attributes to [filepath]{filepath}[/]"
-                                )
-                        else:
-                            xattr_written, xattr_skipped = write_extended_attributes(
-                                p,
-                                photo_files,
-                                xattr_template,
-                                strip=strip,
-                                export_dir=dest,
-                                verbose=verbose,
+                report_writer.write(export_results)
+
+                if print_template:
+                    options = RenderOptions(export_dir=dest)
+                    for template in print_template:
+                        rendered_templates, unmatched = p.render_template(
+                            template,
+                            options,
+                        )
+                        if unmatched:
+                            rich_click_echo(
+                                f"[warning]Unmatched template field: {unmatched}[/]"
                            )
-                            export_results.xattr_written.extend(xattr_written)
-                            export_results.xattr_skipped.extend(xattr_skipped)
-                            results.xattr_written.extend(xattr_written)
-                            results.xattr_skipped.extend(xattr_skipped)
+                        for rendered_template in rendered_templates:
+                            if not rendered_template:
+                                continue
+                            rich_click_echo(rendered_template)

-                    report_writer.write(export_results)
+                progress.advance(task)

-                    if print_template:
-                        options = RenderOptions(export_dir=dest)
-                        for template in print_template:
-                            rendered_templates, unmatched = p.render_template(
-                                template,
-                                options,
-                            )
-                            if unmatched:
-                                rich_click_echo(
-                                    f"[warning]Unmatched template field: {unmatched}[/]"
-                                )
-                            for rendered_template in rendered_templates:
-                                if not rendered_template:
-                                    continue
-                                rich_click_echo(rendered_template)
-
-                    progress.advance(task)
-
-                    # handle limit
-                    if export_results.exported:
-                        # if any photos were exported, increment num_exported used by limit
-                        # limit considers each PhotoInfo object as a single photo even if multiple files are exported
-                        num_exported += 1
-                    if limit and num_exported >= limit:
-                        # advance progress to end
-                        progress.advance(task, num_photos - photo_num)
-                        break
+                # handle limit
+                if export_results.exported:
+                    # if any photos were exported, increment num_exported used by limit
+                    # limit considers each PhotoInfo object as a single photo even if multiple files are exported
+                    num_exported += 1
+                if limit and num_exported >= limit:
+                    # advance progress to end
+                    progress.advance(task, num_photos - photo_num)
+                    break

        photo_str_total = pluralize(len(photos), "photo", "photos")
        if update or force_update:
@@ -1668,45 +1683,6 @@ def export(
    export_db.close()


-def export_worker(
-    photo: osxphotos.PhotoInfo, **kwargs
-) -> tuple[osxphotos.PhotoInfo, ExportResults]:
-    """Export worker function for multi-threaded export of photos"""
-    dry_run = kwargs["dry_run"]
-    verbose: Callable[[str], Any] = kwargs["verbose"]
-    export_args = {
-        k: v
-        for k, v in kwargs.items()
-        if k in inspect.getfullargspec(export_photo).args
-    }
-    export_args["photo"] = photo
-    export_results = export_photo(**export_args)
-    if post_function := kwargs["post_function"]:
-        for function in post_function:
-            # post function is tuple of (function, filename.py::function_name)
-            verbose(f"Calling post-function [bold]{function[1]}")
-            if not dry_run:
-                try:
-                    function[0](photo, export_results, verbose)
-                except Exception as e:
-                    rich_echo_error(
-                        f"[error]Error running post-function [italic]{function[1]}[/italic]: {e}"
-                    )
-
-    run_post_command(
-        photo=photo,
-        post_command=kwargs["post_command"],
-        export_results=export_results,
-        export_dir=kwargs["dest"],
-        dry_run=dry_run,
-        exiftool_path=kwargs["exiftool_path"],
-        export_db=kwargs["export_db"],
-        verbose=verbose,
-    )
-
-    return photo, export_results
-
-
 def export_photo(
    photo=None,
    dest=None,
--- a/osxphotos/cli/timewarp.py
+++ b/osxphotos/cli/timewarp.py
@@ -164,7 +164,7 @@ See also `osxphotos help timewarp` for more information on the timewarp
 command which can be used to change the time zone of photos after import.


-"""
+"""  # noqa: E501
                ),
                width=formatter.width,
                markdown=True,
--- a/osxphotos/configoptions.py
+++ b/osxphotos/configoptions.py
@@ -50,7 +50,7 @@ class ConfigOptions:
            try:
                arg = args[attr]
                # don't test 'not arg'; need to handle empty strings as valid values
-                if arg is None or arg == False:
+                if arg is None or arg is False:
                    if type(self._attrs[attr]) == tuple:
                        setattr(self, attr, ())
                    else:
--- a/osxphotos/docs/docs.zip
+++ b/osxphotos/docs/docs.zip
--- a/osxphotos/exiftool.py
+++ b/osxphotos/exiftool.py
@@ -1,11 +1,11 @@
 """ Yet another simple exiftool wrapper 
    I rolled my own for following reasons: 
    1. I wanted something under MIT license (best alternative was licensed under GPL/BSD)
-    2. I wanted exiftool processes to stay resident between calls (improved performance)
+    2. I wanted singleton behavior so only a single exiftool process was ever running
    3. When used as a context manager, I wanted the operations to batch until exiting the context (improved performance)
-"""
+    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 """

-from __future__ import annotations

 import atexit
 import contextlib
@@ -17,7 +17,6 @@ import pathlib
 import re
 import shutil
 import subprocess
-import threading
 from abc import ABC, abstractmethod
 from functools import lru_cache  # pylint: disable=syntax-error

@@ -31,8 +30,6 @@ __all__ = [
    "unescape_str",
 ]

-logger = logging.getLogger("osxphotos")
-
 # exiftool -stay_open commands outputs this EOF marker after command is run
 EXIFTOOL_STAYOPEN_EOF = "{ready}"
 EXIFTOOL_STAYOPEN_EOF_LEN = len(EXIFTOOL_STAYOPEN_EOF)
@@ -45,8 +42,6 @@ EXIFTOOL_FILETYPES_JSON = "exiftool_filetypes.json"
 with (pathlib.Path(__file__).parent / EXIFTOOL_FILETYPES_JSON).open("r") as f:
    EXIFTOOL_SUPPORTED_FILETYPES = json.load(f)

-NUM_PROCESSES = os.cpu_count() or 1
-

 def exiftool_can_write(suffix: str) -> bool:
    """Return True if exiftool supports writing to a file with the given suffix, otherwise False"""
@@ -101,11 +96,8 @@ def get_exiftool_path():


 class _ExifToolProc:
-    """
-    Runs exiftool in a subprocess via Popen
-    Creates a singleton object that dispatches commands to one or
-    more exiftool subprocesses.
-    """
+    """Runs exiftool in a subprocess via Popen
+    Creates a singleton object"""

    def __new__(cls, *args, **kwargs):
        """create new object or return instance of already created singleton"""
@@ -114,11 +106,7 @@ class _ExifToolProc:

        return cls.instance

-    def __init__(
-        self,
-        exiftool: str | None = None,
-        large_file_support: bool = True,
-    ):
+    def __init__(self, exiftool=None, large_file_support=True):
        """construct _ExifToolProc singleton object or return instance of already created object

        Args:
@@ -129,7 +117,7 @@ class _ExifToolProc:
        if hasattr(self, "_process_running") and self._process_running:
            # already running
            if exiftool is not None and exiftool != self._exiftool:
-                logger.warning(
+                logging.warning(
                    f"exiftool subprocess already running, "
                    f"ignoring exiftool={exiftool}"
                )
@@ -137,9 +125,6 @@ class _ExifToolProc:
        self._process_running = False
        self._large_file_support = large_file_support
        self._exiftool = exiftool or get_exiftool_path()
-        self._num_processes = NUM_PROCESSES
-        self._process = []
-        self._process_counter = 0
        self._start_proc(large_file_support=large_file_support)

    @property
@@ -147,20 +132,23 @@ class _ExifToolProc:
        """return the exiftool subprocess"""
        if not self._process_running:
            self._start_proc(large_file_support=self._large_file_support)
-        process_idx = self._process_counter % self._num_processes
-        self._process_counter += 1
-        return self._process[process_idx]
+        return self._process
+
+    @property
+    def pid(self):
+        """return process id (PID) of the exiftool process"""
+        return self._process.pid

    @property
    def exiftool(self):
        """return path to exiftool process"""
        return self._exiftool

-    def _start_proc(self, large_file_support: bool):
+    def _start_proc(self, large_file_support):
        """start exiftool in batch mode"""

        if self._process_running:
-            logger.debug(f"exiftool already running: {self._process}")
+            logging.warning("exiftool already running: {self._process}")
            return

        # open exiftool process
@@ -168,28 +156,25 @@ class _ExifToolProc:
        env = os.environ.copy()
        env["PATH"] = f'/usr/bin/:{env["PATH"]}'
        large_file_args = ["-api", "largefilesupport=1"] if large_file_support else []
-        for _ in range(self._num_processes):
-            self._process.append(
-                subprocess.Popen(
-                    [
-                        self._exiftool,
-                        "-stay_open",  # keep process open in batch mode
-                        "True",  # -stay_open=True, keep process open in batch mode
-                        *large_file_args,
-                        "-@",  # read command-line arguments from file
-                        "-",  # read from stdin
-                        "-common_args",  # specifies args common to all commands subsequently run
-                        "-n",  # no print conversion (e.g. print tag values in machine readable format)
-                        "-P",  # Preserve file modification date/time
-                        "-G",  # print group name for each tag
-                        "-E",  # escape tag values for HTML (allows use of HTML &#xa; for newlines)
-                    ],
-                    stdin=subprocess.PIPE,
-                    stdout=subprocess.PIPE,
-                    stderr=subprocess.STDOUT,
-                    env=env,
-                )
-            )
+        self._process = subprocess.Popen(
+            [
+                self._exiftool,
+                "-stay_open",  # keep process open in batch mode
+                "True",  # -stay_open=True, keep process open in batch mode
+                *large_file_args,
+                "-@",  # read command-line arguments from file
+                "-",  # read from stdin
+                "-common_args",  # specifies args common to all commands subsequently run
+                "-n",  # no print conversion (e.g. print tag values in machine readable format)
+                "-P",  # Preserve file modification date/time
+                "-G",  # print group name for each tag
+                "-E",  # escape tag values for HTML (allows use of HTML &#xa; for newlines)
+            ],
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            env=env,
+        )
        self._process_running = True

        EXIFTOOL_PROCESSES.append(self)
@@ -200,19 +185,17 @@ class _ExifToolProc:
        if not self._process_running:
            return

-        for i in range(self._num_processes):
-            process = self._process[i]
-            with contextlib.suppress(Exception):
-                process.stdin.write(b"-stay_open\n")
-                process.stdin.write(b"False\n")
-                process.stdin.flush()
-            try:
-                process.communicate(timeout=5)
-            except subprocess.TimeoutExpired:
-                process.kill()
-                process.communicate()
+        with contextlib.suppress(Exception):
+            self._process.stdin.write(b"-stay_open\n")
+            self._process.stdin.write(b"False\n")
+            self._process.stdin.flush()
+        try:
+            self._process.communicate(timeout=5)
+        except subprocess.TimeoutExpired:
+            self._process.kill()
+            self._process.communicate()

-        self._process = []
+        del self._process
        self._process_running = False


@@ -250,7 +233,6 @@ class ExifTool:
        self._exiftoolproc = _ExifToolProc(
            exiftool=exiftool, large_file_support=large_file_support
        )
-        self._lock = threading.Lock()
        self._read_exif()

    @property
@@ -354,54 +336,57 @@ class ExifTool:
        if not commands:
            raise TypeError("must provide one or more command to run")

-        with self._lock:
-            if self._context_mgr and self.overwrite:
-                commands = list(commands)
-                commands.append("-overwrite_original")
+        if self._context_mgr and self.overwrite:
+            commands = list(commands)
+            commands.append("-overwrite_original")

-            filename = b"" if no_file else os.fsencode(self.file)
+        filename = b"" if no_file else os.fsencode(self.file)

-            if self.flags:
-                # need to split flags, e.g. so "--ext AVI" becomes ["--ext", "AVI"]
-                flags = []
-                for f in self.flags:
-                    flags.extend(f.split())
-                command_str = b"\n".join([f.encode("utf-8") for f in flags])
-                command_str += b"\n"
+        if self.flags:
+            # need to split flags, e.g. so "--ext AVI" becomes ["--ext", "AVI"]
+            flags = []
+            for f in self.flags:
+                flags.extend(f.split())
+            command_str = b"\n".join([f.encode("utf-8") for f in flags])
+            command_str += b"\n"
+        else:
+            command_str = b""
+
+        command_str += (
+            b"\n".join([c.encode("utf-8") for c in commands])
+            + b"\n"
+            + filename
+            + b"\n"
+            + b"-execute\n"
+        )
+
+        # send the command
+        self._process.stdin.write(command_str)
+        self._process.stdin.flush()
+
+        # read the output
+        output = b""
+        warning = b""
+        error = b""
+        while EXIFTOOL_STAYOPEN_EOF not in str(output):
+            line = self._process.stdout.readline()
+            if line.startswith(b"Warning"):
+                warning += line.strip()
+            elif line.startswith(b"Error"):
+                error += line.strip()
            else:
-                command_str = b""
+                output += line.strip()
+        warning = "" if warning == b"" else warning.decode("utf-8")
+        error = "" if error == b"" else error.decode("utf-8")
+        self.warning = warning
+        self.error = error

-            command_str += (
-                b"\n".join([c.encode("utf-8") for c in commands])
-                + b"\n"
-                + filename
-                + b"\n"
-                + b"-execute\n"
-            )
+        return output[:-EXIFTOOL_STAYOPEN_EOF_LEN], warning, error

-            # send the command
-            process = self._process
-            process.stdin.write(command_str)
-            process.stdin.flush()
-
-            # read the output
-            output = b""
-            warning = b""
-            error = b""
-            while EXIFTOOL_STAYOPEN_EOF not in str(output):
-                line = process.stdout.readline()
-                if line.startswith(b"Warning"):
-                    warning += line.strip()
-                elif line.startswith(b"Error"):
-                    error += line.strip()
-                else:
-                    output += line.strip()
-            warning = "" if warning == b"" else warning.decode("utf-8")
-            error = "" if error == b"" else error.decode("utf-8")
-            self.warning = warning
-            self.error = error
-
-            return output[:-EXIFTOOL_STAYOPEN_EOF_LEN], warning, error
+    @property
+    def pid(self):
+        """return process id (PID) of the exiftool process"""
+        return self._process.pid

    @property
    def version(self):
@@ -419,7 +404,7 @@ class ExifTool:
        """
        json_str, _, _ = self.run_commands("-json")
        if not json_str:
-            return {}
+            return dict()
        json_str = unescape_str(json_str.decode("utf-8"))

        try:
@@ -427,8 +412,8 @@ class ExifTool:
        except Exception as e:
            # will fail with some commands, e.g --ext AVI which produces
            # 'No file with specified extension' instead of json
-            logger.warning(f"error loading json returned by exiftool: {e} {json_str}")
-            return {}
+            logging.warning(f"error loading json returned by exiftool: {e} {json_str}")
+            return dict()
        exifdict = exifdict[0]
        if not tag_groups:
            # strip tag groups
@@ -497,12 +482,7 @@ class _ExifToolCaching(ExifTool):
        """
        self._json_cache = None
        self._asdict_cache = {}
-        super().__init__(
-            filepath,
-            exiftool=exiftool,
-            overwrite=False,
-            flags=None,
-        )
+        super().__init__(filepath, exiftool=exiftool, overwrite=False, flags=None)

    def run_commands(self, *commands, no_file=False):
        if commands[0] not in ["-json", "-ver"]:
--- a/osxphotos/photoexporter.py
+++ b/osxphotos/photoexporter.py
@@ -1212,7 +1212,7 @@ class PhotoExporter:

        # set data in the database
        with export_db.create_or_get_file_record(dest_str, self.photo.uuid) as rec:
-            rec.photoinfo = self.photo.json()
+            rec.photoinfo = self.photo.json(shallow=True)
            rec.export_options = options.bit_flags
            # don't set src_sig as that is set above before any modifications by convert_to_jpeg or exiftool
            if not options.ignore_signature:
--- a/osxphotos/photoinfo.py
+++ b/osxphotos/photoinfo.py
@@ -1888,14 +1888,46 @@ class PhotoInfo:
            "width": self.width,
        }

-    def json(self):
-        """Return JSON representation"""
+    def json(self, indent: int | None = None, shallow: bool = False) -> str:
+        """Return JSON representation
+
+        Args:
+            indent: indent level for JSON, if None, no indent
+            shallow: if True, return shallow JSON representation (does not contain folder_info, person_info, etc.)
+
+        Returns:
+            JSON string
+        """

        def default(o):
            if isinstance(o, (datetime.date, datetime.datetime)):
                return o.isoformat()

        dict_data = self.asdict()
+
+        if shallow:
+            # delete items that are not needed for shallow JSON
+            # these are removed to match behavior of osxphotos < 0.59.0 (See #999, #1039)
+            for key in [
+                "adjustments",
+                "album_info",
+                "burst_album_info",
+                "burst_albums",
+                "burst_default_pick",
+                "burst_key",
+                "burst_photos",
+                "burst_selected",
+                "cloud_metadata",
+                "import_info",
+                "labels_normalized",
+                "path_derivatives",
+                "person_info",
+                "project_info",
+                "search_info_normalized",
+                "search_info",
+            ]:
+                del dict_data[key]
+
        for k, v in dict_data.items():
            # sort lists such as keywords so JSON is consistent
            # but do not sort certain items like location
@@ -1903,7 +1935,7 @@ class PhotoInfo:
                continue
            if v and isinstance(v, (list, tuple)) and not isinstance(v[0], dict):
                dict_data[k] = sorted(v, key=lambda v: v if v is not None else "")
-        return json.dumps(dict_data, sort_keys=True, default=default)
+        return json.dumps(dict_data, sort_keys=True, default=default, indent=indent)

    def _json_hexdigest(self):
        """JSON for use by hexdigest()"""
--- a/osxphotos/phototemplate.py
+++ b/osxphotos/phototemplate.py
@@ -1153,7 +1153,7 @@ class PhotoTemplate:
                )
            except ValueError as e:
                raise SyntaxError(
-                    f"comparison operators may only be used with values that can be converted to numbers: {vals} {conditional_value}"
+                    f"comparison operators may only be used with values that can be converted to numbers: {value} {conditional_value}"
                ) from e

        predicate_is_true = False
@@ -1682,7 +1682,7 @@ def format_date_field(dt: datetime.datetime, field: str, args: List[str]) -> str
            raise ValueError(f"Unhandled template value: {field}") from e


-def get_place_value(photo: "PhotoInfo", field: str):
+def get_place_value(photo: "PhotoInfo", field: str):  # noqa: F821
    """Get the value of a 'place' field by attribute

    Args:
--- a/osxphotos/utils.py
+++ b/osxphotos/utils.py
@@ -432,7 +432,9 @@ def lock_filename(filepath: Union[str, pathlib.Path]) -> bool:
    Returns:
        filepath if lock file created, False if lock file already exists
    """
+    return filepath

+    # TODO: for future implementation
    lockfile = pathlib.Path(f"{filepath}.osxphotos.lock")
    if lockfile.exists():
        return False
@@ -447,6 +449,9 @@ def unlock_filename(filepath: Union[str, pathlib.Path]):
        filepath: str or pathlib.Path; full path, including file name
    """

+    return
+
+    # TODO: for future implementation
    lockfile = pathlib.Path(f"{filepath}.osxphotos.lock")
    if lockfile.exists():
        lockfile.unlink()
@@ -539,6 +544,7 @@ def shortuuid_to_uuid(short_uuid: str) -> str:
    """Convert shortuuid to uuid"""
    return str(shortuuid.decode(short_uuid)).upper()

+
 def under_test() -> bool:
    """Return True if running under pytest"""
-    return "pytest" in sys.modules
+    return "pytest" in sys.modules
--- a/tests/test_catalina_10_15_7.py
+++ b/tests/test_catalina_10_15_7.py
@@ -1,6 +1,7 @@
 """ Basic tests for Photos 5 on MacOS 10.15.7 """

 import datetime
+import json
 import os
 import os.path
 import pathlib
@@ -341,19 +342,16 @@ def test_init5(mocker):


 def test_db_len(photosdb):
-
    # assert photosdb.db_version in osxphotos._TESTED_DB_VERSIONS
    assert len(photosdb) == PHOTOS_DB_LEN


 def test_db_version(photosdb):
-
    # assert photosdb.db_version in osxphotos._TESTED_DB_VERSIONS
    assert photosdb.db_version == "6000"


 def test_persons(photosdb):
-
    assert "Katie" in photosdb.persons
    assert Counter(PERSONS) == Counter(photosdb.persons)

@@ -363,40 +361,34 @@ def test_photos_version(photosdb):


 def test_keywords(photosdb):
-
    assert "wedding" in photosdb.keywords
    assert Counter(KEYWORDS) == Counter(photosdb.keywords)


 def test_album_names(photosdb):
-
    assert "Pumpkin Farm" in photosdb.albums
    assert Counter(ALBUMS) == Counter(photosdb.albums)


 def test_keywords_dict(photosdb):
-
    keywords = photosdb.keywords_as_dict
    assert keywords["wedding"] == 3
    assert keywords == KEYWORDS_DICT


 def test_persons_as_dict(photosdb):
-
    persons = photosdb.persons_as_dict
    assert persons["Maria"] == 2
    assert persons == PERSONS_DICT


 def test_albums_as_dict(photosdb):
-
    albums = photosdb.albums_as_dict
    assert albums["Pumpkin Farm"] == 3
    assert albums == ALBUM_DICT


 def test_album_sort_order(photosdb):
-
    album = [a for a in photosdb.album_info if a.title == "Pumpkin Farm"][0]
    photos = album.photos

@@ -405,14 +397,12 @@ def test_album_sort_order(photosdb):


 def test_album_empty_album(photosdb):
-
    album = [a for a in photosdb.album_info if a.title == "EmptyAlbum"][0]
    photos = album.photos
    assert photos == []


 def test_attributes(photosdb):
-
    photos = photosdb.photos(uuid=["D79B8D77-BFFC-460B-9312-034F2877D35B"])
    assert len(photos) == 1
    p = photos[0]
@@ -484,7 +474,6 @@ def test_attributes_2(photosdb):


 def test_missing(photosdb):
-
    photos = photosdb.photos(uuid=[UUID_DICT["missing"]])
    assert len(photos) == 1
    p = photos[0]
@@ -493,7 +482,6 @@ def test_missing(photosdb):


 def test_favorite(photosdb):
-
    photos = photosdb.photos(uuid=[UUID_DICT["favorite"]])
    assert len(photos) == 1
    p = photos[0]
@@ -501,7 +489,6 @@ def test_favorite(photosdb):


 def test_not_favorite(photosdb):
-
    photos = photosdb.photos(uuid=[UUID_DICT["not_favorite"]])
    assert len(photos) == 1
    p = photos[0]
@@ -509,7 +496,6 @@ def test_not_favorite(photosdb):


 def test_hidden(photosdb):
-
    photos = photosdb.photos(uuid=[UUID_DICT["hidden"]])
    assert len(photos) == 1
    p = photos[0]
@@ -517,7 +503,6 @@ def test_hidden(photosdb):


 def test_not_hidden(photosdb):
-
    photos = photosdb.photos(uuid=[UUID_DICT["not_hidden"]])
    assert len(photos) == 1
    p = photos[0]
@@ -656,7 +641,6 @@ def test_not_ismovie(photosdb):


 def test_count(photosdb):
-
    photos = photosdb.photos()
    assert len(photos) == PHOTOS_NOT_IN_TRASH_LEN

@@ -735,13 +719,11 @@ def test_photoinfo_not_intrash(photosdb):


 def test_keyword_2(photosdb):
-
    photos = photosdb.photos(keywords=["wedding"])
    assert len(photos) == 2  # won't show the one in the trash


 def test_keyword_not_in_album(photosdb):
-
    # find all photos with keyword "Kids" not in the album "Pumpkin Farm"
    photos1 = photosdb.photos(albums=["Pumpkin Farm"])
    photos2 = photosdb.photos(keywords=["Kids"])
@@ -758,20 +740,17 @@ def test_album_folder_name(photosdb):


 def test_multi_person(photosdb):
-
    photos = photosdb.photos(persons=["Katie", "Suzy"])

    assert len(photos) == 3


 def test_get_db_path(photosdb):
-
    db_path = photosdb.db_path
    assert db_path.endswith(PHOTOS_DB_PATH)


 def test_get_library_path(photosdb):
-
    lib_path = photosdb.library_path
    assert lib_path.endswith(PHOTOS_LIBRARY_PATH)

@@ -1080,14 +1059,12 @@ def test_eq_2():


 def test_not_eq(photosdb):
-
    photos1 = photosdb.photos(uuid=[UUID_DICT["export"]])
    photos2 = photosdb.photos(uuid=[UUID_DICT["missing"]])
    assert photos1[0] != photos2[0]


 def test_photosdb_repr():
-
    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photosdb2 = eval(repr(photosdb))

@@ -1098,7 +1075,6 @@ def test_photosdb_repr():


 def test_photosinfo_repr(photosdb):
-
    photos = photosdb.photos(uuid=[UUID_DICT["favorite"]])
    photo = photos[0]
    photo2 = eval(repr(photo))
@@ -1502,3 +1478,33 @@ def test_fingerprint(photosdb):
    for uuid, fingerprint in UUID_FINGERPRINT.items():
        photo = photosdb.get_photo(uuid)
        assert photo.fingerprint == fingerprint
+
+
+def test_asdict(photosdb: osxphotos.PhotosDB):
+    """Test PhotoInfo.asdict()"""
+    photo = photosdb.get_photo(UUID_DICT["favorite"])
+    photo_dict = photo.asdict()
+    assert photo_dict["favorite"]
+
+
+def test_json(photosdb: osxphotos.PhotosDB):
+    """Test PhotoInfo.json()"""
+    photo = photosdb.get_photo(UUID_DICT["favorite"])
+    photo_dict = json.loads(photo.json())
+    assert photo_dict["favorite"]
+
+
+def test_json_indent(photosdb: osxphotos.PhotosDB):
+    """Test PhotoInfo.json() with indent"""
+    photo = photosdb.get_photo(UUID_DICT["favorite"])
+    photo_dict = json.loads(photo.json(indent=4))
+    assert photo_dict["favorite"]
+    assert "album_info" in photo_dict
+
+
+def test_json_shallow(photosdb: osxphotos.PhotosDB):
+    """Test PhotoInfo.json() with shallow=True"""
+    photo = photosdb.get_photo(UUID_DICT["favorite"])
+    photo_dict = json.loads(photo.json(shallow=True))
+    assert photo_dict["favorite"]
+    assert "album_info" not in photo_dict
--- a/tests/test_cli_add_to_album.py
+++ b/tests/test_cli_add_to_album.py
@@ -12,8 +12,8 @@ UUID_MISSING = {
 }

 # photos with matching names
-QUERY_NAME = "AAF035"
-QUERY_COUNT = 4
+QUERY_NAME = "IMG_"
+QUERY_COUNT = 6


@pytest.mark.addalbum
--- a/tests/test_exiftool.py
+++ b/tests/test_exiftool.py
@@ -419,6 +419,22 @@ def test_addvalues_unicode():
    assert sorted(exif.data["IPTC:Keywords"]) == sorted(["ǂ", "Ƕ"])


+def test_singleton():
+    import osxphotos.exiftool
+
+    exif1 = osxphotos.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
+    exif2 = osxphotos.exiftool.ExifTool(TEST_FILE_MULTI_KEYWORD)
+
+    assert exif1._process.pid == exif2._process.pid
+
+
+def test_pid():
+    import osxphotos.exiftool
+
+    exif1 = osxphotos.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
+    assert exif1.pid == exif1._process.pid
+
+
 def test_exiftoolproc_process():
    import osxphotos.exiftool

--- a/tests/test_projects_catalina.py
+++ b/tests/test_projects_catalina.py
@@ -149,3 +149,11 @@ def test_photoinfo_project_info(photosdb, uuid, expected_projects):

    project_names = [p.title for p in photo.project_info]
    assert sorted(project_names) == sorted(expected_projects)
+
+
+@pytest.mark.parametrize("uuid,expected_projects", PHOTO_PROJECTS.items())
+def test_photoinfo_project_info_asdict(photosdb, uuid, expected_projects):
+    """Test PhotoInfo.project_info.asdict() #999"""
+    photo = photosdb.get_photo(uuid)
+    for p in photo.project_info:
+        assert p.asdict()
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -27,7 +27,6 @@ def test_dd_to_dms():

@pytest.mark.skip(reason="Fails on some machines")
 def test_get_system_library_path():
-
    _, major, _ = osxphotos.utils._get_os_version()
    if int(major) < 15:
        assert osxphotos.utils.get_system_library_path() is None
@@ -84,7 +83,6 @@ def test_list_directory():


 def test_list_directory_invalid():
-
    temp_dir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    files = list_directory(f"{temp_dir.name}/no_such_dir", glob="*.jpg")
    assert len(files) == 0
@@ -151,6 +149,7 @@ def test_increment_filename_with_lock():
        )


+@pytest.mark.skip(reason="Lock files not yet implemented")
 def test_increment_filename_with_lock_exists():
    # test that increment_filename works with lock=True when lock file already exists

--- a/tests/test_ventura_13_0_0.py
+++ b/tests/test_ventura_13_0_0.py
@@ -1,5 +1,6 @@
 """Test macOS 13.0 Photos library"""

+import json
 from collections import namedtuple

 import pytest
@@ -660,7 +661,6 @@ def test_keyword_2(photosdb):


 def test_keyword_not_in_album(photosdb):
-
    # find all photos with keyword "Kids" not in the album "Pumpkin Farm"
    photos1 = photosdb.photos(albums=["Pumpkin Farm"])
    photos2 = photosdb.photos(keywords=["Kids"])
@@ -1273,3 +1273,26 @@ def test_person_feature_less(photosdb):

    photo = photosdb.get_photo(UUID_PERSON_NOT_FEATURE_LESS)
    assert not photo.person_info[0].feature_less
+
+
+def test_json(photosdb: osxphotos.PhotosDB):
+    """Test PhotoInfo.json()"""
+    photo = photosdb.get_photo(UUID_DICT["favorite"])
+    photo_dict = json.loads(photo.json())
+    assert photo_dict["favorite"]
+
+
+def test_json_indent(photosdb: osxphotos.PhotosDB):
+    """Test PhotoInfo.json() with indent"""
+    photo = photosdb.get_photo(UUID_DICT["favorite"])
+    photo_dict = json.loads(photo.json(indent=4))
+    assert photo_dict["favorite"]
+    assert "album_info" in photo_dict
+
+
+def test_json_shallow(photosdb: osxphotos.PhotosDB):
+    """Test PhotoInfo.json() with shallow=True"""
+    photo = photosdb.get_photo(UUID_DICT["favorite"])
+    photo_dict = json.loads(photo.json(shallow=True))
+    assert photo_dict["favorite"]
+    assert "album_info" not in photo_dict
Author	SHA1	Message	Date
Rhet Turnbull	058b56092f	Release 0.59.2 (#1041 )	2023-04-08 12:04:54 -07:00
Rhet Turnbull	d2b7783125	Added shallow json() option, #1038 (#1040 )	2023-04-08 11:10:29 -07:00
Rhet Turnbull	f4a743468d	Fix for json() failing on photos in projects, #999 (#1039 )	2023-04-08 09:49:31 -07:00
Rhet Turnbull	adac985309	Fix non-incrementing photo count, #999	2023-04-08 09:09:33 -07:00
allcontributors[bot]	4939324d2f	add dvdkon as a contributor for code (#1037 ) * update README.md [skip ci] * update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>	2023-04-07 08:17:00 -07:00
Christian Clauss	1a3b4c2afe	Lint Python twice: 1. Whole repo, 2. Exclude tests/ (#1035 ) * Lint Python twice: 1. Whole repo, 2. Exclude tests/ Both runs take less than a second so... `line-length=366` is more reasonable` ``` - run: pip install --user ruff # Lint Python twice: 1. Whole repo, 2. Exclude tests/ - run: ruff --format=github --line-length=7228 --target-version=py39 --ignore=E402,E712,E721,E722,E741,F401,F403,F405,F541,F601,F811,F822,F841 . - run: ruff --format=github --line-length=366 --target-version=py39 --exclude=tests/ --ignore=E402,E712,E722,E741,F401,F403,F405,F541,F822,F841 . ``` * Update configoptions.py	2023-04-07 08:14:51 -07:00
Rhet Turnbull	1b16a39cef	Updated CHANGELOG.md [skip ci]	2023-04-02 22:07:10 -07:00
Rhet Turnbull	0d31a152be	Test fix for Ventura	2023-04-02 22:00:35 -07:00
Rhet Turnbull	34fbd87fc6	Release 0.59.1 (#1034 )	2023-04-02 21:18:18 -07:00
Christian Clauss	3ddfea6a3d	Fix two undefined names in phototemplate.py (#1030 ) * Fix two undefined names in phototemplate.py % `ruff --exit-zero --select=E9,F63,F7,F82,YTT .` ``` osxphotos/cli/report_writer.py:22:1: F822 Undefined name `ExportReportWriterSqlite` in `__all__` osxphotos/cli/report_writer.py:22:1: F822 Undefined name `SyncReportWriterSqlite` in `__all__` osxphotos/phototemplate.py:1156:108: F821 Undefined name `vals` osxphotos/phototemplate.py:1685:29: F821 Undefined name `PhotoInfo` Found 4 errors. ``` * Avoid cyclic imports	2023-04-02 19:45:33 -07:00
Christian Clauss	8b59615ff7	GitHub Action to lint Python code (#1025 ) * GitHub Action to lint Python code [Ruff](https://beta.ruff.rs/) supports [over 500 lint rules](https://beta.ruff.rs/docs/rules) including bandit, isort, pylint, pyupgrade, and flake8 plus its plugins, and is written in Rust for speed. The `ruff` Action uses minimal steps to __run in ~5 seconds__, rapidly providing intuitive GitHub Annotations to contributors. ![image](https://user-images.githubusercontent.com/3709715/223758136-afc386d2-70aa-4eff-953a-2c2d82ceea23.png) * ruff --target-version=py39	2023-04-02 19:45:13 -07:00
allcontributors[bot]	c590a16d70	add cclauss as a contributor for code (#1033 ) * update README.md [skip ci] * update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>	2023-04-02 19:44:49 -07:00
Rhet Turnbull	36ce86c4a6	Removed file locking, performance improvements (#1032 )	2023-04-02 19:42:28 -07:00