Export DB can now reside outside export directory, #568

More refactoring of export code, #462
Refactored photoinfo, photoexporter; #462
2022-01-04 06:28:59 -08:00 · 2022-01-02 22:38:22 -08:00 · 2022-01-02 09:06:04 -08:00 · 2021-12-31 20:50:42 -08:00 · 2021-12-31 20:31:15 -08:00 · 2021-12-31 17:34:41 -08:00
555 changed files with 8858 additions and 8822 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -241,6 +241,69 @@
      "contributions": [
        "data"
      ]
+    },
+    {
+      "login": "dssinger",
+      "name": "David Singer",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1817903?v=4",
+      "profile": "https://github.com/dssinger",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "oPromessa",
+      "name": "oPromessa",
+      "avatar_url": "https://avatars.githubusercontent.com/u/21261491?v=4",
+      "profile": "https://github.com/oPromessa",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "spencerc99",
+      "name": "Spencer Chang",
+      "avatar_url": "https://avatars.githubusercontent.com/u/14796580?v=4",
+      "profile": "http://spencerchang.me",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "dgleich",
+      "name": "David Gleich",
+      "avatar_url": "https://avatars.githubusercontent.com/u/33995?v=4",
+      "profile": "https://www.cs.purdue.edu/homes/dgleich",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "alandefreitas",
+      "name": "Alan de Freitas",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5369819?v=4",
+      "profile": "https://alandefreitas.github.io/alandefreitas/",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "hyfen",
+      "name": "Andrew Louis",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6291?v=4",
+      "profile": "https://hyfen.net",
+      "contributions": [
+        "doc", "code"
+      ]
+    },
+    {
+      "login": "neebah",
+      "name": "neebah",
+      "avatar_url": "https://avatars.githubusercontent.com/u/71442026?v=4",
+      "profile": "https://github.com/neebah",
+      "contributions": [
+        "bug"
+      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+** Before submitting a bug report, please ensure you are running the most recent version of osxphotos and that the bug is reproducible on the latest version **
+
+- If you installed with pipx: `pipx upgrade osxphotos`
+- If you installed with pip: `pip install --upgrade osxphotos`
+- If you installed the pre-built binary, download and install the latest [release](https://github.com/RhetTbull/osxphotos/releases)
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. What' the full command line you used with osxphotos?
+2. What was the error output?
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. which version of macOS]
+ - osxphotos version (`osxphotos --version`)
+
+**Additional context**
+Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feature request
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ cli.spec
 *.pyc
 docsrc/_build/
 venv/
+.python-version
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,239 @@ All notable changes to this project will be documented in this file. Dates are d

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

+#### [v0.44.3](https://github.com/RhetTbull/osxphotos/compare/v0.44.2...v0.44.3)
+
+> 31 December 2021
+
+- ImageConverter now uses generic context; #562 [`a3b2784`](https://github.com/RhetTbull/osxphotos/commit/a3b2784f3177a753b78965b8ca205ca9bbb08168)
+- Updated tests and docs [`1391675`](https://github.com/RhetTbull/osxphotos/commit/1391675a3a45be0d6800a68c8bcc6d0d55d1ab7a)
+- Updated docs [skip ci] [`cbe79ee`](https://github.com/RhetTbull/osxphotos/commit/cbe79ee98cae68e0789df275220f5a5870a8bd91)
+
+#### [v0.44.2](https://github.com/RhetTbull/osxphotos/compare/v0.44.1...v0.44.2)
+
+> 31 December 2021
+
+- Bug fix for #559 [`42426b9`](https://github.com/RhetTbull/osxphotos/commit/42426b95ee786b2d53482d3d931a0b962a4db20d)
+
+#### [v0.44.1](https://github.com/RhetTbull/osxphotos/compare/v0.44.0...v0.44.1)
+
+> 31 December 2021
+
+- Added --skip-uuid, --skip-uuid-from-file, #563 [`04930c3`](https://github.com/RhetTbull/osxphotos/commit/04930c3644da99c1923c4e3aaa9213902aeadfd1)
+
+#### [v0.44.0](https://github.com/RhetTbull/osxphotos/compare/v0.43.9...v0.44.0)
+
+> 31 December 2021
+
+- Added support for projects, implements #559 [`44594a8`](https://github.com/RhetTbull/osxphotos/commit/44594a8e437c20bae6fd8eecb74075d49da4b91f)
+- Updated docs [skip ci] [`c4e3c5a`](https://github.com/RhetTbull/osxphotos/commit/c4e3c5a8beac1db00533f7820ab8249cf351aef0)
+- Fixed test for #561 [`690d981`](https://github.com/RhetTbull/osxphotos/commit/690d981f310b083f5f58407cc879bca494730765)
+
+#### [v0.43.9](https://github.com/RhetTbull/osxphotos/compare/v0.43.8...v0.43.9)
+
+> 28 December 2021
+
+- Fix for accented characters in album names, #561 [`03f4e7c`](https://github.com/RhetTbull/osxphotos/commit/03f4e7cc3473c276dfd7c7e6ad64e4dfe5b32011)
+
+#### [v0.43.8](https://github.com/RhetTbull/osxphotos/compare/v0.43.7...v0.43.8)
+
+> 26 December 2021
+
+- Fixed #463 [`#463`](https://github.com/RhetTbull/osxphotos/issues/463)
+- Updated docs [skip ci] [`181f678`](https://github.com/RhetTbull/osxphotos/commit/181f678d9eda8bc8acca11b4ebd470900f30bdcb)
+- Added install/uninstall commands, #531 [`085f482`](https://github.com/RhetTbull/osxphotos/commit/085f482820af2d51f0d411c7e8a7a27329bf0722)
+- Implement #323 [`debb17c`](https://github.com/RhetTbull/osxphotos/commit/debb17c9520bec25d725426feaa512745e9d4ec0)
+- Updated docs [skip ci] [`0e54a08`](https://github.com/RhetTbull/osxphotos/commit/0e54a08ae07853c4cdb2c548bdba27335cfc32ba)
+- Added get_photos_library_version [`b71c752`](https://github.com/RhetTbull/osxphotos/commit/b71c752e9d2c59412baf812bfc50e6358ea3f02e)
+
+#### [v0.43.7](https://github.com/RhetTbull/osxphotos/compare/v0.43.6...v0.43.7)
+
+> 21 December 2021
+
+- Adds missing f-string to retry message [`#553`](https://github.com/RhetTbull/osxphotos/pull/553)
+- Update issue templates [`e7bd80e`](https://github.com/RhetTbull/osxphotos/commit/e7bd80e05f94238fd41e478e32c1709b442eb361)
+- Partial fix for #556 [`a08a653`](https://github.com/RhetTbull/osxphotos/commit/a08a653f202a49853780ab4a686bf3dfbc32a491)
+- Updated all-contributors [`e1f1772`](https://github.com/RhetTbull/osxphotos/commit/e1f1772080d24373ceb5791683615451cd390874)
+- Version bump [`6ce1b83`](https://github.com/RhetTbull/osxphotos/commit/6ce1b83ca2c7f0c6f9c86757602b81df1d9bf453)
+
+#### [v0.43.6](https://github.com/RhetTbull/osxphotos/compare/v0.43.5...v0.43.6)
+
+> 10 December 2021
+
+- Fixes typo in README [`#548`](https://github.com/RhetTbull/osxphotos/pull/548)
+- docs: add alandefreitas as a contributor for bug [`#551`](https://github.com/RhetTbull/osxphotos/pull/551)
+- docs: add dgleich as a contributor for code [`#541`](https://github.com/RhetTbull/osxphotos/pull/541)
+- Updated docs [`197e566`](https://github.com/RhetTbull/osxphotos/commit/197e5663df058a013ce2d6f8c5fd7ff71a5cc46e)
+- Added test library for Monterey on M1 [`3e038bf`](https://github.com/RhetTbull/osxphotos/commit/3e038bf124b98d6b74f19dd4db0f8f1e3c48e787)
+- Updated docs [skip ci] [`f6dedaa`](https://github.com/RhetTbull/osxphotos/commit/f6dedaa6197dc244616c5b4e9e8ce42ce6b7a252)
+- Added MomentInfo for Photos 5+, #71 [`a52b4d2`](https://github.com/RhetTbull/osxphotos/commit/a52b4d2f43970086bf25659bd58dc8479b841704)
+- Fixed error for missing photo path, #547 [`0906dbe`](https://github.com/RhetTbull/osxphotos/commit/0906dbe6370922b4c9649350014ed8a21d29c4fd)
+
+#### [v0.43.5](https://github.com/RhetTbull/osxphotos/compare/v0.43.4...v0.43.5)
+
+> 25 November 2021
+
+- Updated dependencies for pyobjc 8.0 [`7d92359`](https://github.com/RhetTbull/osxphotos/commit/7d923590ae4df941b1b9d35c21937c03eb7b4284)
+
+#### [v0.43.4](https://github.com/RhetTbull/osxphotos/compare/v0.43.3...v0.43.4)
+
+> 11 November 2021
+
+- Fix for --use-photokit with --skip-live, #537 [`0e6c92d`](https://github.com/RhetTbull/osxphotos/commit/0e6c92dbd951dd0e63cfb8b6d64e6ab96ece5955)
+
+#### [v0.43.3](https://github.com/RhetTbull/osxphotos/compare/v0.43.1...v0.43.3)
+
+> 7 November 2021
+
+- Updated docs [skip ci] [`fb583e2`](https://github.com/RhetTbull/osxphotos/commit/fb583e28e0fc2c23bf24052db8a5ee669d8c92f5)
+- Updated OTL to MTL [`2ffcf1e`](https://github.com/RhetTbull/osxphotos/commit/2ffcf1e82bfc013a4a9e0e7a709a7c1395c074ce)
+- Test fixes for Monterey/M1 [`51ba549`](https://github.com/RhetTbull/osxphotos/commit/51ba54971a874cfce00368aa5be5380b3439c254)
+
+#### [v0.43.1](https://github.com/RhetTbull/osxphotos/compare/v0.43.0...v0.43.1)
+
+> 30 October 2021
+
+- Dependency update for Monterey [`818f4f4`](https://github.com/RhetTbull/osxphotos/commit/818f4f45a4ce520b0ba1c688eabd2f4311be9540)
+- Updated docs [skip ci] [`2cf19f6`](https://github.com/RhetTbull/osxphotos/commit/2cf19f6af1a03767e4d53eee556c4d3ed9af1776)
+
+#### [v0.43.0](https://github.com/RhetTbull/osxphotos/compare/v0.42.94...v0.43.0)
+
+> 28 October 2021
+
+- Updated for Monterey 12.0.1 release [`ef82c6e`](https://github.com/RhetTbull/osxphotos/commit/ef82c6e32b536b0677530133892f95b852c6dce0)
+
+#### [v0.42.94](https://github.com/RhetTbull/osxphotos/compare/v0.42.93...v0.42.94)
+
+> 15 October 2021
+
+- docs: add spencerc99 as a contributor for bug [`#527`](https://github.com/RhetTbull/osxphotos/pull/527)
+- Fix for #526 with --update [`419b34e`](https://github.com/RhetTbull/osxphotos/commit/419b34ea73f15ccbe29f51896e11e9735ea5786b)
+- Updated docs [skip ci] [`0e9b9d6`](https://github.com/RhetTbull/osxphotos/commit/0e9b9d625190b94c1dd68276e3b0e5367002d87c)
+- Fixed FileUtil to use correct import [`f64c4ed`](https://github.com/RhetTbull/osxphotos/commit/f64c4ed374c120a95fe8adea26bd44852ca67e31)
+
+#### [v0.42.93](https://github.com/RhetTbull/osxphotos/compare/v0.42.92...v0.42.93)
+
+> 11 October 2021
+
+- Fix for #526 [`202bc11`](https://github.com/RhetTbull/osxphotos/commit/202bc1144bc842ddec825eef0745830d56170aba)
+- Updated README.md [skip ci] [`a0c654e`](https://github.com/RhetTbull/osxphotos/commit/a0c654e43f4aa5389a96c3c84fd7037c33d23404)
+
+#### [v0.42.92](https://github.com/RhetTbull/osxphotos/compare/v0.42.91...v0.42.92)
+
+> 11 October 2021
+
+- docs: add oPromessa as a contributor for bug [`#525`](https://github.com/RhetTbull/osxphotos/pull/525)
+- Fix for #524 [`04ac0a1`](https://github.com/RhetTbull/osxphotos/commit/04ac0a11215b275178013e60c6a61b9f1b3603c9)
+- Fix for #525 [`d2b0bd4`](https://github.com/RhetTbull/osxphotos/commit/d2b0bd4e28cfdf3c930aa6ae3317549327b0e29c)
+- Updated docs [skip ci] [`2bb677d`](https://github.com/RhetTbull/osxphotos/commit/2bb677dc19abaf254bc66e2cd788676e0613e548)
+
+#### [v0.42.91](https://github.com/RhetTbull/osxphotos/compare/v0.42.90...v0.42.91)
+
+> 11 October 2021
+
+- Updated docs [skip ci] [`b23e74f`](https://github.com/RhetTbull/osxphotos/commit/b23e74f8f5a8387564108c330c3f8ac11189860d)
+- Added python 3.10 to supported versions [`3f81a3c`](https://github.com/RhetTbull/osxphotos/commit/3f81a3c179dde37e9811ef19c847920bb3bd514c)
+- Updated dependencies [`a895833`](https://github.com/RhetTbull/osxphotos/commit/a895833c7f0a264488e671f1735f9e10d2618e2d)
+
+#### [v0.42.90](https://github.com/RhetTbull/osxphotos/compare/v0.42.89...v0.42.90)
+
+> 30 September 2021
+
+- Updated REPL, now with more cowbell [`c472698`](https://github.com/RhetTbull/osxphotos/commit/c472698b1d0d8ff9f4d1bde715859bf766f99290)
+- Updated docs [skip ci] [`1ddb1de`](https://github.com/RhetTbull/osxphotos/commit/1ddb1de99841e65b690ffc1cbcc5e42e6e25f727)
+
+#### [v0.42.89](https://github.com/RhetTbull/osxphotos/compare/v0.42.88...v0.42.89)
+
+> 26 September 2021
+
+- Updated docs [skip ci] [`bfbc156`](https://github.com/RhetTbull/osxphotos/commit/bfbc156821d2d262b7bd9c4437e23e310da10769)
+- Updated docs [skip ci] [`3abaa5a`](https://github.com/RhetTbull/osxphotos/commit/3abaa5ae84ca44cd900f1e3af4532ab405d41a09)
+- Fixed AlbumInfo.owner, #239 [`bfd6274`](https://github.com/RhetTbull/osxphotos/commit/bfd627460255c65f870bca6d036401e8792d29d5)
+
+#### [v0.42.88](https://github.com/RhetTbull/osxphotos/compare/v0.42.87...v0.42.88)
+
+> 26 September 2021
+
+- Performance fix for #239, owner [`14710e3`](https://github.com/RhetTbull/osxphotos/commit/14710e31789d71b2c948a37722fb6054aca4d85e)
+- version bump [`06138e1`](https://github.com/RhetTbull/osxphotos/commit/06138e15d0b87e4865a9ef0cc542303edb44c861)
+
+#### [v0.42.87](https://github.com/RhetTbull/osxphotos/compare/v0.42.86...v0.42.87)
+
+> 26 September 2021
+
+#### [v0.42.86](https://github.com/RhetTbull/osxphotos/compare/v0.42.85...v0.42.86)
+
+> 26 September 2021
+
+- Fix for #517, #239 [`ac47df8`](https://github.com/RhetTbull/osxphotos/commit/ac47df8475762fe8c8f63ad5ffa83b1e20d116b8)
+- Fixed formatting [`6adafb8`](https://github.com/RhetTbull/osxphotos/commit/6adafb8ce70e95a9f0bec1a3db6362742fcd1b0d)
+- Updated docs [skip ci] [`725f7c8`](https://github.com/RhetTbull/osxphotos/commit/725f7c87351353efeee8c43c3c7f8a95acb14490)
+
+#### [v0.42.85](https://github.com/RhetTbull/osxphotos/compare/v0.42.84...v0.42.85)
+
+> 25 September 2021
+
+- Implemented PhotoInfo.owner, AlbumInfo.owner, #216, #239 [`c4b7c26`](https://github.com/RhetTbull/osxphotos/commit/c4b7c2623f077d9964d5d578ce6c01bb83fab088)
+- Updated docs [skip ci] [`59ba325`](https://github.com/RhetTbull/osxphotos/commit/59ba325273b2f16935be944fd46c1237ce637bb8)
+
+#### [v0.42.84](https://github.com/RhetTbull/osxphotos/compare/v0.42.83...v0.42.84)
+
+> 25 September 2021
+
+- Fix for #516 [`e3e1da2`](https://github.com/RhetTbull/osxphotos/commit/e3e1da2fd898896595fc851288f905bd4e2150f8)
+- Updated docs [skip ci] [`64c226b`](https://github.com/RhetTbull/osxphotos/commit/64c226b85529581e393a2d0604b41c37a8dc2eaf)
+- Update docs [`c429a86`](https://github.com/RhetTbull/osxphotos/commit/c429a860b1ebeb77f3c3e36e9660fc9153d85d11)
+
+#### [v0.42.83](https://github.com/RhetTbull/osxphotos/compare/v0.42.82...v0.42.83)
+
+> 15 September 2021
+
+- Fixed detected_text to use image orientation if available [`dd08c7f`](https://github.com/RhetTbull/osxphotos/commit/dd08c7f701335a7e1e30fda251e6ad20ff781652)
+- Added twine [`16335a6`](https://github.com/RhetTbull/osxphotos/commit/16335a6bd66eaa53fd1c390901e2fb028059d8e1)
+- Added wheel [`e0f6d8e`](https://github.com/RhetTbull/osxphotos/commit/e0f6d8ecf27fe772b748c7b2f3108558fbc23e8a)
+
+#### [v0.42.82](https://github.com/RhetTbull/osxphotos/compare/v0.42.80...v0.42.82)
+
+> 14 September 2021
+
+- Fix for #515 [`93bf0c2`](https://github.com/RhetTbull/osxphotos/commit/93bf0c210cf01f351611427662025c86955ac373)
+- Fix for #515, updated tests [`59c31ff`](https://github.com/RhetTbull/osxphotos/commit/59c31ff88d099b251cf1b571279d7a28a0aac138)
+- Updated docs [`773dca8`](https://github.com/RhetTbull/osxphotos/commit/773dca849424c61a7447cb1bb87140708ab0a07c)
+
+#### [v0.42.80](https://github.com/RhetTbull/osxphotos/compare/v0.42.79...v0.42.80)
+
+> 29 August 2021
+
+- Bug fix for null title, #512 [`6bcc676`](https://github.com/RhetTbull/osxphotos/commit/6bcc67634ca50e84494539b8a25eb7925dcede62)
+- Updated dependencies [`2eb6e70`](https://github.com/RhetTbull/osxphotos/commit/2eb6e70e57ff1dc79907a29618757953f5871145)
+- Updated README [skip ci] [`81dd1a7`](https://github.com/RhetTbull/osxphotos/commit/81dd1a753062dacc83aaf4ce8a7667de2cda599b)
+
+#### [v0.42.79](https://github.com/RhetTbull/osxphotos/compare/v0.42.78...v0.42.79)
+
+> 29 August 2021
+
+#### [v0.42.78](https://github.com/RhetTbull/osxphotos/compare/v0.42.77...v0.42.78)
+
+> 29 August 2021
+
+- docs: add dssinger as a contributor for bug [`#514`](https://github.com/RhetTbull/osxphotos/pull/514)
+- Fix for newlines in exif tags, #513 [`f0d7496`](https://github.com/RhetTbull/osxphotos/commit/f0d7496bc66aae291337efc570a2e2c4b9b5529c)
+
+#### [v0.42.77](https://github.com/RhetTbull/osxphotos/compare/v0.42.74...v0.42.77)
+
+> 28 August 2021
+
+- Fixed --strip behavior, #511 [`dbb4dbc`](https://github.com/RhetTbull/osxphotos/commit/dbb4dbc0a7f7cb590ab3b2ce532c5c618c7fc249)
+- Update test for #506 [`f1cea14`](https://github.com/RhetTbull/osxphotos/commit/f1cea1498b3b973aa500d874126b9668a8743f1f)
+- Added {strip} template [`159d110`](https://github.com/RhetTbull/osxphotos/commit/159d1102aabd56def2caf6754747f7a4caa7d374)
+
+#### [v0.42.74](https://github.com/RhetTbull/osxphotos/compare/v0.42.73...v0.42.74)
+
+> 23 August 2021
+
+- Fix for #506 [`db5b34d`](https://github.com/RhetTbull/osxphotos/commit/db5b34d58950c65f95d22a0e81390b9d4fb7ccd7)
+- Updated README [skip ci] [`fb4138c`](https://github.com/RhetTbull/osxphotos/commit/fb4138cfe6cfad02fead821b70b4b84d11b027e9)
+
 #### [v0.42.73](https://github.com/RhetTbull/osxphotos/compare/v0.42.72...v0.42.73)

 > 15 August 2021
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,4 +2,5 @@ include README.md
 include README.rst
 include osxphotos/templates/*
 include osxphotos/phototemplate.tx
-include osxphotos/phototemplate.md
+include osxphotos/phototemplate.md
+include osxphotos/queries/*
--- a/README.md
+++ b/README.md
@@ -4,7 +4,9 @@
 [![tests](https://github.com/RhetTbull/osxphotos/workflows/Tests/badge.svg)](https://github.com/RhetTbull/osxphotos/workflows/Tests/badge.svg)
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/osxphotos)
 [![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)
-[![All Contributors](https://img.shields.io/badge/all_contributors-25-orange.svg?style=flat)](#contributors)
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+[![All Contributors](https://img.shields.io/badge/all_contributors-32-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.

@@ -12,7 +14,7 @@ OSXPhotos provides the ability to interact with and query Apple's Photos.app lib

 # Table of Contents
 * [Supported operating systems](#supported-operating-systems)
-* [Installation instructions](#installation-instructions)
+* [Installation](#installation)
 * [Command Line Usage](#command-line-usage)
  + [Command line examples](#command-line-examples)
  + [Tutorial](#tutorial)
@@ -23,6 +25,7 @@ OSXPhotos provides the ability to interact with and query Apple's Photos.app lib
  + [ExifInfo](#exifinfo)
  + [AlbumInfo](#albuminfo)
  + [ImportInfo](#importinfo)
+  + [ProjectInfo](#projectinfo)
  + [FolderInfo](#folderinfo)
  + [PlaceInfo](#placeinfo)
  + [ScoreInfo](#scoreinfo)
@@ -50,13 +53,12 @@ OSXPhotos provides the ability to interact with and query Apple's Photos.app lib

 ## Supported operating systems

-Only works on macOS (aka Mac OS X). Tested on macOS Sierra (10.12.6) until macOS Big Sur (10.16/11.3).
+Only works on macOS (aka Mac OS X). Tested on macOS Sierra (10.12.6) through macOS Monterey (12.0.1).  Tested on both x86 and Apple silicon (M1).

-If you have access to the macOS 12 / Monterey beta and would like to help ensure osxphotos is compatible, please visit the [Discussions](https://github.com/RhetTbull/osxphotos/discussions) page and let me know!

 | macOS Version     | macOS name | Photos.app version |
 | ----------------- |------------|:-------------------|
-| 12.0              | Monterey   | ?.0 UNKNOWN        |
+| 12.0              | Monterey   | 7.0 ✅             |
 | 10.16, 11.0-11.4  | Big Sur    | 6.0 ✅             |
 | 10.15.1 - 10.15.7 | Catalina   | 5.0 ✅             |
 | 10.14.5, 10.14.6  | Mojave     | 4.0 ✅             |
@@ -138,20 +140,22 @@ Options:
  -h, --help                   Show this message and exit.

 Commands:
-  about     Print information about osxphotos including license.
-  albums    Print out albums found in the Photos library.
-  dump      Print list of all photos & associated info from the Photos...
-  export    Export photos from the Photos database.
-  help      Print help; for help on commands: help <command>.
-  info      Print out descriptive info of the Photos library database.
-  keywords  Print out keywords found in the Photos library.
-  labels    Print out image classification labels found in the Photos...
-  list      Print list of Photos libraries found on the system.
-  persons   Print out persons (faces) found in the Photos library.
-  places    Print out places found in the Photos library.
-  query     Query the Photos database using 1 or more search options; if...
-  repl      Run interactive osxphotos shell
-  tutorial  Display osxphotos tutorial.
+  about      Print information about osxphotos including license.
+  albums     Print out albums found in the Photos library.
+  dump       Print list of all photos & associated info from the Photos...
+  export     Export photos from the Photos database.
+  help       Print help; for help on commands: help <command>.
+  info       Print out descriptive info of the Photos library database.
+  install    Install Python packages into the same environment as osxphotos
+  keywords   Print out keywords found in the Photos library.
+  labels     Print out image classification labels found in the Photos...
+  list       Print list of Photos libraries found on the system.
+  persons    Print out persons (faces) found in the Photos library.
+  places     Print out places found in the Photos library.
+  query      Query the Photos database using 1 or more search options; if...
+  repl       Run interactive osxphotos REPL shell (useful for debugging,...
+  tutorial   Display osxphotos tutorial.
+  uninstall  Uninstall Python packages from the osxphotos environment
 ```

 To get help on a specific command, use `osxphotos help <command_name>`
@@ -451,15 +455,15 @@ For example, to set Finder comment to the photo's title and description:

 In the template string above, `{newline}` instructs osxphotos to insert a new line character ("\n") between the title and description. In this example, if `{title}` or `{descr}` is empty, you'll get "title\n" or "\ndescription" which may not be desired so you can use more advanced features of the template system to handle these cases:

-`osxphotos export /path/to/export --xattr-template findercomment "{title}{title?{descr?{newline},},}{descr}"`
+`osxphotos export /path/to/export --xattr-template findercomment "{title,}{title?{descr?{newline},},}{descr,}"`

 Explanation of the template string:

 ```txt
-{title}{title?{descr?{newline},},}{descr}
+{title,}{title?{descr?{newline},},}{descr,}
 │           │      │ │       │ │  │ 
 │           │      │ │       │ │  │ 
- └──> insert title  │ │       │ │  │ 
+ └──> insert title (or nothing if no title) 
             │      │ │       │ │  │
             └───> is there a title?
                    │ │       │ │  │
@@ -471,7 +475,8 @@ Explanation of the template string:
                                │  │ 
                                └───> if title is blank, insert nothing
                                   │
-                                   └───> finally, insert description
+                                   └───> finally, insert description 
+                                         (or nothing if no description)
 ```

 In this example, `title?` demonstrates use of the boolean (True/False) feature of the template system.  `title?` is read as "Is the title True (or not blank/empty)?  If so, then the value immediately following the `?` is used in place of `title`.  If `title` is blank, then the value immediately following the comma is used instead.  The format for boolean fields is `field?value if true,value if false`.  Either `value if true` or `value if false` may be blank, in which case a blank string ("") is used for the value and both may also be an entirely new template string as seen in the above example.  Using this format, template strings may be nested inside each other to form complex `if-then-else` statements.
@@ -610,7 +615,8 @@ Options:
                                  FILENAME. If more than one --name options is
                                  specified, they are treated as "OR", e.g. find
                                  photos matching any FILENAME.
-  --uuid UUID                     Search for photos with UUID(s).
+  --uuid UUID                     Search for photos with UUID(s). May be
+                                  repeated to include multiple UUIDs.
  --uuid-from-file FILE           Search for photos with UUID(s) loaded from
                                  FILE. Format is a single UUID per line.  Lines
                                  preceded with # are ignored.
@@ -727,6 +733,15 @@ Options:
                                  repeating '--regex' with different arguments.
  --selected                      Filter for photos that are currently selected
                                  in Photos.
+  --exif EXIF_TAG VALUE           Search for photos where EXIF_TAG exists in
+                                  photo's EXIF data and contains VALUE. For
+                                  example, to find photos created by Adobe
+                                  Photoshop: `--exif Software 'Adobe Photoshop'
+                                  `or to find all photos shot on a Canon camera:
+                                  `--exif Make Canon`. EXIF_TAG can be any valid
+                                  exiftool tag, with or without group name, e.g.
+                                  `EXIF:Make` or `Make`. To use --exif, exiftool
+                                  must be installed and in the path.
  --query-eval CRITERIA           Evaluate CRITERIA to filter photos. CRITERIA
                                  will be evaluated in context of the following
                                  python list comprehension: `photos = [photo
@@ -823,6 +838,11 @@ Options:
                                  photos if the RAW photo does not have an
                                  associated JPEG image (e.g. the RAW file was
                                  imported to Photos without a JPEG preview).
+  --skip-uuid UUID                Skip photos with UUID(s) during export. May be
+                                  repeated to include multiple UUIDs.
+  --skip-uuid-from-file FILE      Skip photos with UUID(s) loaded from FILE.
+                                  Format is a single UUID per line.  Lines
+                                  preceded with # are ignored.
  --current-name                  Use photo's current filename instead of
                                  original filename for export.  Note: Starting
                                  with Photos 5, all photos are renamed upon
@@ -1134,14 +1154,13 @@ Options:
                                  You can run more than one function by
                                  repeating the '--post-function' option with
                                  different arguments. See Post Function below.
-  --exportdb EXPORTDB_FILE        Specify alternate name for database file which
+  --exportdb EXPORTDB_FILE        Specify alternate path for database file which
                                  stores state information for export and
                                  --update. If --exportdb is not specified,
                                  export database will be saved to
                                  '.osxphotos_export.db' in the export
-                                  directory.  Must be specified as filename
-                                  only, not a path, as export database will be
-                                  saved in export directory.
+                                  directory.  If --exportdb is specified, it
+                                  will be saved to the specified file.
  --load-config <config file path>
                                  Load options from file as written with --save-
                                  config. This allows you to save a complex
@@ -1257,8 +1276,8 @@ s
 ** Templating System **

 The templating system converts one or template statements, written in osxphotos 
-templating language, to one or more rendered values using information from the  
-photo being processed.                                                          
+metadata templating language, to one or more rendered values using information  
+from the photo being processed.                                                 

 In its simplest form, a template statement has the form: "{template_field}", for
 example "{title}" which would resolve to the title of the photo.                
@@ -1701,7 +1720,7 @@ Substitution                    Description
 {lf}                            A line feed: '\n', alias for {newline}
 {cr}                            A carriage return: '\r'
 {crlf}                          a carriage return + line feed: '\r\n'
-{osxphotos_version}             The osxphotos version, e.g. '0.42.74'
+{osxphotos_version}             The osxphotos version, e.g. '0.44.4'
 {osxphotos_cmd_line}            The full command line used to run osxphotos

 The following substitutions may result in multiple values. Thus if specified for
@@ -1716,6 +1735,13 @@ Substitution             Description
 {folder_album}           Folder path + album photo is contained in. e.g.
                         'Folder/Subfolder/Album' or just 'Album' if no
                         enclosing folder
+{project}                Project(s) photo is contained in (such as greeting
+                         cards, calendars, slideshows)
+{album_project}          Album(s) and project(s) photo is contained in; treats
+                         projects as regular albums
+{folder_album_project}   Folder path + album (includes projects as albums)
+                         photo is contained in. e.g. 'Folder/Subfolder/Album'
+                         or just 'Album' if no enclosing folder
 {keyword}                Keyword(s) assigned to photo
 {person}                 Person(s) / face(s) in a photo
 {label}                  Image categorization label associated with a photo
@@ -1778,6 +1804,8 @@ Substitution             Description
                         rendered TEMPLATE value(s) for safe usage in the
                         shell, e.g. My file.jpeg => 'My file.jpeg'; only adds
                         quotes if needed.
+{strip}                  Use in form '{strip,TEMPLATE}'; strips whitespace
+                         from begining and end of rendered TEMPLATE value(s).
 {function}               Execute a python function from an external file and
                         use return value as template substitution. Use in
                         format: {function:file.py::function_name} where
@@ -1817,7 +1845,7 @@ COMMAND is an osxphotos template string which will be rendered and passed to the
 shell for execution. CATEGORY is the category of file to pass to COMMAND. The
 following categories are available:

-Catgory                   Description
+Category                  Description
 exported                  All exported files
 new                       When used with '--update', all newly exported files
 updated                   When used with '--update', all files which were
@@ -1858,13 +1886,13 @@ Both the '{shell_quote}' template and the '|shell_quote' template filter are
 available for this purpose.  For example, the following command outputs the full
 path of newly exported files to file 'new.txt':

--post-command new "echo {filepath.name|shell_quote} >> {shell_quote,{export_dir}/exported.txt}"
+--post-command new "echo {filepath|shell_quote} >> {shell_quote,{export_dir}/exported.txt}"

-In the above command, the 'shell_quote' filter is used to ensure
-'{filepath.name}' is properly quoted and the '{shell_quote}' template ensures
-the constructed path of '{exported_dir}/exported.txt' is properly quoted. If
-'{filepath.name}' is 'IMG 1234.jpeg' and '{export_dir}' is '/Volumes/Photo
-Export', the command thus renders to:
+In the above command, the 'shell_quote' filter is used to ensure '{filepath}' is
+properly quoted and the '{shell_quote}' template ensures the constructed path of
+'{exported_dir}/exported.txt' is properly quoted. If '{filepath}' is 'IMG
+1234.jpeg' and '{export_dir}' is '/Volumes/Photo Export', the command thus
+renders to:

 echo 'IMG 1234.jpeg' >> '/Volumes/Photo Export/exported.txt'

@@ -2088,7 +2116,7 @@ keywords = photosdb.keywords

 Returns a list of the keywords found in the Photos library

-#### `album_info`
+#### <a name="photosdbalbuminfo">`album_info`</a>
 ```python
 # assumes photosdb is a PhotosDB object (see above)
 albums = photosdb.album_info
@@ -2118,6 +2146,10 @@ Returns list of shared album names found in photos database (e.g. albums shared

 Returns a list of [ImportInfo](#importinfo) objects representing the import sessions for the database.

+#### `project_info`
+
+Returns a list of [ProjectInfo](#projectinfo) objects representing the projects/creations (cards, calendars, etc.) in the database.
+
 #### `folder_info`
 ```python
 # assumes photosdb is a PhotosDB object (see above)
@@ -2370,6 +2402,8 @@ For example, in my library, Photos says I have 19,386 photos and 474 movies.  Ho
 #### <a name="getphoto">`get_photo(uuid)`</A>
 Returns a single PhotoInfo instance for photo with UUID matching `uuid` or None if no photo is found matching `uuid`.  If you know the UUID of a photo, `get_photo()` is much faster than `photos`.  See also [photos()](#photos).

+#### `execute(sql)`
+Execute sql statement against the Photos database and return a sqlite cursor with the results.

 ### PhotoInfo 
 PhotosDB.photos() returns a list of PhotoInfo objects.  Each PhotoInfo object represents a single photo in the Photos library.
@@ -2405,11 +2439,15 @@ Returns a list of keywords (e.g. tags) applied to the photo
 Returns a list of albums the photo is contained in. See also [album_info](#album_info).

 #### `album_info`
-Returns a list of [AlbumInfo](#AlbumInfo) objects representing the albums the photo is contained in.  See also [albums](#albums).
+Returns a list of [AlbumInfo](#AlbumInfo) objects representing the albums the photo is contained in or empty list of the photo is not in any albums.  See also [albums](#albums).

 #### `import_info`
 Returns an [ImportInfo](#importinfo) object representing the import session associated with the photo or `None` if there is no associated import session.

+#### `project_info`
+Returns a list of [ProjectInfo](#projectinfo) objects representing projects/creations (cards, calendars, etc.) the photo is contained in or empty list if there are no projects associated with the photo.
+
+
 #### `persons`
 Returns a list of the names of the persons in the photo

@@ -2513,7 +2551,12 @@ Returns a [PlaceInfo](#PlaceInfo) object with reverse geolocation data or None i
 #### `shared`
 Returns True if photo is in a shared album, otherwise False.

-**Note**: *Only valid on Photos 5 / MacOS 10.15+; on Photos <= 4, returns None instead of True/False.
+**Note**: *Only valid on Photos 5 / MacOS 10.15+; on Photos <= 4, returns None.
+
+#### `owner`
+Returns full name of the photo owner (person who shared the photo) for shared photos or None if photo is not shared. Also returns None if you are the person who shared the photo.
+
+**Note**: *Only valid on Photos 5 / MacOS 10.15+; on Photos <= 4, returns None.

 #### `comments`
 Returns list of [CommentInfo](#commentinfo) objects for comments on shared photos or empty list if no comments.
@@ -2763,7 +2806,7 @@ If overwrite=False and increment=False, export will fail if destination file alr

 Render template string for photo.  none_str is used if template substitution results in None value and no default specified.

- `template_str`: str in osxphotos template language (OTL) format. See also [Template System](#template-system) table. See notes below regarding specific details of the syntax.
+- `template_str`: str in metadata template language (MTL) format. See also [Template System](#template-system) table. See notes below regarding specific details of the syntax.
 - `options`: an optional osxphotos.phototemplate.RenderOptions object specifying the options to pass to the rendering engine.

 `RenderOptions` has the following properties:
@@ -2887,6 +2930,11 @@ Photos Library
 #### `parent`
 Returns a [FolderInfo](#FolderInfo) object representing the albums parent folder or `None` if album is not a in a folder.

+#### `owner`
+Returns full name of the album owner (person who shared the album) for shared albums or None if album is not shared.
+
+**Note**: *Only valid on Photos 5 / MacOS 10.15+; on Photos <= 4, returns None.
+
 ### ImportInfo 
 PhotosDB.import_info returns a list of ImportInfo objects.  Each ImportInfo object represents an import session in the library.  PhotoInfo.import_info returns a single ImportInfo object representing the import session for the photo (or `None` if no associated import session).

@@ -2907,6 +2955,23 @@ Returns the start date as a timezone aware datetime.datetime object for when the
 #### `end_date`
 Returns the end date as a timezone aware datetime.datetime object for when the import session completed.

+### ProjectInfo 
+PhotosDB.projcet_info returns a list of ProjectInfo objects.  Each ProjectInfo object represents a project in the library.  PhotoInfo.project_info returns a list of ProjectInfo objects for each project the photo is contained in.
+
+Projects (found under "My Projects" in Photos) are projects or creations such as cards, calendars, and slideshows created in Photos.  osxphotos provides only very basic information about projects and projects created with third party plugins may not accessible to osxphotos.
+
+#### `uuid`
+Returns the universally unique identifier (uuid) of the project.  This is how Photos keeps track of individual objects within the database.
+
+#### `title`
+Returns the title or name of the project.
+
+#### <a name="projectphotos">`photos`</a>
+Returns a list of [PhotoInfo](#PhotoInfo) objects representing each photo contained in the project.
+
+#### `creation_date`
+Returns the creation date as a timezone aware datetime.datetime object of the project.
+
 ### FolderInfo 
 PhotosDB.folder_info returns a list of FolderInfo objects representing the top level folders in the library.  Each FolderInfo object represents a single folder in the Photos library.

@@ -3254,7 +3319,6 @@ The following additional properties are also available but are not yet fully doc
 - `manual`: 
 - `face_type`:
 - `age_type`:
- `bald_type`:
 - `eye_makeup_type`:
 - `eye_state`:
 - `facial_hair_type`:
@@ -3337,7 +3401,7 @@ To get the path of every raw photo, whether it's a single raw photo or a raw+JPE
 ### Template System 

 <!-- OSXPHOTOS-TEMPLATE-HELP:START - Do not remove or modify this section -->
-The templating system converts one or template statements, written in osxphotos templating language, to one or more rendered values using information from the photo being processed. 
+The templating system converts one or template statements, written in osxphotos metadata templating language, to one or more rendered values using information from the photo being processed. 

 In its simplest form, a template statement has the form: `"{template_field}"`, for example `"{title}"` which would resolve to the title of the photo.

@@ -3558,10 +3622,13 @@ The following template field substitutions are availabe for use the templating s
 |{lf}|A line feed: '\n', alias for {newline}|
 |{cr}|A carriage return: '\r'|
 |{crlf}|a carriage return + line feed: '\r\n'|
-|{osxphotos_version}|The osxphotos version, e.g. '0.42.74'|
+|{osxphotos_version}|The osxphotos version, e.g. '0.44.4'|
 |{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|
+|{project}|Project(s) photo is contained in (such as greeting cards, calendars, slideshows)|
+|{album_project}|Album(s) and project(s) photo is contained in; treats projects as regular albums|
+|{folder_album_project}|Folder path + album (includes projects as albums) photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder|
 |{keyword}|Keyword(s) assigned to photo|
 |{person}|Person(s) / face(s) in a photo|
 |{label}|Image categorization label associated with a photo (Photos 5+ only). Labels are added automatically by Photos using machine learning algorithms to categorize images. These are not the same as {keyword} which refers to the user-defined keywords/tags applied in Photos.|
@@ -3575,6 +3642,7 @@ The following template field substitutions are availabe for use the templating s
 |{photo}|Provides direct access to the PhotoInfo object for the photo. Must be used in format '{photo.property}' where 'property' represents a PhotoInfo property. For example: '{photo.favorite}' is the same as '{favorite}' and '{photo.place.name}' is the same as '{place.name}'. '{photo}' provides access to properties that are not available as separate template fields but it assumes some knowledge of the underlying PhotoInfo class.  See https://rhettbull.github.io/osxphotos/ for additional documentation on the PhotoInfo class.|
 |{detected_text}|List of text strings found in the image after performing text detection. Using '{detected_text}' will cause osxphotos to perform text detection on your photos using the built-in macOS text detection algorithms which will slow down your export. The results for each photo will be cached in the export database so that future exports with '--update' do not need to reprocess each photo. You may pass a confidence threshold value between 0.0 and 1.0 after a colon as in '{detected_text:0.5}'; The default confidence threshold is 0.75. '{detected_text}' works only on macOS Catalina (10.15) or later. Note: this feature is not the same thing as Live Text in macOS Monterey, which osxphotos does not yet support.|
 |{shell_quote}|Use in form '{shell_quote,TEMPLATE}'; quotes the rendered TEMPLATE value(s) for safe usage in the shell, e.g. My file.jpeg => 'My file.jpeg'; only adds quotes if needed.|
+|{strip}|Use in form '{strip,TEMPLATE}'; strips whitespace from begining and end of rendered TEMPLATE value(s).|
 |{function}|Execute a python function from an external file and use return value as template substitution. Use in format: {function:file.py::function_name} where 'file.py' is the name of the python file and 'function_name' is the name of the function to call. The function will be passed the PhotoInfo object for the photo. See https://github.com/RhetTbull/osxphotos/blob/master/examples/template_function.py for an example of how to implement a template function.|
 <!-- OSXPHOTOS-TEMPLATE-TABLE:END -->

@@ -3662,13 +3730,6 @@ Returns path to last opened Photo Library as string.

 Returns list of Photos libraries found on the system.  **Note**: On MacOS 10.15, this appears to list all libraries. On older systems, it may not find some libraries if they are not located in ~/Pictures.  Provided for convenience but do not rely on this to find all libraries on the system.

-#### `dd_to_dms_str(lat, lon)`
-Convert latitude, longitude in degrees to degrees, minutes, seconds as string.
- `lat`: latitude in degrees
- `lon`: longitude in degrees
-returns: string tuple in format ("51 deg 30' 12.86\\" N", "0 deg 7' 54.50\\" W")
-This is the same format used by exiftool's json format.
-

 ## Examples

@@ -3724,15 +3785,10 @@ if __name__ == "__main__":

 ## Related Projects

- [rhettbull/photosmeta](https://github.com/rhettbull/photosmeta): uses osxphotos and [exiftool](https://exiftool.org/) to apply metadata from Photos as exif data in the photo files.  Can also export photos while preserving metadata and also apply Photos keywords as spotlight tags to make it easier to search for photos using spotlight.  This is mostly made obsolete by osxphotos.  The one feature that photosmeta has that osxphotos does not is ability to update the metadata of the actual photo files in the Photos library without exporting them. (Use with caution!)
+- [rhettbull/exif2findertags](https://github.com/RhetTbull/exif2findertags): Read EXIF metadata from image and video files and convert it to macOS Finder tags and/or Finder comments and other extended attributes.
+- [rhettbull/photos_time_warp](https://github.com/RhetTbull/photos_time_warp): Batch adjust the date, time, or timezone of photos in Apple Photos. 
 - [rhettbull/PhotoScript](https://github.com/RhetTbull/PhotoScript): python wrapper around Photos' applescript API allowing automation of Photos (including creation/deletion of items) from python.
- [patrikhson/photo-export](https://github.com/patrikhson/photo-export): Exports older versions of Photos databases.  Provided the inspiration for osxphotos.
- [doersino/apple-photos-export](https://github.com/doersino/apple-photos-export): Photos export script for Mojave.
- [orangeturtle739/photos-export](https://github.com/orangeturtle739/photos-export): Set of scripts to export Photos libraries.
- [ndbroadbent/icloud_photos_downloader](https://github.com/ndbroadbent/icloud_photos_downloader): Download photos from iCloud.  Currently unmaintained.
- [AaronVanGeffen/ExportPhotosLibrary](https://github.com/AaronVanGeffen/ExportPhotosLibrary): Another python script for exporting older versions of Photos libraries.
- [MossieurPropre/PhotosAlbumExporter](https://github.com/MossieurPropre/PhotosAlbumExporter): Javascript script to export photos while maintaining album structure.
- [ajslater/magritte](https://github.com/ajslater/magritte): Another python command line script for exporting photos from older versions of Photos libraries.
+- [ndbroadbent/icloud_photos_downloader](https://github.com/ndbroadbent/icloud_photos_downloader): Download photos from iCloud. 

 ## Contributing

@@ -3785,6 +3841,15 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
    <td align="center"><a href="https://github.com/kaduskj"><img src="https://avatars.githubusercontent.com/u/983067?v=4?s=75" width="75px;" alt=""/><br /><sub><b>kaduskj</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/issues?q=author%3Akaduskj" title="Bug reports">🐛</a></td>
    <td align="center"><a href="https://github.com/mkirkland4874"><img src="https://avatars.githubusercontent.com/u/36466711?v=4?s=75" width="75px;" alt=""/><br /><sub><b>mkirkland4874</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/issues?q=author%3Amkirkland4874" title="Bug reports">🐛</a> <a href="#example-mkirkland4874" title="Examples">💡</a></td>
    <td align="center"><a href="https://github.com/jcommisso07"><img src="https://avatars.githubusercontent.com/u/3111054?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Joseph Commisso</b></sub></a><br /><a href="#data-jcommisso07" title="Data">🔣</a></td>
+    <td align="center"><a href="https://github.com/dssinger"><img src="https://avatars.githubusercontent.com/u/1817903?v=4?s=75" width="75px;" alt=""/><br /><sub><b>David Singer</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/issues?q=author%3Adssinger" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/oPromessa"><img src="https://avatars.githubusercontent.com/u/21261491?v=4?s=75" width="75px;" alt=""/><br /><sub><b>oPromessa</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/issues?q=author%3AoPromessa" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="http://spencerchang.me"><img src="https://avatars.githubusercontent.com/u/14796580?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Spencer Chang</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/issues?q=author%3Aspencerc99" title="Bug reports">🐛</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://www.cs.purdue.edu/homes/dgleich"><img src="https://avatars.githubusercontent.com/u/33995?v=4?s=75" width="75px;" alt=""/><br /><sub><b>David Gleich</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=dgleich" title="Code">💻</a></td>
+    <td align="center"><a href="https://alandefreitas.github.io/alandefreitas/"><img src="https://avatars.githubusercontent.com/u/5369819?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Alan de Freitas</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/issues?q=author%3Aalandefreitas" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://hyfen.net"><img src="https://avatars.githubusercontent.com/u/6291?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Andrew Louis</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=hyfen" title="Documentation">📖</a> <a href="https://github.com/RhetTbull/osxphotos/commits?author=hyfen" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/neebah"><img src="https://avatars.githubusercontent.com/u/71442026?v=4?s=75" width="75px;" alt=""/><br /><sub><b>neebah</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/issues?q=author%3Aneebah" title="Bug reports">🐛</a></td>
  </tr>
 </table>

@@ -3826,6 +3891,8 @@ For additional details about how osxphotos is implemented or if you would like t
 - [textx](https://github.com/textX/textX)
 - [bitmath](https://github.com/tbielawa/bitmath)
 - [more-itertools](https://github.com/more-itertools/more-itertools)
+- [ptpython](https://github.com/prompt-toolkit/ptpython)
+- [objexplore](https://github.com/kylepollina/objexplore)


 ## Acknowledgements
--- a/build.sh
+++ b/build.sh
@@ -3,9 +3,10 @@
 # script to help build osxphotos release
 # this is unique to my own dev setup

-source venv/bin/activate
+# source venv/bin/activate
 rm -rf dist; rm -rf build
 python3 utils/update_readme.py
 (cd docsrc && make github && make pdf)
-python3 setup.py sdist bdist_wheel
-./make_cli_exe.sh
+# python3 setup.py sdist bdist_wheel
+python3 -m build
+./make_cli_exe.sh
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -1,7 +1,10 @@
+build
+m2r2
+pyinstaller==4.4
+pytest-mock
 pytest==6.2.4
-pytest-mock==3.6.1
-Sphinx==4.0.2
-sphinx-rtd-theme==0.5.2
-wheel==0.36.2
-twine==3.4.1
-pyinstaller==4.3
+sphinx_click
+sphinx_rtd_theme
+twine
+wheel
+Sphinx
--- 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: 23e7c9cd300c96ffa7fce04034b83f61
+config: abcd83bede460ffb3604a85d16e98db7
 tags: 645f666f9bcd5a90fca523b33c5a78b7
--- a/docs/_modules/index.html
+++ b/docs/_modules/index.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Overview: module code &#8212; osxphotos 0.42.69 documentation</title>
+    <title>Overview: module code &#8212; osxphotos 0.43.9 documentation</title>
    <link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="../_static/alabaster.css" />
    <script data-url_root="../" id="documentation_options" src="../_static/documentation_options.js"></script>
@@ -71,7 +71,7 @@
  <h3 id="searchlabel">Quick search</h3>
    <div class="searchformwrapper">
    <form class="search" action="../search.html" method="get">
-      <input type="text" name="q" aria-labelledby="searchlabel" />
+      <input type="text" name="q" aria-labelledby="searchlabel" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"/>
      <input type="submit" value="Go" />
    </form>
    </div>
@@ -93,7 +93,7 @@
      &copy;2021, Rhet Turnbull.
      
      |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.0.2</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.3.2</a>
      &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
      
    </div>
--- a/docs/_modules/osxphotos/photoinfo/_photoinfo_export.html
+++ b/docs/_modules/osxphotos/photoinfo/_photoinfo_export.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos.photoinfo._photoinfo_export &#8212; osxphotos 0.42.69 documentation</title>
+    <title>osxphotos.photoinfo._photoinfo_export &#8212; osxphotos 0.43.6 documentation</title>
    <link rel="stylesheet" type="text/css" href="../../../_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="../../../_static/alabaster.css" />
    <script data-url_root="../../../" id="documentation_options" src="../../../_static/documentation_options.js"></script>
@@ -89,7 +89,7 @@
 <span class="p">)</span>
 <span class="kn">from</span> <span class="nn">..phototemplate</span> <span class="kn">import</span> <span class="n">RenderOptions</span>
 <span class="kn">from</span> <span class="nn">..uti</span> <span class="kn">import</span> <span class="n">get_preferred_uti_extension</span>
-<span class="kn">from</span> <span class="nn">..utils</span> <span class="kn">import</span> <span class="n">findfiles</span><span class="p">,</span> <span class="n">lineno</span><span class="p">,</span> <span class="n">noop</span>
+<span class="kn">from</span> <span class="nn">..utils</span> <span class="kn">import</span> <span class="n">increment_filename</span><span class="p">,</span> <span class="n">increment_filename_with_count</span><span class="p">,</span> <span class="n">lineno</span>

 <span class="c1"># retry if use_photos_export fails the first time (which sometimes it does)</span>
 <span class="n">MAX_PHOTOSCRIPT_RETRIES</span> <span class="o">=</span> <span class="mi">3</span>
@@ -313,7 +313,7 @@

    <span class="k">if</span> <span class="ow">not</span> <span class="n">exported_files</span> <span class="ow">or</span> <span class="ow">not</span> <span class="n">filename</span><span class="p">:</span>
        <span class="c1"># nothing got exported</span>
-        <span class="k">raise</span> <span class="n">ExportError</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;Could not export photo </span><span class="si">{</span><span class="n">uuid</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span>
+        <span class="k">raise</span> <span class="n">ExportError</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;Could not export photo </span><span class="si">{</span><span class="n">uuid</span><span class="si">}</span><span class="s2"> (</span><span class="si">{</span><span class="n">lineno</span><span class="p">(</span><span class="vm">__file__</span><span class="p">)</span><span class="si">}</span><span class="s2">)&quot;</span><span class="p">)</span>

    <span class="c1"># need to find actual filename as sometimes Photos renames JPG to jpeg on export</span>
    <span class="c1"># may be more than one file exported (e.g. if Live Photo, Photos exports both .jpeg and .mov)</span>
@@ -563,6 +563,7 @@
    <span class="n">preview</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
    <span class="n">preview_suffix</span><span class="o">=</span><span class="n">DEFAULT_PREVIEW_SUFFIX</span><span class="p">,</span>
    <span class="n">render_options</span><span class="p">:</span> <span class="n">Optional</span><span class="p">[</span><span class="n">RenderOptions</span><span class="p">]</span> <span class="o">=</span> <span class="kc">None</span><span class="p">,</span>
+    <span class="n">strip</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
 <span class="p">):</span>
    <span class="sd">&quot;&quot;&quot;export photo, like export but with update and dry_run options</span>
 <span class="sd">    dest: must be valid destination path or exception raised</span>
@@ -621,6 +622,7 @@
 <span class="sd">    preview: if True, also exports preview image</span>
 <span class="sd">    preview_suffix: optional string to append to end of filename for preview images</span>
 <span class="sd">    render_options: optional osxphotos.phototemplate.RenderOptions instance to specify options for rendering templates</span>
+<span class="sd">    strip: if True, strip whitespace from rendered templates</span>

 <span class="sd">    Returns: ExportResults class</span>
 <span class="sd">        ExportResults has attributes:</span>
@@ -714,15 +716,12 @@
    <span class="c1"># e.g. exporting sidecar for file1.png and file1.jpeg</span>
    <span class="c1"># if file1.png exists and exporting file1.jpeg,</span>
    <span class="c1"># dest will be file1 (1).jpeg even though file1.jpeg doesn&#39;t exist to prevent sidecar collision</span>
-    <span class="n">count</span> <span class="o">=</span> <span class="mi">0</span>
-    <span class="k">if</span> <span class="ow">not</span> <span class="n">update</span> <span class="ow">and</span> <span class="n">increment</span> <span class="ow">and</span> <span class="ow">not</span> <span class="n">overwrite</span><span class="p">:</span>
-        <span class="n">dest_files</span> <span class="o">=</span> <span class="n">findfiles</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">dest_original</span><span class="o">.</span><span class="n">stem</span><span class="si">}</span><span class="s2">*&quot;</span><span class="p">,</span> <span class="nb">str</span><span class="p">(</span><span class="n">dest_original</span><span class="o">.</span><span class="n">parent</span><span class="p">))</span>
-        <span class="n">dest_files</span> <span class="o">=</span> <span class="p">[</span><span class="n">pathlib</span><span class="o">.</span><span class="n">Path</span><span class="p">(</span><span class="n">f</span><span class="p">)</span><span class="o">.</span><span class="n">stem</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span> <span class="k">for</span> <span class="n">f</span> <span class="ow">in</span> <span class="n">dest_files</span><span class="p">]</span>
-        <span class="n">dest_new</span> <span class="o">=</span> <span class="n">dest_original</span><span class="o">.</span><span class="n">stem</span>
-        <span class="k">while</span> <span class="n">dest_new</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span> <span class="ow">in</span> <span class="n">dest_files</span><span class="p">:</span>
-            <span class="n">count</span> <span class="o">+=</span> <span class="mi">1</span>
-            <span class="n">dest_new</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">dest_original</span><span class="o">.</span><span class="n">stem</span><span class="si">}</span><span class="s2"> (</span><span class="si">{</span><span class="n">count</span><span class="si">}</span><span class="s2">)&quot;</span>
-        <span class="n">dest_original</span> <span class="o">=</span> <span class="n">dest_original</span><span class="o">.</span><span class="n">parent</span> <span class="o">/</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">dest_new</span><span class="si">}{</span><span class="n">dest_original</span><span class="o">.</span><span class="n">suffix</span><span class="si">}</span><span class="s2">&quot;</span>
+    <span class="n">increment_file_count</span> <span class="o">=</span> <span class="mi">0</span>
+    <span class="k">if</span> <span class="n">increment</span> <span class="ow">and</span> <span class="ow">not</span> <span class="n">update</span> <span class="ow">and</span> <span class="ow">not</span> <span class="n">overwrite</span><span class="p">:</span>
+        <span class="n">dest_original</span><span class="p">,</span> <span class="n">increment_file_count</span> <span class="o">=</span> <span class="n">increment_filename_with_count</span><span class="p">(</span>
+            <span class="n">dest_original</span>
+        <span class="p">)</span>
+        <span class="n">dest_original</span> <span class="o">=</span> <span class="n">pathlib</span><span class="o">.</span><span class="n">Path</span><span class="p">(</span><span class="n">dest_original</span><span class="p">)</span>

    <span class="c1"># if overwrite==False and #increment==False, export should fail if file exists</span>
    <span class="k">if</span> <span class="p">(</span>
@@ -737,17 +736,11 @@
        <span class="p">)</span>

    <span class="k">if</span> <span class="n">export_edited</span><span class="p">:</span>
-        <span class="k">if</span> <span class="ow">not</span> <span class="n">update</span> <span class="ow">and</span> <span class="n">increment</span> <span class="ow">and</span> <span class="ow">not</span> <span class="n">overwrite</span><span class="p">:</span>
-            <span class="n">dest_files</span> <span class="o">=</span> <span class="n">findfiles</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">dest_edited</span><span class="o">.</span><span class="n">stem</span><span class="si">}</span><span class="s2">*&quot;</span><span class="p">,</span> <span class="nb">str</span><span class="p">(</span><span class="n">dest_edited</span><span class="o">.</span><span class="n">parent</span><span class="p">))</span>
-            <span class="n">dest_files</span> <span class="o">=</span> <span class="p">[</span><span class="n">pathlib</span><span class="o">.</span><span class="n">Path</span><span class="p">(</span><span class="n">f</span><span class="p">)</span><span class="o">.</span><span class="n">stem</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span> <span class="k">for</span> <span class="n">f</span> <span class="ow">in</span> <span class="n">dest_files</span><span class="p">]</span>
-            <span class="n">dest_new</span> <span class="o">=</span> <span class="n">dest_edited</span><span class="o">.</span><span class="n">stem</span>
-            <span class="k">if</span> <span class="n">count</span><span class="p">:</span>
-                <span class="c1"># incremented above when checking original destination</span>
-                <span class="n">dest_new</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">dest_new</span><span class="si">}</span><span class="s2"> (</span><span class="si">{</span><span class="n">count</span><span class="si">}</span><span class="s2">)&quot;</span>
-            <span class="k">while</span> <span class="n">dest_new</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span> <span class="ow">in</span> <span class="n">dest_files</span><span class="p">:</span>
-                <span class="n">count</span> <span class="o">+=</span> <span class="mi">1</span>
-                <span class="n">dest_new</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">dest</span><span class="o">.</span><span class="n">stem</span><span class="si">}</span><span class="s2"> (</span><span class="si">{</span><span class="n">count</span><span class="si">}</span><span class="s2">)&quot;</span>
-            <span class="n">dest_edited</span> <span class="o">=</span> <span class="n">dest_edited</span><span class="o">.</span><span class="n">parent</span> <span class="o">/</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">dest_new</span><span class="si">}{</span><span class="n">dest_edited</span><span class="o">.</span><span class="n">suffix</span><span class="si">}</span><span class="s2">&quot;</span>
+        <span class="k">if</span> <span class="n">increment</span> <span class="ow">and</span> <span class="ow">not</span> <span class="n">update</span> <span class="ow">and</span> <span class="ow">not</span> <span class="n">overwrite</span><span class="p">:</span>
+            <span class="n">dest_edited</span><span class="p">,</span> <span class="n">increment_file_count</span> <span class="o">=</span> <span class="n">increment_filename_with_count</span><span class="p">(</span>
+                <span class="n">dest_edited</span><span class="p">,</span> <span class="n">increment_file_count</span>
+            <span class="p">)</span>
+            <span class="n">dest_edited</span> <span class="o">=</span> <span class="n">pathlib</span><span class="o">.</span><span class="n">Path</span><span class="p">(</span><span class="n">dest_edited</span><span class="p">)</span>

        <span class="c1"># if overwrite==False and #increment==False, export should fail if file exists</span>
        <span class="k">if</span> <span class="n">dest_edited</span><span class="o">.</span><span class="n">exists</span><span class="p">()</span> <span class="ow">and</span> <span class="ow">not</span> <span class="n">update</span> <span class="ow">and</span> <span class="ow">not</span> <span class="n">overwrite</span> <span class="ow">and</span> <span class="ow">not</span> <span class="n">increment</span><span class="p">:</span>
@@ -831,20 +824,16 @@
                    <span class="p">)</span>
                <span class="k">if</span> <span class="n">dest_uuid</span> <span class="o">!=</span> <span class="bp">self</span><span class="o">.</span><span class="n">uuid</span><span class="p">:</span>
                    <span class="c1"># not the right file, find the right one</span>
-                    <span class="n">count</span> <span class="o">=</span> <span class="mi">1</span>
                    <span class="n">glob_str</span> <span class="o">=</span> <span class="nb">str</span><span class="p">(</span><span class="n">dest</span><span class="o">.</span><span class="n">parent</span> <span class="o">/</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">dest</span><span class="o">.</span><span class="n">stem</span><span class="si">}</span><span class="s2"> (*</span><span class="si">{</span><span class="n">dest</span><span class="o">.</span><span class="n">suffix</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span>
                    <span class="n">dest_files</span> <span class="o">=</span> <span class="n">glob</span><span class="o">.</span><span class="n">glob</span><span class="p">(</span><span class="n">glob_str</span><span class="p">)</span>
-                    <span class="n">found_match</span> <span class="o">=</span> <span class="kc">False</span>
                    <span class="k">for</span> <span class="n">file_</span> <span class="ow">in</span> <span class="n">dest_files</span><span class="p">:</span>
                        <span class="n">dest_uuid</span> <span class="o">=</span> <span class="n">export_db</span><span class="o">.</span><span class="n">get_uuid_for_file</span><span class="p">(</span><span class="n">file_</span><span class="p">)</span>
                        <span class="k">if</span> <span class="n">dest_uuid</span> <span class="o">==</span> <span class="bp">self</span><span class="o">.</span><span class="n">uuid</span><span class="p">:</span>
                            <span class="n">dest</span> <span class="o">=</span> <span class="n">pathlib</span><span class="o">.</span><span class="n">Path</span><span class="p">(</span><span class="n">file_</span><span class="p">)</span>
-                            <span class="n">found_match</span> <span class="o">=</span> <span class="kc">True</span>
                            <span class="k">break</span>
                        <span class="k">elif</span> <span class="n">dest_uuid</span> <span class="ow">is</span> <span class="kc">None</span> <span class="ow">and</span> <span class="n">fileutil</span><span class="o">.</span><span class="n">cmp</span><span class="p">(</span><span class="n">src</span><span class="p">,</span> <span class="n">file_</span><span class="p">):</span>
                            <span class="c1"># files match, update the UUID</span>
                            <span class="n">dest</span> <span class="o">=</span> <span class="n">pathlib</span><span class="o">.</span><span class="n">Path</span><span class="p">(</span><span class="n">file_</span><span class="p">)</span>
-                            <span class="n">found_match</span> <span class="o">=</span> <span class="kc">True</span>
                            <span class="n">export_db</span><span class="o">.</span><span class="n">set_data</span><span class="p">(</span>
                                <span class="n">filename</span><span class="o">=</span><span class="n">dest</span><span class="p">,</span>
                                <span class="n">uuid</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">uuid</span><span class="p">,</span>
@@ -856,18 +845,14 @@
                                <span class="n">exif_json</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
                            <span class="p">)</span>
                            <span class="k">break</span>
-
-                    <span class="k">if</span> <span class="ow">not</span> <span class="n">found_match</span><span class="p">:</span>
+                    <span class="k">else</span><span class="p">:</span>
                        <span class="c1"># increment the destination file</span>
-                        <span class="n">count</span> <span class="o">=</span> <span class="mi">1</span>
-                        <span class="n">glob_str</span> <span class="o">=</span> <span class="nb">str</span><span class="p">(</span><span class="n">dest</span><span class="o">.</span><span class="n">parent</span> <span class="o">/</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">dest</span><span class="o">.</span><span class="n">stem</span><span class="si">}</span><span class="s2">*&quot;</span><span class="p">)</span>
-                        <span class="n">dest_files</span> <span class="o">=</span> <span class="n">glob</span><span class="o">.</span><span class="n">glob</span><span class="p">(</span><span class="n">glob_str</span><span class="p">)</span>
-                        <span class="n">dest_files</span> <span class="o">=</span> <span class="p">[</span><span class="n">pathlib</span><span class="o">.</span><span class="n">Path</span><span class="p">(</span><span class="n">f</span><span class="p">)</span><span class="o">.</span><span class="n">stem</span> <span class="k">for</span> <span class="n">f</span> <span class="ow">in</span> <span class="n">dest_files</span><span class="p">]</span>
-                        <span class="n">dest_new</span> <span class="o">=</span> <span class="n">dest</span><span class="o">.</span><span class="n">stem</span>
-                        <span class="k">while</span> <span class="n">dest_new</span> <span class="ow">in</span> <span class="n">dest_files</span><span class="p">:</span>
-                            <span class="n">dest_new</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">dest</span><span class="o">.</span><span class="n">stem</span><span class="si">}</span><span class="s2"> (</span><span class="si">{</span><span class="n">count</span><span class="si">}</span><span class="s2">)&quot;</span>
-                            <span class="n">count</span> <span class="o">+=</span> <span class="mi">1</span>
-                        <span class="n">dest</span> <span class="o">=</span> <span class="n">dest</span><span class="o">.</span><span class="n">parent</span> <span class="o">/</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">dest_new</span><span class="si">}{</span><span class="n">dest</span><span class="o">.</span><span class="n">suffix</span><span class="si">}</span><span class="s2">&quot;</span>
+                        <span class="n">dest</span> <span class="o">=</span> <span class="n">pathlib</span><span class="o">.</span><span class="n">Path</span><span class="p">(</span><span class="n">increment_filename</span><span class="p">(</span><span class="n">dest</span><span class="p">))</span>
+
+            <span class="k">if</span> <span class="n">export_original</span><span class="p">:</span>
+                <span class="n">dest_original</span> <span class="o">=</span> <span class="n">dest</span>
+            <span class="k">else</span><span class="p">:</span>
+                <span class="n">dest_edited</span> <span class="o">=</span> <span class="n">dest</span>

            <span class="c1"># export the dest file</span>
            <span class="n">results</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_export_photo</span><span class="p">(</span>
@@ -960,6 +945,14 @@
            <span class="n">preview_path</span> <span class="o">=</span> <span class="n">pathlib</span><span class="o">.</span><span class="n">Path</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">path_derivatives</span><span class="p">[</span><span class="mi">0</span><span class="p">])</span>
            <span class="n">preview_ext</span> <span class="o">=</span> <span class="n">preview_path</span><span class="o">.</span><span class="n">suffix</span>
            <span class="n">preview_name</span> <span class="o">=</span> <span class="n">dest</span><span class="o">.</span><span class="n">parent</span> <span class="o">/</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">dest</span><span class="o">.</span><span class="n">stem</span><span class="si">}{</span><span class="n">preview_suffix</span><span class="si">}{</span><span class="n">preview_ext</span><span class="si">}</span><span class="s2">&quot;</span>
+            <span class="c1"># if original is missing, the filename won&#39;t have been incremented so</span>
+            <span class="c1"># need to check here to make sure there aren&#39;t duplicate preview files in</span>
+            <span class="c1"># the export directory</span>
+            <span class="n">preview_name</span> <span class="o">=</span> <span class="p">(</span>
+                <span class="n">preview_name</span>
+                <span class="k">if</span> <span class="n">overwrite</span> <span class="ow">or</span> <span class="n">update</span>
+                <span class="k">else</span> <span class="n">pathlib</span><span class="o">.</span><span class="n">Path</span><span class="p">(</span><span class="n">increment_filename</span><span class="p">(</span><span class="n">preview_name</span><span class="p">))</span>
+            <span class="p">)</span>
            <span class="k">if</span> <span class="n">preview_path</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
                <span class="n">results</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_export_photo</span><span class="p">(</span>
                    <span class="n">preview_path</span><span class="p">,</span>
@@ -1002,6 +995,7 @@
            <span class="n">persons</span><span class="o">=</span><span class="n">persons</span><span class="p">,</span>
            <span class="n">location</span><span class="o">=</span><span class="n">location</span><span class="p">,</span>
            <span class="n">replace_keywords</span><span class="o">=</span><span class="n">replace_keywords</span><span class="p">,</span>
+            <span class="n">strip</span><span class="o">=</span><span class="n">strip</span><span class="p">,</span>
        <span class="p">)</span>
        <span class="n">sidecars</span><span class="o">.</span><span class="n">append</span><span class="p">(</span>
            <span class="p">(</span>
@@ -1028,6 +1022,7 @@
            <span class="n">persons</span><span class="o">=</span><span class="n">persons</span><span class="p">,</span>
            <span class="n">location</span><span class="o">=</span><span class="n">location</span><span class="p">,</span>
            <span class="n">replace_keywords</span><span class="o">=</span><span class="n">replace_keywords</span><span class="p">,</span>
+            <span class="n">strip</span><span class="o">=</span><span class="n">strip</span><span class="p">,</span>
        <span class="p">)</span>
        <span class="n">sidecars</span><span class="o">.</span><span class="n">append</span><span class="p">(</span>
            <span class="p">(</span>
@@ -1050,6 +1045,7 @@
            <span class="n">persons</span><span class="o">=</span><span class="n">persons</span><span class="p">,</span>
            <span class="n">location</span><span class="o">=</span><span class="n">location</span><span class="p">,</span>
            <span class="n">replace_keywords</span><span class="o">=</span><span class="n">replace_keywords</span><span class="p">,</span>
+            <span class="n">strip</span><span class="o">=</span><span class="n">strip</span><span class="p">,</span>
        <span class="p">)</span>
        <span class="n">sidecars</span><span class="o">.</span><span class="n">append</span><span class="p">(</span>
            <span class="p">(</span>
@@ -1120,6 +1116,7 @@
                        <span class="n">persons</span><span class="o">=</span><span class="n">persons</span><span class="p">,</span>
                        <span class="n">location</span><span class="o">=</span><span class="n">location</span><span class="p">,</span>
                        <span class="n">replace_keywords</span><span class="o">=</span><span class="n">replace_keywords</span><span class="p">,</span>
+                        <span class="n">strip</span><span class="o">=</span><span class="n">strip</span><span class="p">,</span>
                    <span class="p">)</span>
                <span class="p">)[</span><span class="mi">0</span><span class="p">]</span>
                <span class="k">if</span> <span class="n">old_data</span> <span class="o">!=</span> <span class="n">current_data</span><span class="p">:</span>
@@ -1143,6 +1140,7 @@
                        <span class="n">persons</span><span class="o">=</span><span class="n">persons</span><span class="p">,</span>
                        <span class="n">location</span><span class="o">=</span><span class="n">location</span><span class="p">,</span>
                        <span class="n">replace_keywords</span><span class="o">=</span><span class="n">replace_keywords</span><span class="p">,</span>
+                        <span class="n">strip</span><span class="o">=</span><span class="n">strip</span><span class="p">,</span>
                    <span class="p">)</span>
                    <span class="k">if</span> <span class="n">warning_</span><span class="p">:</span>
                        <span class="n">all_results</span><span class="o">.</span><span class="n">exiftool_warning</span><span class="o">.</span><span class="n">append</span><span class="p">((</span><span class="n">exported_file</span><span class="p">,</span> <span class="n">warning_</span><span class="p">))</span>
@@ -1163,6 +1161,7 @@
                        <span class="n">persons</span><span class="o">=</span><span class="n">persons</span><span class="p">,</span>
                        <span class="n">location</span><span class="o">=</span><span class="n">location</span><span class="p">,</span>
                        <span class="n">replace_keywords</span><span class="o">=</span><span class="n">replace_keywords</span><span class="p">,</span>
+                        <span class="n">strip</span><span class="o">=</span><span class="n">strip</span><span class="p">,</span>
                    <span class="p">),</span>
                <span class="p">)</span>
                <span class="n">export_db</span><span class="o">.</span><span class="n">set_stat_exif_for_file</span><span class="p">(</span>
@@ -1188,6 +1187,7 @@
                    <span class="n">persons</span><span class="o">=</span><span class="n">persons</span><span class="p">,</span>
                    <span class="n">location</span><span class="o">=</span><span class="n">location</span><span class="p">,</span>
                    <span class="n">replace_keywords</span><span class="o">=</span><span class="n">replace_keywords</span><span class="p">,</span>
+                    <span class="n">strip</span><span class="o">=</span><span class="n">strip</span><span class="p">,</span>
                <span class="p">)</span>
                <span class="k">if</span> <span class="n">warning_</span><span class="p">:</span>
                    <span class="n">all_results</span><span class="o">.</span><span class="n">exiftool_warning</span><span class="o">.</span><span class="n">append</span><span class="p">((</span><span class="n">exported_file</span><span class="p">,</span> <span class="n">warning_</span><span class="p">))</span>
@@ -1208,6 +1208,7 @@
                    <span class="n">persons</span><span class="o">=</span><span class="n">persons</span><span class="p">,</span>
                    <span class="n">location</span><span class="o">=</span><span class="n">location</span><span class="p">,</span>
                    <span class="n">replace_keywords</span><span class="o">=</span><span class="n">replace_keywords</span><span class="p">,</span>
+                    <span class="n">strip</span><span class="o">=</span><span class="n">strip</span><span class="p">,</span>
                <span class="p">),</span>
            <span class="p">)</span>
            <span class="n">export_db</span><span class="o">.</span><span class="n">set_stat_exif_for_file</span><span class="p">(</span>
@@ -1298,6 +1299,7 @@
                            <span class="n">dest</span><span class="o">.</span><span class="n">name</span><span class="p">,</span>
                            <span class="n">version</span><span class="o">=</span><span class="n">PHOTOS_VERSION_CURRENT</span><span class="p">,</span>
                            <span class="n">overwrite</span><span class="o">=</span><span class="n">overwrite</span><span class="p">,</span>
+                            <span class="n">video</span><span class="o">=</span><span class="n">live_photo</span><span class="p">,</span>
                        <span class="p">)</span>
                        <span class="n">all_results</span><span class="o">.</span><span class="n">exported</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="n">exported</span><span class="p">)</span>
                    <span class="k">except</span> <span class="ne">Exception</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
@@ -1345,6 +1347,7 @@
                            <span class="n">dest</span><span class="o">.</span><span class="n">name</span><span class="p">,</span>
                            <span class="n">version</span><span class="o">=</span><span class="n">PHOTOS_VERSION_ORIGINAL</span><span class="p">,</span>
                            <span class="n">overwrite</span><span class="o">=</span><span class="n">overwrite</span><span class="p">,</span>
+                            <span class="n">video</span><span class="o">=</span><span class="n">live_photo</span><span class="p">,</span>
                        <span class="p">)</span>
                        <span class="n">all_results</span><span class="o">.</span><span class="n">exported</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="n">exported</span><span class="p">)</span>
                    <span class="k">except</span> <span class="ne">Exception</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
@@ -1554,16 +1557,31 @@
        <span class="n">edited_stat</span> <span class="o">=</span> <span class="n">fileutil</span><span class="o">.</span><span class="n">file_sig</span><span class="p">(</span><span class="n">src</span><span class="p">)</span> <span class="k">if</span> <span class="n">edited</span> <span class="k">else</span> <span class="p">(</span><span class="kc">None</span><span class="p">,</span> <span class="kc">None</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span>
        <span class="k">if</span> <span class="n">dest_exists</span> <span class="ow">and</span> <span class="p">(</span><span class="n">update</span> <span class="ow">or</span> <span class="n">overwrite</span><span class="p">):</span>
            <span class="c1"># need to remove the destination first</span>
-            <span class="n">fileutil</span><span class="o">.</span><span class="n">unlink</span><span class="p">(</span><span class="n">dest</span><span class="p">)</span>
+            <span class="k">try</span><span class="p">:</span>
+                <span class="n">fileutil</span><span class="o">.</span><span class="n">unlink</span><span class="p">(</span><span class="n">dest</span><span class="p">)</span>
+            <span class="k">except</span> <span class="ne">Exception</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
+                <span class="k">raise</span> <span class="n">ExportError</span><span class="p">(</span>
+                    <span class="sa">f</span><span class="s2">&quot;Error removing file </span><span class="si">{</span><span class="n">dest</span><span class="si">}</span><span class="s2">: </span><span class="si">{</span><span class="n">e</span><span class="si">}</span><span class="s2"> ((</span><span class="si">{</span><span class="n">lineno</span><span class="p">(</span><span class="vm">__file__</span><span class="p">)</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">if</span> <span class="n">export_as_hardlink</span><span class="p">:</span>
-            <span class="n">fileutil</span><span class="o">.</span><span class="n">hardlink</span><span class="p">(</span><span class="n">src</span><span class="p">,</span> <span class="n">dest</span><span class="p">)</span>
+            <span class="k">try</span><span class="p">:</span>
+                <span class="n">fileutil</span><span class="o">.</span><span class="n">hardlink</span><span class="p">(</span><span class="n">src</span><span class="p">,</span> <span class="n">dest</span><span class="p">)</span>
+            <span class="k">except</span> <span class="ne">Exception</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
+                <span class="k">raise</span> <span class="n">ExportError</span><span class="p">(</span>
+                    <span class="sa">f</span><span class="s2">&quot;Error hardlinking </span><span class="si">{</span><span class="n">src</span><span class="si">}</span><span class="s2"> to </span><span class="si">{</span><span class="n">dest</span><span class="si">}</span><span class="s2">: </span><span class="si">{</span><span class="n">e</span><span class="si">}</span><span class="s2"> (</span><span class="si">{</span><span class="n">lineno</span><span class="p">(</span><span class="vm">__file__</span><span class="p">)</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">elif</span> <span class="n">convert_to_jpeg</span><span class="p">:</span>
            <span class="c1"># use convert_to_jpeg to export the file</span>
            <span class="n">fileutil</span><span class="o">.</span><span class="n">convert_to_jpeg</span><span class="p">(</span><span class="n">src</span><span class="p">,</span> <span class="n">dest_str</span><span class="p">,</span> <span class="n">compression_quality</span><span class="o">=</span><span class="n">jpeg_quality</span><span class="p">)</span>
            <span class="n">converted_stat</span> <span class="o">=</span> <span class="n">fileutil</span><span class="o">.</span><span class="n">file_sig</span><span class="p">(</span><span class="n">dest_str</span><span class="p">)</span>
            <span class="n">converted_to_jpeg_files</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">dest_str</span><span class="p">)</span>
        <span class="k">else</span><span class="p">:</span>
-            <span class="n">fileutil</span><span class="o">.</span><span class="n">copy</span><span class="p">(</span><span class="n">src</span><span class="p">,</span> <span class="n">dest_str</span><span class="p">)</span>
+            <span class="k">try</span><span class="p">:</span>
+                <span class="n">fileutil</span><span class="o">.</span><span class="n">copy</span><span class="p">(</span><span class="n">src</span><span class="p">,</span> <span class="n">dest_str</span><span class="p">)</span>
+            <span class="k">except</span> <span class="ne">Exception</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
+                <span class="k">raise</span> <span class="n">ExportError</span><span class="p">(</span>
+                    <span class="sa">f</span><span class="s2">&quot;Error copying file </span><span class="si">{</span><span class="n">src</span><span class="si">}</span><span class="s2"> to </span><span class="si">{</span><span class="n">dest_str</span><span class="si">}</span><span class="s2">: </span><span class="si">{</span><span class="n">e</span><span class="si">}</span><span class="s2"> (</span><span class="si">{</span><span class="n">lineno</span><span class="p">(</span><span class="vm">__file__</span><span class="p">)</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">export_db</span><span class="o">.</span><span class="n">set_data</span><span class="p">(</span>
            <span class="n">filename</span><span class="o">=</span><span class="n">dest_str</span><span class="p">,</span>
@@ -1613,6 +1631,7 @@
    <span class="n">persons</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
    <span class="n">location</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
    <span class="n">replace_keywords</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
+    <span class="n">strip</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
 <span class="p">):</span>
    <span class="sd">&quot;&quot;&quot;write exif data to image file at filepath</span>

@@ -1626,6 +1645,7 @@
 <span class="sd">        persons: if True, write person data to metadata</span>
 <span class="sd">        location: if True, write location data to metadata</span>
 <span class="sd">        replace_keywords: if True, keyword_template replaces any keywords, otherwise it&#39;s additive</span>
+<span class="sd">        strip: if True, strip any leading or trailing whitespace from rendered templates</span>

 <span class="sd">    Returns:</span>
 <span class="sd">        (warning, error) of warning and error strings if exiftool produces warnings or errors</span>
@@ -1643,6 +1663,7 @@
        <span class="n">persons</span><span class="o">=</span><span class="n">persons</span><span class="p">,</span>
        <span class="n">location</span><span class="o">=</span><span class="n">location</span><span class="p">,</span>
        <span class="n">replace_keywords</span><span class="o">=</span><span class="n">replace_keywords</span><span class="p">,</span>
+        <span class="n">strip</span><span class="o">=</span><span class="n">strip</span><span class="p">,</span>
    <span class="p">)</span>

    <span class="k">with</span> <span class="n">ExifTool</span><span class="p">(</span><span class="n">filepath</span><span class="p">,</span> <span class="n">flags</span><span class="o">=</span><span class="n">flags</span><span class="p">,</span> <span class="n">exiftool</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">_db</span><span class="o">.</span><span class="n">_exiftool_path</span><span class="p">)</span> <span class="k">as</span> <span class="n">exiftool</span><span class="p">:</span>
@@ -1668,6 +1689,7 @@
    <span class="n">persons</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
    <span class="n">location</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
    <span class="n">replace_keywords</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
+    <span class="n">strip</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
 <span class="p">):</span>
    <span class="sd">&quot;&quot;&quot;Return dict of EXIF details for building exiftool JSON sidecar or sending commands to ExifTool.</span>
 <span class="sd">        Does not include all the EXIF fields as those are likely already in the image.</span>
@@ -1684,6 +1706,7 @@
 <span class="sd">        persons: if True, include person data</span>
 <span class="sd">        location: if True, include location data</span>
 <span class="sd">        replace_keywords: if True, keyword_template replaces any keywords, otherwise it&#39;s additive</span>
+<span class="sd">        strip: if True, strip any rendered templates</span>

 <span class="sd">    Returns: dict with exiftool tags / values</span>

@@ -1731,6 +1754,8 @@
        <span class="p">)</span>
        <span class="n">rendered</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">render_template</span><span class="p">(</span><span class="n">description_template</span><span class="p">,</span> <span class="n">options</span><span class="p">)[</span><span class="mi">0</span><span class="p">]</span>
        <span class="n">description</span> <span class="o">=</span> <span class="s2">&quot; &quot;</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">rendered</span><span class="p">)</span> <span class="k">if</span> <span class="n">rendered</span> <span class="k">else</span> <span class="s2">&quot;&quot;</span>
+        <span class="k">if</span> <span class="n">strip</span><span class="p">:</span>
+            <span class="n">description</span> <span class="o">=</span> <span class="n">description</span><span class="o">.</span><span class="n">strip</span><span class="p">()</span>
        <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;EXIF:ImageDescription&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">description</span>
        <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;XMP:Description&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">description</span>
        <span class="n">exif</span><span class="p">[</span><span class="s2">&quot;IPTC:Caption-Abstract&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">description</span>
@@ -1778,6 +1803,9 @@
                <span class="p">)</span>
            <span class="n">rendered_keywords</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="n">rendered</span><span class="p">)</span>

+        <span class="k">if</span> <span class="n">strip</span><span class="p">:</span>
+            <span class="n">rendered_keywords</span> <span class="o">=</span> <span class="p">[</span><span class="n">keyword</span><span class="o">.</span><span class="n">strip</span><span class="p">()</span> <span class="k">for</span> <span class="n">keyword</span> <span class="ow">in</span> <span class="n">rendered_keywords</span><span class="p">]</span>
+
        <span class="c1"># filter out any template values that didn&#39;t match by looking for sentinel</span>
        <span class="n">rendered_keywords</span> <span class="o">=</span> <span class="p">[</span>
            <span class="n">keyword</span>
@@ -1884,12 +1912,6 @@
                <span class="bp">self</span><span class="o">.</span><span class="n">date_modified</span>
            <span class="p">)</span><span class="o">.</span><span class="n">strftime</span><span class="p">(</span><span class="s2">&quot;%Y:%m:</span><span class="si">%d</span><span class="s2"> %H:%M:%S&quot;</span><span class="p">)</span>

-    <span class="c1"># remove any new lines in any fields</span>
-    <span class="k">for</span> <span class="n">field</span><span class="p">,</span> <span class="n">val</span> <span class="ow">in</span> <span class="n">exif</span><span class="o">.</span><span class="n">items</span><span class="p">():</span>
-        <span class="k">if</span> <span class="nb">type</span><span class="p">(</span><span class="n">val</span><span class="p">)</span> <span class="o">==</span> <span class="nb">str</span><span class="p">:</span>
-            <span class="n">exif</span><span class="p">[</span><span class="n">field</span><span class="p">]</span> <span class="o">=</span> <span class="n">val</span><span class="o">.</span><span class="n">replace</span><span class="p">(</span><span class="s2">&quot;</span><span class="se">\n</span><span class="s2">&quot;</span><span class="p">,</span> <span class="s2">&quot; &quot;</span><span class="p">)</span>
-        <span class="k">elif</span> <span class="nb">type</span><span class="p">(</span><span class="n">val</span><span class="p">)</span> <span class="o">==</span> <span class="nb">list</span><span class="p">:</span>
-            <span class="n">exif</span><span class="p">[</span><span class="n">field</span><span class="p">]</span> <span class="o">=</span> <span class="p">[</span><span class="nb">str</span><span class="p">(</span><span class="n">v</span><span class="p">)</span><span class="o">.</span><span class="n">replace</span><span class="p">(</span><span class="s2">&quot;</span><span class="se">\n</span><span class="s2">&quot;</span><span class="p">,</span> <span class="s2">&quot; &quot;</span><span class="p">)</span> <span class="k">for</span> <span class="n">v</span> <span class="ow">in</span> <span class="n">val</span> <span class="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="p">]</span>
    <span class="k">return</span> <span class="n">exif</span>


@@ -1942,6 +1964,7 @@
    <span class="n">persons</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
    <span class="n">location</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
    <span class="n">replace_keywords</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
+    <span class="n">strip</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
 <span class="p">):</span>
    <span class="sd">&quot;&quot;&quot;Return dict of EXIF details for building exiftool JSON sidecar or sending commands to ExifTool.</span>
 <span class="sd">        Does not include all the EXIF fields as those are likely already in the image.</span>
@@ -1959,6 +1982,7 @@
 <span class="sd">        persons: if True, include person data</span>
 <span class="sd">        location: if True, include location data</span>
 <span class="sd">        replace_keywords: if True, keyword_template replaces any keywords, otherwise it&#39;s additive</span>
+<span class="sd">        strip: if True, strip whitespace from rendered templates</span>

 <span class="sd">    Returns: dict with exiftool tags / values</span>

@@ -1998,6 +2022,7 @@
        <span class="n">persons</span><span class="o">=</span><span class="n">persons</span><span class="p">,</span>
        <span class="n">location</span><span class="o">=</span><span class="n">location</span><span class="p">,</span>
        <span class="n">replace_keywords</span><span class="o">=</span><span class="n">replace_keywords</span><span class="p">,</span>
+        <span class="n">strip</span><span class="o">=</span><span class="n">strip</span><span class="p">,</span>
    <span class="p">)</span>

    <span class="k">if</span> <span class="ow">not</span> <span class="n">tag_groups</span><span class="p">:</span>
@@ -2023,6 +2048,7 @@
    <span class="n">persons</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
    <span class="n">location</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
    <span class="n">replace_keywords</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
+    <span class="n">strip</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
 <span class="p">):</span>
    <span class="sd">&quot;&quot;&quot;returns string for XMP sidecar</span>
 <span class="sd">    use_albums_as_keywords: treat album names as keywords</span>
@@ -2035,6 +2061,7 @@
 <span class="sd">    persons: if True, include person data</span>
 <span class="sd">    location: if True, include location data</span>
 <span class="sd">    replace_keywords: if True, keyword_template replaces any keywords, otherwise it&#39;s additive</span>
+<span class="sd">    strip: if True, strip whitespace from rendered templates</span>
 <span class="sd">    &quot;&quot;&quot;</span>

    <span class="n">xmp_template_file</span> <span class="o">=</span> <span class="p">(</span>
@@ -2052,6 +2079,8 @@
        <span class="p">)</span>
        <span class="n">rendered</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">render_template</span><span class="p">(</span><span class="n">description_template</span><span class="p">,</span> <span class="n">options</span><span class="p">)[</span><span class="mi">0</span><span class="p">]</span>
        <span class="n">description</span> <span class="o">=</span> <span class="s2">&quot; &quot;</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">rendered</span><span class="p">)</span> <span class="k">if</span> <span class="n">rendered</span> <span class="k">else</span> <span class="s2">&quot;&quot;</span>
+        <span class="k">if</span> <span class="n">strip</span><span class="p">:</span>
+            <span class="n">description</span> <span class="o">=</span> <span class="n">description</span><span class="o">.</span><span class="n">strip</span><span class="p">()</span>
    <span class="k">else</span><span class="p">:</span>
        <span class="n">description</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">description</span> <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">description</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>

@@ -2093,6 +2122,9 @@
                <span class="p">)</span>
            <span class="n">rendered_keywords</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="n">rendered</span><span class="p">)</span>

+        <span class="k">if</span> <span class="n">strip</span><span class="p">:</span>
+            <span class="n">rendered_keywords</span> <span class="o">=</span> <span class="p">[</span><span class="n">keyword</span><span class="o">.</span><span class="n">strip</span><span class="p">()</span> <span class="k">for</span> <span class="n">keyword</span> <span class="ow">in</span> <span class="n">rendered_keywords</span><span class="p">]</span>
+
        <span class="c1"># filter out any template values that didn&#39;t match by looking for sentinel</span>
        <span class="n">rendered_keywords</span> <span class="o">=</span> <span class="p">[</span>
            <span class="n">keyword</span>
@@ -2180,7 +2212,7 @@
  <h3 id="searchlabel">Quick search</h3>
    <div class="searchformwrapper">
    <form class="search" action="../../../search.html" method="get">
-      <input type="text" name="q" aria-labelledby="searchlabel" />
+      <input type="text" name="q" aria-labelledby="searchlabel" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"/>
      <input type="submit" value="Go" />
    </form>
    </div>
@@ -2202,7 +2234,7 @@
      &copy;2021, Rhet Turnbull.
      
      |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.0.2</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.2.0</a>
      &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
      
    </div>
--- a/docs/_modules/osxphotos/photoinfo/photoinfo.html
+++ b/docs/_modules/osxphotos/photoinfo/photoinfo.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos.photoinfo.photoinfo &#8212; osxphotos 0.42.69 documentation</title>
+    <title>osxphotos.photoinfo.photoinfo &#8212; osxphotos 0.43.6 documentation</title>
    <link rel="stylesheet" type="text/css" href="../../../_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="../../../_static/alabaster.css" />
    <script data-url_root="../../../" id="documentation_options" src="../../../_static/documentation_options.js"></script>
@@ -47,6 +47,7 @@
 <span class="kn">from</span> <span class="nn">typing</span> <span class="kn">import</span> <span class="n">Optional</span>

 <span class="kn">import</span> <span class="nn">yaml</span>
+<span class="kn">from</span> <span class="nn">osxmetadata</span> <span class="kn">import</span> <span class="n">OSXMetaData</span>

 <span class="kn">from</span> <span class="nn">.._constants</span> <span class="kn">import</span> <span class="p">(</span>
    <span class="n">_MOVIE_TYPE</span><span class="p">,</span>
@@ -67,9 +68,11 @@
 <span class="p">)</span>
 <span class="kn">from</span> <span class="nn">..adjustmentsinfo</span> <span class="kn">import</span> <span class="n">AdjustmentsInfo</span>
 <span class="kn">from</span> <span class="nn">..albuminfo</span> <span class="kn">import</span> <span class="n">AlbumInfo</span><span class="p">,</span> <span class="n">ImportInfo</span>
+<span class="kn">from</span> <span class="nn">..momentinfo</span> <span class="kn">import</span> <span class="n">MomentInfo</span>
 <span class="kn">from</span> <span class="nn">..personinfo</span> <span class="kn">import</span> <span class="n">FaceInfo</span><span class="p">,</span> <span class="n">PersonInfo</span>
 <span class="kn">from</span> <span class="nn">..phototemplate</span> <span class="kn">import</span> <span class="n">PhotoTemplate</span><span class="p">,</span> <span class="n">RenderOptions</span>
 <span class="kn">from</span> <span class="nn">..placeinfo</span> <span class="kn">import</span> <span class="n">PlaceInfo4</span><span class="p">,</span> <span class="n">PlaceInfo5</span>
+<span class="kn">from</span> <span class="nn">..query_builder</span> <span class="kn">import</span> <span class="n">get_query</span>
 <span class="kn">from</span> <span class="nn">..text_detection</span> <span class="kn">import</span> <span class="n">detect_text</span>
 <span class="kn">from</span> <span class="nn">..uti</span> <span class="kn">import</span> <span class="n">get_preferred_uti_extension</span><span class="p">,</span> <span class="n">get_uti_for_extension</span>
 <span class="kn">from</span> <span class="nn">..utils</span> <span class="kn">import</span> <span class="n">_debug</span><span class="p">,</span> <span class="n">_get_resource_loc</span><span class="p">,</span> <span class="n">findfiles</span>
@@ -525,6 +528,18 @@
                <span class="bp">self</span><span class="o">.</span><span class="n">_faceinfo</span> <span class="o">=</span> <span class="p">[]</span>
            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_faceinfo</span>

+    <span class="nd">@property</span>
+    <span class="k">def</span> <span class="nf">moment</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot;Moment photo belongs to&quot;&quot;&quot;</span>
+        <span class="k">try</span><span class="p">:</span>
+            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_moment</span>
+        <span class="k">except</span> <span class="ne">AttributeError</span><span class="p">:</span>
+            <span class="k">try</span><span class="p">:</span>
+                <span class="bp">self</span><span class="o">.</span><span class="n">_moment</span> <span class="o">=</span> <span class="n">MomentInfo</span><span class="p">(</span><span class="n">db</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">_db</span><span class="p">,</span> <span class="n">moment_pk</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">_info</span><span class="p">[</span><span class="s2">&quot;momentID&quot;</span><span class="p">])</span>
+            <span class="k">except</span> <span class="ne">ValueError</span><span class="p">:</span>
+                <span class="bp">self</span><span class="o">.</span><span class="n">_moment</span> <span class="o">=</span> <span class="kc">None</span>
+            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_moment</span>
+
    <span class="nd">@property</span>
    <span class="k">def</span> <span class="nf">albums</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
        <span class="sd">&quot;&quot;&quot;list of albums picture is contained in&quot;&quot;&quot;</span>
@@ -596,7 +611,12 @@
    <span class="nd">@property</span>
    <span class="k">def</span> <span class="nf">title</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
        <span class="sd">&quot;&quot;&quot;name / title of picture&quot;&quot;&quot;</span>
-        <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_info</span><span class="p">[</span><span class="s2">&quot;name&quot;</span><span class="p">]</span>
+        <span class="c1"># if user sets then deletes title, Photos sets it to empty string in DB instead of NULL</span>
+        <span class="c1"># in this case, return None so result is the same as if title had never been set (which returns NULL)</span>
+        <span class="c1"># issue #512</span>
+        <span class="n">title</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_info</span><span class="p">[</span><span class="s2">&quot;name&quot;</span><span class="p">]</span>
+        <span class="n">title</span> <span class="o">=</span> <span class="kc">None</span> <span class="k">if</span> <span class="n">title</span> <span class="o">==</span> <span class="s2">&quot;&quot;</span> <span class="k">else</span> <span class="n">title</span>
+        <span class="k">return</span> <span class="n">title</span>

    <span class="nd">@property</span>
    <span class="k">def</span> <span class="nf">uuid</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
@@ -869,7 +889,7 @@
        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">_db</span><span class="o">.</span><span class="n">_db_version</span> <span class="o">&lt;=</span> <span class="n">_PHOTOS_4_VERSION</span><span class="p">:</span>
            <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">live_photo</span> <span class="ow">and</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">ismissing</span><span class="p">:</span>
                <span class="n">live_model_id</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_info</span><span class="p">[</span><span class="s2">&quot;live_model_id&quot;</span><span class="p">]</span>
-                <span class="k">if</span> <span class="n">live_model_id</span> <span class="o">==</span> <span class="kc">None</span><span class="p">:</span>
+                <span class="k">if</span> <span class="n">live_model_id</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
                    <span class="n">logging</span><span class="o">.</span><span class="n">debug</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;missing live_model_id: </span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">_uuid</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span>
                    <span class="n">photopath</span> <span class="o">=</span> <span class="kc">None</span>
                <span class="k">else</span><span class="p">:</span>
@@ -890,28 +910,20 @@
                        <span class="c1"># photos 4 has &quot;isOnDisk&quot; column we could check</span>
                        <span class="c1"># or could do the actual check with &quot;isfile&quot;</span>
                        <span class="c1"># TODO: should this be a warning or debug?</span>
-                        <span class="n">logging</span><span class="o">.</span><span class="n">debug</span><span class="p">(</span>
-                            <span class="sa">f</span><span class="s2">&quot;MISSING PATH: live photo path for UUID </span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">_uuid</span><span class="si">}</span><span class="s2"> should be at </span><span class="si">{</span><span class="n">photopath</span><span class="si">}</span><span class="s2"> but does not appear to exist&quot;</span>
-                        <span class="p">)</span>
                        <span class="n">photopath</span> <span class="o">=</span> <span class="kc">None</span>
            <span class="k">else</span><span class="p">:</span>
                <span class="n">photopath</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="k">else</span><span class="p">:</span>
-            <span class="c1"># Photos 5</span>
-            <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">live_photo</span> <span class="ow">and</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">ismissing</span><span class="p">:</span>
-                <span class="n">filename</span> <span class="o">=</span> <span class="n">pathlib</span><span class="o">.</span><span class="n">Path</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">path</span><span class="p">)</span>
-                <span class="n">photopath</span> <span class="o">=</span> <span class="n">filename</span><span class="o">.</span><span class="n">parent</span><span class="o">.</span><span class="n">joinpath</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">filename</span><span class="o">.</span><span class="n">stem</span><span class="si">}</span><span class="s2">_3.mov&quot;</span><span class="p">)</span>
-                <span class="n">photopath</span> <span class="o">=</span> <span class="nb">str</span><span class="p">(</span><span class="n">photopath</span><span class="p">)</span>
-                <span class="k">if</span> <span class="ow">not</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">isfile</span><span class="p">(</span><span class="n">photopath</span><span class="p">):</span>
-                    <span class="c1"># In testing, I&#39;ve seen occasional missing movie for live photo</span>
-                    <span class="c1"># these appear to be valid -- e.g. video component not yet downloaded from iCloud</span>
-                    <span class="c1"># TODO: should this be a warning or debug?</span>
-                    <span class="n">logging</span><span class="o">.</span><span class="n">debug</span><span class="p">(</span>
-                        <span class="sa">f</span><span class="s2">&quot;MISSING PATH: live photo path for UUID </span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">_uuid</span><span class="si">}</span><span class="s2"> should be at </span><span class="si">{</span><span class="n">photopath</span><span class="si">}</span><span class="s2"> but does not appear to exist&quot;</span>
-                    <span class="p">)</span>
-                    <span class="n">photopath</span> <span class="o">=</span> <span class="kc">None</span>
-            <span class="k">else</span><span class="p">:</span>
+        <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">live_photo</span> <span class="ow">and</span> <span class="bp">self</span><span class="o">.</span><span class="n">path</span> <span class="ow">and</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">ismissing</span><span class="p">:</span>
+            <span class="n">filename</span> <span class="o">=</span> <span class="n">pathlib</span><span class="o">.</span><span class="n">Path</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">path</span><span class="p">)</span>
+            <span class="n">photopath</span> <span class="o">=</span> <span class="n">filename</span><span class="o">.</span><span class="n">parent</span><span class="o">.</span><span class="n">joinpath</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">filename</span><span class="o">.</span><span class="n">stem</span><span class="si">}</span><span class="s2">_3.mov&quot;</span><span class="p">)</span>
+            <span class="n">photopath</span> <span class="o">=</span> <span class="nb">str</span><span class="p">(</span><span class="n">photopath</span><span class="p">)</span>
+            <span class="k">if</span> <span class="ow">not</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">isfile</span><span class="p">(</span><span class="n">photopath</span><span class="p">):</span>
+                <span class="c1"># In testing, I&#39;ve seen occasional missing movie for live photo</span>
+                <span class="c1"># these appear to be valid -- e.g. video component not yet downloaded from iCloud</span>
+                <span class="c1"># TODO: should this be a warning or debug?</span>
                <span class="n">photopath</span> <span class="o">=</span> <span class="kc">None</span>
+        <span class="k">else</span><span class="p">:</span>
+            <span class="n">photopath</span> <span class="o">=</span> <span class="kc">None</span>

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

@@ -1081,15 +1093,15 @@
            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_info</span><span class="p">[</span><span class="s2">&quot;orientation&quot;</span><span class="p">]</span>

        <span class="c1"># For Photos 5+, try to get the adjusted orientation</span>
-        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">hasadjustments</span><span class="p">:</span>
-            <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">adjustments</span><span class="p">:</span>
-                <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">adjustments</span><span class="o">.</span><span class="n">adj_orientation</span>
-            <span class="k">else</span><span class="p">:</span>
-                <span class="c1"># can&#39;t reliably determine orientation for edited photo if adjustmentinfo not available</span>
-                <span class="k">return</span> <span class="mi">0</span>
-        <span class="k">else</span><span class="p">:</span>
+        <span class="k">if</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">hasadjustments</span><span class="p">:</span>
            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_info</span><span class="p">[</span><span class="s2">&quot;orientation&quot;</span><span class="p">]</span>

+        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">adjustments</span><span class="p">:</span>
+            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">adjustments</span><span class="o">.</span><span class="n">adj_orientation</span>
+        <span class="k">else</span><span class="p">:</span>
+            <span class="c1"># can&#39;t reliably determine orientation for edited photo if adjustmentinfo not available</span>
+            <span class="k">return</span> <span class="mi">0</span>
+
    <span class="nd">@property</span>
    <span class="k">def</span> <span class="nf">original_height</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
        <span class="sd">&quot;&quot;&quot;returns height of the original photo version in pixels&quot;&quot;&quot;</span>
@@ -1125,6 +1137,26 @@
            <span class="n">logging</span><span class="o">.</span><span class="n">warning</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;Did not find signature for </span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">uuid</span><span class="si">}</span><span class="s2"> in _db_signatures&quot;</span><span class="p">)</span>
        <span class="k">return</span> <span class="n">duplicates</span>

+    <span class="nd">@property</span>
+    <span class="k">def</span> <span class="nf">owner</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot;Return name of photo owner for shared photos (Photos 5+ only), or None if not shared&quot;&quot;&quot;</span>
+        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">_db</span><span class="o">.</span><span class="n">_db_version</span> <span class="o">&lt;=</span> <span class="n">_PHOTOS_4_VERSION</span><span class="p">:</span>
+            <span class="k">return</span> <span class="kc">None</span>
+
+        <span class="k">try</span><span class="p">:</span>
+            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_owner</span>
+        <span class="k">except</span> <span class="ne">AttributeError</span><span class="p">:</span>
+            <span class="k">try</span><span class="p">:</span>
+                <span class="n">personid</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_info</span><span class="p">[</span><span class="s2">&quot;cloudownerhashedpersonid&quot;</span><span class="p">]</span>
+                <span class="bp">self</span><span class="o">.</span><span class="n">_owner</span> <span class="o">=</span> <span class="p">(</span>
+                    <span class="bp">self</span><span class="o">.</span><span class="n">_db</span><span class="o">.</span><span class="n">_db_hashed_person_id</span><span class="p">[</span><span class="n">personid</span><span class="p">][</span><span class="s2">&quot;full_name&quot;</span><span class="p">]</span>
+                    <span class="k">if</span> <span class="n">personid</span>
+                    <span class="k">else</span> <span class="kc">None</span>
+                <span class="p">)</span>
+            <span class="k">except</span> <span class="ne">KeyError</span><span class="p">:</span>
+                <span class="bp">self</span><span class="o">.</span><span class="n">_owner</span> <span class="o">=</span> <span class="kc">None</span>
+            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_owner</span>
+
 <div class="viewcode-block" id="PhotoInfo.render_template"><a class="viewcode-back" href="../../../reference.html#osxphotos.PhotoInfo.render_template">[docs]</a>    <span class="k">def</span> <span class="nf">render_template</span><span class="p">(</span>
        <span class="bp">self</span><span class="p">,</span> <span class="n">template_str</span><span class="p">:</span> <span class="nb">str</span><span class="p">,</span> <span class="n">options</span><span class="p">:</span> <span class="n">Optional</span><span class="p">[</span><span class="n">RenderOptions</span><span class="p">]</span> <span class="o">=</span> <span class="kc">None</span>
    <span class="p">):</span>
@@ -1151,6 +1183,28 @@

 <span class="sd">        Returns: list of (detected text, confidence) tuples</span>
 <span class="sd">        &quot;&quot;&quot;</span>
+
+        <span class="k">try</span><span class="p">:</span>
+            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_detected_text_cache</span><span class="p">[</span><span class="n">confidence_threshold</span><span class="p">]</span>
+        <span class="k">except</span> <span class="p">(</span><span class="ne">AttributeError</span><span class="p">,</span> <span class="ne">KeyError</span><span class="p">)</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
+            <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">e</span><span class="p">,</span> <span class="ne">AttributeError</span><span class="p">):</span>
+                <span class="bp">self</span><span class="o">.</span><span class="n">_detected_text_cache</span> <span class="o">=</span> <span class="p">{}</span>
+
+            <span class="k">try</span><span class="p">:</span>
+                <span class="n">detected_text</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_detected_text</span><span class="p">()</span>
+            <span class="k">except</span> <span class="ne">Exception</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
+                <span class="n">logging</span><span class="o">.</span><span class="n">warning</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;Error detecting text in photo </span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">uuid</span><span class="si">}</span><span class="s2">: </span><span class="si">{</span><span class="n">e</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span>
+                <span class="n">detected_text</span> <span class="o">=</span> <span class="p">[]</span>
+
+            <span class="bp">self</span><span class="o">.</span><span class="n">_detected_text_cache</span><span class="p">[</span><span class="n">confidence_threshold</span><span class="p">]</span> <span class="o">=</span> <span class="p">[</span>
+                <span class="p">(</span><span class="n">text</span><span class="p">,</span> <span class="n">confidence</span><span class="p">)</span>
+                <span class="k">for</span> <span class="n">text</span><span class="p">,</span> <span class="n">confidence</span> <span class="ow">in</span> <span class="n">detected_text</span>
+                <span class="k">if</span> <span class="n">confidence</span> <span class="o">&gt;=</span> <span class="n">confidence_threshold</span>
+            <span class="p">]</span>
+            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_detected_text_cache</span><span class="p">[</span><span class="n">confidence_threshold</span><span class="p">]</span></div>
+
+    <span class="k">def</span> <span class="nf">_detected_text</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot;detect text in photo, either from cached extended attribute or by attempting text detection&quot;&quot;&quot;</span>
        <span class="n">path</span> <span class="o">=</span> <span class="p">(</span>
            <span class="bp">self</span><span class="o">.</span><span class="n">path_edited</span> <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">hasadjustments</span> <span class="ow">and</span> <span class="bp">self</span><span class="o">.</span><span class="n">path_edited</span> <span class="k">else</span> <span class="bp">self</span><span class="o">.</span><span class="n">path</span>
        <span class="p">)</span>
@@ -1158,23 +1212,13 @@
        <span class="k">if</span> <span class="ow">not</span> <span class="n">path</span><span class="p">:</span>
            <span class="k">return</span> <span class="p">[]</span>

-        <span class="k">try</span><span class="p">:</span>
-            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_detected_text</span><span class="p">[(</span><span class="n">path</span><span class="p">,</span> <span class="n">confidence_threshold</span><span class="p">)]</span>
-        <span class="k">except</span> <span class="p">(</span><span class="ne">AttributeError</span><span class="p">,</span> <span class="ne">KeyError</span><span class="p">)</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
-            <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">e</span><span class="p">,</span> <span class="ne">AttributeError</span><span class="p">):</span>
-                <span class="bp">self</span><span class="o">.</span><span class="n">_detected_text</span> <span class="o">=</span> <span class="p">{}</span>
-
-            <span class="k">try</span><span class="p">:</span>
-                <span class="n">detected_text</span> <span class="o">=</span> <span class="n">detect_text</span><span class="p">(</span><span class="n">path</span><span class="p">)</span>
-            <span class="k">except</span> <span class="ne">Exception</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
-                <span class="n">detected_text</span> <span class="o">=</span> <span class="p">[]</span>
-
-            <span class="bp">self</span><span class="o">.</span><span class="n">_detected_text</span><span class="p">[(</span><span class="n">path</span><span class="p">,</span> <span class="n">confidence_threshold</span><span class="p">)]</span> <span class="o">=</span> <span class="p">[</span>
-                <span class="p">(</span><span class="n">text</span><span class="p">,</span> <span class="n">confidence</span><span class="p">)</span>
-                <span class="k">for</span> <span class="n">text</span><span class="p">,</span> <span class="n">confidence</span> <span class="ow">in</span> <span class="n">detected_text</span>
-                <span class="k">if</span> <span class="n">confidence</span> <span class="o">&gt;=</span> <span class="n">confidence_threshold</span>
-            <span class="p">]</span>
-            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_detected_text</span><span class="p">[(</span><span class="n">path</span><span class="p">,</span> <span class="n">confidence_threshold</span><span class="p">)]</span></div>
+        <span class="n">md</span> <span class="o">=</span> <span class="n">OSXMetaData</span><span class="p">(</span><span class="n">path</span><span class="p">)</span>
+        <span class="n">detected_text</span> <span class="o">=</span> <span class="n">md</span><span class="o">.</span><span class="n">get_attribute</span><span class="p">(</span><span class="s2">&quot;osxphotos_detected_text&quot;</span><span class="p">)</span>
+        <span class="k">if</span> <span class="n">detected_text</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
+            <span class="n">orientation</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">orientation</span> <span class="ow">or</span> <span class="kc">None</span>
+            <span class="n">detected_text</span> <span class="o">=</span> <span class="n">detect_text</span><span class="p">(</span><span class="n">path</span><span class="p">,</span> <span class="n">orientation</span><span class="p">)</span>
+            <span class="n">md</span><span class="o">.</span><span class="n">set_attribute</span><span class="p">(</span><span class="s2">&quot;osxphotos_detected_text&quot;</span><span class="p">,</span> <span class="n">detected_text</span><span class="p">)</span>
+        <span class="k">return</span> <span class="n">detected_text</span>

    <span class="nd">@property</span>
    <span class="k">def</span> <span class="nf">_longitude</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
@@ -1433,7 +1477,7 @@
  <h3 id="searchlabel">Quick search</h3>
    <div class="searchformwrapper">
    <form class="search" action="../../../search.html" method="get">
-      <input type="text" name="q" aria-labelledby="searchlabel" />
+      <input type="text" name="q" aria-labelledby="searchlabel" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"/>
      <input type="submit" value="Go" />
    </form>
    </div>
@@ -1455,7 +1499,7 @@
      &copy;2021, Rhet Turnbull.
      
      |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.0.2</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.2.0</a>
      &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
      
    </div>
--- a/docs/_modules/osxphotos/photosdb/photosdb.html
+++ b/docs/_modules/osxphotos/photosdb/photosdb.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos.photosdb.photosdb &#8212; osxphotos 0.42.66 documentation</title>
+    <title>osxphotos.photosdb.photosdb &#8212; osxphotos 0.43.8 documentation</title>
    <link rel="stylesheet" type="text/css" href="../../../_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="../../../_static/alabaster.css" />
    <script data-url_root="../../../" id="documentation_options" src="../../../_static/documentation_options.js"></script>
@@ -45,12 +45,14 @@
 <span class="kn">import</span> <span class="nn">sys</span>
 <span class="kn">import</span> <span class="nn">tempfile</span>
 <span class="kn">from</span> <span class="nn">collections</span> <span class="kn">import</span> <span class="n">OrderedDict</span>
+<span class="kn">from</span> <span class="nn">collections.abc</span> <span class="kn">import</span> <span class="n">Iterable</span>
 <span class="kn">from</span> <span class="nn">datetime</span> <span class="kn">import</span> <span class="n">datetime</span><span class="p">,</span> <span class="n">timedelta</span><span class="p">,</span> <span class="n">timezone</span>
 <span class="kn">from</span> <span class="nn">pprint</span> <span class="kn">import</span> <span class="n">pformat</span>
 <span class="kn">from</span> <span class="nn">typing</span> <span class="kn">import</span> <span class="n">List</span>

 <span class="kn">import</span> <span class="nn">bitmath</span>
 <span class="kn">import</span> <span class="nn">photoscript</span>
+<span class="kn">from</span> <span class="nn">rich</span> <span class="kn">import</span> <span class="nb">print</span>

 <span class="kn">from</span> <span class="nn">.._constants</span> <span class="kn">import</span> <span class="p">(</span>
    <span class="n">_DB_TABLE_NAMES</span><span class="p">,</span>
@@ -283,6 +285,10 @@
        <span class="c1"># Dict to hold information on volume names (Photos 5+)</span>
        <span class="bp">self</span><span class="o">.</span><span class="n">_db_filesystem_volumes</span> <span class="o">=</span> <span class="p">{}</span>

+        <span class="c1"># Dict to hold information on moments (Photos 5+)</span>
+        <span class="c1"># key is Z_PK of ZMOMENT table and values are the moment info</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">_db_moment_pk</span> <span class="o">=</span> <span class="p">{}</span>
+
        <span class="k">if</span> <span class="n">_debug</span><span class="p">():</span>
            <span class="n">logging</span><span class="o">.</span><span class="n">debug</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;dbfile = </span><span class="si">{</span><span class="n">dbfile</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span>

@@ -363,6 +369,8 @@
        <span class="k">else</span><span class="p">:</span>
            <span class="bp">self</span><span class="o">.</span><span class="n">_process_database5</span><span class="p">()</span>

+        <span class="bp">self</span><span class="o">.</span><span class="n">_db_connection</span><span class="p">,</span> <span class="n">_</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">get_db_connection</span><span class="p">()</span>
+
    <span class="nd">@property</span>
    <span class="k">def</span> <span class="nf">keywords_as_dict</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
        <span class="sd">&quot;&quot;&quot;return keywords as dict of keyword, count in reverse sorted order (descending)&quot;&quot;&quot;</span>
@@ -823,8 +831,8 @@
                <span class="s2">&quot;creation_date&quot;</span><span class="p">:</span> <span class="n">album</span><span class="p">[</span><span class="mi">8</span><span class="p">],</span>
                <span class="s2">&quot;start_date&quot;</span><span class="p">:</span> <span class="kc">None</span><span class="p">,</span>  <span class="c1"># Photos 5 only</span>
                <span class="s2">&quot;end_date&quot;</span><span class="p">:</span> <span class="kc">None</span><span class="p">,</span>  <span class="c1"># Photos 5 only</span>
-                <span class="s2">&quot;customsortascending&quot;</span><span class="p">:</span> <span class="kc">None</span><span class="p">,</span> <span class="c1"># Photos 5 only</span>
-                <span class="s2">&quot;customsortkey&quot;</span><span class="p">:</span> <span class="kc">None</span><span class="p">,</span> <span class="c1"># Photos 5 only</span>
+                <span class="s2">&quot;customsortascending&quot;</span><span class="p">:</span> <span class="kc">None</span><span class="p">,</span>  <span class="c1"># Photos 5 only</span>
+                <span class="s2">&quot;customsortkey&quot;</span><span class="p">:</span> <span class="kc">None</span><span class="p">,</span>  <span class="c1"># Photos 5 only</span>
            <span class="p">}</span>

        <span class="c1"># get details about folders</span>
@@ -1137,7 +1145,9 @@
            <span class="c1"># get info on special types</span>
            <span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">[</span><span class="n">uuid</span><span class="p">][</span><span class="s2">&quot;specialType&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">25</span><span class="p">]</span>
            <span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">[</span><span class="n">uuid</span><span class="p">][</span><span class="s2">&quot;masterModelID&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">26</span><span class="p">]</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">[</span><span class="n">uuid</span><span class="p">][</span><span class="s2">&quot;pk&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">26</span><span class="p">]</span> <span class="c1"># same as masterModelID, to match Photos 5</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">[</span><span class="n">uuid</span><span class="p">][</span><span class="s2">&quot;pk&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span>
+                <span class="mi">26</span>
+            <span class="p">]</span>  <span class="c1"># same as masterModelID, to match Photos 5</span>
            <span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">[</span><span class="n">uuid</span><span class="p">][</span><span class="s2">&quot;panorama&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">True</span> <span class="k">if</span> <span class="n">row</span><span class="p">[</span><span class="mi">25</span><span class="p">]</span> <span class="o">==</span> <span class="mi">1</span> <span class="k">else</span> <span class="kc">False</span>
            <span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">[</span><span class="n">uuid</span><span class="p">][</span><span class="s2">&quot;slow_mo&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">True</span> <span class="k">if</span> <span class="n">row</span><span class="p">[</span><span class="mi">25</span><span class="p">]</span> <span class="o">==</span> <span class="mi">2</span> <span class="k">else</span> <span class="kc">False</span>
            <span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">[</span><span class="n">uuid</span><span class="p">][</span><span class="s2">&quot;time_lapse&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">True</span> <span class="k">if</span> <span class="n">row</span><span class="p">[</span><span class="mi">25</span><span class="p">]</span> <span class="o">==</span> <span class="mi">3</span> <span class="k">else</span> <span class="kc">False</span>
@@ -1228,6 +1238,9 @@
            <span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">[</span><span class="n">uuid</span><span class="p">][</span><span class="s2">&quot;import_uuid&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">44</span><span class="p">]</span>
            <span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">[</span><span class="n">uuid</span><span class="p">][</span><span class="s2">&quot;fok_import_session&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">None</span>

+            <span class="c1"># photos 5+ only, for shared photos</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">[</span><span class="n">uuid</span><span class="p">][</span><span class="s2">&quot;cloudownerhashedpersonid&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">None</span>
+
            <span class="c1"># compute signatures for finding possible duplicates</span>
            <span class="n">signature</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_duplicate_signature</span><span class="p">(</span><span class="n">uuid</span><span class="p">)</span>
            <span class="k">try</span><span class="p">:</span>
@@ -1956,7 +1969,8 @@
 <span class="s2">                </span><span class="si">{</span><span class="n">asset_table</span><span class="si">}</span><span class="s2">.ZTRASHEDDATE,</span>
 <span class="s2">                </span><span class="si">{</span><span class="n">asset_table</span><span class="si">}</span><span class="s2">.ZSAVEDASSETTYPE,</span>
 <span class="s2">                </span><span class="si">{</span><span class="n">asset_table</span><span class="si">}</span><span class="s2">.ZADDEDDATE,</span>
-<span class="s2">                </span><span class="si">{</span><span class="n">asset_table</span><span class="si">}</span><span class="s2">.Z_PK</span>
+<span class="s2">                </span><span class="si">{</span><span class="n">asset_table</span><span class="si">}</span><span class="s2">.Z_PK,</span>
+<span class="s2">                </span><span class="si">{</span><span class="n">asset_table</span><span class="si">}</span><span class="s2">.ZCLOUDOWNERHASHEDPERSONID</span>
 <span class="s2">                FROM </span><span class="si">{</span><span class="n">asset_table</span><span class="si">}</span><span class="s2"> </span>
 <span class="s2">                JOIN ZADDITIONALASSETATTRIBUTES ON ZADDITIONALASSETATTRIBUTES.ZASSET = </span><span class="si">{</span><span class="n">asset_table</span><span class="si">}</span><span class="s2">.Z_PK </span>
 <span class="s2">                ORDER BY </span><span class="si">{</span><span class="n">asset_table</span><span class="si">}</span><span class="s2">.ZUUID  &quot;&quot;&quot;</span>
@@ -2006,6 +2020,7 @@
        <span class="c1"># 40   ZGENERICASSET.ZSAVEDASSETTYPE -- how item imported</span>
        <span class="c1"># 41   ZGENERICASSET.ZADDEDDATE -- date item added to the library</span>
        <span class="c1"># 42   ZGENERICASSET.Z_PK -- primary key</span>
+        <span class="c1"># 43   ZGENERICASSET.ZCLOUDOWNERHASHEDPERSONID -- used to look up owner name (for shared photos)</span>

        <span class="k">for</span> <span class="n">row</span> <span class="ow">in</span> <span class="n">c</span><span class="p">:</span>
            <span class="n">uuid</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
@@ -2191,6 +2206,7 @@
                <span class="n">info</span><span class="p">[</span><span class="s2">&quot;added_date&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">datetime</span><span class="p">(</span><span class="mi">1970</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="mi">1</span><span class="p">)</span>

            <span class="n">info</span><span class="p">[</span><span class="s2">&quot;pk&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">42</span><span class="p">]</span>
+            <span class="n">info</span><span class="p">[</span><span class="s2">&quot;cloudownerhashedpersonid&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">43</span><span class="p">]</span>

            <span class="c1"># initialize import session info which will be filled in later</span>
            <span class="c1"># not every photo has an import session so initialize all records now</span>
@@ -2514,6 +2530,10 @@
        <span class="n">verbose</span><span class="p">(</span><span class="s2">&quot;Processing comments and likes for shared photos.&quot;</span><span class="p">)</span>
        <span class="bp">self</span><span class="o">.</span><span class="n">_process_comments</span><span class="p">()</span>

+        <span class="c1"># process moments</span>
+        <span class="n">verbose</span><span class="p">(</span><span class="s2">&quot;Processing moments.&quot;</span><span class="p">)</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">_process_moments</span><span class="p">()</span>
+
        <span class="c1"># done processing, dump debug data if requested</span>
        <span class="n">verbose</span><span class="p">(</span><span class="s2">&quot;Done processing details from Photos library.&quot;</span><span class="p">)</span>
        <span class="k">if</span> <span class="n">_debug</span><span class="p">():</span>
@@ -2559,6 +2579,109 @@
            <span class="n">logging</span><span class="o">.</span><span class="n">debug</span><span class="p">(</span><span class="s2">&quot;Burst Photos (dbphotos_burst:&quot;</span><span class="p">)</span>
            <span class="n">logging</span><span class="o">.</span><span class="n">debug</span><span class="p">(</span><span class="n">pformat</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos_burst</span><span class="p">))</span>

+    <span class="k">def</span> <span class="nf">_process_moments</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot;Process data from ZMOMENT table&quot;&quot;&quot;</span>
+        <span class="c1"># _db_moment_pk is dict in form {pk: {moment info}} by ZMOMENT.Z_PK</span>
+
+        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">_db_version</span> <span class="o">&lt;=</span> <span class="n">_PHOTOS_4_VERSION</span><span class="p">:</span>
+            <span class="k">raise</span> <span class="ne">NotImplementedError</span><span class="p">(</span>
+                <span class="sa">f</span><span class="s2">&quot;Moment info implemented for this database version&quot;</span>
+            <span class="p">)</span>
+        <span class="k">else</span><span class="p">:</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">_process_moment_5</span><span class="p">()</span>
+
+    <span class="k">def</span> <span class="nf">_process_moment_5</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot;Process moment info for Photos 5 databases&quot;&quot;&quot;</span>
+
+        <span class="bp">self</span><span class="o">.</span><span class="n">_db_moment_pk</span> <span class="o">=</span> <span class="p">{}</span>
+
+        <span class="n">results</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">execute</span><span class="p">(</span>
+            <span class="sa">f</span><span class="s2">&quot;&quot;&quot;</span>
+<span class="s2">            SELECT </span>
+<span class="s2">            Z_PK,</span>
+<span class="s2">            ZTIMEZONEOFFSET,</span>
+<span class="s2">            ZTRASHEDSTATE,</span>
+<span class="s2">            ZAPPROXIMATELATITUDE,</span>
+<span class="s2">            ZAPPROXIMATELONGITUDE,</span>
+<span class="s2">            ZENDDATE,</span>
+<span class="s2">            ZMODIFICATIONDATE,</span>
+<span class="s2">            ZREPRESENTATIVEDATE,</span>
+<span class="s2">            ZSTARTDATE,</span>
+<span class="s2">            ZSUBTITLE,</span>
+<span class="s2">            ZTITLE,</span>
+<span class="s2">            ZUUID</span>
+<span class="s2">            FROM ZMOMENT&quot;&quot;&quot;</span>
+        <span class="p">)</span>
+
+        <span class="c1"># results</span>
+        <span class="c1"># 0  Z_PK,</span>
+        <span class="c1"># 1  ZTIMEZONEOFFSET,</span>
+        <span class="c1"># 2  ZTRASHEDSTATE,</span>
+        <span class="c1"># 3  ZAPPROXIMATELATITUDE,</span>
+        <span class="c1"># 4  ZAPPROXIMATELONGITUDE,</span>
+        <span class="c1"># 5  ZENDDATE,</span>
+        <span class="c1"># 6  ZMODIFICATIONDATE,</span>
+        <span class="c1"># 7  ZREPRESENTATIVEDATE,</span>
+        <span class="c1"># 8  ZSTARTDATE,</span>
+        <span class="c1"># 9  ZSUBTITLE,</span>
+        <span class="c1"># 10 ZTITLE,</span>
+        <span class="c1"># 11 ZUUID</span>
+
+        <span class="k">for</span> <span class="n">row</span> <span class="ow">in</span> <span class="n">results</span><span class="p">:</span>
+            <span class="n">moment_info</span> <span class="o">=</span> <span class="p">{}</span>
+            <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;pk&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
+            <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;timezoneOffset&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">1</span><span class="p">]</span>
+            <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;trashedState&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">2</span><span class="p">]</span>
+            <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;approximateLatitude&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">3</span><span class="p">]</span>
+            <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;approximateLongitude&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">4</span><span class="p">]</span>
+            <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;endDate&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">5</span><span class="p">]</span>
+            <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;modificationDate&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">6</span><span class="p">]</span>
+            <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;representativeDate&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">7</span><span class="p">]</span>
+            <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;startDate&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">8</span><span class="p">]</span>
+            <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;subtitle&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">9</span><span class="p">]</span>
+            <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;title&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">10</span><span class="p">]</span>
+            <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;uuid&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">row</span><span class="p">[</span><span class="mi">11</span><span class="p">]</span>
+
+            <span class="c1"># if both lat/lon == -180, then it means location undefined</span>
+            <span class="k">if</span> <span class="p">(</span>
+                <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;approximateLatitude&quot;</span><span class="p">]</span> <span class="o">==</span> <span class="o">-</span><span class="mf">180.0</span>
+                <span class="ow">and</span> <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;approximateLongitude&quot;</span><span class="p">]</span> <span class="o">==</span> <span class="o">-</span><span class="mf">180.0</span>
+            <span class="p">):</span>
+                <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;latitude&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">None</span>
+                <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;longitude&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">None</span>
+            <span class="k">else</span><span class="p">:</span>
+                <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;latitude&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;approximateLatitude&quot;</span><span class="p">]</span>
+                <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;longitude&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;approximateLongitude&quot;</span><span class="p">]</span>
+
+            <span class="c1"># process date stamps</span>
+            <span class="n">offset_seconds</span> <span class="o">=</span> <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;timezoneOffset&quot;</span><span class="p">]</span> <span class="ow">or</span> <span class="mi">0</span>
+            <span class="n">delta</span> <span class="o">=</span> <span class="n">timedelta</span><span class="p">(</span><span class="n">seconds</span><span class="o">=</span><span class="n">offset_seconds</span><span class="p">)</span>
+            <span class="n">tz</span> <span class="o">=</span> <span class="n">timezone</span><span class="p">(</span><span class="n">delta</span><span class="p">)</span>
+            <span class="k">for</span> <span class="n">date_name</span> <span class="ow">in</span> <span class="p">[</span>
+                <span class="s2">&quot;startDate&quot;</span><span class="p">,</span>
+                <span class="s2">&quot;endDate&quot;</span><span class="p">,</span>
+                <span class="s2">&quot;modificationDate&quot;</span><span class="p">,</span>
+                <span class="s2">&quot;representativeDate&quot;</span><span class="p">,</span>
+            <span class="p">]:</span>
+                <span class="n">date_stamp</span> <span class="o">=</span> <span class="n">moment_info</span><span class="p">[</span><span class="n">date_name</span><span class="p">]</span>
+                <span class="k">try</span><span class="p">:</span>
+                    <span class="n">moment_date</span> <span class="o">=</span> <span class="n">datetime</span><span class="o">.</span><span class="n">fromtimestamp</span><span class="p">(</span><span class="n">date_stamp</span> <span class="o">+</span> <span class="n">TIME_DELTA</span><span class="p">)</span>
+                    <span class="c1"># save raw time stamp valu</span>
+                    <span class="n">moment_info</span><span class="p">[</span><span class="n">date_name</span> <span class="o">+</span> <span class="s2">&quot;_timestamp&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">moment_info</span><span class="p">[</span><span class="n">date_name</span><span class="p">]</span>
+                    <span class="n">moment_info</span><span class="p">[</span><span class="n">date_name</span><span class="p">]</span> <span class="o">=</span> <span class="n">moment_date</span><span class="o">.</span><span class="n">astimezone</span><span class="p">(</span><span class="n">tz</span><span class="o">=</span><span class="n">tz</span><span class="p">)</span>
+                <span class="k">except</span> <span class="ne">ValueError</span><span class="p">:</span>
+                    <span class="c1"># sometimes imageDate is invalid so use 1 Jan 1970 in UTC as image date</span>
+                    <span class="n">moment_date</span> <span class="o">=</span> <span class="n">datetime</span><span class="p">(</span><span class="mi">1970</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="mi">1</span><span class="p">)</span>
+                    <span class="n">tz</span> <span class="o">=</span> <span class="n">timezone</span><span class="p">(</span><span class="n">timedelta</span><span class="p">(</span><span class="mi">0</span><span class="p">))</span>
+                    <span class="n">moment_info</span><span class="p">[</span><span class="n">date_name</span> <span class="o">+</span> <span class="s2">&quot;_timestamp&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">date_stamp</span>
+                    <span class="n">moment_info</span><span class="p">[</span><span class="n">date_name</span><span class="p">]</span> <span class="o">=</span> <span class="n">moment_date</span><span class="o">.</span><span class="n">astimezone</span><span class="p">(</span><span class="n">tz</span><span class="o">=</span><span class="n">tz</span><span class="p">)</span>
+
+            <span class="c1"># process title/subtitle</span>
+            <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;title&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;title&quot;</span><span class="p">]</span> <span class="ow">or</span> <span class="s2">&quot;&quot;</span>
+            <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;subtitle&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;subtitle&quot;</span><span class="p">]</span> <span class="ow">or</span> <span class="s2">&quot;&quot;</span>
+
+            <span class="bp">self</span><span class="o">.</span><span class="n">_db_moment_pk</span><span class="p">[</span><span class="n">moment_info</span><span class="p">[</span><span class="s2">&quot;pk&quot;</span><span class="p">]]</span> <span class="o">=</span> <span class="n">moment_info</span>
+
    <span class="k">def</span> <span class="nf">_build_album_folder_hierarchy_5</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">uuid</span><span class="p">,</span> <span class="n">folders</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
        <span class="sd">&quot;&quot;&quot;recursively build folder/album hierarchy</span>
 <span class="sd">        uuid: uuid of the album/folder being processed</span>
@@ -3319,9 +3442,9 @@
        <span class="k">if</span> <span class="n">options</span><span class="o">.</span><span class="n">regex</span><span class="p">:</span>
            <span class="n">flags</span> <span class="o">=</span> <span class="n">re</span><span class="o">.</span><span class="n">IGNORECASE</span> <span class="k">if</span> <span class="n">options</span><span class="o">.</span><span class="n">ignore_case</span> <span class="k">else</span> <span class="mi">0</span>
            <span class="n">render_options</span> <span class="o">=</span> <span class="n">RenderOptions</span><span class="p">(</span><span class="n">none_str</span><span class="o">=</span><span class="s2">&quot;&quot;</span><span class="p">)</span>
+            <span class="n">photo_list</span> <span class="o">=</span> <span class="p">[]</span>
            <span class="k">for</span> <span class="n">regex</span><span class="p">,</span> <span class="n">template</span> <span class="ow">in</span> <span class="n">options</span><span class="o">.</span><span class="n">regex</span><span class="p">:</span>
                <span class="n">regex</span> <span class="o">=</span> <span class="n">re</span><span class="o">.</span><span class="n">compile</span><span class="p">(</span><span class="n">regex</span><span class="p">,</span> <span class="n">flags</span><span class="p">)</span>
-                <span class="n">photo_list</span> <span class="o">=</span> <span class="p">[]</span>
                <span class="k">for</span> <span class="n">p</span> <span class="ow">in</span> <span class="n">photos</span><span class="p">:</span>
                    <span class="n">rendered</span><span class="p">,</span> <span class="n">_</span> <span class="o">=</span> <span class="n">p</span><span class="o">.</span><span class="n">render_template</span><span class="p">(</span><span class="n">template</span><span class="p">,</span> <span class="n">render_options</span><span class="p">)</span>
                    <span class="k">for</span> <span class="n">value</span> <span class="ow">in</span> <span class="n">rendered</span><span class="p">:</span>
@@ -3381,12 +3504,45 @@
                <span class="c1"># selection only works if photos selected in main media browser</span>
                <span class="n">photos</span> <span class="o">=</span> <span class="p">[]</span>

+        <span class="k">if</span> <span class="n">options</span><span class="o">.</span><span class="n">exif</span><span class="p">:</span>
+            <span class="n">matching_photos</span> <span class="o">=</span> <span class="p">[]</span>
+            <span class="k">for</span> <span class="n">p</span> <span class="ow">in</span> <span class="n">photos</span><span class="p">:</span>
+                <span class="k">if</span> <span class="ow">not</span> <span class="n">p</span><span class="o">.</span><span class="n">exiftool</span><span class="p">:</span>
+                    <span class="k">continue</span>
+                <span class="n">exifdata</span> <span class="o">=</span> <span class="n">p</span><span class="o">.</span><span class="n">exiftool</span><span class="o">.</span><span class="n">asdict</span><span class="p">(</span><span class="n">normalized</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
+                <span class="n">exifdata</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">p</span><span class="o">.</span><span class="n">exiftool</span><span class="o">.</span><span class="n">asdict</span><span class="p">(</span><span class="n">tag_groups</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">normalized</span><span class="o">=</span><span class="kc">True</span><span class="p">))</span>
+                <span class="k">for</span> <span class="n">exiftag</span><span class="p">,</span> <span class="n">exifvalue</span> <span class="ow">in</span> <span class="n">options</span><span class="o">.</span><span class="n">exif</span><span class="p">:</span>
+                    <span class="k">if</span> <span class="n">options</span><span class="o">.</span><span class="n">ignore_case</span><span class="p">:</span>
+                        <span class="n">exifvalue</span> <span class="o">=</span> <span class="n">exifvalue</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span>
+                        <span class="n">exifdata_value</span> <span class="o">=</span> <span class="n">exifdata</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="n">exiftag</span><span class="o">.</span><span class="n">lower</span><span class="p">(),</span> <span class="s2">&quot;&quot;</span><span class="p">)</span>
+                        <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">exifdata_value</span><span class="p">,</span> <span class="nb">str</span><span class="p">):</span>
+                            <span class="n">exifdata_value</span> <span class="o">=</span> <span class="n">exifdata_value</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span>
+                        <span class="k">elif</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">exifdata_value</span><span class="p">,</span> <span class="n">Iterable</span><span class="p">):</span>
+                            <span class="n">exifdata_value</span> <span class="o">=</span> <span class="p">[</span><span class="n">v</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span> <span class="k">for</span> <span class="n">v</span> <span class="ow">in</span> <span class="n">exifdata_value</span><span class="p">]</span>
+                        <span class="k">else</span><span class="p">:</span>
+                            <span class="n">exifdata_value</span> <span class="o">=</span> <span class="nb">str</span><span class="p">(</span><span class="n">exifdata_value</span><span class="p">)</span>
+
+                        <span class="k">if</span> <span class="n">exifvalue</span> <span class="ow">in</span> <span class="n">exifdata_value</span><span class="p">:</span>
+                            <span class="n">matching_photos</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">p</span><span class="p">)</span>
+                    <span class="k">else</span><span class="p">:</span>
+                        <span class="n">exifdata_value</span> <span class="o">=</span> <span class="n">exifdata</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="n">exiftag</span><span class="o">.</span><span class="n">lower</span><span class="p">(),</span> <span class="s2">&quot;&quot;</span><span class="p">)</span>
+                        <span class="k">if</span> <span class="ow">not</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">exifdata_value</span><span class="p">,</span> <span class="p">(</span><span class="nb">str</span><span class="p">,</span> <span class="n">Iterable</span><span class="p">)):</span>
+                            <span class="n">exifdata_value</span> <span class="o">=</span> <span class="nb">str</span><span class="p">(</span><span class="n">exifdata_value</span><span class="p">)</span>
+                        <span class="k">if</span> <span class="n">exifvalue</span> <span class="ow">in</span> <span class="n">exifdata_value</span><span class="p">:</span>
+                            <span class="n">matching_photos</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">p</span><span class="p">)</span>
+            <span class="n">photos</span> <span class="o">=</span> <span class="n">matching_photos</span>
+
        <span class="k">if</span> <span class="n">options</span><span class="o">.</span><span class="n">function</span><span class="p">:</span>
            <span class="k">for</span> <span class="n">function</span> <span class="ow">in</span> <span class="n">options</span><span class="o">.</span><span class="n">function</span><span class="p">:</span>
                <span class="n">photos</span> <span class="o">=</span> <span class="n">function</span><span class="p">[</span><span class="mi">0</span><span class="p">](</span><span class="n">photos</span><span class="p">)</span>

        <span class="k">return</span> <span class="n">photos</span></div>

+<div class="viewcode-block" id="PhotosDB.execute"><a class="viewcode-back" href="../../../reference.html#osxphotos.PhotosDB.execute">[docs]</a>    <span class="k">def</span> <span class="nf">execute</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">sql</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot;Execute sql statement and return cursor&quot;&quot;&quot;</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">_db_connection</span><span class="p">,</span> <span class="n">_</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">get_db_connection</span><span class="p">()</span>
+        <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_db_connection</span><span class="o">.</span><span class="n">cursor</span><span class="p">()</span><span class="o">.</span><span class="n">execute</span><span class="p">(</span><span class="n">sql</span><span class="p">)</span></div>
+
    <span class="k">def</span> <span class="nf">_duplicate_signature</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">uuid</span><span class="p">):</span>
        <span class="sd">&quot;&quot;&quot;Compute a signature for finding possible duplicates&quot;&quot;&quot;</span>
        <span class="k">return</span> <span class="p">(</span>
@@ -3412,7 +3568,11 @@
        <span class="sd">&quot;&quot;&quot;Returns number of photos in the database</span>
 <span class="sd">        Includes recently deleted photos and non-selected burst images</span>
 <span class="sd">        &quot;&quot;&quot;</span>
-        <span class="k">return</span> <span class="nb">len</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">)</span></div>
+        <span class="k">return</span> <span class="nb">len</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_dbphotos</span><span class="p">)</span>
+
+    <span class="k">def</span> <span class="fm">__del__</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="k">if</span> <span class="nb">getattr</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="s2">&quot;_db_connection&quot;</span><span class="p">,</span> <span class="kc">None</span><span class="p">):</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">_db_connection</span><span class="o">.</span><span class="n">close</span><span class="p">()</span></div>


 <span class="k">def</span> <span class="nf">_get_photos_by_attribute</span><span class="p">(</span><span class="n">photos</span><span class="p">,</span> <span class="n">attribute</span><span class="p">,</span> <span class="n">values</span><span class="p">,</span> <span class="n">ignore_case</span><span class="p">):</span>
@@ -3477,7 +3637,7 @@
  <h3 id="searchlabel">Quick search</h3>
    <div class="searchformwrapper">
    <form class="search" action="../../../search.html" method="get">
-      <input type="text" name="q" aria-labelledby="searchlabel" />
+      <input type="text" name="q" aria-labelledby="searchlabel" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"/>
      <input type="submit" value="Go" />
    </form>
    </div>
@@ -3499,7 +3659,7 @@
      &copy;2021, Rhet Turnbull.
      
      |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.0.2</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.3.2</a>
      &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
      
    </div>
--- a/docs/_static/basic.css
+++ b/docs/_static/basic.css
@@ -731,8 +731,9 @@ dl.glossary dt {

 .classifier:before {
    font-style: normal;
-    margin: 0.5em;
+    margin: 0 0.5em;
    content: ":";
+    display: inline-block;
 }

 abbr, acronym {
@@ -819,7 +820,7 @@ div.code-block-caption code {

 table.highlighttable td.linenos,
 span.linenos,
-div.doctest > div.highlight span.gp {  /* gp: Generic.Prompt */
+div.highlight span.gp {  /* gp: Generic.Prompt */
  user-select: none;
  -webkit-user-select: text; /* Safari fallback only */
  -webkit-user-select: none; /* Chrome/Safari */
--- a/docs/_static/doctools.js
+++ b/docs/_static/doctools.js
@@ -301,12 +301,14 @@ var Documentation = {
              window.location.href = prevHref;
              return false;
            }
+            break;
          case 39: // right
            var nextHref = $('link[rel="next"]').prop('href');
            if (nextHref) {
              window.location.href = nextHref;
              return false;
            }
+            break;
        }
      }
    });
--- a/docs/_static/documentation_options.js
+++ b/docs/_static/documentation_options.js
@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
    URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '0.42.69',
+    VERSION: '0.44.4',
    LANGUAGE: 'None',
    COLLAPSE_INDEX: false,
    BUILDER: 'html',
--- a/docs/_static/searchtools.js
+++ b/docs/_static/searchtools.js
@@ -282,7 +282,10 @@ var Search = {
                  complete: function(jqxhr, textstatus) {
                    var data = jqxhr.responseText;
                    if (data !== '' && data !== undefined) {
-                      listItem.append(Search.makeSearchSummary(data, searchterms, hlterms));
+                      var summary = Search.makeSearchSummary(data, searchterms, hlterms);
+                      if (summary) {
+                        listItem.append(summary);
+                      }
                    }
                    Search.output.append(listItem);
                    setTimeout(function() {
@@ -325,7 +328,9 @@ var Search = {
    var results = [];

    for (var prefix in objects) {
-      for (var name in objects[prefix]) {
+      for (var iMatch = 0; iMatch != objects[prefix].length; ++iMatch) {
+        var match = objects[prefix][iMatch];
+        var name = match[4];
        var fullname = (prefix ? prefix + '.' : '') + name;
        var fullnameLower = fullname.toLowerCase()
        if (fullnameLower.indexOf(object) > -1) {
@@ -339,7 +344,6 @@ var Search = {
          } else if (parts[parts.length - 1].indexOf(object) > -1) {
            score += Scorer.objPartialMatch;
          }
-          var match = objects[prefix][name];
          var objname = objnames[match[1]][2];
          var title = titles[match[0]];
          // If more than one term searched for, we require other words to be
@@ -498,6 +502,9 @@ var Search = {
   */
  makeSearchSummary : function(htmlText, keywords, hlwords) {
    var text = Search.htmlToText(htmlText);
+    if (text == "") {
+      return null;
+    }
    var textLower = text.toLowerCase();
    var start = 0;
    $.each(keywords, function() {
--- a/docs/cli.html
+++ b/docs/cli.html
--- a/docs/genindex.html
+++ b/docs/genindex.html
--- a/docs/index.html
+++ b/docs/index.html
@@ -4,8 +4,9 @@
 <html>
  <head>
    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Welcome to osxphotos’s documentation! &#8212; osxphotos 0.42.69 documentation</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
+
+    <title>Welcome to osxphotos’s documentation! &#8212; osxphotos 0.44.4 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
    <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
@@ -31,30 +32,30 @@

          <div class="body" role="main">
            
-  <div class="section" id="welcome-to-osxphotos-s-documentation">
+  <section id="welcome-to-osxphotos-s-documentation">
 <h1>Welcome to osxphotos’s documentation!<a class="headerlink" href="#welcome-to-osxphotos-s-documentation" title="Permalink to this headline">¶</a></h1>
-</div>
-<div class="section" id="osxphotos">
+</section>
+<section id="osxphotos">
 <h1>OSXPhotos<a class="headerlink" href="#osxphotos" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="what-is-osxphotos">
+<section id="what-is-osxphotos">
 <h2>What is osxphotos?<a class="headerlink" href="#what-is-osxphotos" title="Permalink to this headline">¶</a></h2>
 <p>OSXPhotos provides both the ability to interact with and query Apple’s Photos.app library on macOS directly from your python code
 as well as a very flexible command line interface (CLI) app for exporting photos.
 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.</p>
-</div>
-<div class="section" id="supported-operating-systems">
+</section>
+<section id="supported-operating-systems">
 <h2>Supported operating systems<a class="headerlink" href="#supported-operating-systems" title="Permalink to this headline">¶</a></h2>
 <p>Only works on macOS (aka Mac OS X). Tested on macOS Sierra (10.12.6) through macOS Big Sur (11.3).</p>
 <p>If you have access to macOS 12 / Monterey beta and would like to help ensure osxphotos is compatible, please contact me via GitHub.</p>
 <p>This package will read Photos databases for any supported version on any supported macOS version.
 E.g. you can read a database created with Photos 5.0 on MacOS 10.15 on a machine running macOS 10.12 and vice versa.</p>
 <p>Requires python &gt;= <code class="docutils literal notranslate"><span class="pre">3.7</span></code>.</p>
-</div>
-<div class="section" id="installation">
+</section>
+<section id="installation">
 <h2>Installation<a class="headerlink" href="#installation" title="Permalink to this headline">¶</a></h2>
 <p>If you are new to python and just want to use the command line application, I recommend you to install using pipx. See other advanced options below.</p>
-<div class="section" id="installation-using-pipx">
+<section id="installation-using-pipx">
 <h3>Installation using pipx<a class="headerlink" href="#installation-using-pipx" title="Permalink to this headline">¶</a></h3>
 <p>If you aren’t familiar with installing python applications, I recommend you install <code class="docutils literal notranslate"><span class="pre">osxphotos</span></code> with <a class="reference external" href="https://github.com/pipxproject/pipx">pipx</a>. If you use <code class="docutils literal notranslate"><span class="pre">pipx</span></code>, you will not need to create a virtual environment as <code class="docutils literal notranslate"><span class="pre">pipx</span></code> takes care of this. The easiest way to do this on a Mac is to use <a class="reference external" href="https://brew.sh/">homebrew</a>:</p>
 <ul class="simple">
@@ -64,15 +65,15 @@ E.g. you can read a database created with Photos 5.0 on MacOS 10.15 on a machine
 <li><p>Then type this: <code class="docutils literal notranslate"><span class="pre">pipx</span> <span class="pre">install</span> <span class="pre">osxphotos</span></code></p></li>
 <li><p>Now you should be able to run <code class="docutils literal notranslate"><span class="pre">osxphotos</span></code> by typing: <code class="docutils literal notranslate"><span class="pre">osxphotos</span></code></p></li>
 </ul>
-</div>
-<div class="section" id="installation-using-pip">
+</section>
+<section id="installation-using-pip">
 <h3>Installation using pip<a class="headerlink" href="#installation-using-pip" title="Permalink to this headline">¶</a></h3>
 <p>You can also install directly from <a class="reference external" href="https://pypi.org/project/osxphotos/">pypi</a>:</p>
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">pip</span> <span class="n">install</span> <span class="n">osxphotos</span>
 </pre></div>
 </div>
-</div>
-<div class="section" id="installation-from-git-repository">
+</section>
+<section id="installation-from-git-repository">
 <h3>Installation from git repository<a class="headerlink" href="#installation-from-git-repository" title="Permalink to this headline">¶</a></h3>
 <p>OSXPhotos uses setuptools, thus simply run:</p>
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">git</span> <span class="n">clone</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">github</span><span class="o">.</span><span class="n">com</span><span class="o">/</span><span class="n">RhetTbull</span><span class="o">/</span><span class="n">osxphotos</span><span class="o">.</span><span class="n">git</span>
@@ -87,9 +88,9 @@ I recommend you install the latest version from <a class="reference external" hr
 libraries. If you just want to use the command line utility, you can download a pre-built executable of the latest
 <a class="reference external" href="https://github.com/RhetTbull/osxphotos/releases">release</a> or you can install via <code class="docutils literal notranslate"><span class="pre">pip</span></code> which also installs the command line app.
 If you aren’t comfortable with running python on your Mac, start with the pre-built executable or <code class="docutils literal notranslate"><span class="pre">pipx</span></code> as described above.</p>
-</div>
-</div>
-<div class="section" id="command-line-usage">
+</section>
+</section>
+<section id="command-line-usage">
 <h2>Command Line Usage<a class="headerlink" href="#command-line-usage" title="Permalink to this headline">¶</a></h2>
 <p>This package will install a command line utility called <code class="docutils literal notranslate"><span class="pre">osxphotos</span></code> that allows you to query the Photos database and export photos.
 Alternatively, you can also run the command line utility like this: <code class="docutils literal notranslate"><span class="pre">python3</span> <span class="pre">-m</span> <span class="pre">osxphotos</span></code></p>
@@ -127,38 +128,38 @@ Alternatively, you can also run the command line utility like this: <code class=
 </pre></div>
 </div>
 <p>To get help on a specific command, use <code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">help</span> <span class="pre">&lt;command_name&gt;</span></code></p>
-<div class="section" id="command-line-examples">
+<section id="command-line-examples">
 <h3>Command line examples<a class="headerlink" href="#command-line-examples" title="Permalink to this headline">¶</a></h3>
-<div class="section" id="export-all-photos-to-desktop-export-group-in-folders-by-date-created">
+<section id="export-all-photos-to-desktop-export-group-in-folders-by-date-created">
 <h4>export all photos to ~/Desktop/export group in folders by date created<a class="headerlink" href="#export-all-photos-to-desktop-export-group-in-folders-by-date-created" title="Permalink to this headline">¶</a></h4>
 <p><code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">export</span> <span class="pre">--export-by-date</span> <span class="pre">~/Pictures/Photos\</span> <span class="pre">Library.photoslibrary</span> <span class="pre">~/Desktop/export</span></code></p>
 <p><strong>Note</strong>: Photos library/database path can also be specified using <code class="docutils literal notranslate"><span class="pre">--db</span></code> option:</p>
 <p><code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">export</span> <span class="pre">--export-by-date</span> <span class="pre">--db</span> <span class="pre">~/Pictures/Photos\</span> <span class="pre">Library.photoslibrary</span> <span class="pre">~/Desktop/export</span></code></p>
-</div>
-<div class="section" id="find-all-photos-with-keyword-kids-and-output-results-to-json-file-named-results-json">
+</section>
+<section id="find-all-photos-with-keyword-kids-and-output-results-to-json-file-named-results-json">
 <h4>find all photos with keyword “Kids” and output results to json file named results.json:<a class="headerlink" href="#find-all-photos-with-keyword-kids-and-output-results-to-json-file-named-results-json" title="Permalink to this headline">¶</a></h4>
 <p><code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">query</span> <span class="pre">--keyword</span> <span class="pre">Kids</span> <span class="pre">--json</span> <span class="pre">~/Pictures/Photos\</span> <span class="pre">Library.photoslibrary</span> <span class="pre">&gt;results.json</span></code></p>
-</div>
-<div class="section" id="export-photos-to-file-structure-based-on-4-digit-year-and-full-name-of-month-of-photo-s-creation-date">
+</section>
+<section id="export-photos-to-file-structure-based-on-4-digit-year-and-full-name-of-month-of-photo-s-creation-date">
 <h4>export photos to file structure based on 4-digit year and full name of month of photo’s creation date:<a class="headerlink" href="#export-photos-to-file-structure-based-on-4-digit-year-and-full-name-of-month-of-photo-s-creation-date" title="Permalink to this headline">¶</a></h4>
 <p><code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">export</span> <span class="pre">~/Desktop/export</span> <span class="pre">--directory</span> <span class="pre">&quot;{created.year}/{created.month}&quot;</span></code></p>
 <p>(by default, it will attempt to use the system library)</p>
-</div>
-<div class="section" id="export-photos-to-file-structure-based-on-4-digit-year-of-photo-s-creation-date-and-add-keywords-for-media-type-and-labels-labels-are-only-awailable-on-photos-5-and-higher">
+</section>
+<section id="export-photos-to-file-structure-based-on-4-digit-year-of-photo-s-creation-date-and-add-keywords-for-media-type-and-labels-labels-are-only-awailable-on-photos-5-and-higher">
 <h4>export photos to file structure based on 4-digit year of photo’s creation date and add keywords for media type and labels (labels are only awailable on Photos 5 and higher):<a class="headerlink" href="#export-photos-to-file-structure-based-on-4-digit-year-of-photo-s-creation-date-and-add-keywords-for-media-type-and-labels-labels-are-only-awailable-on-photos-5-and-higher" title="Permalink to this headline">¶</a></h4>
 <p><code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">export</span> <span class="pre">~/Desktop/export</span> <span class="pre">--directory</span> <span class="pre">&quot;{created.year}&quot;</span> <span class="pre">--keyword-template</span> <span class="pre">&quot;{label}&quot;</span> <span class="pre">--keyword-template</span> <span class="pre">&quot;{media_type}&quot;</span></code></p>
-</div>
-<div class="section" id="export-default-library-using-country-name-year-as-output-directory-but-use-nocountry-year-if-country-not-specified-add-persons-album-names-and-year-as-keywords-write-exif-metadata-to-files-when-exporting-update-only-changed-files-print-verbose-ouput">
+</section>
+<section id="export-default-library-using-country-name-year-as-output-directory-but-use-nocountry-year-if-country-not-specified-add-persons-album-names-and-year-as-keywords-write-exif-metadata-to-files-when-exporting-update-only-changed-files-print-verbose-ouput">
 <h4>export default library using ‘country name/year’ as output directory (but use “NoCountry/year” if country not specified), add persons, album names, and year as keywords, write exif metadata to files when exporting, update only changed files, print verbose ouput<a class="headerlink" href="#export-default-library-using-country-name-year-as-output-directory-but-use-nocountry-year-if-country-not-specified-add-persons-album-names-and-year-as-keywords-write-exif-metadata-to-files-when-exporting-update-only-changed-files-print-verbose-ouput" title="Permalink to this headline">¶</a></h4>
 <p><code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">export</span> <span class="pre">~/Desktop/export</span> <span class="pre">--directory</span> <span class="pre">&quot;{place.name.country,NoCountry}/{created.year}&quot;</span>&#160; <span class="pre">--person-keyword</span> <span class="pre">--album-keyword</span> <span class="pre">--keyword-template</span> <span class="pre">&quot;{created.year}&quot;</span> <span class="pre">--exiftool</span> <span class="pre">--update</span> <span class="pre">--verbose</span></code></p>
-</div>
-<div class="section" id="find-all-videos-larger-than-200mb-and-add-them-to-photos-album-big-videos-creating-the-album-if-necessary">
+</section>
+<section id="find-all-videos-larger-than-200mb-and-add-them-to-photos-album-big-videos-creating-the-album-if-necessary">
 <h4>find all videos larger than 200MB and add them to Photos album “Big Videos” creating the album if necessary<a class="headerlink" href="#find-all-videos-larger-than-200mb-and-add-them-to-photos-album-big-videos-creating-the-album-if-necessary" title="Permalink to this headline">¶</a></h4>
 <p><code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">query</span> <span class="pre">--only-movies</span> <span class="pre">--min-size</span> <span class="pre">200MB</span> <span class="pre">--add-to-album</span> <span class="pre">&quot;Big</span> <span class="pre">Videos&quot;</span></code></p>
-</div>
-</div>
-</div>
-<div class="section" id="example-uses-of-the-package">
+</section>
+</section>
+</section>
+<section id="example-uses-of-the-package">
 <h2>Example uses of the package<a class="headerlink" href="#example-uses-of-the-package" title="Permalink to this headline">¶</a></h2>
 <div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="sd">&quot;&quot;&quot; Simple usage of the package &quot;&quot;&quot;</span>
 <span class="kn">import</span> <span class="nn">osxphotos</span>
@@ -274,48 +275,29 @@ Alternatively, you can also run the command line utility like this: <code class=
    <span class="n">export</span><span class="p">()</span>  <span class="c1"># pylint: disable=no-value-for-parameter</span>
 </pre></div>
 </div>
-</div>
-<div class="section" id="package-interface">
+</section>
+<section id="package-interface">
 <h2>Package Interface<a class="headerlink" href="#package-interface" title="Permalink to this headline">¶</a></h2>
 <p>Reference full documentation on <a class="reference external" href="https://github.com/RhetTbull/osxphotos/blob/master/README.md">GitHub</a></p>
 <div class="toctree-wrapper compound">
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="cli.html">osxphotos command line interface (CLI)</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="cli.html#osxphotos">osxphotos</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-about">about</a></li>
-<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-albums">albums</a></li>
-<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-dump">dump</a></li>
-<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-export">export</a></li>
-<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-help">help</a></li>
-<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-info">info</a></li>
-<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-keywords">keywords</a></li>
-<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-labels">labels</a></li>
-<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-list">list</a></li>
-<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-persons">persons</a></li>
-<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-places">places</a></li>
-<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-query">query</a></li>
-<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-repl">repl</a></li>
-<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-tutorial">tutorial</a></li>
-</ul>
-</li>
-</ul>
-</li>
+<li class="toctree-l1"><a class="reference internal" href="cli.html">osxphotos command line interface (CLI)</a></li>
 <li class="toctree-l1"><a class="reference internal" href="reference.html">osxphotos package</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="reference.html#osxphotos-module">osxphotos module</a></li>
 </ul>
 </li>
 </ul>
 </div>
-</div>
-</div>
-<div class="section" id="indices-and-tables">
+</section>
+</section>
+<section id="indices-and-tables">
 <h1>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Permalink to this headline">¶</a></h1>
 <ul class="simple">
 <li><p><a class="reference internal" href="genindex.html"><span class="std std-ref">Index</span></a></p></li>
 <li><p><a class="reference internal" href="py-modindex.html"><span class="std std-ref">Module Index</span></a></p></li>
 <li><p><a class="reference internal" href="search.html"><span class="std std-ref">Search Page</span></a></p></li>
 </ul>
-</div>
+</section>


          </div>
@@ -351,7 +333,7 @@ Alternatively, you can also run the command line utility like this: <code class=
  <h3 id="searchlabel">Quick search</h3>
    <div class="searchformwrapper">
    <form class="search" action="search.html" method="get">
-      <input type="text" name="q" aria-labelledby="searchlabel" />
+      <input type="text" name="q" aria-labelledby="searchlabel" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"/>
      <input type="submit" value="Go" />
    </form>
    </div>
@@ -373,7 +355,7 @@ Alternatively, you can also run the command line utility like this: <code class=
      &copy;2021, Rhet Turnbull.
      
      |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.0.2</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.3.1</a>
      &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
      
      |
--- a/docs/modules.html
+++ b/docs/modules.html
@@ -4,8 +4,9 @@
 <html>
  <head>
    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos &#8212; osxphotos 0.42.69 documentation</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
+
+    <title>osxphotos &#8212; osxphotos 0.44.4 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
    <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
@@ -30,11 +31,11 @@

          <div class="body" role="main">
            
-  <div class="section" id="osxphotos">
+  <section id="osxphotos">
 <h1>osxphotos<a class="headerlink" href="#osxphotos" title="Permalink to this headline">¶</a></h1>
 <div class="toctree-wrapper compound">
 </div>
-</div>
+</section>


          </div>
@@ -69,7 +70,7 @@
  <h3 id="searchlabel">Quick search</h3>
    <div class="searchformwrapper">
    <form class="search" action="search.html" method="get">
-      <input type="text" name="q" aria-labelledby="searchlabel" />
+      <input type="text" name="q" aria-labelledby="searchlabel" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"/>
      <input type="submit" value="Go" />
    </form>
    </div>
@@ -91,7 +92,7 @@
      &copy;2021, Rhet Turnbull.
      
      |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.0.2</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.3.1</a>
      &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
      
      |
--- a/docs/objects.inv
+++ b/docs/objects.inv
--- a/docs/reference.html
+++ b/docs/reference.html
--- a/docs/search.html
+++ b/docs/search.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Search &#8212; osxphotos 0.42.69 documentation</title>
+    <title>Search &#8212; osxphotos 0.44.4 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
    
@@ -38,13 +38,14 @@
            
  <h1 id="search-documentation">Search</h1>
  
-  <div id="fallback" class="admonition warning">
-  <script>$('#fallback').hide();</script>
+  <noscript>
+  <div class="admonition warning">
  <p>
    Please activate JavaScript to enable the search
    functionality.
  </p>
  </div>
+  </noscript>
  
  
  <p>
@@ -54,7 +55,7 @@
  
  
  <form action="" method="get">
-    <input type="text" name="q" aria-labelledby="search-documentation" value="" />
+    <input type="text" name="q" aria-labelledby="search-documentation" value="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"/>
    <input type="submit" value="search" />
    <span id="search-progress" style="padding-left: 10px"></span>
  </form>
@@ -110,7 +111,7 @@
      &copy;2021, Rhet Turnbull.
      
      |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.0.2</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.3.1</a>
      &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
      
    </div>
--- a/docs/searchindex.js
+++ b/docs/searchindex.js
--- a/osxphotos/init.py
+++ b/osxphotos/init.py
@@ -1,7 +1,8 @@
 from ._constants import AlbumSortOrder
 from ._version import __version__
 from .exiftool import ExifTool
-from .photoinfo import ExportResults, PhotoInfo
+from .photoexporter import ExportResults, PhotoExporter
+from .photoinfo import PhotoInfo
 from .photosdb import PhotosDB
 from .photosdb._photosdb_process_comments import CommentInfo, LikeInfo
 from .phototemplate import PhotoTemplate
--- a/osxphotos/_constants.py
+++ b/osxphotos/_constants.py
@@ -30,6 +30,8 @@ _TESTED_DB_VERSIONS = ["6000", "4025", "4016", "3301", "2622"]
 # Photos 6 (10.16.0 Beta) == 14104
 _TEST_MODEL_VERSIONS = ["13537", "13703", "14104"]

+_PHOTOS_2_VERSION = "2622"
+
 # only version 3 - 4 have RKVersion.selfPortrait
 _PHOTOS_3_VERSION = "3301"

@@ -94,6 +96,8 @@ _TESTED_OS_VERSIONS = [
    ("11", "2"),
    ("11", "3"),
    ("11", "4"),
+    ("11", "5"),
+    ("11", "6"),
 ]

 # Photos 5 has persons who are empty string if unidentified face
@@ -119,12 +123,20 @@ _XMP_TEMPLATE_NAME_BETA = "xmp_sidecar_beta.mako"
 # Constants used for processing folders and albums
 _PHOTOS_5_ALBUM_KIND = 2  # normal user album
 _PHOTOS_5_SHARED_ALBUM_KIND = 1505  # shared album
+_PHOTOS_5_PROJECT_ALBUM_KIND = 1508  # My Projects (e.g. Calendar, Card, Slideshow)
 _PHOTOS_5_FOLDER_KIND = 4000  # user folder
 _PHOTOS_5_ROOT_FOLDER_KIND = 3999  # root folder
 _PHOTOS_5_IMPORT_SESSION_ALBUM_KIND = 1506  # import session

 _PHOTOS_4_ALBUM_KIND = 3  # RKAlbum.albumSubclass
-_PHOTOS_4_TOP_LEVEL_ALBUM = "TopLevelAlbums"
+_PHOTOS_4_ALBUM_TYPE_ALBUM = 1  # RKAlbum.albumType
+_PHOTOS_4_ALBUM_TYPE_PROJECT = 9  # RKAlbum.albumType
+_PHOTOS_4_ALBUM_TYPE_SLIDESHOW = 8  # RKAlbum.albumType
+_PHOTOS_4_TOP_LEVEL_ALBUMS = [
+    "TopLevelAlbums",
+    "TopLevelKeepsakes",
+    "TopLevelSlideshows",
+]
 _PHOTOS_4_ROOT_FOLDER = "LibraryFolder"

 # EXIF related constants
@@ -275,12 +287,15 @@ POST_COMMAND_CATEGORIES = {
    # "deleted_directories": "When used with '--cleanup', all directories deleted during the export",
 }

+
 class AlbumSortOrder(Enum):
    """Album Sort Order"""
+
    UNKNOWN = 0
    MANUAL = 1
    NEWEST_FIRST = 2
    OLDEST_FIRST = 3
    TITLE = 5

-TEXT_DETECTION_CONFIDENCE_THRESHOLD = 0.75
+
+TEXT_DETECTION_CONFIDENCE_THRESHOLD = 0.75
--- a/osxphotos/_version.py
+++ b/osxphotos/_version.py
@@ -1,3 +1,3 @@
 """ version info """

-__version__ = "0.42.74"
+__version__ = "0.44.4"
--- a/osxphotos/albuminfo.py
+++ b/osxphotos/albuminfo.py
@@ -14,7 +14,7 @@ from datetime import datetime, timedelta, timezone

 from ._constants import (
    _PHOTOS_4_ALBUM_KIND,
-    _PHOTOS_4_TOP_LEVEL_ALBUM,
+    _PHOTOS_4_TOP_LEVEL_ALBUMS,
    _PHOTOS_4_VERSION,
    _PHOTOS_5_ALBUM_KIND,
    _PHOTOS_5_FOLDER_KIND,
@@ -22,6 +22,7 @@ from ._constants import (
    AlbumSortOrder,
 )
 from .datetime_utils import get_local_tz
+from .query_builder import get_query


 def sort_list_by_keys(values, sort_keys):
@@ -131,6 +132,28 @@ class AlbumInfoBaseClass:
    def photos(self):
        return []

+    @property
+    def owner(self):
+        """Return name of photo owner for shared album (Photos 5+ only), or None if not shared"""
+        if self._db._db_version <= _PHOTOS_4_VERSION:
+            return None
+
+        try:
+            return self._owner
+        except AttributeError:
+            try:
+                personid = self._db._dbalbum_details[self.uuid][
+                    "cloudownerhashedpersonid"
+                ]
+                self._owner = (
+                    self._db._db_hashed_person_id[personid]["full_name"]
+                    if personid
+                    else None
+                )
+            except KeyError:
+                self._owner = None
+            return self._owner
+
    def __len__(self):
        """return number of photos contained in album"""
        return len(self.photos)
@@ -138,7 +161,6 @@ class AlbumInfoBaseClass:

 class AlbumInfo(AlbumInfoBaseClass):
    """
-    Base class for AlbumInfo, ImportInfo
    Info about a specific Album, contains all the details about the album
    including folders, photos, etc.
    """
@@ -208,7 +230,7 @@ class AlbumInfo(AlbumInfoBaseClass):
                parent_uuid = self._db._dbalbum_details[self._uuid]["folderUuid"]
                self._parent = (
                    FolderInfo(db=self._db, uuid=parent_uuid)
-                    if parent_uuid != _PHOTOS_4_TOP_LEVEL_ALBUM
+                    if parent_uuid not in _PHOTOS_4_TOP_LEVEL_ALBUMS
                    else None
                )
            else:
@@ -243,18 +265,17 @@ class AlbumInfo(AlbumInfoBaseClass):

    def photo_index(self, photo):
        """return index of photo in album (based on album sort order)"""
-        index = 0
-        for p in self.photos:
+        for index, p in enumerate(self.photos):
            if p.uuid == photo.uuid:
                return index
-            index += 1
-        else:
-            raise ValueError(
-                f"Photo with uuid {photo.uuid} does not appear to be in this album"
-            )
+        raise ValueError(
+            f"Photo with uuid {photo.uuid} does not appear to be in this album"
+        )


 class ImportInfo(AlbumInfoBaseClass):
+    """Information about import sessions"""
+
    @property
    def photos(self):
        """return list of photos contained in import session"""
@@ -273,6 +294,15 @@ class ImportInfo(AlbumInfoBaseClass):
            return self._photos


+class ProjectInfo(AlbumInfo):
+    """
+    ProjectInfo with info about projects
+    Projects are cards, calendars, slideshows, etc.
+    """
+
+    ...
+
+
 class FolderInfo:
    """
    Info about a specific folder, contains all the details about the folder
@@ -334,7 +364,7 @@ class FolderInfo:
                parent_uuid = self._db._dbfolder_details[self._uuid]["parentFolderUuid"]
                self._parent = (
                    FolderInfo(db=self._db, uuid=parent_uuid)
-                    if parent_uuid != _PHOTOS_4_TOP_LEVEL_ALBUM
+                    if parent_uuid not in _PHOTOS_4_TOP_LEVEL_ALBUMS
                    else None
                )
            else:
--- a/osxphotos/cli.py
+++ b/osxphotos/cli.py
@@ -12,6 +12,7 @@ import shlex
 import subprocess
 import sys
 import time
+from runpy import run_module

 import bitmath
 import click
@@ -55,13 +56,15 @@ from .exiftool import get_exiftool_path
 from .export_db import ExportDB, ExportDBInMemory
 from .fileutil import FileUtil, FileUtilNoOp
 from .path_utils import is_valid_filepath, sanitize_filename, sanitize_filepath
-from .photoinfo import ExportResults
+from .photoexporter import ExportResults, PhotoExporter
+from .photoinfo import PhotoInfo
 from .photokit import check_photokit_authorization, request_photokit_authorization
 from .photosalbum import PhotosAlbum
 from .phototemplate import PhotoTemplate, RenderOptions
+from .pyrepl import embed_repl
 from .queryoptions import QueryOptions
 from .uti import get_preferred_uti_extension
-from .utils import expand_and_validate_filepath, load_function
+from .utils import expand_and_validate_filepath, load_function, normalize_fs_path

 # global variable to control verbose output
 # set via --verbose/-V
@@ -296,7 +299,8 @@ def QUERY_OPTIONS(f):
            metavar="UUID",
            default=None,
            multiple=True,
-            help="Search for photos with UUID(s).",
+            help="Search for photos with UUID(s). "
+            "May be repeated to include multiple UUIDs.",
        ),
        o(
            "--uuid-from-file",
@@ -541,6 +545,17 @@ def QUERY_OPTIONS(f):
            is_flag=True,
            help="Filter for photos that are currently selected in Photos.",
        ),
+        o(
+            "--exif",
+            metavar="EXIF_TAG VALUE",
+            nargs=2,
+            multiple=True,
+            help="Search for photos where EXIF_TAG exists in photo's EXIF data and contains VALUE. "
+            "For example, to find photos created by Adobe Photoshop: `--exif Software 'Adobe Photoshop' `"
+            "or to find all photos shot on a Canon camera: `--exif Make Canon`. "
+            "EXIF_TAG can be any valid exiftool tag, with or without group name, e.g. `EXIF:Make` or `Make`. "
+            "To use --exif, exiftool must be installed and in the path.",
+        ),
        o(
            "--query-eval",
            metavar="CRITERIA",
@@ -686,6 +701,23 @@ def cli(ctx, db, json_, debug):
    "Note: this does not skip RAW photos if the RAW photo does not have an associated JPEG image "
    "(e.g. the RAW file was imported to Photos without a JPEG preview).",
 )
+@click.option(
+    "--skip-uuid",
+    metavar="UUID",
+    default=None,
+    multiple=True,
+    help="Skip photos with UUID(s) during export. "
+    "May be repeated to include multiple UUIDs.",
+)
+@click.option(
+    "--skip-uuid-from-file",
+    metavar="FILE",
+    default=None,
+    multiple=False,
+    help="Skip photos with UUID(s) loaded from FILE. "
+    "Format is a single UUID per line.  Lines preceded with # are ignored.",
+    type=click.Path(exists=True),
+)
@click.option(
    "--current-name",
    is_flag=True,
@@ -1028,10 +1060,9 @@ def cli(ctx, db, json_, debug):
    metavar="EXPORTDB_FILE",
    default=None,
    help=(
-        "Specify alternate name for database file which stores state information for export and --update. "
+        "Specify alternate path for database file which stores state information for export and --update. "
        f"If --exportdb is not specified, export database will be saved to '{OSXPHOTOS_EXPORT_DB}' "
-        "in the export directory.  Must be specified as filename only, not a path, as export database "
-        "will be saved in export directory."
+        "in the export directory.  If --exportdb is specified, it will be saved to the specified file. "
    ),
    type=click.Path(),
 )
@@ -1111,6 +1142,8 @@ def export(
    skip_bursts,
    skip_live,
    skip_raw,
+    skip_uuid,
+    skip_uuid_from_file,
    person_keyword,
    album_keyword,
    keyword_template,
@@ -1188,6 +1221,7 @@ def export(
    max_size,
    regex,
    selected,
+    exif,
    query_eval,
    query_function,
    duplicate,
@@ -1278,6 +1312,8 @@ def export(
        skip_bursts = cfg.skip_bursts
        skip_live = cfg.skip_live
        skip_raw = cfg.skip_raw
+        skip_uuid = cfg.skip_uuid
+        skip_uuid_from_file = cfg.skip_uuid_from_file
        person_keyword = cfg.person_keyword
        album_keyword = cfg.album_keyword
        keyword_template = cfg.keyword_template
@@ -1352,6 +1388,7 @@ def export(
        max_size = cfg.max_size
        regex = cfg.regex
        selected = cfg.selected
+        exif = cfg.exif
        query_eval = cfg.query_eval
        query_function = cfg.query_function
        duplicate = cfg.duplicate
@@ -1535,25 +1572,23 @@ def export(

    # sanity check exportdb
    if exportdb and exportdb != OSXPHOTOS_EXPORT_DB:
-        if "/" in exportdb:
-            click.echo(
-                click.style(
-                    f"Error: --exportdb must be specified as filename not path; "
-                    + f"export database will saved in export directory '{dest}'.",
-                    fg=CLI_COLOR_ERROR,
-                )
-            )
-            raise click.Abort()
-        elif pathlib.Path(pathlib.Path(dest) / OSXPHOTOS_EXPORT_DB).exists():
+        if pathlib.Path(pathlib.Path(dest) / OSXPHOTOS_EXPORT_DB).exists():
            click.echo(
                click.style(
                    f"Warning: export database is '{exportdb}' but found '{OSXPHOTOS_EXPORT_DB}' in {dest}; using '{exportdb}'",
                    fg=CLI_COLOR_WARNING,
                )
            )
+        if pathlib.Path(exportdb).resolve().parent != pathlib.Path(dest):
+            click.echo(
+                click.style(
+                    f"Warning: export database '{pathlib.Path(exportdb).resolve()}' is in a different directory than export destination '{dest}'",
+                    fg=CLI_COLOR_WARNING,
+                )
+            )

    # open export database and assign copy/link/unlink functions
-    export_db_path = os.path.join(dest, exportdb or OSXPHOTOS_EXPORT_DB)
+    export_db_path = exportdb or os.path.join(dest, OSXPHOTOS_EXPORT_DB)

    # check that export isn't in the parent or child of a previously exported library
    other_db_files = find_files_in_branch(dest, OSXPHOTOS_EXPORT_DB)
@@ -1576,10 +1611,10 @@ def export(
        click.confirm("Do you want to continue?", abort=True)

    if dry_run:
-        export_db = ExportDBInMemory(export_db_path)
+        export_db = ExportDBInMemory(dbfile=export_db_path, export_dir=dest)
        fileutil = FileUtilNoOp
    else:
-        export_db = ExportDB(export_db_path)
+        export_db = ExportDB(dbfile=export_db_path, export_dir=dest)
        fileutil = FileUtil

    if verbose_:
@@ -1671,6 +1706,7 @@ def export(
        max_size=max_size,
        regex=regex,
        selected=selected,
+        exif=exif,
        query_eval=query_eval,
        function=query_function,
        duplicate=duplicate,
@@ -1687,6 +1723,13 @@ def export(
        else:
            raise ValueError(e)

+    if skip_uuid:
+        photos = [p for p in photos if p.uuid not in skip_uuid]
+
+    if skip_uuid_from_file:
+        skip_uuid_list = load_uuid_from_file(skip_uuid_from_file)
+        photos = [p for p in photos if p.uuid not in skip_uuid_list]
+
    if photos and only_new:
        # ignore previously exported files
        previous_uuids = {uuid: 1 for uuid in export_db.get_previous_uuids()}
@@ -2083,6 +2126,7 @@ def query(
    max_size,
    regex,
    selected,
+    exif,
    query_eval,
    query_function,
    add_to_album,
@@ -2118,6 +2162,7 @@ def query(
        max_size,
        regex,
        selected,
+        exif,
        duplicate,
    ]
    exclusive = [
@@ -2249,6 +2294,7 @@ def query(
        function=query_function,
        regex=regex,
        selected=selected,
+        exif=exif,
        duplicate=duplicate,
    )

@@ -2784,9 +2830,7 @@ def _render_suffix_template(
        return ""

    try:
-        options = RenderOptions(
-            filename=True, strip=strip, export_dir=dest, exportdb=export_db
-        )
+        options = RenderOptions(filename=True, export_dir=dest, exportdb=export_db)
        rendered_suffix, unmatched = photo.render_template(suffix_template, options)
    except ValueError as e:
        raise click.BadOptionUsage(
@@ -2803,6 +2847,10 @@ def _render_suffix_template(
            var_name,
            f"Invalid template for {option_name}: may not use multi-valued templates: '{suffix_template}': results={rendered_suffix}",
        )
+
+    if strip:
+        rendered_suffix[0] = rendered_suffix[0].strip()
+
    return rendered_suffix[0]


@@ -2904,7 +2952,8 @@ def export_photo_to_directory(
        tries += 1
        error = 0
        try:
-            export_results = photo.export2(
+            exporter = PhotoExporter(photo)
+            export_results = exporter.export2(
                dest_path,
                original_filename=filename,
                edited=edited,
@@ -2966,7 +3015,7 @@ def export_photo_to_directory(
                break
            else:
                click.echo(
-                    "Retrying export for photo ({photo.uuid}: {photo.original_filename})"
+                    f"Retrying export for photo ({photo.uuid}: {photo.original_filename})"
                )
        except Exception as e:
            click.echo(
@@ -3033,7 +3082,6 @@ def get_filenames_from_template(
            options = RenderOptions(
                path_sep="_",
                filename=True,
-                strip=strip,
                edited_version=edited,
                export_dir=export_dir,
                dest_path=dest_path,
@@ -3057,7 +3105,10 @@ def get_filenames_from_template(
            else [photo.filename]
        )

+    if strip:
+        filenames = [filename.strip() for filename in filenames]
    filenames = [sanitize_filename(filename) for filename in filenames]
+
    return filenames


@@ -3101,7 +3152,7 @@ def get_dirnames_from_template(
        # got a directory template, render it and check results are valid
        try:
            options = RenderOptions(
-                dirname=True, strip=strip, edited_version=edited, exportdb=export_db
+                dirname=True, edited_version=edited, exportdb=export_db
            )
            dirnames, unmatched = photo.render_template(directory, options)
        except ValueError as e:
@@ -3116,6 +3167,8 @@ def get_dirnames_from_template(

        dest_paths = []
        for dirname in dirnames:
+            if strip:
+                dirname = dirname.strip()
            dirname = sanitize_filepath(dirname)
            dest_path = os.path.join(dest, dirname)
            if not is_valid_filepath(dest_path):
@@ -3351,11 +3404,13 @@ def cleanup_files(dest_path, files_to_keep, fileutil):
    Returns:
        tuple of (list of files deleted, list of directories deleted)
    """
-    keepers = {str(filename).lower(): 1 for filename in files_to_keep}
+    keepers = {
+        normalize_fs_path(str(filename).lower()): 1 for filename in files_to_keep
+    }

    deleted_files = []
    for p in pathlib.Path(dest_path).rglob("*"):
-        path = str(p).lower()
+        path = normalize_fs_path(str(p).lower())
        if p.is_file() and path not in keepers:
            verbose_(f"Deleting {p}")
            fileutil.unlink(p)
@@ -3410,7 +3465,7 @@ def write_finder_tags(
    skipped = []
    if keywords:
        # match whatever keywords would've been used in --exiftool or --sidecar
-        exif = photo._exiftool_dict(
+        exif = PhotoExporter(photo)._exiftool_dict(
            use_albums_as_keywords=album_keyword,
            use_persons_as_keywords=person_keyword,
            keyword_template=keyword_template,
@@ -3429,7 +3484,6 @@ def write_finder_tags(
                options = RenderOptions(
                    none_str=_OSXPHOTOS_NONE_SENTINEL,
                    path_sep="/",
-                    strip=strip,
                    export_dir=export_dir,
                    exportdb=export_db,
                )
@@ -3451,6 +3505,9 @@ def write_finder_tags(
            rendered_tags.extend(rendered)

        # filter out any template values that didn't match by looking for sentinel
+        if strip:
+            rendered_tags = [value.strip() for value in rendered_tags]
+
        rendered_tags = [
            value.replace(_OSXPHOTOS_NONE_SENTINEL, "") for value in rendered_tags
        ]
@@ -3496,7 +3553,6 @@ def write_extended_attributes(
            options = RenderOptions(
                none_str=_OSXPHOTOS_NONE_SENTINEL,
                path_sep="/",
-                strip=strip,
                export_dir=export_dir,
                exportdb=export_db,
            )
@@ -3516,6 +3572,9 @@ def write_extended_attributes(
            )

        # filter out any template values that didn't match by looking for sentinel
+        if strip:
+            rendered = [value.strip() for value in rendered]
+
        rendered = [value.replace(_OSXPHOTOS_NONE_SENTINEL, "") for value in rendered]

        try:
@@ -3591,6 +3650,30 @@ def run_post_command(
                            )


+@cli.command()
+@click.argument("packages", nargs=-1, required=True)
+@click.option(
+    "-U", "--upgrade", is_flag=True, help="Upgrade packages to latest version"
+)
+def install(packages, upgrade):
+    """Install Python packages into the same environment as osxphotos"""
+    args = ["pip", "install"]
+    if upgrade:
+        args += ["--upgrade"]
+    args += list(packages)
+    sys.argv = args
+    run_module("pip", run_name="__main__")
+
+
+@cli.command()
+@click.argument("packages", nargs=-1, required=True)
+@click.option("-y", "--yes", is_flag=True, help="Don't ask for confirmation")
+def uninstall(packages, yes):
+    """Uninstall Python packages from the osxphotos environment"""
+    sys.argv = ["pip", "uninstall"] + list(packages) + (["-y"] if yes else [])
+    run_module("pip", run_name="__main__")
+
+
@cli.command(hidden=True)
@DB_OPTION
@DB_ARGUMENT
@@ -3604,7 +3687,8 @@ def run_post_command(
@click.option(
    "--uuid",
    metavar="UUID",
-    help="Use with '--dump photos' to dump only certain UUIDs",
+    help="Use with '--dump photos' to dump only certain UUIDs. "
+    "May be repeated to include multiple UUIDs.",
    multiple=True,
 )
@click.option("--verbose", "-V", "verbose", is_flag=True, help="Print verbose output.")
@@ -4001,6 +4085,32 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+osxphotos uses the following 3rd party software licensed under the BSD-3-Clause License:
+Click (Copyright 2014 Pallets), ptpython (Copyright (c) 2015, Jonathan Slenders)
+
+Redistribution and use in source and binary forms, with or without modification, are 
+permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list 
+of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list 
+of conditions and the following disclaimer in the documentation and/or other materials 
+provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be 
+used to endorse or promote products derived from this software without specific prior 
+written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR 
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY 
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 """
    click.echo(f"osxphotos, version {__version__}")
    click.echo("")
@@ -4022,7 +4132,7 @@ def tutorial(ctx, cli_obj, width):
    click.echo_via_pager(tutorial_help(width=width))


-def _show_photo(photo):
+def _show_photo(photo: PhotoInfo):
    """open image with default image viewer

    Note: This is for debugging only -- it will actually open any filetype which could
@@ -4068,16 +4178,42 @@ def _get_selected(photosdb):
    return get_selected


+def _spotlight_photo(photo: PhotoInfo):
+    photo_ = photoscript.Photo(photo.uuid)
+    photo_.spotlight()
+
+
@cli.command()
@DB_OPTION
@click.pass_obj
@click.pass_context
-def repl(ctx, cli_obj, db):
-    """Run interactive osxphotos shell"""
+@click.option(
+    "--emacs",
+    required=False,
+    is_flag=True,
+    default=False,
+    help="Launch REPL with Emacs keybindings (default is vi bindings)",
+)
+def repl(ctx, cli_obj, db, emacs):
+    """Run interactive osxphotos REPL shell (useful for debugging, prototyping, and inspecting your Photos library)"""
+    import logging

-    from osxphotos import PhotosDB, PhotoInfo, ExifTool
+    from objexplore import explore
+    from photoscript import Album, Photo, PhotosLibrary
    from rich import inspect as _inspect

+    from osxphotos import ExifTool, PhotoInfo, PhotosDB
+    from osxphotos.albuminfo import AlbumInfo
+    from osxphotos.momentinfo import MomentInfo
+    from osxphotos.photoexporter import ExportResults, PhotoExporter
+    from osxphotos.placeinfo import PlaceInfo
+    from osxphotos.queryoptions import QueryOptions
+    from osxphotos.scoreinfo import ScoreInfo
+    from osxphotos.searchinfo import SearchInfo
+
+    logger = logging.getLogger()
+    logger.disabled = True
+
    pretty.install()
    print(f"python version: {sys.version}")
    print(f"osxphotos version: {osxphotos._version.__version__}")
@@ -4092,29 +4228,60 @@ def repl(ctx, cli_obj, db):
    # shortcut for helper functions
    get_photo = photosdb.get_photo
    show = _show_photo
+    spotlight = _spotlight_photo
    get_selected = _get_selected(photosdb)
+    try:
+        selected = get_selected()
+    except Exception:
+        # get_selected sometimes fails
+        selected = []

    def inspect(obj):
        """inspect object"""
        return _inspect(obj, methods=True)

-    print(f"Found {len(photos)} photos in {tictoc:0.2f} seconds")
+    print(f"Found {len(photos)} photos in {tictoc:0.2f} seconds\n")
+    print("The following classes have been imported from osxphotos:")
+    print(
+        "- AlbumInfo, ExifTool, PhotoInfo, PhotoExporter, ExportResults, PhotosDB, PlaceInfo, QueryOptions, MomentInfo, ScoreInfo, SearchInfo\n"
+    )
    print("The following variables are defined:")
    print(f"- photosdb: PhotosDB() instance for {photosdb.library_path}")
    print(
-        f"- photos: list of PhotoInfo objects for all photos in photosdb, including those in the trash"
+        f"- photos: list of PhotoInfo objects for all photos in photosdb, including those in the trash (len={len(photos)})"
+    )
+    print(
+        f"- selected: list of PhotoInfo objects for any photos selected in Photos (len={len(selected)})"
    )
    print(f"\nThe following functions may be helpful:")
-    print(f"- get_photo(uuid): return a PhotoInfo object for photo with uuid")
    print(
-        f"- get_selected(): return list of PhotoInfo objects for photos selected in Photos"
-    )
-    print(f"- show(photo): open a photo object in the default viewer")
-    print(
-        f"- help(object): print help text including list of methods for object; for example, help(PhotosDB)"
+        f"- get_photo(uuid): return a PhotoInfo object for photo with uuid; e.g. get_photo('B13F4485-94E0-41CD-AF71-913095D62E31')"
    )
    print(
-        f"- inspect(object): print information about an object; for example inspect(photosdb)"
+        f"- get_selected(); return list of PhotoInfo objects for photos selected in Photos"
+    )
+    print(
+        f"- show(photo): open a photo object in the default viewer; e.g. show(selected[0])"
+    )
+    print(
+        f"- show(path): open a file at path in the default viewer; e.g. show('/path/to/photo.jpg')"
+    )
+    print(f"- spotlight(photo): open a photo and spotlight it in Photos")
+    # print(
+    #     f"- help(object): print help text including list of methods for object; for example, help(PhotosDB)"
+    # )
+    print(
+        f"- inspect(object): print information about an object; e.g. inspect(PhotoInfo)"
+    )
+    print(
+        f"- explore(object): interactively explore an object with objexplore; e.g. explore(PhotoInfo)"
+    )
+    print(f"- q, quit, quit(), exit, exit(): exit this interactive shell\n")
+
+    embed_repl(
+        globals=globals(),
+        locals=locals(),
+        history_filename=str(pathlib.Path.home() / ".osxphotos_repl_history"),
+        quit_words=["q", "quit", "exit"],
+        vi_mode=not emacs,
    )
-    print(f"- quit(): exit this interactive shell\n")
-    code.interact(banner="", local=locals())
--- a/osxphotos/cli_help.py
+++ b/osxphotos/cli_help.py
@@ -207,7 +207,7 @@ The following attributes may be used with '--xattr-template':
            + "The following categories are available: "
        )
        formatter.write("\n")
-        templ_tuples = [("Catgory", "Description")]
+        templ_tuples = [("Category", "Description")]
        templ_tuples.extend((k, v) for k, v in POST_COMMAND_CATEGORIES.items())
        formatter.write_dl(templ_tuples)
        formatter.write("\n")
@@ -224,13 +224,13 @@ The following attributes may be used with '--xattr-template':
        )
        formatter.write("\n")
        formatter.write(
-            '--post-command new "echo {filepath.name|shell_quote} >> {shell_quote,{export_dir}/exported.txt}"'
+            '--post-command new "echo {filepath|shell_quote} >> {shell_quote,{export_dir}/exported.txt}"'
        )
        formatter.write("\n\n")
        formatter.write_text(
-            "In the above command, the 'shell_quote' filter is used to ensure '{filepath.name}' is properly quoted "
+            "In the above command, the 'shell_quote' filter is used to ensure '{filepath}' is properly quoted "
            + "and the '{shell_quote}' template ensures the constructed path of '{exported_dir}/exported.txt' is properly quoted. "
-            "If '{filepath.name}' is 'IMG 1234.jpeg' and '{export_dir}' is '/Volumes/Photo Export', the command "
+            "If '{filepath}' is 'IMG 1234.jpeg' and '{export_dir}' is '/Volumes/Photo Export', the command "
            "thus renders to: "
        )
        formatter.write("\n")
--- a/osxphotos/exifinfo.py
+++ b/osxphotos/exifinfo.py
@@ -0,0 +1,28 @@
+""" ExifInfo class to expose EXIF info from the library """
+
+from dataclasses import dataclass
+
+
+@dataclass(frozen=True)
+class ExifInfo:
+    """EXIF info associated with a photo from the Photos library"""
+
+    flash_fired: bool
+    iso: int
+    metering_mode: int
+    sample_rate: int
+    track_format: int
+    white_balance: int
+    aperture: float
+    bit_rate: float
+    duration: float
+    exposure_bias: float
+    focal_length: float
+    fps: float
+    latitude: float
+    longitude: float
+    shutter_speed: float
+    camera_make: str
+    camera_model: str
+    codec: str
+    lens_model: str
--- a/osxphotos/exiftool.py
+++ b/osxphotos/exiftool.py
@@ -7,6 +7,7 @@
    pyexiftool: https://github.com/smarnach/pyexiftool which provides more functionality """

 import atexit
+import html
 import json
 import logging
 import os
@@ -24,16 +25,34 @@ EXIFTOOL_STAYOPEN_EOF_LEN = len(EXIFTOOL_STAYOPEN_EOF)
 EXIFTOOL_PROCESSES = []


+def escape_str(s):
+    """escape string for use with exiftool -E"""
+    if type(s) != str:
+        return s
+    s = html.escape(s)
+    s = s.replace("\n", "&#xa;")
+    s = s.replace("\t", "&#x9;")
+    s = s.replace("\r", "&#xd;")
+    return s
+
+
+def unescape_str(s):
+    """unescape an HTML string returned by exiftool -E"""
+    if type(s) != str:
+        return s
+    return html.unescape(s)
+
+
@atexit.register
 def terminate_exiftool():
-    """Terminate any running ExifTool subprocesses; call this to cleanup when done using ExifTool """
+    """Terminate any running ExifTool subprocesses; call this to cleanup when done using ExifTool"""
    for proc in EXIFTOOL_PROCESSES:
        proc._stop_proc()


@lru_cache(maxsize=1)
 def get_exiftool_path():
-    """ return path of exiftool, cache result """
+    """return path of exiftool, cache result"""
    exiftool_path = shutil.which("exiftool")
    if exiftool_path:
        return exiftool_path.rstrip()
@@ -49,7 +68,7 @@ class _ExifToolProc:
    Creates a singleton object"""

    def __new__(cls, *args, **kwargs):
-        """ create new object or return instance of already created singleton """
+        """create new object or return instance of already created singleton"""
        if not hasattr(cls, "instance") or not cls.instance:
            cls.instance = super().__new__(cls)

@@ -74,7 +93,7 @@ class _ExifToolProc:

    @property
    def process(self):
-        """ return the exiftool subprocess """
+        """return the exiftool subprocess"""
        if self._process_running:
            return self._process
        else:
@@ -83,16 +102,16 @@ class _ExifToolProc:

    @property
    def pid(self):
-        """ return process id (PID) of the exiftool process """
+        """return process id (PID) of the exiftool process"""
        return self._process.pid

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

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

        if self._process_running:
            logging.warning("exiftool already running: {self._process}")
@@ -110,6 +129,7 @@ class _ExifToolProc:
                "-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,
@@ -120,7 +140,7 @@ class _ExifToolProc:
        EXIFTOOL_PROCESSES.append(self)

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

        if not self._process_running:
            return
@@ -143,7 +163,7 @@ class _ExifToolProc:


 class ExifTool:
-    """ Basic exiftool interface for reading and writing EXIF tags """
+    """Basic exiftool interface for reading and writing EXIF tags"""

    def __init__(self, filepath, exiftool=None, overwrite=True, flags=None):
        """Create ExifTool object
@@ -189,6 +209,7 @@ class ExifTool:

        if value is None:
            value = ""
+        value = escape_str(value)
        command = [f"-{tag}={value}"]
        if self.overwrite and not self._context_mgr:
            command.append("-overwrite_original")
@@ -233,6 +254,7 @@ class ExifTool:
        for value in values:
            if value is None:
                raise ValueError("Can't add None value to tag")
+            value = escape_str(value)
            command.append(f"-{tag}+={value}")

        if self.overwrite and not self._context_mgr:
@@ -315,12 +337,12 @@ class ExifTool:

    @property
    def pid(self):
-        """ return process id (PID) of the exiftool process """
+        """return process id (PID) of the exiftool process"""
        return self._process.pid

    @property
    def version(self):
-        """ returns exiftool version """
+        """returns exiftool version"""
        ver, _, _ = self.run_commands("-ver", no_file=True)
        return ver.decode("utf-8")

@@ -335,6 +357,7 @@ class ExifTool:
        json_str, _, _ = self.run_commands("-json")
        if not json_str:
            return dict()
+        json_str = unescape_str(json_str.decode("utf-8"))

        try:
            exifdict = json.loads(json_str)
@@ -342,7 +365,6 @@ class ExifTool:
            # will fail with some commands, e.g --ext AVI which produces
            # 'No file with specified extension' instead of json
            return dict()
-
        exifdict = exifdict[0]
        if not tag_groups:
            # strip tag groups
@@ -358,12 +380,13 @@ class ExifTool:
        return exifdict

    def json(self):
-        """ returns JSON string containing all EXIF tags and values from exiftool """
+        """returns JSON string containing all EXIF tags and values from exiftool"""
        json, _, _ = self.run_commands("-json")
+        json = unescape_str(json.decode("utf-8"))
        return json

    def _read_exif(self):
-        """ read exif data from file """
+        """read exif data from file"""
        data = self.asdict()
        self.data = {k: v for k, v in data.items()}

@@ -384,15 +407,15 @@ class ExifTool:


 class ExifToolCaching(ExifTool):
-    """ Basic exiftool interface for reading and writing EXIF tags, with caching. 
-        Use this only when you know the file's EXIF data will not be changed by any external process. 
-        
-        Creates a singleton cached ExifTool instance """
+    """Basic exiftool interface for reading and writing EXIF tags, with caching.
+    Use this only when you know the file's EXIF data will not be changed by any external process.
+
+    Creates a singleton cached ExifTool instance"""

    _singletons = {}

    def __new__(cls, filepath, exiftool=None):
-        """ create new object or return instance of already created singleton """
+        """create new object or return instance of already created singleton"""
        if filepath not in cls._singletons:
            cls._singletons[filepath] = _ExifToolCaching(filepath, exiftool=exiftool)
        return cls._singletons[filepath]
@@ -448,7 +471,6 @@ class _ExifToolCaching(ExifTool):
            return self._asdict_cache[tag_groups][normalized]

    def flush_cache(self):
-        """ Clear cached data so that calls to json or asdict return fresh data """
+        """Clear cached data so that calls to json or asdict return fresh data"""
        self._json_cache = None
        self._asdict_cache = {}
-
--- a/osxphotos/export_db.py
+++ b/osxphotos/export_db.py
@@ -1,5 +1,6 @@
 """ Helper class for managing a database used by PhotoInfo.export for tracking state of exports and updates """

+
 import datetime
 import logging
 import os
@@ -14,7 +15,7 @@ from ._constants import OSXPHOTOS_EXPORT_DB
 from ._version import __version__

 OSXPHOTOS_EXPORTDB_VERSION = "4.0"
-OSXPHOTOS_ABOUT_STRING = f"Created by osxphotos version {__version__} (https://github.com/RhetTbull/osxphotos) on {str(datetime.datetime.now())}"
+OSXPHOTOS_ABOUT_STRING = f"Created by osxphotos version {__version__} (https://github.com/RhetTbull/osxphotos) on {datetime.datetime.now()}"


 class ExportDB_ABC(ABC):
@@ -171,7 +172,7 @@ class ExportDBNoOp(ExportDB_ABC):
        return []

    def get_detected_text_for_uuid(self, uuid):
-        return None 
+        return None

    def set_detected_text_for_uuid(self, uuid, json_text):
        pass
@@ -193,15 +194,14 @@ class ExportDBNoOp(ExportDB_ABC):
 class ExportDB(ExportDB_ABC):
    """Interface to sqlite3 database used to store state information for osxphotos export command"""

-    def __init__(self, dbfile):
+    def __init__(self, dbfile, export_dir):
        """dbfile: path to osxphotos export database file"""
        self._dbfile = dbfile
-        # _path is parent of the database
-        # all files referenced by get_/set_uuid_for_file will be converted to
-        # relative paths to this parent _path
+        # export_dir is required as all files referenced by get_/set_uuid_for_file will be converted to
+        # relative paths to this path
        # this allows the entire export tree to be moved to a new disk/location
        # whilst preserving the UUID to filename mapping
-        self._path = pathlib.Path(dbfile).parent
+        self._path = export_dir
        self._conn = self._open_export_db(dbfile)
        self._insert_run_info()

@@ -214,14 +214,13 @@ class ExportDB(ExportDB_ABC):
        try:
            c = conn.cursor()
            c.execute(
-                f"SELECT uuid FROM files WHERE filepath_normalized = ?", (filename,)
+                "SELECT uuid FROM files WHERE filepath_normalized = ?", (filename,)
            )
            results = c.fetchone()
            uuid = results[0] if results else None
        except Error as e:
            logging.warning(e)
            uuid = None
-
        return uuid

    def set_uuid_for_file(self, filename, uuid):
@@ -232,9 +231,10 @@ class ExportDB(ExportDB_ABC):
        try:
            c = conn.cursor()
            c.execute(
-                f"INSERT OR REPLACE INTO files(filepath, filepath_normalized, uuid) VALUES (?, ?, ?);",
+                "INSERT OR REPLACE INTO files(filepath, filepath_normalized, uuid) VALUES (?, ?, ?);",
                (filename, filename_normalized, uuid),
            )
+
            conn.commit()
        except Error as e:
            logging.warning(e)
@@ -274,15 +274,14 @@ class ExportDB(ExportDB_ABC):
            )
            results = c.fetchone()
            if results:
-                stats = results[0:3]
+                stats = results[:3]
                mtime = int(stats[2]) if stats[2] is not None else None
                stats = (stats[0], stats[1], mtime)
            else:
                stats = (None, None, None)
        except Error as e:
            logging.warning(e)
-            stats = (None, None, None)
-
+            stats = None, None, None
        return stats

    def set_stat_edited_for_file(self, filename, stats):
@@ -332,15 +331,14 @@ class ExportDB(ExportDB_ABC):
            )
            results = c.fetchone()
            if results:
-                stats = results[0:3]
+                stats = results[:3]
                mtime = int(stats[2]) if stats[2] is not None else None
                stats = (stats[0], stats[1], mtime)
            else:
                stats = (None, None, None)
        except Error as e:
            logging.warning(e)
-            stats = (None, None, None)
-
+            stats = None, None, None
        return stats

    def set_stat_converted_for_file(self, filename, stats):
@@ -493,7 +491,10 @@ class ExportDB(ExportDB_ABC):
            c = conn.cursor()
            c.execute(
                "INSERT OR REPLACE INTO detected_text(uuid, text_data) VALUES (?, ?);",
-                (uuid, text_json,),
+                (
+                    uuid,
+                    text_json,
+                ),
            )
            conn.commit()
        except Error as e:
@@ -517,9 +518,10 @@ class ExportDB(ExportDB_ABC):
        try:
            c = conn.cursor()
            c.execute(
-                f"INSERT OR REPLACE INTO files(filepath, filepath_normalized, uuid) VALUES (?, ?, ?);",
+                "INSERT OR REPLACE INTO files(filepath, filepath_normalized, uuid) VALUES (?, ?, ?);",
                (filename, filename_normalized, uuid),
            )
+
            c.execute(
                "UPDATE files "
                + "SET orig_mode = ?, orig_size = ?, orig_mtime = ? "
@@ -582,7 +584,7 @@ class ExportDB(ExportDB_ABC):
        )
        results = c.fetchone()
        if results:
-            stats = results[0:3]
+            stats = results[:3]
            mtime = int(stats[2]) if stats[2] is not None else None
            stats = (stats[0], stats[1], mtime)
        else:
@@ -741,9 +743,10 @@ class ExportDB(ExportDB_ABC):
        try:
            c = conn.cursor()
            c.execute(
-                f"INSERT INTO runs (datetime, python_path, script_name, args, cwd) VALUES (?, ?, ?, ?, ?)",
+                "INSERT INTO runs (datetime, python_path, script_name, args, cwd) VALUES (?, ?, ?, ?, ?)",
                (dt, python_path, cmd, args, cwd),
            )
+
            conn.commit()
        except Error as e:
            logging.warning(e)
@@ -755,14 +758,13 @@ class ExportDBInMemory(ExportDB):
    modifying the on-disk version
    """

-    def __init__(self, dbfile):
+    def __init__(self, dbfile, export_dir):
        self._dbfile = dbfile or f"./{OSXPHOTOS_EXPORT_DB}"
-        # _path is parent of the database
-        # all files referenced by get_/set_uuid_for_file will be converted to
-        # relative paths to this parent _path
+        # export_dir is required as all files referenced by get_/set_uuid_for_file will be converted to
+        # relative paths to this path
        # this allows the entire export tree to be moved to a new disk/location
        # whilst preserving the UUID to filename mapping
-        self._path = pathlib.Path(self._dbfile).parent
+        self._path = export_dir
        self._conn = self._open_export_db(self._dbfile)
        self._insert_run_info()

--- a/osxphotos/fileutil.py
+++ b/osxphotos/fileutil.py
@@ -7,7 +7,7 @@ import subprocess
 import sys
 from abc import ABC, abstractmethod

-import CoreFoundation
+import Foundation

 from .imageconverter import ImageConverter

@@ -114,7 +114,7 @@ class FileUtilMacOS(FileUtilABC):
        if dest.is_dir():
            dest /= src.name

-        filemgr = CoreFoundation.NSFileManager.defaultManager()
+        filemgr = Foundation.NSFileManager.defaultManager()
        error = filemgr.copyItemAtPath_toPath_error_(str(src), str(dest), None)
        # error is a tuple of (bool, error_string)
        # error[0] is True if copy succeeded
--- a/osxphotos/imageconverter.py
+++ b/osxphotos/imageconverter.py
@@ -17,25 +17,25 @@ from wurlitzer import pipes


 class ImageConversionError(Exception):
-    """Base class for exceptions in this module. """
+    """Base class for exceptions in this module."""

    pass


 class ImageConverter:
-    """ Convert images to jpeg.  This class is a singleton
-        which will re-use the Core Image CIContext to avoid
-        creating a new context for every conversion. """
+    """Convert images to jpeg.  This class is a singleton
+    which will re-use the Core Image CIContext to avoid
+    creating a new context for every conversion."""

    def __new__(cls, *args, **kwargs):
-        """ create new object or return instance of already created singleton """
+        """create new object or return instance of already created singleton"""
        if not hasattr(cls, "instance") or not cls.instance:
            cls.instance = super().__new__(cls)

        return cls.instance

    def __init__(self):
-        """ return existing singleton or create a new one """
+        """return existing singleton or create a new one"""

        if hasattr(self, "context"):
            return
@@ -47,13 +47,10 @@ class ImageConverter:
                "workingFormat": Quartz.kCIFormatRGBAh,
            }
        )
-        mtldevice = Metal.MTLCreateSystemDefaultDevice()
-        self.context = Quartz.CIContext.contextWithMTLDevice_options_(
-            mtldevice, context_options
-        )
+        self.context = Quartz.CIContext.contextWithOptions_(context_options)

    def write_jpeg(self, input_path, output_path, compression_quality=1.0):
-        """ convert image to jpeg and write image to output_path
+        """convert image to jpeg and write image to output_path

        Args:
            input_path: path to input image (e.g. '/path/to/import/file.CR2') as str or pathlib.Path
@@ -104,8 +101,11 @@ class ImageConverter:
            if input_image is None:
                raise ImageConversionError(f"Could not create CIImage for {input_path}")

-            output_colorspace = input_image.colorSpace() or Quartz.CGColorSpaceCreateWithName(
-                Quartz.CoreGraphics.kCGColorSpaceSRGB
+            output_colorspace = (
+                input_image.colorSpace()
+                or Quartz.CGColorSpaceCreateWithName(
+                    Quartz.CoreGraphics.kCGColorSpaceSRGB
+                )
            )

            output_options = NSDictionary.dictionaryWithDictionary_(
@@ -123,4 +123,3 @@ class ImageConverter:
                raise ImageConversionError(
                    f"Error converting file {input_path} to jpeg at {output_path}: {error}"
                )
-
--- a/osxphotos/momentinfo.py
+++ b/osxphotos/momentinfo.py
@@ -0,0 +1,69 @@
+"""MomentInfo class with details about photo moments."""
+
+
+class MomentInfo:
+    """Info about a photo moment"""
+
+    def __init__(self, db, moment_pk):
+        """Initialize with a moment PK; returns None if PK not found."""
+        self._db = db
+        self._pk = moment_pk
+
+        self._moment = self._db._db_moment_pk.get(moment_pk)
+        if not self._moment:
+            raise ValueError(f"No moment with PK {moment_pk}")
+
+    @property
+    def pk(self):
+        """Primary key of the moment."""
+        return self._pk
+
+    @property
+    def location(self):
+        """Location of the moment."""
+        return (self._moment.get("latitude"), self._moment.get("longitude"))
+
+    @property
+    def title(self):
+        """Title of the moment."""
+        return self._moment.get("title")
+
+    @property
+    def subtitle(self):
+        """Subtitle of the moment."""
+        return self._moment.get("subtitle")
+
+    @property
+    def start_date(self):
+        """Start date of the moment."""
+        return self._moment.get("startDate")
+
+    @property
+    def end_date(self):
+        """Stop date of the moment."""
+        return self._moment.get("endDate")
+
+    @property
+    def date(self):
+        """Date of the moment."""
+        return self._moment.get("representativeDate")
+
+    @property
+    def modification_date(self):
+        """Modification date of the moment."""
+        return self._moment.get("modificationDate")
+
+    @property
+    def photos(self):
+        """All photos in this moment"""
+        try:
+            return self._photos
+        except AttributeError:
+            photo_uuids = [
+                uuid
+                for uuid, photo in self._db._dbphotos.items()
+                if photo["momentID"] == self._pk
+            ]
+
+            self._photos = self._db.photos_by_uuid(photo_uuids)
+            return self._photos
--- a/osxphotos/personinfo.py
+++ b/osxphotos/personinfo.py
@@ -141,7 +141,7 @@ class FaceInfo:
        self.manual = face["manual"]
        self.face_type = face["facetype"]
        self.age_type = face["agetype"]
-        self.bald_type = face["baldtype"]
+        # self.bald_type = face["baldtype"]
        self.eye_makeup_type = face["eyemakeuptype"]
        self.eye_state = face["eyestate"]
        self.facial_hair_type = face["facialhairtype"]
@@ -438,7 +438,7 @@ class FaceInfo:
            "manual": self.manual,
            "face_type": self.face_type,
            "age_type": self.age_type,
-            "bald_type": self.bald_type,
+            # "bald_type": self.bald_type,
            "eye_makeup_type": self.eye_makeup_type,
            "eye_state": self.eye_state,
            "facial_hair_type": self.facial_hair_type,
--- a/osxphotos/photoexporter.py
+++ b/osxphotos/photoexporter.py
--- a/osxphotos/photoinfo/photoinfo.py
+++ b/osxphotos/photoinfo/photoinfo.py
@@ -16,14 +16,18 @@ from typing import Optional
 import yaml
 from osxmetadata import OSXMetaData

-from .._constants import (
+from ._constants import (
    _MOVIE_TYPE,
    _PHOTO_TYPE,
    _PHOTOS_4_ALBUM_KIND,
+    _PHOTOS_4_ALBUM_TYPE_ALBUM,
+    _PHOTOS_4_ALBUM_TYPE_PROJECT,
+    _PHOTOS_4_ALBUM_TYPE_SLIDESHOW,
    _PHOTOS_4_ROOT_FOLDER,
    _PHOTOS_4_VERSION,
    _PHOTOS_5_ALBUM_KIND,
    _PHOTOS_5_IMPORT_SESSION_ALBUM_KIND,
+    _PHOTOS_5_PROJECT_ALBUM_KIND,
    _PHOTOS_5_SHARED_ALBUM_KIND,
    _PHOTOS_5_SHARED_PHOTO_PATH,
    _PHOTOS_5_VERSION,
@@ -33,14 +37,21 @@ from .._constants import (
    BURST_SELECTED,
    TEXT_DETECTION_CONFIDENCE_THRESHOLD,
 )
-from ..adjustmentsinfo import AdjustmentsInfo
-from ..albuminfo import AlbumInfo, ImportInfo
-from ..personinfo import FaceInfo, PersonInfo
-from ..phototemplate import PhotoTemplate, RenderOptions
-from ..placeinfo import PlaceInfo4, PlaceInfo5
-from ..text_detection import detect_text
-from ..uti import get_preferred_uti_extension, get_uti_for_extension
-from ..utils import _debug, _get_resource_loc, findfiles
+from .adjustmentsinfo import AdjustmentsInfo
+from .albuminfo import AlbumInfo, ImportInfo, ProjectInfo
+from .exifinfo import ExifInfo
+from .exiftool import ExifToolCaching, get_exiftool_path
+from .momentinfo import MomentInfo
+from .personinfo import FaceInfo, PersonInfo
+from .photoexporter import PhotoExporter
+from .phototemplate import PhotoTemplate, RenderOptions
+from .placeinfo import PlaceInfo4, PlaceInfo5
+from .query_builder import get_query
+from .scoreinfo import ScoreInfo
+from .searchinfo import SearchInfo
+from .text_detection import detect_text
+from .uti import get_preferred_uti_extension, get_uti_for_extension
+from .utils import _debug, _get_resource_loc, findfiles


 class PhotoInfo:
@@ -49,42 +60,12 @@ class PhotoInfo:
    including keywords, persons, albums, uuid, path, etc.
    """

-    # import additional methods
-    from ._photoinfo_comments import comments, likes
-    from ._photoinfo_exifinfo import ExifInfo, exif_info
-    from ._photoinfo_exiftool import exiftool
-    from ._photoinfo_export import (
-        ExportResults,
-        _exiftool_dict,
-        _exiftool_json_sidecar,
-        _export_photo,
-        _export_photo_with_photos_export,
-        _get_exif_keywords,
-        _get_exif_persons,
-        _write_exif_data,
-        _write_sidecar,
-        _xmp_sidecar,
-        export,
-        export2,
-    )
-    from ._photoinfo_scoreinfo import ScoreInfo, score
-    from ._photoinfo_searchinfo import (
-        SearchInfo,
-        labels,
-        labels_normalized,
-        search_info,
-        search_info_normalized,
-    )
-
    def __init__(self, db=None, uuid=None, info=None):
        self._uuid = uuid
        self._info = info
        self._db = db
        self._verbose = self._db._verbose

-        # TODO: remove this once refactor of PhotoExporter is done
-        self._render_options = RenderOptions()
-
    @property
    def filename(self):
        """filename of the picture"""
@@ -493,6 +474,18 @@ class PhotoInfo:
                self._faceinfo = []
            return self._faceinfo

+    @property
+    def moment(self):
+        """Moment photo belongs to"""
+        try:
+            return self._moment
+        except AttributeError:
+            try:
+                self._moment = MomentInfo(db=self._db, moment_pk=self._info["momentID"])
+            except ValueError:
+                self._moment = None
+            return self._moment
+
    @property
    def albums(self):
        """list of albums picture is contained in"""
@@ -556,6 +549,18 @@ class PhotoInfo:
            )
            return self._import_info

+    @property
+    def project_info(self):
+        """list of AlbumInfo objects representing projects for the photo or None if no projects"""
+        try:
+            return self._project_info
+        except AttributeError:
+            project_uuids = self._get_album_uuids(project=True)
+            self._project_info = [
+                ProjectInfo(db=self._db, uuid=album) for album in project_uuids
+            ]
+            return self._project_info
+
    @property
    def keywords(self):
        """list of keywords for picture"""
@@ -564,7 +569,12 @@ class PhotoInfo:
    @property
    def title(self):
        """name / title of picture"""
-        return self._info["name"]
+        # if user sets then deletes title, Photos sets it to empty string in DB instead of NULL
+        # in this case, return None so result is the same as if title had never been set (which returns NULL)
+        # issue #512
+        title = self._info["name"]
+        title = None if title == "" else title
+        return title

    @property
    def uuid(self):
@@ -837,7 +847,7 @@ class PhotoInfo:
        if self._db._db_version <= _PHOTOS_4_VERSION:
            if self.live_photo and not self.ismissing:
                live_model_id = self._info["live_model_id"]
-                if live_model_id == None:
+                if live_model_id is None:
                    logging.debug(f"missing live_model_id: {self._uuid}")
                    photopath = None
                else:
@@ -858,28 +868,20 @@ class PhotoInfo:
                        # photos 4 has "isOnDisk" column we could check
                        # or could do the actual check with "isfile"
                        # TODO: should this be a warning or debug?
-                        logging.debug(
-                            f"MISSING PATH: live photo path for UUID {self._uuid} should be at {photopath} but does not appear to exist"
-                        )
                        photopath = None
            else:
                photopath = None
-        else:
-            # Photos 5
-            if self.live_photo and not self.ismissing:
-                filename = pathlib.Path(self.path)
-                photopath = filename.parent.joinpath(f"{filename.stem}_3.mov")
-                photopath = str(photopath)
-                if not os.path.isfile(photopath):
-                    # In testing, I've seen occasional missing movie for live photo
-                    # these appear to be valid -- e.g. video component not yet downloaded from iCloud
-                    # TODO: should this be a warning or debug?
-                    logging.debug(
-                        f"MISSING PATH: live photo path for UUID {self._uuid} should be at {photopath} but does not appear to exist"
-                    )
-                    photopath = None
-            else:
+        elif self.live_photo and self.path and not self.ismissing:
+            filename = pathlib.Path(self.path)
+            photopath = filename.parent.joinpath(f"{filename.stem}_3.mov")
+            photopath = str(photopath)
+            if not os.path.isfile(photopath):
+                # In testing, I've seen occasional missing movie for live photo
+                # these appear to be valid -- e.g. video component not yet downloaded from iCloud
+                # TODO: should this be a warning or debug?
                photopath = None
+        else:
+            photopath = None

        return photopath

@@ -1049,15 +1051,15 @@ class PhotoInfo:
            return self._info["orientation"]

        # For Photos 5+, try to get the adjusted orientation
-        if self.hasadjustments:
-            if self.adjustments:
-                return self.adjustments.adj_orientation
-            else:
-                # can't reliably determine orientation for edited photo if adjustmentinfo not available
-                return 0
-        else:
+        if not self.hasadjustments:
            return self._info["orientation"]

+        if self.adjustments:
+            return self.adjustments.adj_orientation
+        else:
+            # can't reliably determine orientation for edited photo if adjustmentinfo not available
+            return 0
+
    @property
    def original_height(self):
        """returns height of the original photo version in pixels"""
@@ -1093,21 +1095,259 @@ class PhotoInfo:
            logging.warning(f"Did not find signature for {self.uuid} in _db_signatures")
        return duplicates

-    def render_template(
-        self, template_str: str, options: Optional[RenderOptions] = None
-    ):
-        """Renders a template string for PhotoInfo instance using PhotoTemplate
+    @property
+    def owner(self):
+        """Return name of photo owner for shared photos (Photos 5+ only), or None if not shared"""
+        if self._db._db_version <= _PHOTOS_4_VERSION:
+            return None

-        Args:
-            template_str: a template string with fields to render
-            options: a RenderOptions instance
+        try:
+            return self._owner
+        except AttributeError:
+            try:
+                personid = self._info["cloudownerhashedpersonid"]
+                self._owner = (
+                    self._db._db_hashed_person_id[personid]["full_name"]
+                    if personid
+                    else None
+                )
+            except KeyError:
+                self._owner = None
+            return self._owner
+
+    @property
+    def score(self):
+        """Computed score information for a photo

        Returns:
-            ([rendered_strings], [unmatched]): tuple of list of rendered strings and list of unmatched template values
+            ScoreInfo instance
        """
-        options = options or RenderOptions()
-        template = PhotoTemplate(self, exiftool_path=self._db._exiftool_path)
-        return template.render(template_str, options)
+
+        if self._db._db_version <= _PHOTOS_4_VERSION:
+            logging.debug(f"score not implemented for this database version")
+            return None
+
+        try:
+            return self._scoreinfo  # pylint: disable=access-member-before-definition
+        except AttributeError:
+            try:
+                scores = self._db._db_scoreinfo_uuid[self.uuid]
+                self._scoreinfo = ScoreInfo(
+                    overall=scores["overall_aesthetic"],
+                    curation=scores["curation"],
+                    promotion=scores["promotion"],
+                    highlight_visibility=scores["highlight_visibility"],
+                    behavioral=scores["behavioral"],
+                    failure=scores["failure"],
+                    harmonious_color=scores["harmonious_color"],
+                    immersiveness=scores["immersiveness"],
+                    interaction=scores["interaction"],
+                    interesting_subject=scores["interesting_subject"],
+                    intrusive_object_presence=scores["intrusive_object_presence"],
+                    lively_color=scores["lively_color"],
+                    low_light=scores["low_light"],
+                    noise=scores["noise"],
+                    pleasant_camera_tilt=scores["pleasant_camera_tilt"],
+                    pleasant_composition=scores["pleasant_composition"],
+                    pleasant_lighting=scores["pleasant_lighting"],
+                    pleasant_pattern=scores["pleasant_pattern"],
+                    pleasant_perspective=scores["pleasant_perspective"],
+                    pleasant_post_processing=scores["pleasant_post_processing"],
+                    pleasant_reflection=scores["pleasant_reflection"],
+                    pleasant_symmetry=scores["pleasant_symmetry"],
+                    sharply_focused_subject=scores["sharply_focused_subject"],
+                    tastefully_blurred=scores["tastefully_blurred"],
+                    well_chosen_subject=scores["well_chosen_subject"],
+                    well_framed_subject=scores["well_framed_subject"],
+                    well_timed_shot=scores["well_timed_shot"],
+                )
+                return self._scoreinfo
+            except KeyError:
+                self._scoreinfo = ScoreInfo(
+                    overall=0.0,
+                    curation=0.0,
+                    promotion=0.0,
+                    highlight_visibility=0.0,
+                    behavioral=0.0,
+                    failure=0.0,
+                    harmonious_color=0.0,
+                    immersiveness=0.0,
+                    interaction=0.0,
+                    interesting_subject=0.0,
+                    intrusive_object_presence=0.0,
+                    lively_color=0.0,
+                    low_light=0.0,
+                    noise=0.0,
+                    pleasant_camera_tilt=0.0,
+                    pleasant_composition=0.0,
+                    pleasant_lighting=0.0,
+                    pleasant_pattern=0.0,
+                    pleasant_perspective=0.0,
+                    pleasant_post_processing=0.0,
+                    pleasant_reflection=0.0,
+                    pleasant_symmetry=0.0,
+                    sharply_focused_subject=0.0,
+                    tastefully_blurred=0.0,
+                    well_chosen_subject=0.0,
+                    well_framed_subject=0.0,
+                    well_timed_shot=0.0,
+                )
+                return self._scoreinfo
+
+    @property
+    def search_info(self):
+        """returns SearchInfo object for photo
+        only valid on Photos 5, on older libraries, returns None
+        """
+        if self._db._db_version <= _PHOTOS_4_VERSION:
+            return None
+
+        # memoize SearchInfo object
+        try:
+            return self._search_info
+        except AttributeError:
+            self._search_info = SearchInfo(self)
+            return self._search_info
+
+    @property
+    def search_info_normalized(self):
+        """returns SearchInfo object for photo that produces normalized results
+        only valid on Photos 5, on older libraries, returns None
+        """
+        if self._db._db_version <= _PHOTOS_4_VERSION:
+            return None
+
+        # memoize SearchInfo object
+        try:
+            return self._search_info_normalized
+        except AttributeError:
+            self._search_info_normalized = SearchInfo(self, normalized=True)
+            return self._search_info_normalized
+
+    @property
+    def labels(self):
+        """returns list of labels applied to photo by Photos image categorization
+        only valid on Photos 5, on older libraries returns empty list
+        """
+        if self._db._db_version <= _PHOTOS_4_VERSION:
+            return []
+
+        return self.search_info.labels
+
+    @property
+    def labels_normalized(self):
+        """returns normalized list of labels applied to photo by Photos image categorization
+        only valid on Photos 5, on older libraries returns empty list
+        """
+        if self._db._db_version <= _PHOTOS_4_VERSION:
+            return []
+
+        return self.search_info_normalized.labels
+
+    @property
+    def comments(self):
+        """Returns list of Comment objects for any comments on the photo (sorted by date)"""
+        try:
+            return self._db._db_comments_uuid[self.uuid]["comments"]
+        except:
+            return []
+
+    @property
+    def likes(self):
+        """Returns list of Like objects for any likes on the photo (sorted by date)"""
+        try:
+            return self._db._db_comments_uuid[self.uuid]["likes"]
+        except:
+            return []
+
+    @property
+    def exif_info(self):
+        """Returns an ExifInfo object with the EXIF data for photo
+        Note: the returned EXIF data is the data Photos stores in the database on import;
+        ExifInfo does not provide access to the EXIF info in the actual image file
+        Some or all of the fields may be None
+        Only valid for Photos 5; on earlier database returns None
+        """
+
+        if self._db._db_version <= _PHOTOS_4_VERSION:
+            logging.debug(f"exif_info not implemented for this database version")
+            return None
+
+        try:
+            exif = self._db._db_exifinfo_uuid[self.uuid]
+            exif_info = ExifInfo(
+                iso=exif["ZISO"],
+                flash_fired=True if exif["ZFLASHFIRED"] == 1 else False,
+                metering_mode=exif["ZMETERINGMODE"],
+                sample_rate=exif["ZSAMPLERATE"],
+                track_format=exif["ZTRACKFORMAT"],
+                white_balance=exif["ZWHITEBALANCE"],
+                aperture=exif["ZAPERTURE"],
+                bit_rate=exif["ZBITRATE"],
+                duration=exif["ZDURATION"],
+                exposure_bias=exif["ZEXPOSUREBIAS"],
+                focal_length=exif["ZFOCALLENGTH"],
+                fps=exif["ZFPS"],
+                latitude=exif["ZLATITUDE"],
+                longitude=exif["ZLONGITUDE"],
+                shutter_speed=exif["ZSHUTTERSPEED"],
+                camera_make=exif["ZCAMERAMAKE"],
+                camera_model=exif["ZCAMERAMODEL"],
+                codec=exif["ZCODEC"],
+                lens_model=exif["ZLENSMODEL"],
+            )
+        except KeyError:
+            logging.debug(f"Could not find exif record for uuid {self.uuid}")
+            exif_info = ExifInfo(
+                iso=None,
+                flash_fired=None,
+                metering_mode=None,
+                sample_rate=None,
+                track_format=None,
+                white_balance=None,
+                aperture=None,
+                bit_rate=None,
+                duration=None,
+                exposure_bias=None,
+                focal_length=None,
+                fps=None,
+                latitude=None,
+                longitude=None,
+                shutter_speed=None,
+                camera_make=None,
+                camera_model=None,
+                codec=None,
+                lens_model=None,
+            )
+
+        return exif_info
+
+    @property
+    def exiftool(self):
+        """Returns a ExifToolCaching (read-only instance of ExifTool) object for the photo.
+        Requires that exiftool (https://exiftool.org/) be installed
+        If exiftool not installed, logs warning and returns None
+        If photo path is missing, returns None
+        """
+        try:
+            # return the memoized instance if it exists
+            return self._exiftool
+        except AttributeError:
+            try:
+                exiftool_path = self._db._exiftool_path or get_exiftool_path()
+                if self.path is not None and os.path.isfile(self.path):
+                    exiftool = ExifToolCaching(self.path, exiftool=exiftool_path)
+                else:
+                    exiftool = None
+            except FileNotFoundError:
+                # get_exiftool_path raises FileNotFoundError if exiftool not found
+                exiftool = None
+                logging.warning(
+                    "exiftool not in path; download and install from https://exiftool.org/"
+                )
+
+            self._exiftool = exiftool
+            return self._exiftool

    def detected_text(self, confidence_threshold=TEXT_DETECTION_CONFIDENCE_THRESHOLD):
        """Detects text in photo and returns lists of results as (detected text, confidence)
@@ -1151,7 +1391,8 @@ class PhotoInfo:
        md = OSXMetaData(path)
        detected_text = md.get_attribute("osxphotos_detected_text")
        if detected_text is None:
-            detected_text = detect_text(path)
+            orientation = self.orientation or None
+            detected_text = detect_text(path, orientation)
            md.set_attribute("osxphotos_detected_text", detected_text)
        return detected_text

@@ -1165,34 +1406,150 @@ class PhotoInfo:
        """Returns latitude, in degrees"""
        return self._info["latitude"]

-    def _get_album_uuids(self):
+    def render_template(
+        self, template_str: str, options: Optional[RenderOptions] = None
+    ):
+        """Renders a template string for PhotoInfo instance using PhotoTemplate
+
+        Args:
+            template_str: a template string with fields to render
+            options: a RenderOptions instance
+
+        Returns:
+            ([rendered_strings], [unmatched]): tuple of list of rendered strings and list of unmatched template values
+        """
+        options = options or RenderOptions()
+        template = PhotoTemplate(self, exiftool_path=self._db._exiftool_path)
+        return template.render(template_str, options)
+
+    def export(
+        self,
+        dest,
+        filename=None,
+        edited=False,
+        live_photo=False,
+        raw_photo=False,
+        export_as_hardlink=False,
+        overwrite=False,
+        increment=True,
+        sidecar_json=False,
+        sidecar_exiftool=False,
+        sidecar_xmp=False,
+        use_photos_export=False,
+        timeout=120,
+        exiftool=False,
+        use_albums_as_keywords=False,
+        use_persons_as_keywords=False,
+        keyword_template=None,
+        description_template=None,
+        render_options: Optional[RenderOptions] = None,
+    ):
+        """export photo
+        dest: must be valid destination path (or exception raised)
+        filename: (optional): name of exported picture; if not provided, will use current filename
+                    **NOTE**: if provided, user must ensure file extension (suffix) is correct.
+                    For example, if photo is .CR2 file, edited image may be .jpeg.
+                    If you provide an extension different than what the actual file is,
+                    export will print a warning but will export the photo using the
+                    incorrect file extension (unless use_photos_export is true, in which case export will
+                    use the extension provided by Photos upon export; in this case, an incorrect extension is
+                    silently ignored).
+                    e.g. to get the extension of the edited photo,
+                    reference PhotoInfo.path_edited
+        edited: (boolean, default=False); if True will export the edited version of the photo, otherwise exports the original version
+                (or raise exception if no edited version)
+        live_photo: (boolean, default=False); if True, will also export the associated .mov for live photos
+        raw_photo: (boolean, default=False); if True, will also export the associated RAW photo
+        export_as_hardlink: (boolean, default=False); if True, will hardlink files instead of copying them
+        overwrite: (boolean, default=False); if True will overwrite files if they already exist
+        increment: (boolean, default=True); if True, will increment file name until a non-existant name is found
+                    if overwrite=False and increment=False, export will fail if destination file already exists
+        sidecar_json: if set will write a json sidecar with data in format readable by exiftool
+                    sidecar filename will be dest/filename.json; includes exiftool tag group names (e.g. `exiftool -G -j`)
+        sidecar_exiftool: if set will write a json sidecar with data in format readable by exiftool
+                    sidecar filename will be dest/filename.json; does not include exiftool tag group names (e.g. `exiftool -j`)
+        sidecar_xmp: if set will write an XMP sidecar with IPTC data
+                    sidecar filename will be dest/filename.xmp
+        use_photos_export: (boolean, default=False); if True will attempt to export photo via applescript interaction with Photos
+        timeout: (int, default=120) timeout in seconds used with use_photos_export
+        exiftool: (boolean, default = False); if True, will use exiftool to write metadata to export file
+        returns list of full paths to the exported files
+        use_albums_as_keywords: (boolean, default = False); if True, will include album names in keywords
+        when exporting metadata with exiftool or sidecar
+        use_persons_as_keywords: (boolean, default = False); if True, will include person names in keywords
+        when exporting metadata with exiftool or sidecar
+        keyword_template: (list of strings); list of template strings that will be rendered as used as keywords
+        description_template: string; optional template string that will be rendered for use as photo description
+        render_options: an optional osxphotos.phototemplate.RenderOptions instance with options to pass to template renderer
+
+        Returns: list of photos exported
+        """
+
+        exporter = PhotoExporter(self)
+        return exporter.export(
+            dest=dest,
+            filename=filename,
+            edited=edited,
+            live_photo=live_photo,
+            raw_photo=raw_photo,
+            export_as_hardlink=export_as_hardlink,
+            overwrite=overwrite,
+            increment=increment,
+            sidecar_json=sidecar_json,
+            sidecar_exiftool=sidecar_exiftool,
+            sidecar_xmp=sidecar_xmp,
+            use_photos_export=use_photos_export,
+            timeout=timeout,
+            exiftool=exiftool,
+            use_albums_as_keywords=use_albums_as_keywords,
+            use_persons_as_keywords=use_persons_as_keywords,
+            keyword_template=keyword_template,
+            description_template=description_template,
+            render_options=render_options,
+        )
+
+    def _get_album_uuids(self, project=False):
        """Return list of album UUIDs this photo is found in

            Filters out albums in the trash and any special album types

+            if project is True, returns special "My Project" albums (e.g. cards, calendars, slideshows)
+
        Returns: list of album UUIDs
        """
        if self._db._db_version <= _PHOTOS_4_VERSION:
-            version4 = True
            album_kind = [_PHOTOS_4_ALBUM_KIND]
-        else:
-            version4 = False
-            album_kind = [_PHOTOS_5_SHARED_ALBUM_KIND, _PHOTOS_5_ALBUM_KIND]
+            album_type = (
+                [_PHOTOS_4_ALBUM_TYPE_PROJECT, _PHOTOS_4_ALBUM_TYPE_SLIDESHOW]
+                if project
+                else [_PHOTOS_4_ALBUM_TYPE_ALBUM]
+            )
+            album_list = []
+            for album in self._info["albums"]:
+                detail = self._db._dbalbum_details[album]
+                if (
+                    detail["kind"] in album_kind
+                    and detail["albumType"] in album_type
+                    and not detail["intrash"]
+                    and detail["folderUuid"] != _PHOTOS_4_ROOT_FOLDER
+                    # in Photos <= 4, special albums like "printAlbum" have kind _PHOTOS_4_ALBUM_KIND
+                    # but should not be listed here; they can be distinguished by looking
+                    # for folderUuid of _PHOTOS_4_ROOT_FOLDER as opposed to _PHOTOS_4_TOP_LEVEL_ALBUM
+                ):
+                    album_list.append(album)
+            return album_list
+
+        # Photos 5+
+        album_kind = (
+            [_PHOTOS_5_PROJECT_ALBUM_KIND]
+            if project
+            else [_PHOTOS_5_SHARED_ALBUM_KIND, _PHOTOS_5_ALBUM_KIND]
+        )

        album_list = []
        for album in self._info["albums"]:
            detail = self._db._dbalbum_details[album]
-            if (
-                detail["kind"] in album_kind
-                and not detail["intrash"]
-                and (
-                    not version4
-                    # in Photos <= 4, special albums like "printAlbum" have kind _PHOTOS_4_ALBUM_KIND
-                    # but should not be listed here; they can be distinguished by looking
-                    # for folderUuid of _PHOTOS_4_ROOT_FOLDER as opposed to _PHOTOS_4_TOP_LEVEL_ALBUM
-                    or (version4 and detail["folderUuid"] != _PHOTOS_4_ROOT_FOLDER)
-                )
-            ):
+            if detail["kind"] in album_kind and not detail["intrash"]:
                album_list.append(album)
        return album_list

--- a/osxphotos/photoinfo/init.py
+++ b/osxphotos/photoinfo/init.py
@@ -1,10 +0,0 @@
-"""
-PhotoInfo class
-Represents a single photo in the Photos library and provides access to the photo's attributes
-PhotosDB.photos() returns a list of PhotoInfo objects
-"""
-
-from ._photoinfo_exifinfo import ExifInfo
-from ._photoinfo_export import ExportResults
-from ._photoinfo_scoreinfo import ScoreInfo
-from .photoinfo import PhotoInfo, PhotoInfoNone
--- a/osxphotos/photoinfo/_photoinfo_comments.py
+++ b/osxphotos/photoinfo/_photoinfo_comments.py
@@ -1,17 +0,0 @@
-""" PhotoInfo methods to expose comments and likes for shared photos """ 
-
-@property
-def comments(self):
-    """ Returns list of Comment objects for any comments on the photo (sorted by date) """
-    try:
-        return self._db._db_comments_uuid[self.uuid]["comments"]
-    except:
-        return []
-
-@property
-def likes(self):
-    """ Returns list of Like objects for any likes on the photo (sorted by date) """
-    try:
-        return self._db._db_comments_uuid[self.uuid]["likes"]
-    except:
-        return []
--- a/osxphotos/photoinfo/_photoinfo_exifinfo.py
+++ b/osxphotos/photoinfo/_photoinfo_exifinfo.py
@@ -1,94 +0,0 @@
-""" PhotoInfo methods to expose EXIF info from the library """
-
-import logging
-from dataclasses import dataclass
-
-from .._constants import _PHOTOS_4_VERSION
-
-
-@dataclass(frozen=True)
-class ExifInfo:
-    """ EXIF info associated with a photo from the Photos library """
-
-    flash_fired: bool
-    iso: int
-    metering_mode: int
-    sample_rate: int
-    track_format: int
-    white_balance: int
-    aperture: float
-    bit_rate: float
-    duration: float
-    exposure_bias: float
-    focal_length: float
-    fps: float
-    latitude: float
-    longitude: float
-    shutter_speed: float
-    camera_make: str
-    camera_model: str
-    codec: str
-    lens_model: str
-
-
-@property
-def exif_info(self):
-    """ Returns an ExifInfo object with the EXIF data for photo
-        Note: the returned EXIF data is the data Photos stores in the database on import;
-        ExifInfo does not provide access to the EXIF info in the actual image file
-        Some or all of the fields may be None
-        Only valid for Photos 5; on earlier database returns None
-        """
-
-    if self._db._db_version <= _PHOTOS_4_VERSION:
-        logging.debug(f"exif_info not implemented for this database version")
-        return None
-
-    try:
-        exif = self._db._db_exifinfo_uuid[self.uuid]
-        exif_info = ExifInfo(
-            iso=exif["ZISO"],
-            flash_fired=True if exif["ZFLASHFIRED"] == 1 else False,
-            metering_mode=exif["ZMETERINGMODE"],
-            sample_rate=exif["ZSAMPLERATE"],
-            track_format=exif["ZTRACKFORMAT"],
-            white_balance=exif["ZWHITEBALANCE"],
-            aperture=exif["ZAPERTURE"],
-            bit_rate=exif["ZBITRATE"],
-            duration=exif["ZDURATION"],
-            exposure_bias=exif["ZEXPOSUREBIAS"],
-            focal_length=exif["ZFOCALLENGTH"],
-            fps=exif["ZFPS"],
-            latitude=exif["ZLATITUDE"],
-            longitude=exif["ZLONGITUDE"],
-            shutter_speed=exif["ZSHUTTERSPEED"],
-            camera_make=exif["ZCAMERAMAKE"],
-            camera_model=exif["ZCAMERAMODEL"],
-            codec=exif["ZCODEC"],
-            lens_model=exif["ZLENSMODEL"],
-        )
-    except KeyError:
-        logging.debug(f"Could not find exif record for uuid {self.uuid}")
-        exif_info = ExifInfo(
-            iso=None,
-            flash_fired=None,
-            metering_mode=None,
-            sample_rate=None,
-            track_format=None,
-            white_balance=None,
-            aperture=None,
-            bit_rate=None,
-            duration=None,
-            exposure_bias=None,
-            focal_length=None,
-            fps=None,
-            latitude=None,
-            longitude=None,
-            shutter_speed=None,
-            camera_make=None,
-            camera_model=None,
-            codec=None,
-            lens_model=None,
-        )
-
-    return exif_info
--- a/osxphotos/photoinfo/_photoinfo_exiftool.py
+++ b/osxphotos/photoinfo/_photoinfo_exiftool.py
@@ -1,34 +0,0 @@
-""" Implementation for PhotoInfo.exiftool property which returns ExifTool object for a photo """
-
-import logging
-import os
-
-from ..exiftool import ExifToolCaching, get_exiftool_path
-
-
-@property
-def exiftool(self):
-    """ Returns a ExifToolCaching (read-only instance of ExifTool) object for the photo.
-        Requires that exiftool (https://exiftool.org/) be installed
-        If exiftool not installed, logs warning and returns None
-        If photo path is missing, returns None
-    """
-    try:
-        # return the memoized instance if it exists
-        return self._exiftool
-    except AttributeError:
-        try:
-            exiftool_path = self._db._exiftool_path or get_exiftool_path()
-            if self.path is not None and os.path.isfile(self.path):
-                exiftool = ExifToolCaching(self.path, exiftool=exiftool_path)
-            else:
-                exiftool = None
-        except FileNotFoundError:
-            # get_exiftool_path raises FileNotFoundError if exiftool not found
-            exiftool = None
-            logging.warning(
-                f"exiftool not in path; download and install from https://exiftool.org/"
-            )
-
-        self._exiftool = exiftool
-        return self._exiftool
--- a/osxphotos/photoinfo/_photoinfo_export.py
+++ b/osxphotos/photoinfo/_photoinfo_export.py
--- a/osxphotos/photoinfo/_photoinfo_scoreinfo.py
+++ b/osxphotos/photoinfo/_photoinfo_scoreinfo.py
@@ -1,119 +0,0 @@
-""" PhotoInfo methods to expose computed score info from the library """
-
-import logging
-from dataclasses import dataclass
-
-from .._constants import _PHOTOS_4_VERSION
-
-
-@dataclass(frozen=True)
-class ScoreInfo:
-    """ Computed photo score info associated with a photo from the Photos library """
-
-    overall: float
-    curation: float
-    promotion: float
-    highlight_visibility: float
-    behavioral: float
-    failure: float
-    harmonious_color: float
-    immersiveness: float
-    interaction: float
-    interesting_subject: float
-    intrusive_object_presence: float
-    lively_color: float
-    low_light: float
-    noise: float
-    pleasant_camera_tilt: float
-    pleasant_composition: float
-    pleasant_lighting: float
-    pleasant_pattern: float
-    pleasant_perspective: float
-    pleasant_post_processing: float
-    pleasant_reflection: float
-    pleasant_symmetry: float
-    sharply_focused_subject: float
-    tastefully_blurred: float
-    well_chosen_subject: float
-    well_framed_subject: float
-    well_timed_shot: float
-
-
-@property
-def score(self):
-    """ Computed score information for a photo
-
-    Returns:
-        ScoreInfo instance
-    """
-
-    if self._db._db_version <= _PHOTOS_4_VERSION:
-        logging.debug(f"score not implemented for this database version")
-        return None
-
-    try:
-        return self._scoreinfo  # pylint: disable=access-member-before-definition
-    except AttributeError:
-        try:
-            scores = self._db._db_scoreinfo_uuid[self.uuid]
-            self._scoreinfo = ScoreInfo(
-                overall=scores["overall_aesthetic"],
-                curation=scores["curation"],
-                promotion=scores["promotion"],
-                highlight_visibility=scores["highlight_visibility"],
-                behavioral=scores["behavioral"],
-                failure=scores["failure"],
-                harmonious_color=scores["harmonious_color"],
-                immersiveness=scores["immersiveness"],
-                interaction=scores["interaction"],
-                interesting_subject=scores["interesting_subject"],
-                intrusive_object_presence=scores["intrusive_object_presence"],
-                lively_color=scores["lively_color"],
-                low_light=scores["low_light"],
-                noise=scores["noise"],
-                pleasant_camera_tilt=scores["pleasant_camera_tilt"],
-                pleasant_composition=scores["pleasant_composition"],
-                pleasant_lighting=scores["pleasant_lighting"],
-                pleasant_pattern=scores["pleasant_pattern"],
-                pleasant_perspective=scores["pleasant_perspective"],
-                pleasant_post_processing=scores["pleasant_post_processing"],
-                pleasant_reflection=scores["pleasant_reflection"],
-                pleasant_symmetry=scores["pleasant_symmetry"],
-                sharply_focused_subject=scores["sharply_focused_subject"],
-                tastefully_blurred=scores["tastefully_blurred"],
-                well_chosen_subject=scores["well_chosen_subject"],
-                well_framed_subject=scores["well_framed_subject"],
-                well_timed_shot=scores["well_timed_shot"],
-            )
-            return self._scoreinfo
-        except KeyError:
-            self._scoreinfo = ScoreInfo(
-                overall=0.0,
-                curation=0.0,
-                promotion=0.0,
-                highlight_visibility=0.0,
-                behavioral=0.0,
-                failure=0.0,
-                harmonious_color=0.0,
-                immersiveness=0.0,
-                interaction=0.0,
-                interesting_subject=0.0,
-                intrusive_object_presence=0.0,
-                lively_color=0.0,
-                low_light=0.0,
-                noise=0.0,
-                pleasant_camera_tilt=0.0,
-                pleasant_composition=0.0,
-                pleasant_lighting=0.0,
-                pleasant_pattern=0.0,
-                pleasant_perspective=0.0,
-                pleasant_post_processing=0.0,
-                pleasant_reflection=0.0,
-                pleasant_symmetry=0.0,
-                sharply_focused_subject=0.0,
-                tastefully_blurred=0.0,
-                well_chosen_subject=0.0,
-                well_framed_subject=0.0,
-                well_timed_shot=0.0,
-            )
-            return self._scoreinfo
--- a/osxphotos/photokit.py
+++ b/osxphotos/photokit.py
@@ -6,8 +6,6 @@
 """

 # NOTES:
-# - This likely leaks memory like a sieve as I need to ensure all the
-#   Objective C objects are cleaned up.
 # - There are several techniques used for handling PhotoKit's various
 #   asynchronous calls used in this code: event loop+notification, threading
 #   event, while loop. I've experimented with each to find the one that works.
@@ -32,6 +30,7 @@ import Photos
 import Quartz
 from Foundation import NSNotificationCenter, NSObject
 from PyObjCTools import AppHelper
+from wurlitzer import pipes

 from .fileutil import FileUtil
 from .uti import get_preferred_uti_extension
@@ -200,16 +199,6 @@ class PHAssetResourceData:
        self.data = b""


-# class LivePhotoData:
-#     """ Simple class to hold the data passed to the handler for
-#         requestLivePhotoForAsset:targetSize:contentMode:options:resultHandler:
-#     """
-
-#     def __init__(self):
-#         self.live_photo = None
-#         self.info = None
-
-
 class PhotoKitNotificationDelegate(NSObject):
    """Handles notifications from NotificationCenter;
    used with asynchronous PhotoKit requests to stop event loop when complete
@@ -487,6 +476,7 @@ class PhotoAsset:
        version=PHOTOS_VERSION_CURRENT,
        overwrite=False,
        raw=False,
+        **kwargs,
    ):
        """Export image to path

@@ -496,6 +486,7 @@ class PhotoAsset:
            version: which version of image (PHOTOS_VERSION_ORIGINAL or PHOTOS_VERSION_CURRENT)
            overwrite: bool, if True, overwrites destination file if it already exists; default is False
            raw: bool, if True, export RAW component of RAW+JPEG pair, default is False
+            **kwargs: used only to avoid issues with each asset type having slightly different export arguments

        Returns:
            List of path to exported image(s)
@@ -504,73 +495,74 @@ class PhotoAsset:
            ValueError if dest is not a valid directory
        """

-        # if self.live:
-        #     raise NotImplementedError("Live photos not implemented yet")
-
        with objc.autorelease_pool():
-            filename = (
-                pathlib.Path(filename)
-                if filename
-                else pathlib.Path(self.original_filename)
-            )
+            with pipes() as (out, err):
+                filename = (
+                    pathlib.Path(filename)
+                    if filename
+                    else pathlib.Path(self.original_filename)
+                )

-            dest = pathlib.Path(dest)
-            if not dest.is_dir():
-                raise ValueError("dest must be a valid directory: {dest}")
+                dest = pathlib.Path(dest)
+                if not dest.is_dir():
+                    raise ValueError("dest must be a valid directory: {dest}")

-            output_file = None
-            if self.isphoto:
-                # will hold exported image data and needs to be cleaned up at end
-                imagedata = None
-                if raw:
-                    # export the raw component
-                    resources = self._resources()
-                    for resource in resources:
-                        if resource.type() == Photos.PHAssetResourceTypeAlternatePhoto:
-                            data = self._request_resource_data(resource)
-                            ext = pathlib.Path(self.raw_filename).suffix[1:]
-                            break
+                output_file = None
+                if self.isphoto:
+                    # will hold exported image data and needs to be cleaned up at end
+                    imagedata = None
+                    if raw:
+                        # export the raw component
+                        resources = self._resources()
+                        for resource in resources:
+                            if (
+                                resource.type()
+                                == Photos.PHAssetResourceTypeAlternatePhoto
+                            ):
+                                data = self._request_resource_data(resource)
+                                ext = pathlib.Path(self.raw_filename).suffix[1:]
+                                break
+                        else:
+                            raise PhotoKitExportError(
+                                "Could not get image data for RAW photo"
+                            )
                    else:
-                        raise PhotoKitExportError(
-                            "Could not get image data for RAW photo"
-                        )
-                else:
-                    # TODO: if user has selected use RAW as original, this returns the RAW
-                    # can get the jpeg with resource.type() == Photos.PHAssetResourceTypePhoto
-                    imagedata = self._request_image_data(version=version)
-                    if not imagedata.image_data:
-                        raise PhotoKitExportError("Could not get image data")
-                    ext = get_preferred_uti_extension(imagedata.uti)
-                    data = imagedata.image_data
+                        # TODO: if user has selected use RAW as original, this returns the RAW
+                        # can get the jpeg with resource.type() == Photos.PHAssetResourceTypePhoto
+                        imagedata = self._request_image_data(version=version)
+                        if not imagedata.image_data:
+                            raise PhotoKitExportError("Could not get image data")
+                        ext = get_preferred_uti_extension(imagedata.uti)
+                        data = imagedata.image_data

-                output_file = dest / f"{filename.stem}.{ext}"
+                    output_file = dest / f"{filename.stem}.{ext}"

-                if not overwrite:
-                    output_file = pathlib.Path(increment_filename(output_file))
+                    if not overwrite:
+                        output_file = pathlib.Path(increment_filename(output_file))

-                with open(output_file, "wb") as fd:
-                    fd.write(data)
+                    with open(output_file, "wb") as fd:
+                        fd.write(data)

-                if imagedata:
-                    del imagedata
-            elif self.ismovie:
-                videodata = self._request_video_data(version=version)
-                if videodata.asset is None:
-                    raise PhotoKitExportError("Could not get video for asset")
+                    if imagedata:
+                        del imagedata
+                elif self.ismovie:
+                    videodata = self._request_video_data(version=version)
+                    if videodata.asset is None:
+                        raise PhotoKitExportError("Could not get video for asset")

-                url = videodata.asset.URL()
-                path = pathlib.Path(NSURL_to_path(url))
-                if not path.is_file():
-                    raise FileNotFoundError("Could not get path to video file")
-                ext = path.suffix
-                output_file = dest / f"{filename.stem}{ext}"
+                    url = videodata.asset.URL()
+                    path = pathlib.Path(NSURL_to_path(url))
+                    if not path.is_file():
+                        raise FileNotFoundError("Could not get path to video file")
+                    ext = path.suffix
+                    output_file = dest / f"{filename.stem}{ext}"

-                if not overwrite:
-                    output_file = pathlib.Path(increment_filename(output_file))
+                    if not overwrite:
+                        output_file = pathlib.Path(increment_filename(output_file))

-                FileUtil.copy(path, output_file)
+                    FileUtil.copy(path, output_file)

-            return [str(output_file)]
+                return [str(output_file)]

    def _request_image_data(self, version=PHOTOS_VERSION_ORIGINAL):
        """Request image data and metadata for self._phasset
@@ -615,9 +607,7 @@ class PhotoAsset:

                nonlocal requestdata

-                options = {}
-                # pylint: disable=no-member
-                options[Quartz.kCGImageSourceShouldCache] = Foundation.kCFBooleanFalse
+                options = {Quartz.kCGImageSourceShouldCache: Foundation.kCFBooleanFalse}
                imgSrc = Quartz.CGImageSourceCreateWithData(imageData, options)
                requestdata.metadata = Quartz.CGImageSourceCopyPropertiesAtIndex(
                    imgSrc, 0, options
@@ -701,9 +691,7 @@ class PhotoAsset:

            nonlocal data

-            options = {}
-            # pylint: disable=no-member
-            options[Quartz.kCGImageSourceShouldCache] = Foundation.kCFBooleanFalse
+            options = {Quartz.kCGImageSourceShouldCache: Foundation.kCFBooleanFalse}
            imgSrc = Quartz.CGImageSourceCreateWithData(imageData, options)
            data.metadata = Quartz.CGImageSourceCopyPropertiesAtIndex(
                imgSrc, 0, options
@@ -789,7 +777,6 @@ class SlowMoVideoExporter(NSObject):
        self.url = None
        self.done = None
        self.nc = None
-        # super(NSObject, self).dealloc()


 class VideoAsset(PhotoAsset):
@@ -801,7 +788,12 @@ class VideoAsset(PhotoAsset):
    # https://developer.apple.com/documentation/photokit/phimagemanager/1616981-requestexportsessionforvideo?language=objc
    # above 10.15 only
    def export(
-        self, dest, filename=None, version=PHOTOS_VERSION_CURRENT, overwrite=False
+        self,
+        dest,
+        filename=None,
+        version=PHOTOS_VERSION_CURRENT,
+        overwrite=False,
+        **kwargs,
    ):
        """Export video to path

@@ -810,6 +802,7 @@ class VideoAsset(PhotoAsset):
            filename: str, optional name of exported file; if not provided, defaults to asset's original filename
            version: which version of image (PHOTOS_VERSION_ORIGINAL or PHOTOS_VERSION_CURRENT)
            overwrite: bool, if True, overwrites destination file if it already exists; default is False
+            **kwargs: used only to avoid issues with each asset type having slightly different export arguments

        Returns:
            List of path to exported image(s)
@@ -819,42 +812,46 @@ class VideoAsset(PhotoAsset):
        """

        with objc.autorelease_pool():
-            if self.slow_mo and version == PHOTOS_VERSION_CURRENT:
-                return [
-                    self._export_slow_mo(
-                        dest, filename=filename, version=version, overwrite=overwrite
-                    )
-                ]
+            with pipes() as (out, err):
+                if self.slow_mo and version == PHOTOS_VERSION_CURRENT:
+                    return [
+                        self._export_slow_mo(
+                            dest,
+                            filename=filename,
+                            version=version,
+                            overwrite=overwrite,
+                        )
+                    ]

-            filename = (
-                pathlib.Path(filename)
-                if filename
-                else pathlib.Path(self.original_filename)
-            )
+                filename = (
+                    pathlib.Path(filename)
+                    if filename
+                    else pathlib.Path(self.original_filename)
+                )

-            dest = pathlib.Path(dest)
-            if not dest.is_dir():
-                raise ValueError("dest must be a valid directory: {dest}")
+                dest = pathlib.Path(dest)
+                if not dest.is_dir():
+                    raise ValueError("dest must be a valid directory: {dest}")

-            output_file = None
-            videodata = self._request_video_data(version=version)
-            if videodata.asset is None:
-                raise PhotoKitExportError("Could not get video for asset")
+                output_file = None
+                videodata = self._request_video_data(version=version)
+                if videodata.asset is None:
+                    raise PhotoKitExportError("Could not get video for asset")

-            url = videodata.asset.URL()
-            path = pathlib.Path(NSURL_to_path(url))
-            del videodata
-            if not path.is_file():
-                raise FileNotFoundError("Could not get path to video file")
-            ext = path.suffix
-            output_file = dest / f"{filename.stem}{ext}"
+                url = videodata.asset.URL()
+                path = pathlib.Path(NSURL_to_path(url))
+                del videodata
+                if not path.is_file():
+                    raise FileNotFoundError("Could not get path to video file")
+                ext = path.suffix
+                output_file = dest / f"{filename.stem}{ext}"

-            if not overwrite:
-                output_file = pathlib.Path(increment_filename(output_file))
+                if not overwrite:
+                    output_file = pathlib.Path(increment_filename(output_file))

-            FileUtil.copy(path, output_file)
+                FileUtil.copy(path, output_file)

-            return [str(output_file)]
+                return [str(output_file)]

    def _export_slow_mo(
        self, dest, filename=None, version=PHOTOS_VERSION_CURRENT, overwrite=False
@@ -1043,6 +1040,7 @@ class LivePhotoAsset(PhotoAsset):
        overwrite=False,
        photo=True,
        video=True,
+        **kwargs,
    ):
        """Export image to path

@@ -1053,6 +1051,7 @@ class LivePhotoAsset(PhotoAsset):
            overwrite: bool, if True, overwrites destination file if it already exists; default is False
            photo: bool, if True, export photo component of live photo
            video: bool, if True, export live video component of live photo
+            **kwargs: used only to avoid issues with each asset type having slightly different export arguments

        Returns:
            list of [path to exported image and/or video]
@@ -1063,132 +1062,69 @@ class LivePhotoAsset(PhotoAsset):
        """

        with objc.autorelease_pool():
-            filename = (
-                pathlib.Path(filename)
-                if filename
-                else pathlib.Path(self.original_filename)
-            )
-
-            dest = pathlib.Path(dest)
-            if not dest.is_dir():
-                raise ValueError("dest must be a valid directory: {dest}")
-
-            request = LivePhotoRequest.alloc().initWithManager_Asset_(
-                self._manager, self.phasset
-            )
-            resources = request.requestLivePhotoResources(version=version)
-
-            video_resource = None
-            photo_resource = None
-            for resource in resources:
-                if resource.type() == Photos.PHAssetResourceTypePairedVideo:
-                    video_resource = resource
-                elif resource.type() == Photos.PHAssetMediaTypeImage:
-                    photo_resource = resource
-
-            if not video_resource or not photo_resource:
-                raise PhotoKitExportError(
-                    "Did not find photo/video resources for live photo"
+            with pipes() as (out, err):
+                filename = (
+                    pathlib.Path(filename)
+                    if filename
+                    else pathlib.Path(self.original_filename)
                )

-            photo_ext = get_preferred_uti_extension(
-                photo_resource.uniformTypeIdentifier()
-            )
-            photo_output_file = dest / f"{filename.stem}.{photo_ext}"
-            video_ext = get_preferred_uti_extension(
-                video_resource.uniformTypeIdentifier()
-            )
-            video_output_file = dest / f"{filename.stem}.{video_ext}"
+                dest = pathlib.Path(dest)
+                if not dest.is_dir():
+                    raise ValueError("dest must be a valid directory: {dest}")

-            if not overwrite:
-                photo_output_file = pathlib.Path(increment_filename(photo_output_file))
-                video_output_file = pathlib.Path(increment_filename(video_output_file))
+                request = LivePhotoRequest.alloc().initWithManager_Asset_(
+                    self._manager, self.phasset
+                )
+                resources = request.requestLivePhotoResources(version=version)

-            # def handler(error):
-            #     if error:
-            #         raise PhotoKitExportError(f"writeDataForAssetResource error: {error}")
+                video_resource = None
+                photo_resource = None
+                for resource in resources:
+                    if resource.type() == Photos.PHAssetResourceTypePairedVideo:
+                        video_resource = resource
+                    elif resource.type() == Photos.PHAssetMediaTypeImage:
+                        photo_resource = resource

-            # resource_manager = Photos.PHAssetResourceManager.defaultManager()
-            # options = Photos.PHAssetResourceRequestOptions.alloc().init()
-            # options.setNetworkAccessAllowed_(True)
-            # exported = []
-            # Note: Tried writeDataForAssetResource_toFile_options_completionHandler_ which works
-            # but sets quarantine flag and for reasons I can't determine (maybe quarantine flag)
-            # causes pathlib.Path().is_file() to fail in tests
+                if not video_resource or not photo_resource:
+                    raise PhotoKitExportError(
+                        "Did not find photo/video resources for live photo"
+                    )

-            # if photo:
-            #     photo_output_url = path_to_NSURL(photo_output_file)
-            #     resource_manager.writeDataForAssetResource_toFile_options_completionHandler_(
-            #         photo_resource, photo_output_url, options, handler
-            #     )
-            #     exported.append(str(photo_output_file))
+                photo_ext = get_preferred_uti_extension(
+                    photo_resource.uniformTypeIdentifier()
+                )
+                photo_output_file = dest / f"{filename.stem}.{photo_ext}"
+                video_ext = get_preferred_uti_extension(
+                    video_resource.uniformTypeIdentifier()
+                )
+                video_output_file = dest / f"{filename.stem}.{video_ext}"

-            # if video:
-            #     video_output_url = path_to_NSURL(video_output_file)
-            #     resource_manager.writeDataForAssetResource_toFile_options_completionHandler_(
-            #         video_resource, video_output_url, options, handler
-            #     )
-            #     exported.append(str(video_output_file))
+                if not overwrite:
+                    photo_output_file = pathlib.Path(
+                        increment_filename(photo_output_file)
+                    )
+                    video_output_file = pathlib.Path(
+                        increment_filename(video_output_file)
+                    )

-            # def completion_handler(error):
-            #     if error:
-            #         raise PhotoKitExportError(f"writeDataForAssetResource error: {error}")
+                exported = []
+                if photo:
+                    data = self._request_resource_data(photo_resource)
+                    # image_data = self.request_image_data(version=version)
+                    with open(photo_output_file, "wb") as fd:
+                        fd.write(data)
+                    exported.append(str(photo_output_file))
+                    del data
+                if video:
+                    data = self._request_resource_data(video_resource)
+                    with open(video_output_file, "wb") as fd:
+                        fd.write(data)
+                    exported.append(str(video_output_file))
+                    del data

-            # would be nice to be able to usewriteDataForAssetResource_toFile_options_completionHandler_
-            # but it sets quarantine flags that cause issues so instead, request the data and write the files directly
-
-            exported = []
-            if photo:
-                data = self._request_resource_data(photo_resource)
-                # image_data = self.request_image_data(version=version)
-                with open(photo_output_file, "wb") as fd:
-                    fd.write(data)
-                exported.append(str(photo_output_file))
-                del data
-            if video:
-                data = self._request_resource_data(video_resource)
-                with open(video_output_file, "wb") as fd:
-                    fd.write(data)
-                exported.append(str(video_output_file))
-                del data
-
-            request.dealloc()
-            return exported
-
-    # def request_image_data(self, version=PHOTOS_VERSION_CURRENT):
-    #     # Returns an NSImage which isn't overly useful
-    #     # https://developer.apple.com/documentation/photokit/phimagemanager/1616964-requestimageforasset?language=objc
-
-    #     # requestImageForAsset:targetSize:contentMode:options:resultHandler:
-
-    #     options = Photos.PHImageRequestOptions.alloc().init()
-    #     options.setVersion_(version)
-    #     options.setNetworkAccessAllowed_(True)
-    #     options.setSynchronous_(True)
-    #     options.setDeliveryMode_(
-    #         Photos.PHImageRequestOptionsDeliveryModeHighQualityFormat
-    #     )
-
-    #     event = threading.Event()
-    #     image_data = ImageData()
-
-    #     def handler(result, info):
-    #         nonlocal image_data
-    #         if not info["PHImageResultIsDegradedKey"]:
-    #             image_data.image_data = result
-    #             image_data.info = info
-    #             event.set()
-
-    #     self._manager.requestImageForAsset_targetSize_contentMode_options_resultHandler_(
-    #         self._phasset,
-    #         Photos.PHImageManagerMaximumSize,
-    #         Photos.PHImageContentModeDefault,
-    #         options,
-    #         handler,
-    #     )
-    #     event.wait()
-    #     options.dealloc()
-    #     return image_data
+                request.dealloc()
+                return exported


 class PhotoLibrary:
--- a/osxphotos/photosdb/_photosdb_process_comments.py
+++ b/osxphotos/photosdb/_photosdb_process_comments.py
@@ -70,12 +70,24 @@ def _process_comments_5(photosdb):
    results = conn.execute(
        """
        SELECT DISTINCT
-        ZINVITEEHASHEDPERSONID,
-        ZINVITEEFIRSTNAME,
-        ZINVITEELASTNAME,
-        ZINVITEEFULLNAME
-        FROM
-        ZCLOUDSHAREDALBUMINVITATIONRECORD
+        ZINVITEEHASHEDPERSONID AS HASHEDPERSONID,
+        ZINVITEEFIRSTNAME AS FIRSTNAME,
+        ZINVITEELASTNAME AS LASTNAME,
+        ZINVITEEFULLNAME AS FULLNAME
+        FROM ZCLOUDSHAREDALBUMINVITATIONRECORD
+        WHERE HASHEDPERSONID IS NOT NULL
+        AND HASHEDPERSONID != ""
+        AND NOT (FIRSTNAME IS NULL AND LASTNAME IS NULL)
+        UNION
+        SELECT DISTINCT
+        ZCLOUDOWNERHASHEDPERSONID AS HASHEDPERSONID,
+        ZCLOUDOWNERFIRSTNAME AS FIRSTNAME,
+        ZCLOUDOWNERLASTNAME AS LASTNAME,
+        ZCLOUDOWNERFULLNAME AS FULLNAME
+        FROM ZGENERICALBUM
+        WHERE HASHEDPERSONID IS NOT NULL
+        AND HASHEDPERSONID != ""
+        AND NOT (FIRSTNAME IS NULL AND LASTNAME IS NULL)
        """
    )

@@ -148,10 +160,10 @@ def _process_comments_5(photosdb):
            db_comments["comments"].append(CommentInfo(dt, user_name, ismine, text))

    # sort results
-    for uuid in photosdb._db_comments_uuid:
+    for uuid, value in photosdb._db_comments_uuid.items():
        if photosdb._db_comments_uuid[uuid]["likes"]:
            photosdb._db_comments_uuid[uuid]["likes"].sort(key=lambda x: x.datetime)
        if photosdb._db_comments_uuid[uuid]["comments"]:
-            photosdb._db_comments_uuid[uuid]["comments"].sort(key=lambda x: x.datetime)
+            value["comments"].sort(key=lambda x: x.datetime)

    conn.close()
--- a/osxphotos/photosdb/_photosdb_process_faceinfo.py
+++ b/osxphotos/photosdb/_photosdb_process_faceinfo.py
@@ -146,7 +146,6 @@ def _process_faceinfo_4(photosdb):

        # Photos 5 only
        face["agetype"] = None
-        face["baldtype"] = None
        face["eyemakeuptype"] = None
        face["eyestate"] = None
        face["facialhairtype"] = None
@@ -194,7 +193,7 @@ def _process_faceinfo_5(photosdb):
        ZDETECTEDFACE.ZPERSON,
        ZPERSON.ZFULLNAME,
        ZDETECTEDFACE.ZAGETYPE,
-        ZDETECTEDFACE.ZBALDTYPE,
+        NULL, -- ZDETECTEDFACE.ZBALDTYPE (Removed in Monterey)
        ZDETECTEDFACE.ZEYEMAKEUPTYPE,
        ZDETECTEDFACE.ZEYESSTATE,
        ZDETECTEDFACE.ZFACIALHAIRTYPE,
@@ -239,7 +238,7 @@ def _process_faceinfo_5(photosdb):
    # 3    ZDETECTEDFACE.ZPERSON,
    # 4    ZPERSON.ZFULLNAME,
    # 5    ZDETECTEDFACE.ZAGETYPE,
-    # 6    ZDETECTEDFACE.ZBALDTYPE,
+    # 6    ZDETECTEDFACE.ZBALDTYPE,  (Not available on Monterey)
    # 7    ZDETECTEDFACE.ZEYEMAKEUPTYPE,
    # 8    ZDETECTEDFACE.ZEYESSTATE,
    # 9    ZDETECTEDFACE.ZFACIALHAIRTYPE,
@@ -284,7 +283,6 @@ def _process_faceinfo_5(photosdb):
        face["person"] = person_pk
        face["fullname"] = normalize_unicode(row[4])
        face["agetype"] = row[5]
-        face["baldtype"] = row[6]
        face["eyemakeuptype"] = row[7]
        face["eyestate"] = row[8]
        face["facialhairtype"] = row[9]
--- a/osxphotos/photosdb/photosdb.py
+++ b/osxphotos/photosdb/photosdb.py
@@ -12,12 +12,14 @@ import re
 import sys
 import tempfile
 from collections import OrderedDict
+from collections.abc import Iterable
 from datetime import datetime, timedelta, timezone
 from pprint import pformat
 from typing import List

 import bitmath
 import photoscript
+from rich import print

 from .._constants import (
    _DB_TABLE_NAMES,
@@ -26,11 +28,15 @@ from .._constants import (
    _PHOTOS_3_VERSION,
    _PHOTOS_4_ALBUM_KIND,
    _PHOTOS_4_ROOT_FOLDER,
-    _PHOTOS_4_TOP_LEVEL_ALBUM,
+    _PHOTOS_4_TOP_LEVEL_ALBUMS,
+    _PHOTOS_4_ALBUM_TYPE_ALBUM,
+    _PHOTOS_4_ALBUM_TYPE_PROJECT,
+    _PHOTOS_4_ALBUM_TYPE_SLIDESHOW,
    _PHOTOS_4_VERSION,
    _PHOTOS_5_ALBUM_KIND,
    _PHOTOS_5_FOLDER_KIND,
    _PHOTOS_5_IMPORT_SESSION_ALBUM_KIND,
+    _PHOTOS_5_PROJECT_ALBUM_KIND,
    _PHOTOS_5_ROOT_FOLDER_KIND,
    _PHOTOS_5_SHARED_ALBUM_KIND,
    _TESTED_OS_VERSIONS,
@@ -40,7 +46,7 @@ from .._constants import (
    TIME_DELTA,
 )
 from .._version import __version__
-from ..albuminfo import AlbumInfo, FolderInfo, ImportInfo
+from ..albuminfo import AlbumInfo, FolderInfo, ImportInfo, ProjectInfo
 from ..datetime_utils import datetime_has_tz, datetime_naive_to_local
 from ..fileutil import FileUtil
 from ..personinfo import PersonInfo
@@ -250,6 +256,10 @@ class PhotosDB:
        # Dict to hold information on volume names (Photos 5+)
        self._db_filesystem_volumes = {}

+        # Dict to hold information on moments (Photos 5+)
+        # key is Z_PK of ZMOMENT table and values are the moment info
+        self._db_moment_pk = {}
+
        if _debug():
            logging.debug(f"dbfile = {dbfile}")

@@ -330,6 +340,8 @@ class PhotosDB:
        else:
            self._process_database5()

+        self._db_connection, _ = self.get_db_connection()
+
    @property
    def keywords_as_dict(self):
        """return keywords as dict of keyword, count in reverse sorted order (descending)"""
@@ -421,7 +433,7 @@ class PhotosDB:
                for folder, detail in self._dbfolder_details.items()
                if not detail["intrash"]
                and not detail["isMagic"]
-                and detail["parentFolderUuid"] == _PHOTOS_4_TOP_LEVEL_ALBUM
+                and detail["parentFolderUuid"] in _PHOTOS_4_TOP_LEVEL_ALBUMS
            ]
        else:
            folders = [
@@ -442,7 +454,7 @@ class PhotosDB:
                for folder in self._dbfolder_details.values()
                if not folder["intrash"]
                and not folder["isMagic"]
-                and folder["parentFolderUuid"] == _PHOTOS_4_TOP_LEVEL_ALBUM
+                and folder["parentFolderUuid"] in _PHOTOS_4_TOP_LEVEL_ALBUMS
            ]
        else:
            folder_names = [
@@ -521,6 +533,18 @@ class PhotosDB:
            ]
            return self._import_info

+    @property
+    def project_info(self):
+        """return list of AlbumInfo projects for each project in the database"""
+        try:
+            return self._project_info
+        except AttributeError:
+            self._project_info = [
+                ProjectInfo(db=self, uuid=album)
+                for album in self._get_album_uuids(project=True)
+            ]
+            return self._project_info
+
    @property
    def db_version(self):
        """return the database version as stored in LiGlobals table"""
@@ -790,8 +814,8 @@ class PhotosDB:
                "creation_date": album[8],
                "start_date": None,  # Photos 5 only
                "end_date": None,  # Photos 5 only
-                "customsortascending": None, # Photos 5 only
-                "customsortkey": None, # Photos 5 only
+                "customsortascending": None,  # Photos 5 only
+                "customsortkey": None,  # Photos 5 only
            }

        # get details about folders
@@ -840,11 +864,10 @@ class PhotosDB:
        # build folder hierarchy
        for album, details in self._dbalbum_details.items():
            parent_folder = details["folderUuid"]
-            if details[
-                "albumSubclass"
-            ] == _PHOTOS_4_ALBUM_KIND and parent_folder not in [
-                _PHOTOS_4_TOP_LEVEL_ALBUM
-            ]:
+            if (
+                details["albumSubclass"] == _PHOTOS_4_ALBUM_KIND
+                and parent_folder not in _PHOTOS_4_TOP_LEVEL_ALBUMS
+            ):
                folder_hierarchy = self._build_album_folder_hierarchy_4(parent_folder)
                self._dbalbum_folders[album] = folder_hierarchy
            else:
@@ -1104,7 +1127,9 @@ class PhotosDB:
            # get info on special types
            self._dbphotos[uuid]["specialType"] = row[25]
            self._dbphotos[uuid]["masterModelID"] = row[26]
-            self._dbphotos[uuid]["pk"] = row[26] # same as masterModelID, to match Photos 5
+            self._dbphotos[uuid]["pk"] = row[
+                26
+            ]  # same as masterModelID, to match Photos 5
            self._dbphotos[uuid]["panorama"] = True if row[25] == 1 else False
            self._dbphotos[uuid]["slow_mo"] = True if row[25] == 2 else False
            self._dbphotos[uuid]["time_lapse"] = True if row[25] == 3 else False
@@ -1195,6 +1220,9 @@ class PhotosDB:
            self._dbphotos[uuid]["import_uuid"] = row[44]
            self._dbphotos[uuid]["fok_import_session"] = None

+            # photos 5+ only, for shared photos
+            self._dbphotos[uuid]["cloudownerhashedpersonid"] = None
+
            # compute signatures for finding possible duplicates
            signature = self._duplicate_signature(uuid)
            try:
@@ -1569,7 +1597,7 @@ class PhotosDB:
        if parent_uuid is None:
            return folders

-        if parent_uuid == _PHOTOS_4_TOP_LEVEL_ALBUM:
+        if parent_uuid in _PHOTOS_4_TOP_LEVEL_ALBUMS:
            if not folders:
                # this is a top-level folder with no sub-folders
                folders = {uuid: None}
@@ -1923,7 +1951,8 @@ class PhotosDB:
                {asset_table}.ZTRASHEDDATE,
                {asset_table}.ZSAVEDASSETTYPE,
                {asset_table}.ZADDEDDATE,
-                {asset_table}.Z_PK
+                {asset_table}.Z_PK,
+                {asset_table}.ZCLOUDOWNERHASHEDPERSONID
                FROM {asset_table} 
                JOIN ZADDITIONALASSETATTRIBUTES ON ZADDITIONALASSETATTRIBUTES.ZASSET = {asset_table}.Z_PK 
                ORDER BY {asset_table}.ZUUID  """
@@ -1973,6 +2002,7 @@ class PhotosDB:
        # 40   ZGENERICASSET.ZSAVEDASSETTYPE -- how item imported
        # 41   ZGENERICASSET.ZADDEDDATE -- date item added to the library
        # 42   ZGENERICASSET.Z_PK -- primary key
+        # 43   ZGENERICASSET.ZCLOUDOWNERHASHEDPERSONID -- used to look up owner name (for shared photos)

        for row in c:
            uuid = row[0]
@@ -2158,6 +2188,7 @@ class PhotosDB:
                info["added_date"] = datetime(1970, 1, 1)

            info["pk"] = row[42]
+            info["cloudownerhashedpersonid"] = row[43]

            # initialize import session info which will be filled in later
            # not every photo has an import session so initialize all records now
@@ -2481,6 +2512,10 @@ class PhotosDB:
        verbose("Processing comments and likes for shared photos.")
        self._process_comments()

+        # process moments
+        verbose("Processing moments.")
+        self._process_moments()
+
        # done processing, dump debug data if requested
        verbose("Done processing details from Photos library.")
        if _debug():
@@ -2526,6 +2561,109 @@ class PhotosDB:
            logging.debug("Burst Photos (dbphotos_burst:")
            logging.debug(pformat(self._dbphotos_burst))

+    def _process_moments(self):
+        """Process data from ZMOMENT table"""
+        # _db_moment_pk is dict in form {pk: {moment info}} by ZMOMENT.Z_PK
+
+        if self._db_version <= _PHOTOS_4_VERSION:
+            raise NotImplementedError(
+                f"Moment info implemented for this database version"
+            )
+        else:
+            self._process_moment_5()
+
+    def _process_moment_5(self):
+        """Process moment info for Photos 5 databases"""
+
+        self._db_moment_pk = {}
+
+        results = self.execute(
+            f"""
+            SELECT 
+            Z_PK,
+            ZTIMEZONEOFFSET,
+            ZTRASHEDSTATE,
+            ZAPPROXIMATELATITUDE,
+            ZAPPROXIMATELONGITUDE,
+            ZENDDATE,
+            ZMODIFICATIONDATE,
+            ZREPRESENTATIVEDATE,
+            ZSTARTDATE,
+            ZSUBTITLE,
+            ZTITLE,
+            ZUUID
+            FROM ZMOMENT"""
+        )
+
+        # results
+        # 0  Z_PK,
+        # 1  ZTIMEZONEOFFSET,
+        # 2  ZTRASHEDSTATE,
+        # 3  ZAPPROXIMATELATITUDE,
+        # 4  ZAPPROXIMATELONGITUDE,
+        # 5  ZENDDATE,
+        # 6  ZMODIFICATIONDATE,
+        # 7  ZREPRESENTATIVEDATE,
+        # 8  ZSTARTDATE,
+        # 9  ZSUBTITLE,
+        # 10 ZTITLE,
+        # 11 ZUUID
+
+        for row in results:
+            moment_info = {}
+            moment_info["pk"] = row[0]
+            moment_info["timezoneOffset"] = row[1]
+            moment_info["trashedState"] = row[2]
+            moment_info["approximateLatitude"] = row[3]
+            moment_info["approximateLongitude"] = row[4]
+            moment_info["endDate"] = row[5]
+            moment_info["modificationDate"] = row[6]
+            moment_info["representativeDate"] = row[7]
+            moment_info["startDate"] = row[8]
+            moment_info["subtitle"] = row[9]
+            moment_info["title"] = row[10]
+            moment_info["uuid"] = row[11]
+
+            # if both lat/lon == -180, then it means location undefined
+            if (
+                moment_info["approximateLatitude"] == -180.0
+                and moment_info["approximateLongitude"] == -180.0
+            ):
+                moment_info["latitude"] = None
+                moment_info["longitude"] = None
+            else:
+                moment_info["latitude"] = moment_info["approximateLatitude"]
+                moment_info["longitude"] = moment_info["approximateLongitude"]
+
+            # process date stamps
+            offset_seconds = moment_info["timezoneOffset"] or 0
+            delta = timedelta(seconds=offset_seconds)
+            tz = timezone(delta)
+            for date_name in [
+                "startDate",
+                "endDate",
+                "modificationDate",
+                "representativeDate",
+            ]:
+                date_stamp = moment_info[date_name]
+                try:
+                    moment_date = datetime.fromtimestamp(date_stamp + TIME_DELTA)
+                    # save raw time stamp valu
+                    moment_info[date_name + "_timestamp"] = moment_info[date_name]
+                    moment_info[date_name] = moment_date.astimezone(tz=tz)
+                except ValueError:
+                    # sometimes imageDate is invalid so use 1 Jan 1970 in UTC as image date
+                    moment_date = datetime(1970, 1, 1)
+                    tz = timezone(timedelta(0))
+                    moment_info[date_name + "_timestamp"] = date_stamp
+                    moment_info[date_name] = moment_date.astimezone(tz=tz)
+
+            # process title/subtitle
+            moment_info["title"] = moment_info["title"] or ""
+            moment_info["subtitle"] = moment_info["subtitle"] or ""
+
+            self._db_moment_pk[moment_info["pk"]] = moment_info
+
    def _build_album_folder_hierarchy_5(self, uuid, folders=None):
        """recursively build folder/album hierarchy
        uuid: uuid of the album/folder being processed
@@ -2702,7 +2840,7 @@ class PhotosDB:
        hierarchy = _recurse_folder_hierarchy(folders)
        return hierarchy

-    def _get_album_uuids(self, shared=False, import_session=False):
+    def _get_album_uuids(self, shared=False, import_session=False, project=False):
        """Return list of album UUIDs found in photos database

            Filters out albums in the trash and any special album types
@@ -2710,20 +2848,21 @@ class PhotosDB:
        Args:
            shared: boolean; if True, returns shared albums, else normal albums
            import_session: boolean, if True, returns import session albums, else normal or shared albums
+            project: boolean, if True, returns albums that are part of My Projects
            Note: flags (shared, import_session) are mutually exclusive

+
        Raises:
            ValueError: raised if mutually exclusive flags passed

        Returns: list of album UUIDs
        """
-        if shared and import_session:
+        if sum(bool(x) for x in [shared, import_session, project]) > 1:
            raise ValueError(
-                "flags are mutually exclusive: pass zero or one of shared, import_session"
+                "flags are mutually exclusive: pass zero or one of shared, import_session, projects"
            )

        if self._db_version <= _PHOTOS_4_VERSION:
-            version4 = True
            if shared:
                logging.warning(
                    f"Shared albums not implemented for Photos library version {self._db_version}"
@@ -2734,16 +2873,44 @@ class PhotosDB:
                    f"Import sessions not implemented for Photos library version {self._db_version}"
                )
                return []  # not implemented for _PHOTOS_4_VERSION
-            else:
+            elif project:
+                album_type = [
+                    _PHOTOS_4_ALBUM_TYPE_PROJECT,
+                    _PHOTOS_4_ALBUM_TYPE_SLIDESHOW,
+                ]
                album_kind = _PHOTOS_4_ALBUM_KIND
-        else:
-            version4 = False
-            if shared:
-                album_kind = _PHOTOS_5_SHARED_ALBUM_KIND
-            elif import_session:
-                album_kind = _PHOTOS_5_IMPORT_SESSION_ALBUM_KIND
            else:
-                album_kind = _PHOTOS_5_ALBUM_KIND
+                album_type = [_PHOTOS_4_ALBUM_TYPE_ALBUM]
+                album_kind = _PHOTOS_4_ALBUM_KIND
+
+            album_list = []
+            # look through _dbalbum_details because _dbalbums_album won't have empty albums it
+            for album, detail in self._dbalbum_details.items():
+                if (
+                    detail["kind"] == album_kind
+                    and detail["albumType"] in album_type
+                    and not detail["intrash"]
+                    and (
+                        (shared and detail["cloudownerhashedpersonid"] is not None)
+                        or (not shared and detail["cloudownerhashedpersonid"] is None)
+                    )
+                    and detail["folderUuid"] != _PHOTOS_4_ROOT_FOLDER
+                    # in Photos <= 4, special albums like "printAlbum" have kind _PHOTOS_4_ALBUM_KIND
+                    # but should not be listed here; they can be distinguished by looking
+                    # for folderUuid of _PHOTOS_4_ROOT_FOLDER as opposed to _PHOTOS_4_TOP_LEVEL_ALBUM
+                ):
+                    album_list.append(album)
+            return album_list
+
+        # Photos version 5+
+        if shared:
+            album_kind = _PHOTOS_5_SHARED_ALBUM_KIND
+        elif import_session:
+            album_kind = _PHOTOS_5_IMPORT_SESSION_ALBUM_KIND
+        elif project:
+            album_kind = _PHOTOS_5_PROJECT_ALBUM_KIND
+        else:
+            album_kind = _PHOTOS_5_ALBUM_KIND

        album_list = []
        # look through _dbalbum_details because _dbalbums_album won't have empty albums it
@@ -2755,13 +2922,6 @@ class PhotosDB:
                    (shared and detail["cloudownerhashedpersonid"] is not None)
                    or (not shared and detail["cloudownerhashedpersonid"] is None)
                )
-                and (
-                    not version4
-                    # in Photos 4, special albums like "printAlbum" have kind _PHOTOS_4_ALBUM_KIND
-                    # but should not be listed here; they can be distinguished by looking
-                    # for folderUuid of _PHOTOS_4_ROOT_FOLDER as opposed to _PHOTOS_4_TOP_LEVEL_ALBUM
-                    or (version4 and detail["folderUuid"] != _PHOTOS_4_ROOT_FOLDER)
-                )
            ):
                album_list.append(album)
        return album_list
@@ -3286,9 +3446,9 @@ class PhotosDB:
        if options.regex:
            flags = re.IGNORECASE if options.ignore_case else 0
            render_options = RenderOptions(none_str="")
+            photo_list = []
            for regex, template in options.regex:
                regex = re.compile(regex, flags)
-                photo_list = []
                for p in photos:
                    rendered, _ = p.render_template(template, render_options)
                    for value in rendered:
@@ -3348,12 +3508,45 @@ class PhotosDB:
                # selection only works if photos selected in main media browser
                photos = []

+        if options.exif:
+            matching_photos = []
+            for p in photos:
+                if not p.exiftool:
+                    continue
+                exifdata = p.exiftool.asdict(normalized=True)
+                exifdata.update(p.exiftool.asdict(tag_groups=False, normalized=True))
+                for exiftag, exifvalue in options.exif:
+                    if options.ignore_case:
+                        exifvalue = exifvalue.lower()
+                        exifdata_value = exifdata.get(exiftag.lower(), "")
+                        if isinstance(exifdata_value, str):
+                            exifdata_value = exifdata_value.lower()
+                        elif isinstance(exifdata_value, Iterable):
+                            exifdata_value = [v.lower() for v in exifdata_value]
+                        else:
+                            exifdata_value = str(exifdata_value)
+
+                        if exifvalue in exifdata_value:
+                            matching_photos.append(p)
+                    else:
+                        exifdata_value = exifdata.get(exiftag.lower(), "")
+                        if not isinstance(exifdata_value, (str, Iterable)):
+                            exifdata_value = str(exifdata_value)
+                        if exifvalue in exifdata_value:
+                            matching_photos.append(p)
+            photos = matching_photos
+
        if options.function:
            for function in options.function:
                photos = function[0](photos)

        return photos

+    def execute(self, sql):
+        """Execute sql statement and return cursor"""
+        self._db_connection, _ = self.get_db_connection()
+        return self._db_connection.cursor().execute(sql)
+
    def _duplicate_signature(self, uuid):
        """Compute a signature for finding possible duplicates"""
        return (
@@ -3381,6 +3574,10 @@ class PhotosDB:
        """
        return len(self._dbphotos)

+    def __del__(self):
+        if getattr(self, "_db_connection", None):
+            self._db_connection.close()
+

 def _get_photos_by_attribute(photos, attribute, values, ignore_case):
    """Search for photos based on values being in PhotoInfo.attribute
--- a/osxphotos/photosdb/photosdb_utils.py
+++ b/osxphotos/photosdb/photosdb_utils.py
@@ -4,7 +4,11 @@ import logging
 import plistlib

 from .._constants import (
+    _PHOTOS_2_VERSION,
+    _PHOTOS_3_VERSION,
+    _PHOTOS_4_VERSION,
    _PHOTOS_5_MODEL_VERSION,
+    _PHOTOS_5_VERSION,
    _PHOTOS_6_MODEL_VERSION,
    _PHOTOS_7_MODEL_VERSION,
    _TESTED_DB_VERSIONS,
@@ -83,3 +87,32 @@ def get_db_model_version(db_file):
        logging.warning(f"Unknown model version: {model_ver}")
        # cross our fingers and try latest version
        return 7
+
+
+class UnknownLibraryVersion(Exception):
+    pass
+
+
+def get_photos_library_version(library_path):
+    """Return int indicating which Photos version a library was created with """
+    library_path = pathlib.Path(library_path)
+    db_ver = get_db_version(str(library_path / "database" / "photos.db"))
+    db_ver = int(db_ver)
+    if db_ver == int(_PHOTOS_2_VERSION):
+        return 2
+    if db_ver == int(_PHOTOS_3_VERSION):
+        return 3
+    if db_ver == int(_PHOTOS_4_VERSION):
+        return 4
+    if db_ver != int(_PHOTOS_5_VERSION):
+        raise UnknownLibraryVersion(f"db_ver = {db_ver}")
+
+    model_ver = get_model_version(str(library_path / "database" / "Photos.sqlite"))
+    model_ver = int(model_ver)
+    if _PHOTOS_5_MODEL_VERSION[0] <= model_ver <= _PHOTOS_5_MODEL_VERSION[1]:
+        return 5
+    if _PHOTOS_6_MODEL_VERSION[0] <= model_ver <= _PHOTOS_6_MODEL_VERSION[1]:
+        return 6
+    if _PHOTOS_7_MODEL_VERSION[0] <= model_ver <= _PHOTOS_7_MODEL_VERSION[1]:
+        return 7
+    raise UnknownLibraryVersion(f"db_ver = {db_ver}, model_ver = {model_ver}")
--- a/osxphotos/phototemplate.md
+++ b/osxphotos/phototemplate.md
@@ -1,4 +1,4 @@
-The templating system converts one or template statements, written in osxphotos templating language, to one or more rendered values using information from the photo being processed. 
+The templating system converts one or template statements, written in osxphotos metadata templating language, to one or more rendered values using information from the photo being processed. 

 In its simplest form, a template statement has the form: `"{template_field}"`, for example `"{title}"` which would resolve to the title of the photo.

--- a/osxphotos/phototemplate.py
+++ b/osxphotos/phototemplate.py
@@ -1,4 +1,4 @@
-""" Custom template system for osxphotos, implements osxphotos template language (OTL) """
+""" Custom template system for osxphotos, implements metadata template language (MTL) """

 import datetime
 import json
@@ -27,7 +27,7 @@ from .utils import expand_and_validate_filepath, load_function
 # ensure locale set to user's locale
 locale.setlocale(locale.LC_ALL, "")

-OTL_GRAMMAR_MODEL = str(pathlib.Path(__file__).parent / "phototemplate.tx")
+MTL_GRAMMAR_MODEL = str(pathlib.Path(__file__).parent / "phototemplate.tx")

 """TextX metamodel for osxphotos template language """

@@ -181,6 +181,9 @@ TEMPLATE_SUBSTITUTIONS_PATHLIB = {
 TEMPLATE_SUBSTITUTIONS_MULTI_VALUED = {
    "{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",
+    "{project}": "Project(s) photo is contained in (such as greeting cards, calendars, slideshows)",
+    "{album_project}": "Album(s) and project(s) photo is contained in; treats projects as regular albums",
+    "{folder_album_project}": "Folder path + album (includes projects as albums) photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder",
    "{keyword}": "Keyword(s) assigned to photo",
    "{person}": "Person(s) / face(s) in a photo",
    "{label}": "Image categorization label associated with a photo (Photos 5+ only). "
@@ -209,6 +212,7 @@ TEMPLATE_SUBSTITUTIONS_MULTI_VALUED = {
    + "'{detected_text}' works only on macOS Catalina (10.15) or later. "
    + "Note: this feature is not the same thing as Live Text in macOS Monterey, which osxphotos does not yet support.",
    "{shell_quote}": "Use in form '{shell_quote,TEMPLATE}'; quotes the rendered TEMPLATE value(s) for safe usage in the shell, e.g. My file.jpeg => 'My file.jpeg'; only adds quotes if needed.",
+    "{strip}": "Use in form '{strip,TEMPLATE}'; strips whitespace from begining and end of rendered TEMPLATE value(s).",
    "{function}": "Execute a python function from an external file and use return value as template substitution. "
    + "Use in format: {function:file.py::function_name} where 'file.py' is the name of the python file and 'function_name' is the name of the function to call. "
    + "The function will be passed the PhotoInfo object for the photo. "
@@ -323,7 +327,7 @@ class PhotoTemplateParser:
        if hasattr(self, "metamodel"):
            return

-        self.metamodel = metamodel_from_file(OTL_GRAMMAR_MODEL, skipws=False)
+        self.metamodel = metamodel_from_file(MTL_GRAMMAR_MODEL, skipws=False)

    def parse(self, template_statement):
        """Parse a template_statement string"""
@@ -371,7 +375,9 @@ class PhotoTemplate:
        self.filepath = options.filepath
        self.quote = options.quote
        self.dest_path = options.dest_path
-        self.exportdb = options.exportdb or ExportDBInMemory(None)
+        self.exportdb = options.exportdb or ExportDBInMemory(
+            None, self.export_dir or "."
+        )

    def render(
        self,
@@ -1003,6 +1009,9 @@ class PhotoTemplate:
        elif self.dirname:
            value = sanitize_dirname(value)

+        # ensure no empty strings in value (see #512)
+        value = None if value == "" else value
+
        return [value]

    def get_template_value_pathlib(self, field):
@@ -1112,6 +1121,11 @@ class PhotoTemplate:
        values = []
        if field == "album":
            values = self.photo.burst_albums if self.photo.burst else self.photo.albums
+        elif field == "project":
+            values = [p.title for p in self.photo.project_info]
+        elif field == "album_project":
+            values = self.photo.burst_albums if self.photo.burst else self.photo.albums
+            values += [p.title for p in self.photo.project_info]
        elif field == "keyword":
            values = self.photo.keywords
        elif field == "person":
@@ -1122,13 +1136,15 @@ class PhotoTemplate:
            values = self.photo.labels
        elif field == "label_normalized":
            values = self.photo.labels_normalized
-        elif field == "folder_album":
+        elif field in ["folder_album", "folder_album_project"]:
            values = []
            # photos must be in an album to be in a folder
            if self.photo.burst:
                album_info = self.photo.burst_album_info
            else:
                album_info = self.photo.album_info
+            if field == "folder_album_project":
+                album_info += self.photo.project_info
            for album in album_info:
                if album.folder_names:
                    # album in folder
@@ -1162,6 +1178,8 @@ class PhotoTemplate:
            )
        elif field == "shell_quote":
            values = [shlex.quote(v) for v in default if v]
+        elif field == "strip":
+            values = [v.strip() for v in default]
        elif field.startswith("photo"):
            # provide access to PhotoInfo object
            properties = field.split(".")
@@ -1187,7 +1205,7 @@ class PhotoTemplate:
            elif isinstance(obj, (str, int, float)):
                values = [str(obj)]
            else:
-                values = [val for val in obj]
+                values = list(obj)
        elif field == "detected_text":
            values = _get_detected_text(self.photo, self.exportdb, confidence=subfield)
        else:
@@ -1196,7 +1214,7 @@ class PhotoTemplate:
        # sanitize directory names if needed, folder_album handled differently above
        if self.filename:
            values = [sanitize_pathpart(value) for value in values]
-        elif self.dirname and field != "folder_album":
+        elif self.dirname and field not in ["folder_album", "folder_album_project"]:
            # skip folder_album because it would have been handled above
            values = [sanitize_dirname(value) for value in values]

--- a/osxphotos/phototemplate.tx
+++ b/osxphotos/phototemplate.tx
@@ -1,4 +1,4 @@
-// OSXPhotos Template Language (OTL)
+// OSXPhotos Metadata Template Language (MTL)
 // a TemplateString has format:
 // pre{delim+template_field:subfield|filter(path_sep)[find,replace] conditional?bool_value,default}post
 // a TemplateStatement may contain zero or more TemplateStrings
--- a/osxphotos/pyrepl.py
+++ b/osxphotos/pyrepl.py
@@ -0,0 +1,131 @@
+""" Custom Python REPL based on ptpython that allows quitting with custom keywords instead of `quit()` """
+
+""" This file is distributed under the same license as the ptpython package:
+
+Copyright (c) 2015, Jonathan Slenders (ptpython), (c) 2021 Rhet Turnbull (this file)
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
+
+* Neither the name of the {organization} nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""
+
+import sys
+from typing import Callable, List, Optional
+
+from ptpython.repl import (
+    ContextManager,
+    DummyContext,
+    PythonRepl,
+    builtins,
+    patch_stdout_context,
+)
+
+
+class PyReplQuitter(PythonRepl):
+    """Custom pypython repl that allows quitting REPL with custom commands"""
+
+    def __init__(self, *args, quit_words: Optional[List[str]] = None, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.quit_words = quit_words or ["quit", "q"]
+
+    def eval(self, line: str) -> object:
+        if line.strip() in self.quit_words:
+            sys.exit(0)
+        return super().eval(line)
+
+
+def embed_repl(
+    globals=None,
+    locals=None,
+    configure: Optional[Callable[[PythonRepl], None]] = None,
+    vi_mode: bool = False,
+    history_filename: Optional[str] = None,
+    title: Optional[str] = None,
+    startup_paths=None,
+    patch_stdout: bool = False,
+    return_asyncio_coroutine: bool = False,
+    quit_words: Optional[List[str]] = None,
+) -> None:
+    """
+    Call this to embed  Python shell at the current point in your program.
+    It's similar to `IPython.embed` and `bpython.embed`. ::
+        from prompt_toolkit.contrib.repl import embed
+        embed(globals(), locals())
+    :param vi_mode: Boolean. Use Vi instead of Emacs key bindings.
+    :param configure: Callable that will be called with the `PythonRepl` as a first
+                      argument, to trigger configuration.
+    :param title: Title to be displayed in the terminal titlebar. (None or string.)
+    :param patch_stdout:  When true, patch `sys.stdout` so that background
+        threads that are printing will print nicely above the prompt.
+    """
+    # Default globals/locals
+    if globals is None:
+        globals = {
+            "__name__": "__main__",
+            "__package__": None,
+            "__doc__": None,
+            "__builtins__": builtins,
+        }
+
+    locals = locals or globals
+
+    def get_globals():
+        return globals
+
+    def get_locals():
+        return locals
+
+    # Create REPL.
+    repl = PyReplQuitter(
+        get_globals=get_globals,
+        get_locals=get_locals,
+        vi_mode=vi_mode,
+        history_filename=history_filename,
+        startup_paths=startup_paths,
+        quit_words=quit_words,
+    )
+
+    if title:
+        repl.terminal_title = title
+
+    if configure:
+        configure(repl)
+
+    # Start repl.
+    patch_context: ContextManager = (
+        patch_stdout_context() if patch_stdout else DummyContext()
+    )
+
+    if return_asyncio_coroutine:
+
+        async def coroutine():
+            with patch_context:
+                await repl.run_async()
+
+        return coroutine()
+    else:
+        with patch_context:
+            repl.run()
--- a/osxphotos/queries/README.md
+++ b/osxphotos/queries/README.md
@@ -0,0 +1,5 @@
+# Query templates
+
+This folder contains sql query templates for getting various photo properties
+
+The query templates must be rendered with mako (see query_builder.py)
--- a/osxphotos/queries/cloud_album_owner.sql.mako
+++ b/osxphotos/queries/cloud_album_owner.sql.mako
@@ -0,0 +1,4 @@
+-- Get owner name for shared iCloud album
+SELECT ZGENERICALBUM.ZCLOUDOWNERFULLNAME AS OWNER_FULLNAME
+FROM ZGENERICALBUM
+WHERE ZGENERICALBUM.ZUUID = '${uuid}'
--- a/osxphotos/queries/shared_owner.sql.mako
+++ b/osxphotos/queries/shared_owner.sql.mako
@@ -0,0 +1,23 @@
+-- Get the owner name of person who owns a photo in a shared album
+--
+-- Case where someone has invited you to a shared album
+-- Need to get the owner of the shared album
+SELECT DISTINCT
+ZGENERICALBUM.ZCLOUDOWNERFULLNAME as OWNER_FULLNAME
+FROM ZGENERICALBUM
+JOIN ${asset_table} ON ${asset_table}.ZCLOUDOWNERHASHEDPERSONID = ZGENERICALBUM.ZCLOUDOWNERHASHEDPERSONID
+WHERE ${asset_table}.ZUUID = "${uuid}"
+AND ZGENERICALBUM.ZCLOUDOWNERHASHEDPERSONID IS NOT NULL 
+AND ZGENERICALBUM.ZCLOUDOWNERHASHEDPERSONID != ""
+AND OWNER_FULLNAME != "(null) (null)"
+UNION
+-- Case where you have invited someone to a shared album
+-- Need to get the data for person who was invited to the album
+SELECT DISTINCT
+ZCLOUDSHAREDALBUMINVITATIONRECORD.ZINVITEEFULLNAME AS OWNER_FULLNAME
+FROM ZCLOUDSHAREDALBUMINVITATIONRECORD 
+JOIN ${asset_table} ON ${asset_table}.ZCLOUDOWNERHASHEDPERSONID = ZCLOUDSHAREDALBUMINVITATIONRECORD.ZINVITEEHASHEDPERSONID
+WHERE ${asset_table}.ZUUID = "${uuid}"
+AND ZCLOUDSHAREDALBUMINVITATIONRECORD.ZINVITEEHASHEDPERSONID IS NOT NULL
+AND ZCLOUDSHAREDALBUMINVITATIONRECORD.ZINVITEEHASHEDPERSONID != ""
+AND OWNER_FULLNAME != "(null) (null)"
--- a/osxphotos/queries/title.sql.mako
+++ b/osxphotos/queries/title.sql.mako
@@ -0,0 +1,6 @@
+-- Get title of a photo with given UUID
+SELECT 
+ZADDITIONALASSETATTRIBUTES.ZTITLE
+FROM ZADDITIONALASSETATTRIBUTES
+JOIN ${asset_table} ON ${asset_table}.Z_PK = ZADDITIONALASSETATTRIBUTES.ZASSET
+WHERE ${asset_table}.ZUUID = "${uuid}"
--- a/osxphotos/query_builder.py
+++ b/osxphotos/query_builder.py
@@ -0,0 +1,36 @@
+"""Build sql queries from template to retrieve info from the database"""
+
+import os.path
+import pathlib
+from functools import lru_cache
+
+from mako.template import Template
+
+from ._constants import _DB_TABLE_NAMES
+
+QUERY_DIR = os.path.join(os.path.dirname(__file__), "queries")
+
+
+def get_query(query_name, photos_ver, **kwargs):
+    """Return sqlite query string for an attribute and a given database version"""
+
+    # there can be a single query for multiple database versions or separate queries for each version
+    # try generic version first (most common case), if that fails, look for version specific query
+    query_string = _get_query_string(query_name, photos_ver)
+    asset_table = _DB_TABLE_NAMES[photos_ver]["ASSET"]
+    query_template = Template(query_string)
+    return query_template.render(asset_table=asset_table, **kwargs)
+
+
+@lru_cache(maxsize=None)
+def _get_query_string(query_name, photos_ver):
+    """Return sqlite query string for an attribute and a given database version"""
+    query_file = pathlib.Path(QUERY_DIR) / f"{query_name}.sql.mako"
+    if not query_file.is_file():
+        query_file = pathlib.Path(QUERY_DIR) / f"{query_name}_{photos_ver}.sql.mako"
+        if not query_file.is_file():
+            raise FileNotFoundError(f"Query file '{query_file}' not found")
+
+    with open(query_file, "r") as f:
+        query_string = f.read()
+    return query_string
--- a/osxphotos/queryoptions.py
+++ b/osxphotos/queryoptions.py
@@ -84,6 +84,7 @@ class QueryOptions:
    no_location: Optional[bool] = None
    function: Optional[List[Tuple[callable, str]]] = None
    selected: Optional[bool] = None
+    exif: Optional[Iterable[Tuple[str, str]]] = None

    def asdict(self):
        return asdict(self)
--- a/osxphotos/scoreinfo.py
+++ b/osxphotos/scoreinfo.py
@@ -0,0 +1,39 @@
+""" ScoreInfo class to expose computed score info from the library """
+
+from dataclasses import dataclass
+
+from ._constants import _PHOTOS_4_VERSION
+
+
+@dataclass(frozen=True)
+class ScoreInfo:
+    """ Computed photo score info associated with a photo from the Photos library """
+
+    overall: float
+    curation: float
+    promotion: float
+    highlight_visibility: float
+    behavioral: float
+    failure: float
+    harmonious_color: float
+    immersiveness: float
+    interaction: float
+    interesting_subject: float
+    intrusive_object_presence: float
+    lively_color: float
+    low_light: float
+    noise: float
+    pleasant_camera_tilt: float
+    pleasant_composition: float
+    pleasant_lighting: float
+    pleasant_pattern: float
+    pleasant_perspective: float
+    pleasant_post_processing: float
+    pleasant_reflection: float
+    pleasant_symmetry: float
+    sharply_focused_subject: float
+    tastefully_blurred: float
+    well_chosen_subject: float
+    well_framed_subject: float
+    well_timed_shot: float
+
--- a/osxphotos/photoinfo/_photoinfo_searchinfo.py
+++ b/osxphotos/photoinfo/_photoinfo_searchinfo.py
@@ -1,98 +1,39 @@
-""" Methods and class for PhotoInfo exposing SearchInfo data such as labels 
-    Adds the following properties to PhotoInfo (valid only for Photos 5):
-        search_info: returns a SearchInfo object
-        search_info_normalized: returns a SearchInfo object with properties that produce normalized results
-        labels: returns list of labels
-        labels_normalized: returns list of normalized labels
+""" class for PhotoInfo exposing SearchInfo data such as labels 
 """

-from .._constants import (
+from ._constants import (
    _PHOTOS_4_VERSION,
+    SEARCH_CATEGORY_ACTIVITY,
+    SEARCH_CATEGORY_ALL_LOCALITY,
+    SEARCH_CATEGORY_BODY_OF_WATER,
    SEARCH_CATEGORY_CITY,
+    SEARCH_CATEGORY_COUNTRY,
+    SEARCH_CATEGORY_HOLIDAY,
    SEARCH_CATEGORY_LABEL,
+    SEARCH_CATEGORY_MEDIA_TYPES,
+    SEARCH_CATEGORY_MONTH,
    SEARCH_CATEGORY_NEIGHBORHOOD,
    SEARCH_CATEGORY_PLACE_NAME,
-    SEARCH_CATEGORY_STREET,
-    SEARCH_CATEGORY_ALL_LOCALITY,
-    SEARCH_CATEGORY_COUNTRY,
+    SEARCH_CATEGORY_SEASON,
    SEARCH_CATEGORY_STATE,
    SEARCH_CATEGORY_STATE_ABBREVIATION,
-    SEARCH_CATEGORY_BODY_OF_WATER,
-    SEARCH_CATEGORY_MONTH,
-    SEARCH_CATEGORY_YEAR,
-    SEARCH_CATEGORY_HOLIDAY,
-    SEARCH_CATEGORY_ACTIVITY,
-    SEARCH_CATEGORY_SEASON,
+    SEARCH_CATEGORY_STREET,
    SEARCH_CATEGORY_VENUE,
    SEARCH_CATEGORY_VENUE_TYPE,
-    SEARCH_CATEGORY_MEDIA_TYPES,
+    SEARCH_CATEGORY_YEAR,
 )


-@property
-def search_info(self):
-    """ returns SearchInfo object for photo 
-        only valid on Photos 5, on older libraries, returns None
-    """
-    if self._db._db_version <= _PHOTOS_4_VERSION:
-        return None
-
-    # memoize SearchInfo object
-    try:
-        return self._search_info
-    except AttributeError:
-        self._search_info = SearchInfo(self)
-        return self._search_info
-
-
-@property
-def search_info_normalized(self):
-    """ returns SearchInfo object for photo that produces normalized results
-        only valid on Photos 5, on older libraries, returns None
-    """
-    if self._db._db_version <= _PHOTOS_4_VERSION:
-        return None
-
-    # memoize SearchInfo object
-    try:
-        return self._search_info_normalized
-    except AttributeError:
-        self._search_info_normalized = SearchInfo(self, normalized=True)
-        return self._search_info_normalized
-
-
-@property
-def labels(self):
-    """ returns list of labels applied to photo by Photos image categorization
-        only valid on Photos 5, on older libraries returns empty list 
-    """
-    if self._db._db_version <= _PHOTOS_4_VERSION:
-        return []
-
-    return self.search_info.labels
-
-
-@property
-def labels_normalized(self):
-    """ returns normalized list of labels applied to photo by Photos image categorization
-        only valid on Photos 5, on older libraries returns empty list 
-    """
-    if self._db._db_version <= _PHOTOS_4_VERSION:
-        return []
-
-    return self.search_info_normalized.labels
-
-
 class SearchInfo:
-    """ Info about search terms such as machine learning labels that Photos knows about a photo """
+    """Info about search terms such as machine learning labels that Photos knows about a photo"""

    def __init__(self, photo, normalized=False):
-        """ photo: PhotoInfo object
-            normalized: if True, all properties return normalized (lower case) results """
+        """photo: PhotoInfo object
+        normalized: if True, all properties return normalized (lower case) results"""

        if photo._db._db_version <= _PHOTOS_4_VERSION:
            raise NotImplementedError(
-                f"search info not implemented for this database version"
+                "search info not implemented for this database version"
            )

        self._photo = photo
@@ -107,27 +48,27 @@ class SearchInfo:

    @property
    def labels(self):
-        """ return list of labels associated with Photo """
+        """return list of labels associated with Photo"""
        return self._get_text_for_category(SEARCH_CATEGORY_LABEL)

    @property
    def place_names(self):
-        """ returns list of place names """
+        """returns list of place names"""
        return self._get_text_for_category(SEARCH_CATEGORY_PLACE_NAME)

    @property
    def streets(self):
-        """ returns list of street names """
+        """returns list of street names"""
        return self._get_text_for_category(SEARCH_CATEGORY_STREET)

    @property
    def neighborhoods(self):
-        """ returns list of neighborhoods """
+        """returns list of neighborhoods"""
        return self._get_text_for_category(SEARCH_CATEGORY_NEIGHBORHOOD)

    @property
    def locality_names(self):
-        """ returns list of other locality names """
+        """returns list of other locality names"""
        locality = []
        for category in SEARCH_CATEGORY_ALL_LOCALITY:
            locality += self._get_text_for_category(category)
@@ -135,74 +76,74 @@ class SearchInfo:

    @property
    def city(self):
-        """ returns city/town """
+        """returns city/town"""
        city = self._get_text_for_category(SEARCH_CATEGORY_CITY)
        return city[0] if city else ""

    @property
    def state(self):
-        """ returns state name """
+        """returns state name"""
        state = self._get_text_for_category(SEARCH_CATEGORY_STATE)
        return state[0] if state else ""

    @property
    def state_abbreviation(self):
-        """ returns state abbreviation """
+        """returns state abbreviation"""
        abbrev = self._get_text_for_category(SEARCH_CATEGORY_STATE_ABBREVIATION)
        return abbrev[0] if abbrev else ""

    @property
    def country(self):
-        """ returns country name """
+        """returns country name"""
        country = self._get_text_for_category(SEARCH_CATEGORY_COUNTRY)
        return country[0] if country else ""

    @property
    def month(self):
-        """ returns month name """
+        """returns month name"""
        month = self._get_text_for_category(SEARCH_CATEGORY_MONTH)
        return month[0] if month else ""

    @property
    def year(self):
-        """ returns year """
+        """returns year"""
        year = self._get_text_for_category(SEARCH_CATEGORY_YEAR)
        return year[0] if year else ""

    @property
    def bodies_of_water(self):
-        """ returns list of body of water names """
+        """returns list of body of water names"""
        return self._get_text_for_category(SEARCH_CATEGORY_BODY_OF_WATER)

    @property
    def holidays(self):
-        """ returns list of holiday names """
+        """returns list of holiday names"""
        return self._get_text_for_category(SEARCH_CATEGORY_HOLIDAY)

    @property
    def activities(self):
-        """ returns list of activity names """
+        """returns list of activity names"""
        return self._get_text_for_category(SEARCH_CATEGORY_ACTIVITY)

    @property
    def season(self):
-        """ returns season name """
+        """returns season name"""
        season = self._get_text_for_category(SEARCH_CATEGORY_SEASON)
        return season[0] if season else ""

    @property
    def venues(self):
-        """ returns list of venue names """
+        """returns list of venue names"""
        return self._get_text_for_category(SEARCH_CATEGORY_VENUE)

    @property
    def venue_types(self):
-        """ returns list of venue types """
+        """returns list of venue types"""
        return self._get_text_for_category(SEARCH_CATEGORY_VENUE_TYPE)

    @property
    def media_types(self):
-        """ returns list of media types (photo, video, panorama, etc) """
+        """returns list of media types (photo, video, panorama, etc)"""
        types = []
        for category in SEARCH_CATEGORY_MEDIA_TYPES:
            types += self._get_text_for_category(category)
@@ -210,7 +151,7 @@ class SearchInfo:

    @property
    def all(self):
-        """ return all search info properties in a single list """
+        """return all search info properties in a single list"""
        all = (
            self.labels
            + self.place_names
@@ -242,7 +183,7 @@ class SearchInfo:
        return all

    def asdict(self):
-        """ return dict of search info """
+        """return dict of search info"""
        return {
            "labels": self.labels,
            "place_names": self.place_names,
@@ -265,7 +206,7 @@ class SearchInfo:
        }

    def _get_text_for_category(self, category):
-        """ return list of text for a specified category ID """
+        """return list of text for a specified category ID"""
        if self._db_searchinfo:
            content = "normalized_string" if self._normalized else "content_string"
            return [
--- a/osxphotos/text_detection.py
+++ b/osxphotos/text_detection.py
@@ -1,7 +1,7 @@
 """ Use Apple's Vision Framework via PyObjC to perform text detection on images (macOS 10.15+ only) """

 import logging
-from typing import List
+from typing import List, Optional

 import objc
 import Quartz
@@ -22,8 +22,13 @@ else:
    vision = True


-def detect_text(img_path: str) -> List:
-    """process image at img_path with VNRecognizeTextRequest and return list of results"""
+def detect_text(img_path: str, orientation: Optional[int] = None) -> List:
+    """process image at img_path with VNRecognizeTextRequest and return list of results
+
+    Args:
+        img_path: path to the image file
+        orientation: optional EXIF orientation (if known, passing orientation may improve quality of results)
+    """
    if not vision:
        logging.warning(f"detect_text not implemented for this version of macOS")
        return []
@@ -40,9 +45,18 @@ def detect_text(img_path: str) -> List:
            input_image = Quartz.CIImage.imageWithContentsOfURL_(input_url)

        vision_options = NSDictionary.dictionaryWithDictionary_({})
-        vision_handler = Vision.VNImageRequestHandler.alloc().initWithCIImage_options_(
-            input_image, vision_options
-        )
+        if orientation is not None:
+            if not 1 <= orientation <= 8:
+                raise ValueError("orientation must be between 1 and 8")
+            vision_handler = Vision.VNImageRequestHandler.alloc().initWithCIImage_orientation_options_(
+                input_image, orientation, vision_options
+            )
+        else:
+            vision_handler = (
+                Vision.VNImageRequestHandler.alloc().initWithCIImage_options_(
+                    input_image, vision_options
+                )
+            )
        results = []
        handler = make_request_handler(results)
        vision_request = (
--- a/osxphotos/tutorial.md
+++ b/osxphotos/tutorial.md
@@ -278,15 +278,15 @@ For example, to set Finder comment to the photo's title and description:

 In the template string above, `{newline}` instructs osxphotos to insert a new line character ("\n") between the title and description. In this example, if `{title}` or `{descr}` is empty, you'll get "title\n" or "\ndescription" which may not be desired so you can use more advanced features of the template system to handle these cases:

-`osxphotos export /path/to/export --xattr-template findercomment "{title}{title?{descr?{newline},},}{descr}"`
+`osxphotos export /path/to/export --xattr-template findercomment "{title,}{title?{descr?{newline},},}{descr,}"`

 Explanation of the template string:

 ```txt
-{title}{title?{descr?{newline},},}{descr}
+{title,}{title?{descr?{newline},},}{descr,}
 │           │      │ │       │ │  │ 
 │           │      │ │       │ │  │ 
- └──> insert title  │ │       │ │  │ 
+ └──> insert title (or nothing if no title) 
             │      │ │       │ │  │
             └───> is there a title?
                    │ │       │ │  │
@@ -298,7 +298,8 @@ Explanation of the template string:
                                │  │ 
                                └───> if title is blank, insert nothing
                                   │
-                                   └───> finally, insert description
+                                   └───> finally, insert description 
+                                         (or nothing if no description)
 ```

 In this example, `title?` demonstrates use of the boolean (True/False) feature of the template system.  `title?` is read as "Is the title True (or not blank/empty)?  If so, then the value immediately following the `?` is used in place of `title`.  If `title` is blank, then the value immediately following the comma is used instead.  The format for boolean fields is `field?value if true,value if false`.  Either `value if true` or `value if false` may be blank, in which case a blank string ("") is used for the value and both may also be an entirely new template string as seen in the above example.  Using this format, template strings may be nested inside each other to form complex `if-then-else` statements.
--- a/osxphotos/uti.py
+++ b/osxphotos/uti.py
@@ -528,35 +528,38 @@ def _get_uti_from_mdls(extension):
    # mdls -name kMDItemContentType foo.3fr
    # kMDItemContentType = "com.hasselblad.3fr-raw-image"

-    with tempfile.NamedTemporaryFile(suffix="." + extension) as temp:
-        output = subprocess.check_output(
-            [
-                "/usr/bin/mdls",
-                "-name",
-                "kMDItemContentType",
-                temp.name,
-            ]
-        ).splitlines()
-        output = output[0].decode("UTF-8") if output else None
-        if not output:
-            return None
+    try:
+        with tempfile.NamedTemporaryFile(suffix="." + extension) as temp:
+            output = subprocess.check_output(
+                [
+                    "/usr/bin/mdls",
+                    "-name",
+                    "kMDItemContentType",
+                    temp.name,
+                ]
+            ).splitlines()
+            output = output[0].decode("UTF-8") if output else None
+            if not output:
+                return None

-        match = re.match(r'kMDItemContentType\s+\=\s+"(.*)"', output)
-        if match:
-            return match.group(1)
+            match = re.match(r'kMDItemContentType\s+\=\s+"(.*)"', output)
+            if match:
+                return match.group(1)
+            return None
+    except Exception:
        return None


 def _get_uti_from_ext_dict(ext):
    try:
-        return EXT_UTI_DICT[ext]
+        return EXT_UTI_DICT[ext.lower()]
    except KeyError:
        return None


 def _get_ext_from_uti_dict(uti):
    try:
-        return UTI_EXT_DICT[uti]
+        return UTI_EXT_DICT[uti.lower()]
    except KeyError:
        return None

--- a/osxphotos/utils.py
+++ b/osxphotos/utils.py
@@ -16,9 +16,11 @@ import sys
 import unicodedata
 import urllib.parse
 from plistlib import load as plistload
-from typing import Callable
+from typing import Callable, Union

 import CoreFoundation
+import objc
+from Foundation import NSString

 from ._constants import UNICODE_FORMAT

@@ -263,6 +265,13 @@ def list_photo_libraries():
    return lib_list


+def normalize_fs_path(path: str) -> str:
+    """Normalize filesystem paths with unicode in them"""
+    with objc.autorelease_pool():
+        normalized_path = NSString.fileSystemRepresentation(path)
+        return normalized_path.decode("utf8")
+
+
 def findfiles(pattern, path_):
    """Returns list of filenames from path_ matched by pattern
    shell pattern. Matching is case-insensitive.
@@ -271,8 +280,11 @@ def findfiles(pattern, path_):
        return []
    # See: https://gist.github.com/techtonik/5694830

+    # paths need to be normalized for unicode as filesystem returns unicode in NFD form
+    pattern = normalize_fs_path(pattern)
    rule = re.compile(fnmatch.translate(pattern), re.IGNORECASE)
-    return [name for name in os.listdir(path_) if rule.match(name)]
+    files = [normalize_fs_path(p) for p in os.listdir(path_)]
+    return [name for name in files if rule.match(name)]


 def _open_sql_file(dbname):
@@ -353,30 +365,50 @@ def normalize_unicode(value):
        return None


-def increment_filename(filepath):
+def increment_filename_with_count(filepath: Union[str,pathlib.Path], count: int = 0) -> str:
    """Return filename (1).ext, etc if filename.ext exists

        If file exists in filename's parent folder with same stem as filename,
        add (1), (2), etc. until a non-existing filename is found.

    Args:
-        filepath: str; full path, including file name
+        filepath: str or pathlib.Path; full path, including file name
+        count: int; starting increment value
+
+    Returns:
+        tuple of new filepath (or same if not incremented), count
+
+    Note: This obviously is subject to race condition so using with caution.
+    """
+    dest = filepath if isinstance(filepath, pathlib.Path) else pathlib.Path(filepath)
+    dest_files = findfiles(f"{dest.stem}*", str(dest.parent))
+    dest_files = [normalize_fs_path(pathlib.Path(f).stem.lower()) for f in dest_files]
+    dest_new = dest.stem
+    if count:
+        dest_new = f"{dest.stem} ({count})"
+    while normalize_fs_path(dest_new.lower()) in dest_files:
+        count += 1
+        dest_new = f"{dest.stem} ({count})"
+    dest = dest.parent / f"{dest_new}{dest.suffix}"
+    return str(dest), count
+
+
+def increment_filename(filepath: Union[str, pathlib.Path]) -> str:
+    """Return filename (1).ext, etc if filename.ext exists
+
+        If file exists in filename's parent folder with same stem as filename,
+        add (1), (2), etc. until a non-existing filename is found.
+
+    Args:
+        filepath: str or pathlib.Path; full path, including file name

    Returns:
        new filepath (or same if not incremented)

    Note: This obviously is subject to race condition so using with caution.
    """
-    dest = pathlib.Path(str(filepath))
-    count = 1
-    dest_files = findfiles(f"{dest.stem}*", str(dest.parent))
-    dest_files = [pathlib.Path(f).stem.lower() for f in dest_files]
-    dest_new = dest.stem
-    while dest_new.lower() in dest_files:
-        dest_new = f"{dest.stem} ({count})"
-        count += 1
-    dest = dest.parent / f"{dest_new}{dest.suffix}"
-    return str(dest)
+    new_filepath, _ = increment_filename_with_count(filepath)
+    return new_filepath


 def expand_and_validate_filepath(path: str) -> str:
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,23 +1,26 @@
-pyobjc-core>=7.2
-pyobjc-framework-AppleScriptKit>=7.2
-pyobjc-framework-AppleScriptObjC>=7.2
-pyobjc-framework-Photos>=7.2
-pyobjc-framework-Quartz>=7.2
-pyobjc-framework-AVFoundation>=7.2
-pyobjc-framework-CoreServices>=7.2
-pyobjc-framework-Metal>=7.2
-pyobjc-framework-Vision>=7.2
-Click==8.0.1
-PyYAML==5.4.1
-Mako==1.1.4
+Click>=8.0.1,<9.0
+Mako>=1.1.4,<1.2.0
+PyYAML>=5.4.1,<6.0.0
+bitmath>=1.3.3.1,<1.4.0.0
 bpylist2==3.0.2
-pathvalidate==2.4.1
 dataclasses==0.7;python_version<'3.7'
-wurlitzer==2.1.0
-photoscript==0.1.4
-toml==0.10.2
-osxmetadata==0.99.31
-textx==2.3.0
-rich==10.6.0
-bitmath==1.3.3.1
-more-itertools==8.8.0 
+more-itertools>=8.8.0,<9.0.0
+objexplore>=1.5.5,<1.6.0
+osxmetadata>=0.99.34,<1.0.0
+pathvalidate>=2.4.1,<2.5.0
+photoscript>=0.1.4,<0.2.0
+ptpython>=3.0.20,<3.1.0
+pyobjc-core>=7.3,<9.0
+pyobjc-framework-AVFoundation>=7.3,<9.0
+pyobjc-framework-AppleScriptKit>=7.3,<9.0
+pyobjc-framework-AppleScriptObjC>=7.3,<9.0
+pyobjc-framework-Cocoa>=7.3,<9.0
+pyobjc-framework-CoreServices>=7.2,<9.0
+pyobjc-framework-Metal>=7.3,<9.0
+pyobjc-framework-Photos>=7.3,<9.0
+pyobjc-framework-Quartz>=7.3,<9.0
+pyobjc-framework-Vision>=7.3,<9.0
+rich>=10.6.0,<=11.0.0
+textx>=2.3.0,<2.4.0
+toml>=0.10.2,<0.11.0
+wurlitzer>=2.1.0,<2.2.0
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -1,6 +0,0 @@
-sphinx_click
-pytest==6.2.4
-pytest-mock
-m2r2
-pyinstaller==4.4
-
--- a/setup.py
+++ b/setup.py
@@ -70,32 +70,36 @@ setup(
        "Programming Language :: Python :: 3.7",
        "Programming Language :: Python :: 3.8",
        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
        "Topic :: Software Development :: Libraries :: Python Modules",
    ],
    install_requires=[
-        "pyobjc-core",
-        "pyobjc-framework-AppleScriptKit",
-        "pyobjc-framework-AppleScriptObjC",
-        "pyobjc-framework-Photos",
-        "pyobjc-framework-Quartz",
-        "pyobjc-framework-AVFoundation",
-        "pyobjc-framework-CoreServices",
-        "pyobjc-framework-Metal",
-        "pyobjc-framework-Vision",
-        "Click==8.0.1",
-        "PyYAML==5.4.1",
-        "Mako==1.1.4",
+        "Click>=8.0.1,<9.0",
+        "Mako>=1.1.4,<1.2.0",
+        "PyYAML>=5.4.1,<5.5.0",
+        "bitmath>=1.3.3.1,<1.4.0.0",
        "bpylist2==3.0.2",
-        "pathvalidate==2.4.1",
        "dataclasses==0.7;python_version<'3.7'",
-        "wurlitzer==2.1.0",
-        "photoscript==0.1.4",
-        "toml==0.10.2",
-        "osxmetadata==0.99.31",
-        "textx==2.3.0",
-        "rich==10.6.0",
-        "bitmath==1.3.3.1",
-        "more-itertools==8.8.0",
+        "more-itertools>=8.8.0,<9.0.0",
+        "objexplore>=1.5.5,<1.6.0",
+        "osxmetadata>=0.99.34,<1.0.0",
+        "pathvalidate>=2.4.1,<3.0.0",
+        "photoscript>=0.1.4,<0.2.0",
+        "ptpython>=3.0.20,<4.0.0",
+        "pyobjc-core>=7.3,<9.0",
+        "pyobjc-framework-AVFoundation>=7.3,<9.0",
+        "pyobjc-framework-AppleScriptKit>=7.3,<9.0",
+        "pyobjc-framework-AppleScriptObjC>=7.3,<9.0",
+        "pyobjc-framework-Cocoa>=7.3,<9.0",
+        "pyobjc-framework-CoreServices>=7.2,<9.0",
+        "pyobjc-framework-Metal>=7.3,<9.0",
+        "pyobjc-framework-Photos>=7.3,<9.0",
+        "pyobjc-framework-Quartz>=7.3,<9.0",
+        "pyobjc-framework-Vision>=7.3,<9.0",
+        "rich>=10.6.0,<=11.0.0",
+        "textx>=2.3.0,<3.0.0",
+        "toml>=0.10.2,<0.11.0",
+        "wurlitzer>=2.1.0,<3.0.0",
    ],
    entry_points={"console_scripts": ["osxphotos=osxphotos.__main__:cli"]},
    include_package_data=True,
--- a/tests/Test-10.15.7.photoslibrary/database/Photos.sqlite
+++ b/tests/Test-10.15.7.photoslibrary/database/Photos.sqlite
--- a/tests/Test-10.15.7.photoslibrary/database/Photos.sqlite-shm
+++ b/tests/Test-10.15.7.photoslibrary/database/Photos.sqlite-shm
--- a/tests/Test-10.15.7.photoslibrary/database/Photos.sqlite-wal
+++ b/tests/Test-10.15.7.photoslibrary/database/Photos.sqlite-wal
--- a/tests/Test-10.15.7.photoslibrary/database/search/psi.sqlite
+++ b/tests/Test-10.15.7.photoslibrary/database/search/psi.sqlite
--- a/tests/Test-10.15.7.photoslibrary/database/search/psi.sqlite-shm
+++ b/tests/Test-10.15.7.photoslibrary/database/search/psi.sqlite-shm
--- a/tests/Test-10.15.7.photoslibrary/database/search/psi.sqlite-wal
+++ b/tests/Test-10.15.7.photoslibrary/database/search/psi.sqlite-wal
--- a/tests/Test-10.15.7.photoslibrary/database/search/synonymsProcess.plist
+++ b/tests/Test-10.15.7.photoslibrary/database/search/synonymsProcess.plist
--- a/tests/Test-10.15.7.photoslibrary/database/search/zeroKeywords.data
+++ b/tests/Test-10.15.7.photoslibrary/database/search/zeroKeywords.data
--- a/tests/Test-10.15.7.photoslibrary/originals/1/1793FAAB-DE75-4E25-886C-2BD66C780D6A.jpeg
+++ b/tests/Test-10.15.7.photoslibrary/originals/1/1793FAAB-DE75-4E25-886C-2BD66C780D6A.jpeg
--- a/tests/Test-10.15.7.photoslibrary/originals/A/A8266C97-9BAF-4AF4-99F3-0013832869B8.jpeg
+++ b/tests/Test-10.15.7.photoslibrary/originals/A/A8266C97-9BAF-4AF4-99F3-0013832869B8.jpeg
--- a/tests/Test-10.15.7.photoslibrary/originals/B/B13F4485-94E0-41CD-AF71-913095D62E31.jpeg
+++ b/tests/Test-10.15.7.photoslibrary/originals/B/B13F4485-94E0-41CD-AF71-913095D62E31.jpeg
--- a/tests/Test-10.15.7.photoslibrary/originals/D/D1D4040D-D141-44E8-93EA-E403D9F63E07.jpeg
+++ b/tests/Test-10.15.7.photoslibrary/originals/D/D1D4040D-D141-44E8-93EA-E403D9F63E07.jpeg
--- a/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-shm
+++ b/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-shm
--- a/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-shm
+++ b/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-shm
--- a/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm
+++ b/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm
--- a/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal
+++ b/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal
--- a/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-shm
+++ b/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-shm
--- a/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-wal
+++ b/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-wal
--- a/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite
+++ b/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite
--- a/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-shm
+++ b/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-shm
--- a/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-wal
+++ b/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-wal
--- a/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-shm
+++ b/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-shm
--- a/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-wal
+++ b/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-wal
--- a/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-shm
+++ b/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-shm
--- a/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-wal
+++ b/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-wal
--- a/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-shm
+++ b/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-shm
--- a/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-wal
+++ b/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-wal
--- a/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGSearchComputationCache.plist
+++ b/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGSearchComputationCache.plist
--- a/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist
+++ b/tests/Test-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist
@@ -3,24 +3,24 @@
 <plist version="1.0">
 <dict>
 	<key>BackgroundHighlightCollection</key>
-	<date>2021-07-20T05:48:01Z</date>
+	<date>2021-09-14T04:40:42Z</date>
 	<key>BackgroundHighlightEnrichment</key>
-	<date>2021-07-20T05:48:00Z</date>
+	<date>2021-09-14T04:40:42Z</date>
 	<key>BackgroundJobAssetRevGeocode</key>
-	<date>2021-07-20T07:05:31Z</date>
+	<date>2021-09-14T04:40:42Z</date>
 	<key>BackgroundJobSearch</key>
-	<date>2021-07-20T05:48:01Z</date>
+	<date>2021-09-14T04:40:42Z</date>
 	<key>BackgroundPeopleSuggestion</key>
-	<date>2021-07-20T05:48:00Z</date>
+	<date>2021-09-14T04:40:41Z</date>
 	<key>BackgroundUserBehaviorProcessor</key>
-	<date>2021-07-20T05:48:01Z</date>
+	<date>2021-09-14T04:40:42Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundGraphConsistencyUpdateJobDateKey</key>
 	<date>2021-07-20T05:48:08Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate</key>
 	<date>2021-07-20T05:47:59Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate</key>
-	<date>2021-07-20T05:48:01Z</date>
+	<date>2021-09-14T04:40:43Z</date>
 	<key>SiriPortraitDonation</key>
-	<date>2021-07-20T05:48:01Z</date>
+	<date>2021-09-14T04:40:42Z</date>
 </dict>
 </plist>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rhet Turnbull	76aee7f189	Export DB can now reside outside export directory, #568	2022-01-04 06:28:59 -08:00
Rhet Turnbull	147b30f973	More refactoring of export code, #462	2022-01-02 22:38:22 -08:00
Rhet Turnbull	a73dc72558	Refactored photoinfo, photoexporter; #462	2022-01-02 09:06:04 -08:00
Rhet Turnbull	c99cf5518d	Updated CHANGELOG.md [skip ci]	2021-12-31 20:50:42 -08:00
Rhet Turnbull	1391675a3a	Updated tests and docs	2021-12-31 20:31:15 -08:00
Rhet Turnbull	a3b2784f31	ImageConverter now uses generic context; #562	2021-12-31 17:34:41 -08:00
Rhet Turnbull	cbe79ee98c	Updated docs [skip ci]	2021-12-31 09:45:42 -08:00
Rhet Turnbull	eb7a2988bf	Updated CHANGELOG.md [skip ci]	2021-12-31 09:45:19 -08:00
Rhet Turnbull	42426b95ee	Bug fix for #559	2021-12-31 09:35:12 -08:00
Rhet Turnbull	262a6f31e7	Updated CHANGELOG.md [skip ci]	2021-12-31 08:39:18 -08:00
Rhet Turnbull	04930c3644	Added --skip-uuid, --skip-uuid-from-file, #563	2021-12-31 08:35:26 -08:00
Rhet Turnbull	44594a8e43	Added support for projects, implements #559	2021-12-31 07:30:20 -08:00
Rhet Turnbull	690d981f31	Fixed test for #561	2021-12-30 15:45:32 -08:00
Rhet Turnbull	06ea8d1e6c	Updated CHANGELOG.md [skip ci]	2021-12-29 11:24:29 -08:00
Rhet Turnbull	c4e3c5a8be	Updated docs [skip ci]	2021-12-28 17:37:00 -08:00
Rhet Turnbull	03f4e7cc34	Fix for accented characters in album names, #561	2021-12-28 17:25:50 -08:00
Rhet Turnbull	0e54a08ae0	Updated docs [skip ci]	2021-12-26 20:09:10 -08:00
Rhet Turnbull	b71c752e9d	Added get_photos_library_version	2021-12-26 19:57:33 -08:00
Rhet Turnbull	521848f955	Added export test for --exif	2021-12-25 05:53:26 -08:00
Rhet Turnbull	debb17c952	Implement #323	2021-12-25 05:41:37 -08:00
Rhet Turnbull	7819740f70	Fixed #463	2021-12-24 18:12:02 -08:00
Rhet Turnbull	b9ffb0d8de	Fixed helped text, #493	2021-12-24 18:08:18 -08:00
Rhet Turnbull	d59852f594	Updated tests	2021-12-24 17:21:13 -08:00
Rhet Turnbull	085f482820	Added install/uninstall commands, #531	2021-12-24 17:05:01 -08:00
Rhet Turnbull	1cb8da96ce	Updated dev_requirements.txt	2021-12-22 19:08:25 -08:00
Rhet Turnbull	50016a9eca	Updated requirements_dev.txt	2021-12-22 18:10:15 -08:00
Rhet Turnbull	924f7325b4	Removed redundant dev_requirements.txt	2021-12-22 18:08:44 -08:00
Rhet Turnbull	181f678d9e	Updated docs [skip ci]	2021-12-22 08:22:02 -08:00
Rhet Turnbull	6ce1b83ca2	Version bump	2021-12-21 09:39:05 -08:00
Rhet Turnbull	a08a653f20	Partial fix for #556	2021-12-21 09:36:42 -08:00
Rhet Turnbull	e1f1772080	Updated all-contributors	2021-12-16 22:11:52 -08:00
Andrew Louis	d2a1f792e9	Adds missing f-string to retry message (#553 )	2021-12-16 17:23:33 -08:00
Rhet Turnbull	e7bd80e05f	Update issue templates	2021-12-11 22:24:38 -08:00
Rhet Turnbull	9089c0323c	Updated CHANGELOG.md [skip ci]	2021-12-10 20:40:40 -08:00
Rhet Turnbull	197e5663df	Updated docs	2021-12-10 20:26:00 -08:00
Rhet Turnbull	f6dedaa619	Updated docs [skip ci]	2021-12-10 20:09:20 -08:00
Rhet Turnbull	0906dbe637	Fixed error for missing photo path, #547	2021-12-10 19:36:25 -08:00
Rhet Turnbull	0629b3f6d6	Merge branch 'master' of github.com:RhetTbull/osxphotos	2021-12-10 19:26:29 -08:00
Rhet Turnbull	55dfc0ec7d	Fixed typo, thanks to @hyfen	2021-12-10 19:26:21 -08:00
Andrew Louis	b7f8b26f1d	Fixes typo in README (#548 )	2021-12-10 19:23:56 -08:00
Rhet Turnbull	9ca7dd50bc	Updated all-contributors	2021-12-10 19:23:12 -08:00
allcontributors[bot]	0e73d57bdf	docs: add alandefreitas as a contributor for bug (#551 ) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>	2021-12-10 19:08:32 -08:00
Rhet Turnbull	9de2c17e47	Added additional try/except in _photoinfo_export.py	2021-12-06 06:16:42 -08:00
Rhet Turnbull	1bae6d33f1	Updated to moment processing for consistency	2021-12-06 06:07:55 -08:00
Rhet Turnbull	a52b4d2f43	Added MomentInfo for Photos 5+, #71	2021-12-05 19:12:37 -08:00
Rhet Turnbull	3e038bf124	Added test library for Monterey on M1	2021-12-05 08:41:08 -08:00
Rhet Turnbull	870ed9c435	Updated README.md for Monterey	2021-12-04 10:46:06 -08:00
allcontributors[bot]	68e7ca3277	docs: add dgleich as a contributor for code (#541 ) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>	2021-11-25 10:06:35 -08:00
Rhet Turnbull	c9142c2156	Updated CHANGELOG.md [skip ci]	2021-11-25 10:01:54 -08:00
Rhet Turnbull	7d923590ae	Updated dependencies for pyobjc 8.0	2021-11-25 08:34:55 -08:00
Rhet Turnbull	5383ced1ca	Updated CHANGELOG.md [skip ci]	2021-11-11 11:05:19 -08:00
Rhet Turnbull	0e6c92dbd9	Fix for --use-photokit with --skip-live, #537	2021-11-11 10:54:48 -08:00
Rhet Turnbull	b00978c61a	Updated CHANGELOG.md [skip ci]	2021-11-07 21:35:46 -08:00
Rhet Turnbull	fb583e28e0	Updated docs [skip ci]	2021-11-07 21:31:27 -08:00
Rhet Turnbull	760386e3d7	Updated tested versions	2021-11-07 21:21:50 -08:00
Rhet Turnbull	51ba54971a	Test fixes for Monterey/M1	2021-11-07 08:33:08 -08:00
Rhet Turnbull	2ffcf1e82b	Updated OTL to MTL	2021-11-06 07:13:02 -07:00
Rhet Turnbull	818f4f45a4	Dependency update for Monterey	2021-10-30 07:37:23 -07:00
Rhet Turnbull	2cf19f6af1	Updated docs [skip ci]	2021-10-30 07:25:26 -07:00
Rhet Turnbull	ef82c6e32b	Updated for Monterey 12.0.1 release	2021-10-28 22:05:17 -07:00
Rhet Turnbull	0e9b9d6251	Updated docs [skip ci]	2021-10-15 05:45:17 -07:00
Rhet Turnbull	419b34ea73	Fix for #526 with --update	2021-10-15 05:36:41 -07:00
Rhet Turnbull	f64c4ed374	Fixed FileUtil to use correct import	2021-10-14 21:29:45 -07:00
Rhet Turnbull	1677f404d2	Updated CHANGELOG.md [skip ci]	2021-10-11 18:07:36 -07:00
allcontributors[bot]	a612a363ed	docs: add spencerc99 as a contributor for bug (#527 ) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>	2021-10-11 18:03:50 -07:00
Rhet Turnbull	202bc1144b	Fix for #526	2021-10-11 17:50:07 -07:00
Rhet Turnbull	a0c654e43f	Updated README.md [skip ci]	2021-10-11 17:03:45 -07:00
Rhet Turnbull	2bb677dc19	Updated docs [skip ci]	2021-10-11 16:52:22 -07:00
Rhet Turnbull	e33805fe42	Merge branch 'master' of github.com:RhetTbull/osxphotos	2021-10-11 16:00:05 -07:00
Rhet Turnbull	04ac0a1121	Fix for #524	2021-10-11 15:59:40 -07:00
Rhet Turnbull	d2b0bd4e28	Fix for #525	2021-10-11 15:59:02 -07:00
allcontributors[bot]	d754899563	docs: add oPromessa as a contributor for bug (#525 ) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>	2021-10-11 15:55:49 -07:00
Rhet Turnbull	4a81e643a7	Updated CHANGELOG.md [skip ci]	2021-10-11 07:35:51 -07:00
Rhet Turnbull	b23e74f8f5	Updated docs [skip ci]	2021-10-11 07:32:15 -07:00
Rhet Turnbull	5dc766249a	Updated dependencies	2021-10-10 23:05:53 -07:00
Rhet Turnbull	a895833c7f	Updated dependencies	2021-10-10 22:27:00 -07:00
Rhet Turnbull	3f81a3c179	Added python 3.10 to supported versions	2021-10-09 09:39:23 -07:00
Rhet Turnbull	f1235f745f	Updated CHANGELOG.md [skip ci]	2021-09-30 06:13:40 -07:00
Rhet Turnbull	1ddb1de998	Updated docs [skip ci]	2021-09-30 06:11:00 -07:00
Rhet Turnbull	c472698b1d	Updated REPL, now with more cowbell	2021-09-30 05:59:03 -07:00
Rhet Turnbull	4e021a0731	Updated CHANGELOG.md [skip ci]	2021-09-26 15:57:07 -07:00
Rhet Turnbull	bfbc156821	Updated docs [skip ci]	2021-09-26 15:55:03 -07:00
Rhet Turnbull	bfd6274602	Fixed AlbumInfo.owner, #239	2021-09-26 15:52:38 -07:00
Rhet Turnbull	3abaa5ae84	Updated docs [skip ci]	2021-09-26 15:43:22 -07:00
Rhet Turnbull	65115a50a9	Updated CHANGELOG.md [skip ci]	2021-09-26 15:00:34 -07:00
Rhet Turnbull	06138e15d0	version bump	2021-09-26 14:56:10 -07:00
Rhet Turnbull	14710e3178	Performance fix for #239 , owner	2021-09-26 14:55:43 -07:00
Rhet Turnbull	f705f09749	Updated CHANGELOG.md [skip ci]	2021-09-26 14:54:59 -07:00
Rhet Turnbull	82c445f41e	Updated CHANGELOG.md [skip ci]	2021-09-26 14:29:36 -07:00
Rhet Turnbull	1b40e9d65f	Fixed tests for comment fix	2021-09-26 14:07:35 -07:00
Rhet Turnbull	725f7c8735	Updated docs [skip ci]	2021-09-26 14:00:46 -07:00
Rhet Turnbull	7cc8578148	Merge branch 'master' of github.com:RhetTbull/osxphotos	2021-09-26 13:53:32 -07:00
Rhet Turnbull	6adafb8ce7	Fixed formatting	2021-09-26 13:53:21 -07:00
Rhet Turnbull	ac47df8475	Fix for #517 , #239	2021-09-26 13:51:47 -07:00
Rhet Turnbull	f680cf78ab	Removed macOS-11, need to fix detected_text test	2021-09-26 09:06:17 -07:00
Rhet Turnbull	c86e84c534	Removed python 3.10-dev, not available in GH	2021-09-26 08:06:32 -07:00
Rhet Turnbull	3fb611825c	Added python 3.10, macOS 11	2021-09-26 07:53:32 -07:00
Rhet Turnbull	1cfdad0176	Updated CHANGELOG.md [skip ci]	2021-09-25 22:51:30 -07:00
Rhet Turnbull	59ba325273	Updated docs [skip ci]	2021-09-25 22:38:46 -07:00
Rhet Turnbull	c4b7c2623f	Implemented PhotoInfo.owner, AlbumInfo.owner, #216 , #239	2021-09-25 22:33:37 -07:00
Rhet Turnbull	e5b2d2ee45	Updated CHANGELOG.md [skip ci]	2021-09-25 09:51:50 -07:00
Rhet Turnbull	64c226b855	Updated docs [skip ci]	2021-09-25 08:54:16 -07:00
Rhet Turnbull	e3e1da2fd8	Fix for #516	2021-09-25 08:47:09 -07:00
Rhet Turnbull	57b2f8a413	Fixed README	2021-09-21 20:14:04 -07:00
Rhet Turnbull	5a76a511db	Test pre-commit hook	2021-09-21 20:13:20 -07:00
Rhet Turnbull	283f049780	Test pre-commit hook	2021-09-21 20:12:42 -07:00
Rhet Turnbull	c4743cc867	Test pre-commit hook	2021-09-21 20:11:02 -07:00
Rhet Turnbull	c429a860b1	Update docs	2021-09-17 06:24:39 -07:00
Rhet Turnbull	1f748c829b	Updated CHANGELOG.md [skip ci]	2021-09-15 20:35:18 -07:00
Rhet Turnbull	dd08c7f701	Fixed detected_text to use image orientation if available	2021-09-15 20:18:18 -07:00
Rhet Turnbull	77103193c0	Updated CHANGELOG.md [skip ci]	2021-09-14 17:38:22 -07:00
Rhet Turnbull	16335a6bd6	Added twine	2021-09-14 17:36:57 -07:00
Rhet Turnbull	e0f6d8ecf2	Added wheel	2021-09-14 17:36:20 -07:00
Rhet Turnbull	59c31ff88d	Fix for #515 , updated tests	2021-09-14 17:24:02 -07:00
Rhet Turnbull	93bf0c210c	Fix for #515	2021-09-13 22:14:48 -07:00
Rhet Turnbull	4f7642b1d2	Updated tested versions	2021-09-12 17:34:16 -07:00
Rhet Turnbull	773dca8494	Updated docs	2021-09-12 17:31:15 -07:00
Rhet Turnbull	3cd26e2e38	Updated .gitignore	2021-09-12 16:35:48 -07:00
Rhet Turnbull	271761cf04	Updated CHANGELOG.md [skip ci]	2021-08-29 19:06:43 -07:00
Rhet Turnbull	6eea552fb9	Updated README [skip ci]	2021-08-29 18:34:35 -07:00
Rhet Turnbull	81dd1a7530	Updated README [skip ci]	2021-08-29 18:31:50 -07:00
Rhet Turnbull	2eb6e70e57	Updated dependencies	2021-08-29 18:30:23 -07:00
Rhet Turnbull	6bcc67634c	Bug fix for null title, #512	2021-08-29 13:06:09 -07:00
Rhet Turnbull	062d8eb206	Updated CHANGELOG.md [skip ci]	2021-08-29 12:21:59 -07:00
Rhet Turnbull	f0d7496bc6	Fix for newlines in exif tags, #513	2021-08-29 12:18:20 -07:00
allcontributors[bot]	8e2b768236	docs: add dssinger as a contributor for bug (#514 ) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>	2021-08-29 07:07:51 -07:00
Rhet Turnbull	48bf326994	Updated CHANGELOG.md [skip ci]	2021-08-28 09:21:07 -07:00
Rhet Turnbull	159d1102aa	Added {strip} template	2021-08-28 08:14:26 -07:00
Rhet Turnbull	dbb4dbc0a7	Fixed --strip behavior, #511	2021-08-28 08:01:08 -07:00
Rhet Turnbull	777e768243	Added selected and quit to repl	2021-08-28 07:23:17 -07:00
Rhet Turnbull	70999a70b8	Updated tutorial template	2021-08-27 23:52:14 -07:00
Rhet Turnbull	3a6b2c2c35	Update test_cli.py	2021-08-23 18:36:35 -07:00
Rhet Turnbull	dfb80ba8d6	Update test_cli.py	2021-08-23 18:30:34 -07:00
Rhet Turnbull	94b818b156	Update test_cli.py	2021-08-23 18:09:36 -07:00
Rhet Turnbull	f1cea1498b	Update test for #506	2021-08-23 17:57:28 -07:00
Rhet Turnbull	345678577a	Updated test for #506	2021-08-23 17:29:38 -07:00